Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Update vifm to 0.13
@ 2023-07-05 22:33 hholst80
  2023-07-05 22:35 ` hholst80
                   ` (33 more replies)
  0 siblings, 34 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 22:33 UTC (permalink / raw)
  To: ml

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

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

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


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

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

From 32c92b6b987e503b5bc8331ef8fc9876c865a93e Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..91cb9bbb88d7 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="A file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

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

* Re: Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
@ 2023-07-05 22:35 ` hholst80
  2023-07-05 22:39 ` [PR PATCH] [Updated] " hholst80
                   ` (32 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 22:35 UTC (permalink / raw)
  To: ml

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

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1622620705

Comment:
perl is a new build dep needed to build the docs'. Well, that or vim. I picked Perl at random.

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

* Re: [PR PATCH] [Updated] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
  2023-07-05 22:35 ` hholst80
@ 2023-07-05 22:39 ` hholst80
  2023-07-05 22:42 ` [PR REVIEW] " classabbyamp
                   ` (31 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 22:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


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

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

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

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

* Re: [PR REVIEW] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
  2023-07-05 22:35 ` hholst80
  2023-07-05 22:39 ` [PR PATCH] [Updated] " hholst80
@ 2023-07-05 22:42 ` classabbyamp
  2023-07-05 23:06 ` [PR PATCH] [Updated] " hholst80
                   ` (30 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2023-07-05 22:42 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1253725559

Comment:
```suggestion
short_desc="File manager with curses interface and a Vim-like environment"
```

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

* Re: [PR PATCH] [Updated] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (2 preceding siblings ...)
  2023-07-05 22:42 ` [PR REVIEW] " classabbyamp
@ 2023-07-05 23:06 ` hholst80
  2023-07-05 23:14 ` hholst80
                   ` (29 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 23:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


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

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

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH 0001/1853] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

From 08b5b965c01ea869e232dca292adfcac8f23e4d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 May 2023 13:08:35 +0200
Subject: [PATCH 0002/1853] c-ares: update to 1.19.1.

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

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index e2093b49feb4..a4538e3f1e51 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,7 +1,7 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.19.0
-revision=2
+version=1.19.1
+revision=1
 build_style=gnu-configure
 checkdepends="iana-etc"
 short_desc="Library for asynchronous DNS requests"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="https://c-ares.haxx.se/download/c-ares-${version}.tar.gz"
-checksum=bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3
+checksum=321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e
 make_check=ci-skip # segfaults only on CI
 
 post_install() {

From 57226542697ad72f645dd40f79988bba0c6310c9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 May 2023 13:10:31 +0200
Subject: [PATCH 0003/1853] elixir: update to 1.14.5.

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

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index cfcd51f13f5f..568e28e4f7ca 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.14.4
+version=1.14.5
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=07d66cf147acadc21bd1679f486efd6f8d64a73856ecc83c71b5e903081b45d2
+checksum=2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From a4f05d33112196a9452ebb4d71ea7b155d67d9d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 May 2023 14:43:13 +0200
Subject: [PATCH 0004/1853] bmake: update to 20230522.

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

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 5a0afae5376d..a0bb5be099ba 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20230512
+version=20230522
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=b927b50a45e4b5579c6491ab09ce3dbd8b170fb10fe6f16d484e13d15e338ffa
+checksum=dfe556df70e1555b70eccf4e6d367aa8b91aa076d5e9b55e36b5ce3e721f9050
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From 1883416531d50a31f028ff703fdede6257edcdd9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 8 Apr 2023 13:52:03 +0100
Subject: [PATCH 0005/1853] wayland-utils: orphan.

Closes #42257.
---
 srcpkgs/wayland-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wayland-utils/template b/srcpkgs/wayland-utils/template
index b3b9c3c4d644..7c05257f97d3 100644
--- a/srcpkgs/wayland-utils/template
+++ b/srcpkgs/wayland-utils/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel wayland-protocols"
 short_desc="Wayland utilities"
-maintainer="Kirill Primak <vyivel@posteo.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/wayland-utils-${version}.tar.xz"

From 3fd8761b07ebfff4d1b07457bb70ada21db04513 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:33:54 -0400
Subject: [PATCH 0006/1853] New package: pipewire-session-manager-bootstrap-0

This dummy package will be the default provider for the the session
manager pulled in by pipewire, breaking a build cycle.
---
 etc/defaults.virtual                                |  1 +
 srcpkgs/pipewire-session-manager-bootstrap/template | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 srcpkgs/pipewire-session-manager-bootstrap/template

diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..f399b1299840 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
 ntp-daemon chrony
 phonon-backend phonon-backend-gstreamer
 phonon-qt5-backend phonon-qt5-backend-gstreamer
+pipewire-session-manager pipewire-session-manager-bootstrap
 rkt-stage1 rkt-stage1-coreos
 smtp-server opensmtpd
 tex texlive
diff --git a/srcpkgs/pipewire-session-manager-bootstrap/template b/srcpkgs/pipewire-session-manager-bootstrap/template
new file mode 100644
index 000000000000..355313ab40dd
--- /dev/null
+++ b/srcpkgs/pipewire-session-manager-bootstrap/template
@@ -0,0 +1,11 @@
+# Template file for 'pipewire-session-manager-bootstrap'
+pkgname=pipewire-session-manager-bootstrap
+version=0
+revision=1
+build_style=meta
+short_desc="Dummy pipewire-session-manager provider"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Public Domain"
+homepage="https://voidlinux.org"
+provides="pipewire-session-manager-${version}_${revision}"
+repository=bootstrap

From 737ffa92739b6b649a456eeb09f1aca64ad80beb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:35:25 -0400
Subject: [PATCH 0007/1853] wireplumber: provide virtual
 pipewire-session-manager

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

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 23b011e8d203..f0ca35159469 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -15,6 +15,7 @@ homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
+provides="pipewire-session-manager-0_1"
 
 post_install() {
 	vlicense LICENSE

From b17b57589be40a77604c2dcfcd06d09e5adaf28b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:38:03 -0400
Subject: [PATCH 0008/1853] pipewire: update to 0.3.71, drop
 pipewire-media-session

Now depends on virtual session manager

Closes: #43574 [via git-merge-pr]
---
 srcpkgs/pipewire/INSTALL.msg                  |  6 +--
 .../patches/autostart-media-session.patch     | 17 -------
 .../patches/jack-fix-notify-skip.patch        | 50 +++++++++++++++++++
 srcpkgs/pipewire/template                     | 27 +++-------
 4 files changed, 60 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/autostart-media-session.patch
 create mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
index 9a3d2db6e1f1..3c3a9b13ef4f 100644
--- a/srcpkgs/pipewire/INSTALL.msg
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -1,4 +1,2 @@
-The pipewire-media-session session manager has been abandoned upstream and will
-be removed from Void in a subsequent pipewire update. All users are encouraged
-to transition to wireplumber as soon as possible to avoid unexpected loss of
-functionality in the future.
+The pipewire-media-session session manager has been removed from Void.
+All users must transition to wireplumber to avoid loss of functionality.
diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
deleted file mode 100644
index c5753a3719c2..000000000000
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream's config does not autostart pipewire-media-session anymore, which
-is an essential component. It's not easy to start it externally in a script
-since it needs the pipewire socket up, and Void doesn't have a mechanism to
-ensure it (systemd socket activation).
-diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in
-index 95632c2..ab0b097 100644
---- a/src/daemon/pipewire.conf.in.orig
-+++ b/src/daemon/pipewire.conf.in
-@@ -236,7 +236,7 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
-+    { path = "@session_manager_path@" args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
new file mode 100644
index 000000000000..fed37727a636
--- /dev/null
+++ b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
@@ -0,0 +1,50 @@
+From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 18 May 2023 09:59:26 +0200
+Subject: [PATCH] jack: update bufsize and samplerate when skipping notify
+
+When we skip the notify because we are not active or we don't have a
+callback, still update the buffer_size and sample_rate fields or else
+we will keep on trying forever.
+
+Fixes #3226
+---
+ pipewire-jack/src/pipewire-jack.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
+index 0c8363ea3..20feb2462 100644
+--- a/pipewire-jack/src/pipewire-jack.c
++++ b/pipewire-jack/src/pipewire-jack.c
+@@ -1027,8 +1027,6 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
+ 	struct notify *notify;
+ 	bool emit = false;;
+ 
+-	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
+-		return 0;
+ 	switch (type) {
+ 	case NOTIFY_TYPE_REGISTRATION:
+ 		emit = c->registration_callback != NULL && o != NULL;
+@@ -1060,8 +1058,18 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
+ 	default:
+ 		break;
+ 	}
++	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
++		emit = false;
+ 	if (!emit) {
+-		pw_log_debug("%p: skip notify %d", c, type);
++		switch (type) {
++		case NOTIFY_TYPE_BUFFER_FRAMES:
++			c->buffer_frames = arg1;
++			break;
++		case NOTIFY_TYPE_SAMPLE_RATE:
++			c->sample_rate = arg1;
++			break;
++		}
++		pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active);
+ 		if (o != NULL && arg1 == 0 && o->removing) {
+ 			o->removing = false;
+ 			free_object(c, o);
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index f2d161227deb..92feaab2a6d7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,9 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.68
+version=0.3.71
 revision=1
-_pms_version=0.4.2
-build_wrksrc="${pkgname}-${version}"
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -15,9 +13,8 @@ configure_args="
  -Dsystemd=disabled
  -Dudevrulesdir=/usr/lib/udev/rules.d
  -Dvulkan=enabled
- -Dmedia-session:systemd=disabled
  -Dbluez5-codec-lc3plus=disabled
- -Dsession-managers=media-session
+ -Dsession-managers=[]
  -Drlimits-match=@_pipewire
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
@@ -26,23 +23,20 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel"
+ libmysofa-devel opus-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
- libspa-v4l2>=${version}_${revision} pulseaudio-utils"
+ libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="fdcf7f2ee881cdc91ef54b3a558e431bdb3395f7a1e9044753c7a89346fafd91
- 4cf8577d4431e08b0e6f29c1ad6bf8662765ab66986ea6f0151883101811c119"
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
+checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
-patch_args="-Np1 --directory=${build_wrksrc}"
 
 build_options="sdl2"
 
@@ -59,18 +53,13 @@ else
 	configure_args+=" -Dbluez5-codec-ldac=disabled"
 fi
 
-post_extract() {
-	mv media-session-${_pms_version} ${build_wrksrc}/subprojects/media-session
-}
-
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
 	vsv pipewire
 	vsv pipewire-pulse
-	vmkdir usr/share/applications
-	cp "${FILESDIR}/pipewire.desktop" ${DESTDIR}/usr/share/applications/pipewire.desktop
-	cp "${FILESDIR}/pipewire-pulse.desktop" ${DESTDIR}/usr/share/applications/pipewire-pulse.desktop
+	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
+	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
 }
 
 libpipewire_package() {

From d467744b2df53e0217841fd4cd86609948e64715 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 17 May 2023 23:10:27 +0000
Subject: [PATCH 0009/1853] neomutt: update to 20230517

---
 srcpkgs/neomutt/template | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 39927bb48fbb..791bdcafd7c7 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,29 +1,29 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20220429
-revision=3
+version=20230517
+revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
 build_style=configure
 configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb
- --rocksdb --testing"
+ --rocksdb"
 make_check_target=test
 conf_files="/etc/neomuttrc"
 # neomutt needs either w3m/lynx/elinks to build manual.html
-hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
-makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
- rocksdb-devel tdb-devel ncurses-devel
- libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
+hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m pkg-config"
+makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel
+ rocksdb-devel tdb-devel ncurses-devel libidn2-devel libnotmuch-devel
+ openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
+_test_files_hash=34f79ee9d91863a97f6e18700aea51157b8610cf
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="45496542897ba8de6bc7cce3f5951d9033ed1c49e5d6f1353adaeefe795d9043
- bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
+checksum="4ac277b40e7ed5d67ba516338e2b26cc6810aa37564f6e9a2d45eb15b3a9213e
+ 4507e70e7c8512c993d9188cf320aea601580345ae9fb0c399ed1402d4e39b1f"
 python_version=3
 
 # fix:
@@ -34,13 +34,22 @@ if [ "${XBPS_CROSS_BASE}" ]; then
 fi
 
 case "${XBPS_TARGET_MACHINE}" in
-	x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";;
+	x86_64-musl)
+		# FIXME: error: variable 'fp' has initializer but incomplete type
+		make_check=no # https://github.com/neomutt/neomutt/issues/3865
+		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+		;;
+	*-musl)
+		make_check=no # Same as in the x86_64-musl condition
+		;;
 	# Inquiry: Do we have largefile support on everywhere?
 esac
 
 post_install() {
 	# move dist to examples dir
-	vsconf contrib/samples/gpg.rc Muttrc.gpg.dist
+	vsconf contrib/oauth2/mutt_oauth2.py Muttrc.mutt_oauth2.dist
+	vsconf contrib/vim-keys/vim-keys.rc Muttrc.vim-keys.dist
+	vsconf contrib/smime_keys Muttrc.smime_keys.dist
 }
 
 pre_check() {

From 4b6ade898c0aa8f2e49e5937dcce79c1d3f16380 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 May 2023 16:56:31 -0400
Subject: [PATCH 0010/1853] mdBook: update to 0.4.29

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

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 2a0be62e53f0..0f14fdda92c3 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.28
+version=0.4.29
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -8,8 +8,8 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
-distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=b7785a0e69a6628bedebb31257113ae659de3b561458cc635d30d07794284b14
+distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz"
+checksum=13e2ff0b9193aa257e6629554bc7dcdb83ee9654235dcd351b254aecd7d7b04f
 
 post_install() {
 	vlicense LICENSE

From 9babae2ec9afb3c01d8626e28a54f24ed824a11e Mon Sep 17 00:00:00 2001
From: Tommy Alatalo <tommy.alatalo@gmail.com>
Date: Tue, 23 May 2023 09:01:19 +0200
Subject: [PATCH 0011/1853] consul: add service

---
 srcpkgs/consul/files/consul/run | 4 ++++
 srcpkgs/consul/template         | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/consul/files/consul/run

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
new file mode 100644
index 000000000000..ece1efba0ce4
--- /dev/null
+++ b/srcpkgs/consul/files/consul/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec 2>&1
+exec consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ed5683591ac2..189ef2eaf55b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=7c04b6a0dd433619e788617434a4c236b7d4f892
@@ -15,4 +15,5 @@ checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
 
 post_install() {
 	vlicense LICENSE
+	vsv consul
 }

From 336da8d52546faffbe1a930ef79069b510e4b778 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 01:08:35 -0500
Subject: [PATCH 0012/1853] nomad: update to 1.5.6.

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

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index d1530935b20f..ef3c1b0a66ec 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.5.1
-revision=2
+version=1.5.6
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=6c118ddaf95e9bfd3d85f488f255fdc5e14129c7
+_git_commit=8af70885c02ab921dedbdf6bc406a1e886866f80
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 depends="cni-plugins"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=d1df280e400149e9bd41ee5e952201a06a2c8ab86554edc4d8d0f33fd2498e2f
+checksum=21bb378584a3f0e3bf3731f89b64658fedf20c829de8eedba9a6773cddfa0c3e
 make_dirs="/etc/nomad.d 0755 root root
  /var/lib/nomad 0755 root root"
 

From c0d9d91ffaf957fea50d48c9d12b960d07552a9f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 17:20:46 -0500
Subject: [PATCH 0013/1853] e2fsprogs: update to 1.47.0, add fuse-devel to
 makedepends, split fuse2fs subpkg

---
 srcpkgs/e2fsprogs/template | 15 ++++++++++++---
 srcpkgs/fuse2fs            |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/fuse2fs

diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index a32c50b823b5..7b41eb0ac1d7 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.46.5
+version=1.47.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -10,14 +10,14 @@ configure_args="--enable-elf-shlibs --disable-fsck
  --sbindir=/usr/bin --libdir=/usr/lib e2fsprogs_cv_struct_st_flags=no"
 make_install_args="install-libs"
 hostmakedepends="texinfo pkg-config"
-makedepends="libuuid-devel libblkid-devel"
+makedepends="libuuid-devel libblkid-devel fuse-devel"
 checkdepends="perl tar"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
+checksum=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {
@@ -55,9 +55,18 @@ e2fsprogs-devel_package() {
 		vmove "usr/share/info/libext2fs.info*"
 	}
 }
+
 e2fsprogs-libs_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
+fuse2fs_package() {
+	short_desc+=" - driver for FUSE"
+	pkg_install() {
+		vmove usr/bin/fuse2fs
+		vmove usr/share/man/man1/fuse2fs.1
+	}
+}
diff --git a/srcpkgs/fuse2fs b/srcpkgs/fuse2fs
new file mode 120000
index 000000000000..84c526343bfc
--- /dev/null
+++ b/srcpkgs/fuse2fs
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file

From 7489ef8fb9263f0560ca8d67275351ad661760c0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Mar 2023 15:26:13 -0400
Subject: [PATCH 0014/1853] grub: patch for e2fsprogs

---
 srcpkgs/grub/patches/xx-e2fsprogs-1.patch | 62 +++++++++++++++++++++++
 srcpkgs/grub/patches/xx-e2fsprogs-2.patch | 60 ++++++++++++++++++++++
 srcpkgs/grub/template                     |  2 +-
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-1.patch
 create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-2.patch

diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-1.patch b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
new file mode 100644
index 000000000000..5cd83273be1a
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
@@ -0,0 +1,62 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
+useful because e2fsprogs 1.47 defaults to this enabled, and grub won't touch it
+--
+From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Fri, 11 Jun 2021 21:36:16 +0200
+Subject: fs/ext2: Ignore checksum seed incompat feature
+
+This incompat feature is used to denote that the filesystem stored its
+metadata checksum seed in the superblock. This is used to allow tune2fs
+changing the UUID on a mounted metdata_csum filesystem without having
+to rewrite all the disk metadata. However, the GRUB doesn't use the
+metadata checksum at all. So, it can just ignore this feature if it
+is enabled. This is consistent with the GRUB filesystem code in general
+which just does a best effort to access the filesystem's data.
+
+The checksum seed incompat feature has to be removed from the ignore
+list if the support for metadata checksum verification is added to the
+GRUB ext2 driver later.
+
+Suggested-by: Eric Sandeen <esandeen@redhat.com>
+Suggested-by: Lukas Czerner <lczerner@redhat.com>
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+Reviewed-by: Lukas Czerner <lczerner@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index e7dd78e..4953a15 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
+ #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
++#define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
+ 
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
+  * mmp:            Not really back-incompatible - was added as such to
+  *                 avoid multiple read-write mounts. Safe to ignore for this
+  *                 RO driver.
++ * checksum seed:  Not really back-incompatible - was added to allow tools
++ *                 such as tune2fs to change the UUID on a mounted metadata
++ *                 checksummed filesystem. Safe to ignore for now since the
++ *                 driver doesn't support checksum verification. However, it
++ *                 has to be removed from this list if the support is added later.
+  */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+-				     | EXT4_FEATURE_INCOMPAT_MMP)
+-
++				     | EXT4_FEATURE_INCOMPAT_MMP \
++				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
+ 
+ #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
+ 
+-- 
+cgit v1.1
+
diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-2.patch b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
new file mode 100644
index 000000000000..7e02e2087799
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
@@ -0,0 +1,60 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b
+useful to support the large_dir ext4 feature
+--
+From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Tue, 30 Aug 2022 22:41:59 -0400
+Subject: fs/ext2: Ignore the large_dir incompat feature
+
+Recently, ext4 added the large_dir feature, which adds support for
+a 3 level htree directory support.
+
+The GRUB supports existing file systems with htree directories by
+ignoring their existence, and since the index nodes for the hash tree
+look like deleted directory entries (by design), the GRUB can simply do
+a brute force O(n) linear search of directories. The same is true for
+3 level deep htrees indicated by large_dir feature flag.
+
+Hence, it is safe for the GRUB to ignore the large_dir incompat feature.
+
+Fixes: https://savannah.gnu.org/bugs/?61606
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index 0989e26..e1cc5e6 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
+ #define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
++#define EXT4_FEATURE_INCOMPAT_LARGEDIR		0x4000 /* >2GB or 3 level htree */
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
+ 
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+");
+  *                 checksummed filesystem. Safe to ignore for now since the
+  *                 driver doesn't support checksum verification. However, it
+  *                 has to be removed from this list if the support is added later.
++ * large_dir:      Not back-incompatible given that the GRUB ext2 driver does
++ *                 not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB
++ *                 eventually supports the htree feature (aka dir_index)
++ *                 it should support 3 level htrees and then move
++ *                 EXT4_FEATURE_INCOMPAT_LARGEDIR to
++ *                 EXT2_DRIVER_SUPPORTED_INCOMPAT.
+  */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+ 				     | EXT4_FEATURE_INCOMPAT_MMP \
+-				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
++				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
++				     | EXT4_FEATURE_INCOMPAT_LARGEDIR)
+ 
+ #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
+ 
+-- 
+cgit v1.1
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index b4d3b07af620..7294fa503f3a 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.06
-revision=2
+revision=3
 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man
  automake gettext-devel-tools"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel

From 94be3facdcd8c47c05e088c3526cb29bb2871fe8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:02:23 +0200
Subject: [PATCH 0015/1853] vagrant: update to 2.3.6.

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

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 99a7b803c1f6..987ff584ab38 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.3.5
-revision=3
+version=2.3.6
+revision=1
 archs="i686 x86_64*"
 build_style=gemspec
 depends="bsdtar curl openssh rsync"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.vagrantup.com/"
 changelog="https://raw.githubusercontent.com/hashicorp/vagrant/main/CHANGELOG.md"
 distfiles="https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"
-checksum=34fce02219c67174457a6f8750063047f6c29b7148e425e4f3647cb80b8a5b2e
+checksum=3f9780b32d979e7cf4565a56fa6dc40b3c9b1b73e4cae9931b1d4a706d0d4d9e
 nocross=yes
 
 post_extract() {

From 4cb4df2e960c2ef7a1e0aef0ddabe6a37282f081 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:05:24 +0200
Subject: [PATCH 0016/1853] terragrunt: update to 0.45.16.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index c45b71409b10..cc4ee5d45d03 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.45.11
+version=0.45.16
 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=621f688faacab5afec7d6cb2f821ceac3539fa737b050df634a54b710d8e8330
+checksum=11c2fadf60545ec495a031ddc72e985af83aa5171f952ef0da451f37f5160435
 
 post_install() {
 	vlicense LICENSE.txt

From b835d5d794dc90835fd0f261db4193c43706cd43 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:07:33 +0200
Subject: [PATCH 0017/1853] kubernetes: update to 1.27.2.

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

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 2cd3a8e544a2..cd21779f27d9 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.27.1
+version=1.27.2
 revision=1
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=3a3f7c6b8cf1d9f03aa67ba2f04669772b1205b89826859f1636062d5f8bec3f
+checksum=c6fcfddd38f877ce49c49318973496f9a16672e83a29874a921242950cd1c5d2
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From b4156d90224fb085157ce9f8b44b52414c0b31bc Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:14:01 +0200
Subject: [PATCH 0018/1853] hugo: update to 0.112.3.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 30bbbbfd088b..d9f4819d8c27 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.111.3
-revision=2
+version=0.112.3
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=b6eeb13d9ed2e5d5c6895bae56480bf0fec24a564ad9d17c90ede14a7b240999
+checksum=24720523cd4feb4a746fb1462c4ad0b1ecdd4c3fbe08469d4498ca0647b9e28f
 
 post_install() {
 	vdoc README.md

From 441781947bd0cf485d2bd438c9c1b24bbeba0ed4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:17:01 +0200
Subject: [PATCH 0019/1853] hopper: update to 5.11.0.

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

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 8dbbc6ed054f..2bc7952d22d3 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=5.10.0
+version=5.11.0
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=9d1bf15b475f4a6cafbf5f10fe8cbe9520fde14a0701529d9803b27bf5dd7aca
+checksum=c14843755669369df54222a54ab0d2069edb30b2fbcdb33abc8da6575bfde6d3
 
 archs="x86_64"
 restricted=yes

From 3c1c5bbb2ebffceee75be05cef69d937ca35c987 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:17:11 +0200
Subject: [PATCH 0020/1853] docker-cli: update to 24.0.1.

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

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 6a848d9b3820..ae4587fa99c7 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 # should be kept in sync with moby
 pkgname=docker-cli
-version=23.0.6
+version=24.0.1
 revision=1
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9
+checksum=f5916273959fb2df56424bb2c26d8b6feb9a148dd15eb400aedd5d3753e06959
 system_groups="docker"
 
 pre_build() {

From 0f17826f0b35bb6b4aa8f68ac6e72ad763877374 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 25 May 2023 16:18:26 +0200
Subject: [PATCH 0021/1853] wlsunset: update to 0.3.0.

---
 .../patches/fix-scdoc-cross-compiling.patch   | 55 -------------------
 srcpkgs/wlsunset/template                     |  7 ++-
 2 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch

diff --git a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
deleted file mode 100644
index f9189f0e700d..000000000000
--- a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7be432057f268fff6e68928f3c3f3b4b70d67368 Mon Sep 17 00:00:00 2001
-From: Kenny Levinsen <kl@kl.wtf>
-Date: Fri, 30 Apr 2021 20:02:02 +0200
-Subject: [PATCH] meson: Copy seatd's scdoc handling
-
-This fixes cross-compiling, and avoids unnecessary search for a shell.
----
- meson.build | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 23d24c5..9a02caf 100644
---- a/meson.build
-+++ b/meson.build
-@@ -3,7 +3,7 @@ project(
- 	'c',
- 	version: '0.2.0',
- 	license: 'MIT',
--	meson_version: '>=0.53.0',
-+	meson_version: '>=0.56.0',
- 	default_options: [
- 		'c_std=c11',
- 		'warning_level=3',
-@@ -56,16 +56,13 @@ executable(
- 	install: true,
- )
- 
--scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
-+scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
- 
- if scdoc.found()
--	sh = find_program('sh')
--
--	man_pages = ['wlsunset.1.scd']
--
-+	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
- 	mandir = get_option('mandir')
- 
--	foreach src : man_pages
-+	foreach src : ['wlsunset.1.scd']
- 		topic = src.split('.')[0]
- 		section = src.split('.')[1]
- 		output = '@0@.@1@'.format(topic, section)
-@@ -75,7 +72,7 @@ if scdoc.found()
- 			input: src,
- 			output: output,
- 			command: [
--				sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
-+				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
- 			],
- 			install: true,
- 			install_dir: '@0@/man@1@'.format(mandir, section)
--- 
-2.30.2
-
diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 984ee8cbfc67..f32f51082c83 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,7 +1,7 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
@@ -9,8 +9,9 @@ short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://sr.ht/~kennylevinsen/wlsunset/"
+changelog="https://git.sr.ht/~kennylevinsen/wlsunset/refs"
 distfiles="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"
-checksum=88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
+checksum=9ece2570c3427888a493cd33a129e82634475e6e9286ed729af24fba07ab5424
 
 post_install() {
 	vlicense LICENSE

From 5e99670002dbbf4d84cc7e055df58ac6103f42ac Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 23 Feb 2023 12:00:26 +0100
Subject: [PATCH 0022/1853] i2pd: restrict /etc/i2pd permissions

It's not a good idea to have /etc/i2pd/*.conf world-readable since
it may contain sensitive information.
---
 srcpkgs/i2pd/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 237ee28d4db8..d0fc5060e887 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -19,7 +19,9 @@ conf_files="
  /etc/i2pd/tunnels.conf"
 system_accounts="_i2pd"
 _i2pd_homedir="/var/lib/i2pd"
-make_dirs="/var/lib/i2pd 0700 _i2pd _i2pd"
+make_dirs="
+ /var/lib/i2pd 0700 _i2pd _i2pd
+ /etc/i2pd 0750 root _i2pd"
 
 case "${XBPS_TARGET_MACHINE}" in
 	x86_64*) ;;

From 8d466231e8e55c35582d7d91d929382cce392a67 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 25 May 2023 18:31:29 +0200
Subject: [PATCH 0023/1853] i2pd: revbump for #42409

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

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index d0fc5060e887..68bfd051faee 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.46.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
 makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel

From c556597ee1e098d6a0373a53e90989f93304adeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 19:51:18 -0300
Subject: [PATCH 0024/1853] build-style/python3-pep517: use generic glob for
 wheels, refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also: do not compile bytecode in `do_install()` since it will be removed
in `post_install()`.

Co-authored-by: Gonzalo Tornaría <tornaria@cmat.edu.uy>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #44071.
---
 common/build-style/python3-pep517.sh | 38 +++++++++++-----------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index f13046ea1968..ffe52fccf3db 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -9,35 +9,27 @@ do_build() {
 }
 
 do_check() {
-	local testjobs
-	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		if python3 -c 'import xdist' >/dev/null 2>&1; then
-			testjobs="-n $XBPS_MAKEJOBS"
-		fi
+	if ! python3 -c 'import pytest' >/dev/null 2>&1; then
+		msg_warn "Testing of python3-pep517 templates requires pytest\n"
+		return 0
+	fi
 
-		if [ -z "${make_install_target}" ]; then
-			local wheelbase="${pkgname#python3-}"
-			make_install_target="dist/${wheelbase//-/_}-${version}-*-*-*.whl"
-		fi
+	local testjobs
+	if python3 -c 'import xdist' >/dev/null 2>&1; then
+		testjobs="-n $XBPS_MAKEJOBS"
+	fi
 
-		local testdir="${wrksrc}/tmp/$(date +%s)"
-		python3 -m installer --destdir "${testdir}" \
-			${make_install_args} ${make_install_target}
+	local testdir="${wrksrc}/tmp/$(date +%s)"
+	python3 -m installer --destdir "${testdir}" \
+		${make_install_args} ${make_install_target:-dist/*.whl}
 
-		PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
-			${make_check_pre} pytest3 ${testjobs} ${make_check_args} ${make_check_target}
-	else
-		msg_warn "Unable to determine tests for PEP517 Python templates\n"
-		return 0
-	fi
+	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
+		${make_check_pre} pytest3 ${testjobs} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	if [ -z "${make_install_target}" ]; then
-		# Default wheel name normalizes hyphens to underscores
-		local wheelbase="${pkgname#python3-}"
-		make_install_target="dist/${wheelbase//-/_}-${version}-*-*-*.whl"
-	fi
+	: ${make_install_args:=--no-compile-bytecode}
+	: ${make_install_target:="dist/*.whl"}
 
 	python3 -m installer --destdir ${DESTDIR} \
 		${make_install_args} ${make_install_target}

From 69d2899d914acd87772adfafd6f5ddb75500c04f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 25 May 2023 09:27:35 -0400
Subject: [PATCH 0025/1853] python3-*: remove unnecessary make_install_target
 for pep517

Now that the wheel glob in do_check and do_install is more generic,
there is no longer a need to override the default behavior.
---
 srcpkgs/python3-PyHamcrest/template        | 1 -
 srcpkgs/python3-Pyphen/template            | 1 -
 srcpkgs/python3-Sphinx/template            | 1 -
 srcpkgs/python3-WeasyPrint/template        | 1 -
 srcpkgs/python3-ansible-lint/template      | 1 -
 srcpkgs/python3-b2sdk/template             | 1 -
 srcpkgs/python3-gnupg/template             | 1 -
 srcpkgs/python3-ipython_ipykernel/template | 1 -
 srcpkgs/python3-logbook/template           | 1 -
 srcpkgs/python3-markdown-it/template       | 1 -
 srcpkgs/python3-mistune2/template          | 1 -
 srcpkgs/python3-quart/template             | 1 -
 srcpkgs/python3-saml2/template             | 1 -
 srcpkgs/python3-ytmusicapi/template        | 1 -
 srcpkgs/rofi-rbw/template                  | 1 -
 srcpkgs/synapse/template                   | 1 -
 16 files changed, 16 deletions(-)

diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
index cbba236bc53b..d6b17d61463f 100644
--- a/srcpkgs/python3-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -3,7 +3,6 @@ pkgname=python3-PyHamcrest
 version=2.0.4
 revision=1
 build_style=python3-pep517
-make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
 hostmakedepends="hatch-vcs"
 depends="python3"
 checkdepends="python3-pytest python3-numpy"
diff --git a/srcpkgs/python3-Pyphen/template b/srcpkgs/python3-Pyphen/template
index a0f9db3ea933..a8d34fb01d9d 100644
--- a/srcpkgs/python3-Pyphen/template
+++ b/srcpkgs/python3-Pyphen/template
@@ -3,7 +3,6 @@ pkgname=python3-Pyphen
 version=0.14.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/pyphen-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core python3-flit_core"
 checkdepends="python3-pytest-isort python3-pytest-cov python3-pytest-flake8
  python3-pytest-xdist"
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 26b161172705..c49bb438a78b 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -3,7 +3,6 @@ pkgname=python3-Sphinx
 version=7.0.1
 revision=1
 build_style=python3-pep517
-make_install_target="dist/sphinx-$version-py3-none-any.whl"
 hostmakedepends="python3-flit_core python3-pyproject-hooks"
 depends="python3-Jinja2 python3-docutils python3-Pygments
  python3-snowballstemmer python3-Babel python3-alabaster python3-imagesize
diff --git a/srcpkgs/python3-WeasyPrint/template b/srcpkgs/python3-WeasyPrint/template
index 8c87d92cbea5..0b0a2040b6c1 100644
--- a/srcpkgs/python3-WeasyPrint/template
+++ b/srcpkgs/python3-WeasyPrint/template
@@ -3,7 +3,6 @@ pkgname=python3-WeasyPrint
 version=59.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/weasyprint-${version}-py3-none-any.whl"
 _runtime_deps="fonttools python3-Pillow python3-cssselect2 python3-html5lib python3-cffi
  python3-Pyphen python3-pydyf glib pango"
 hostmakedepends="python3-poetry-core python3-flit_core ${_runtime_deps}"
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index ad75a253c592..f99a3c167dd6 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -3,7 +3,6 @@ pkgname=python3-ansible-lint
 version=6.14.3
 revision=1
 build_style=python3-pep517
-make_install_target="dist/ansible_lint-*-*-*-*.whl"
 hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3-ansible-compat ansible-core black python3-filelock
  python3-jsonschema python3-packaging python3-yaml python3-rich
diff --git a/srcpkgs/python3-b2sdk/template b/srcpkgs/python3-b2sdk/template
index 720dab64afc0..b2db87588bf8 100644
--- a/srcpkgs/python3-b2sdk/template
+++ b/srcpkgs/python3-b2sdk/template
@@ -3,7 +3,6 @@ pkgname=python3-b2sdk
 version=1.20.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/b2sdk-${version}-*-*-*.whl"
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-logfury python3-Arrow python3-requests python3-tqdm"
 checkdepends="python3-pytest-lazy-fixture $depends python3-dateutil
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index 597b6888818b..4b2c42dc299f 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -3,7 +3,6 @@ pkgname=python3-gnupg
 version=0.5.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/python_gnupg-${version}-py2.py3-none-any.whl"
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3 gnupg"
 checkdepends="${depends} python3-pytest"
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 42020b2dc775..4034b98a6ff5 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -3,7 +3,6 @@ pkgname=python3-ipython_ipykernel
 version=6.19.2
 revision=1
 build_style=python3-pep517
-make_install_target="dist/ipykernel-${version}-*-*-*.whl"
 hostmakedepends="hatchling python3-jupyter_client python3-jupyter_core
  python3-platformdirs"
 depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado
diff --git a/srcpkgs/python3-logbook/template b/srcpkgs/python3-logbook/template
index b49bd495ae46..319bb1e19ab5 100644
--- a/srcpkgs/python3-logbook/template
+++ b/srcpkgs/python3-logbook/template
@@ -4,7 +4,6 @@ version=1.5.3
 revision=6
 build_style=python3-pep517
 make_check_args="--ignore=scripts"
-make_install_target="dist/Logbook-${version}-*-*-*_*.whl"
 hostmakedepends="python3-setuptools python3-wheel python3-devel python3-Cython"
 depends="python3"
 checkdepends="python3-execnet python3-pytest python3-pyzmq python3-SQLAlchemy
diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template
index acd48c68a10a..75075530af2a 100644
--- a/srcpkgs/python3-markdown-it/template
+++ b/srcpkgs/python3-markdown-it/template
@@ -3,7 +3,6 @@ pkgname=python3-markdown-it
 version=2.2.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/markdown_it_py-${version}-*-*-*.whl"
 hostmakedepends="python3-flit_core"
 depends="python3-mdurl"
 short_desc="Python port of the JavaScript mardown-it package"
diff --git a/srcpkgs/python3-mistune2/template b/srcpkgs/python3-mistune2/template
index 76bc57ec0b6c..82f19f0bb31c 100644
--- a/srcpkgs/python3-mistune2/template
+++ b/srcpkgs/python3-mistune2/template
@@ -3,7 +3,6 @@ pkgname=python3-mistune2
 version=2.0.4
 revision=1
 build_style=python3-pep517
-make_install_target="dist/mistune-${version}-*-*-*.whl"
 hostmakedepends="python3-wheel"
 depends="python3"
 checkdepends="python3-pytest"
diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index b032ba6bc283..49f066b717cc 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -3,7 +3,6 @@ pkgname=python3-quart
 version=0.18.4
 revision=1
 build_style=python3-pep517
-make_install_target="dist/quart-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core"
 depends="python3-aiofiles python3-hypercorn python3-click python3-MarkupSafe
  python3-blinker python3-itsdangerous python3-Jinja2 python3-Werkzeug"
diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 0a386d5c2ae1..9583564c1008 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -6,7 +6,6 @@ build_style=python3-pep517
 make_check_args="--ignore=tests/test_36_mdbcache.py \
  --ignore=tests/test_75_mongodb.py \
  --ignore=tests/test_76_metadata_in_mdb.py"
-make_install_target="dist/pysaml2-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core unzip"
 depends="python3-cryptography python3-openssl python3-dateutil python3-pytz
  python3-requests python3-six python3-defusedxml python3-xmlschema"
diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 96248893bded..78e59051e530 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -3,7 +3,6 @@ pkgname=python3-ytmusicapi
 version=1.0.2
 revision=1
 build_style=python3-pep517
-make_install_target="dist/ytmusicapi-*.*.*-*-*-*.whl"
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-requests"
 checkdepends="$depends python3-coverage"
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 164abbeab791..c6d83a812d99 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -3,7 +3,6 @@ pkgname=rofi-rbw
 version=1.2.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/rofi_rbw-${version}-py3-none-any.whl"
 hostmakedepends="python3-poetry-core"
 depends="python3 python3-ConfigArgParse rbw"
 short_desc="Rofi frontend for Bitwarden"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index a116d321f6bc..2749f0a5c548 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -5,7 +5,6 @@ revision=1
 build_style=python3-pep517
 build_helper=rust
 make_check_target=tests
-make_install_target="dist/matrix_synapse-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core python3-setuptools-rust cargo"
 depends="python3-jsonschema python3-immutabledict python3-unpaddedbase64
  python3-canonicaljson python3-signedjson python3-pynacl

From 8c755a8db781c4cf7146883a5ad32b36866248ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 25 May 2023 09:41:17 -0400
Subject: [PATCH 0026/1853] python3-xcffib: update to 1.3.0.

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

diff --git a/srcpkgs/python3-xcffib/template b/srcpkgs/python3-xcffib/template
index e33b1feed7cc..07fa9f0732c0 100644
--- a/srcpkgs/python3-xcffib/template
+++ b/srcpkgs/python3-xcffib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xcffib'
 pkgname=python3-xcffib
-version=0.11.1
-revision=2
+version=1.3.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools pkg-config cabal-install parallel xcb-proto python3-cffi python3-wheel"
 makedepends="python3-devel libffi-devel libxcb-devel python3-six"
@@ -11,7 +11,7 @@ maintainer="Kai Stian Olstad <void@olstad.com>"
 license="Apache-2.0"
 homepage="https://github.com/tych0/xcffib"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=bd89c1e65cf4773fe10d70209ba069e0e1fe82c37c121501fc404aa9867d0ff3
+checksum=e0819e9cf56d47839a58755728af22eee02cad3b8b57157f8f682f187da96013
 nocross="Cannot yet cross compile with Haskell"
 
 pre_build() {

From 0ca99d4cb40167627ac35dbe3b4b47e1f4be7ac6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 May 2023 14:35:50 -0400
Subject: [PATCH 0027/1853] python3-phonenumbers: update to 8.13.11.

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

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index a51431294971..3690912d6585 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.13.10
+version=8.13.11
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=421b69fd6d6650372000a6c47ab5b5c5d7b438b33f7b317739e728eff1ec1886
+checksum=3e3274d88cab3609b55ff5b93417075dbca2d13064f103fbf562e0ea1dda0f9a

From fdef914fbfc2132f2c5267d92bd2c4e2238f240e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 May 2023 14:41:06 -0400
Subject: [PATCH 0028/1853] synapse: update to 1.84.0.

restore make_install_target needed for tests
---
 srcpkgs/synapse/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 2749f0a5c548..47e9393dcb8f 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.82.0
+version=1.84.0
 revision=1
 build_style=python3-pep517
 build_helper=rust
 make_check_target=tests
+make_install_target="dist/matrix_synapse-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core python3-setuptools-rust cargo"
 depends="python3-jsonschema python3-immutabledict python3-unpaddedbase64
  python3-canonicaljson python3-signedjson python3-pynacl
@@ -23,7 +24,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=bea5b8e40be5f79977732867dae34eb45667aae41c3ee366a3164d5e20c8b327
+checksum=f87b0565403bdf457f92c75e314fd3581e50bf48259089f22406dc5d90be44bd
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 61dc9154a494bd61b53114e03ad2e80211fb1b97 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 23 May 2023 21:15:56 +0100
Subject: [PATCH 0029/1853] xdpyinfo: update to 1.3.4.

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

diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 2b51598a40f9..71bf9a858dc9 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,8 +1,9 @@
 # Template file for 'xdpyinfo'
 pkgname=xdpyinfo
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
+configure_args="--with-xf86misc"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXtst-devel libXxf86vm-devel
  libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
@@ -10,8 +11,8 @@ short_desc="Display information utility for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/app/xdpyinfo"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
-checksum=356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206
+distfiles="${XORG_SITE}/app/xdpyinfo-${version}.tar.xz"
+checksum=a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b
 
 post_install() {
 	vlicense COPYING

From 914b7eb9a8da6e70c9132912b8db62bef865421b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 24 May 2023 10:23:57 +0300
Subject: [PATCH 0030/1853] wget: update to 1.21.4, adopt.

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

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 89bb4b69d7c7..7024498b67ac 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,6 +1,6 @@
 # Template file for 'wget'
 pkgname=wget
-version=1.21.3
+version=1.21.4
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
@@ -11,12 +11,12 @@ makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/wget/wget.html"
 changelog="https://git.savannah.gnu.org/cgit/wget.git/plain/NEWS"
 distfiles="${GNU_SITE}/wget/wget-${version}.tar.gz"
-checksum=5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5
+checksum=81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c
 
 build_options="gnutls ssl"
 build_options_default="ssl"

From e47dfd489190609d8586ff32a27c8f3b54629aef Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 20:33:12 +0100
Subject: [PATCH 0031/1853] dav1d: update to 1.2.0.

---
 srcpkgs/dav1d/template | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index 84c9c7e50bb6..93a5a75f8238 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -1,18 +1,27 @@
 # Template file for 'dav1d'
 pkgname=dav1d
-version=1.0.0
+version=1.2.0
 revision=1
 build_style=meson
-configure_args="-Denable_tests=true -Denable_asm=true -Denable_tools=true
- -Dfuzzing_engine=none -Dtestdata_tests=false"
-hostmakedepends="nasm"
+configure_args="-Denable_asm=true -Denable_tools=true -Dfuzzing_engine=none
+ -Dtestdata_tests=false"
 short_desc="Small and fast AV1 Decoder"
 maintainer="mustaqim <git@mustaqim.ml>"
 license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 changelog="https://code.videolan.org/videolan/dav1d/raw/master/NEWS"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive/${version}/dav1d-${version}.tar.bz2"
-checksum=4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f
+checksum=05cedc43127e00a86c68b8a49a5f68e2dc22b9baa10b1e12a5e3bc5b37876a6b
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Denable_tests=true"
+else
+	configure_args+=" -Denable_tests=false"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64* | i686*) hostmakedepends="nasm" ;;
+esac
 
 libdav1d6_package() {
 	short_desc+=" - runtime library"

From 4dd431e6d47ef1fecbd53a6f1724eda8b332a7b9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 21 May 2023 16:38:34 +0300
Subject: [PATCH 0032/1853] lcms2: update to 2.15.

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

diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 079248068934..4607451d89e2 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,15 +1,15 @@
 # Template file for 'lcms2'
 pkgname=lcms2
-version=2.14
-revision=2
-build_style=gnu-configure
+version=2.15
+revision=1
+build_style=meson
 makedepends="tiff-devel"
 short_desc="Small-footprint color management engine, version 2"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://littlecms.com"
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-${version}.tar.gz"
-checksum=28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740
+checksum=b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39
 
 post_install() {
 	vlicense COPYING
@@ -21,7 +21,6 @@ lcms2-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From dbd2236c29925498eb46ea20be4edb59741f311b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 21 May 2023 16:08:19 +0300
Subject: [PATCH 0033/1853] benchmark: update to 1.8.0.

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

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 78941a55ebd3..29941542ad0b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=6430e4092653380d9dc4ccb45a1e2dc9259d581f4866dc0759713126056bc1d7
+checksum=ea2e94c24ddf6594d15c711c06ccd4486434d9cf3eca954e2af8a20c88f9f172
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From edb2430556942d5cb5ab737ef6436c3779842d30 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 21 May 2023 14:33:48 +0200
Subject: [PATCH 0034/1853] codeberg-cli: update to 0.3.5

---
 srcpkgs/codeberg-cli/patches/update-lockfile.patch | 11 -----------
 srcpkgs/codeberg-cli/template                      |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/codeberg-cli/patches/update-lockfile.patch

diff --git a/srcpkgs/codeberg-cli/patches/update-lockfile.patch b/srcpkgs/codeberg-cli/patches/update-lockfile.patch
deleted file mode 100644
index 733a7c5fe850..000000000000
--- a/srcpkgs/codeberg-cli/patches/update-lockfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -195,7 +195,7 @@
- 
- [[package]]
- name = "codeberg-cli"
--version = "0.3.3"
-+version = "0.3.4"
- dependencies = [
-  "anyhow",
-  "chrono",
diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template
index 5cf09bc3bb8c..69027f4b4106 100644
--- a/srcpkgs/codeberg-cli/template
+++ b/srcpkgs/codeberg-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'codeberg-cli'
 pkgname=codeberg-cli
-version=0.3.4
-revision=2
+version=0.3.5
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
 homepage="https://codeberg.org/RobWalt/codeberg-cli"
 changelog="https://codeberg.org/RobWalt/codeberg-cli/raw/branch/main/CHANGELOG.md"
 distfiles="https://codeberg.org/RobWalt/codeberg-cli/archive/v${version}.tar.gz"
-checksum=379e39412eb5a15b5a0920e29d19d36d5abaa5e5b8d4fb16658e3fbbe3eba189
+checksum=bd705df34588fcf668fab8f2c77127679a83335d8ce5248950365fb599d35d29
 
 post_install() {
 	vlicense LICENSE

From 6c41b8ec52b5fece4f3bd5c3727bd7252e3b576b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 21 May 2023 14:21:11 +0100
Subject: [PATCH 0035/1853] blender: update to 3.5.1.

---
 srcpkgs/blender/patches/numpy-2.24.patch | 22 ----------------------
 srcpkgs/blender/template                 | 13 +++++++------
 2 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/blender/patches/numpy-2.24.patch

diff --git a/srcpkgs/blender/patches/numpy-2.24.patch b/srcpkgs/blender/patches/numpy-2.24.patch
deleted file mode 100644
index 716315b74be7..000000000000
--- a/srcpkgs/blender/patches/numpy-2.24.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 74e6e07cf7c67b55d384db72f5aa3892db8a3da6 Mon Sep 17 00:00:00 2001
-From: oreo639 <oreo6391@gmail.com>
-Date: Tue, 17 Jan 2023 14:36:54 -0800
-Subject: [PATCH] Remove usage of deprecated np.bool alias
-
----
- addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
-index 6366434a6..8160c9e99 100644
---- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
-+++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
-@@ -620,7 +620,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs):
-     # Try to guess which polys should be flat based on the fact that all the
-     # loop normals for a flat poly are = the poly's normal.
- 
--    poly_smooths = np.empty(num_polys, dtype=np.bool)
-+    poly_smooths = np.empty(num_polys, dtype=bool)
- 
-     poly_normals = np.empty(num_polys * 3, dtype=np.float32)
-     mesh.polygons.foreach_get('normal', poly_normals)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index d18bc88838ff..ec724bb0a6dc 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
-version=3.4.1
-revision=4
+version=3.5.1
+revision=1
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -12,8 +12,8 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
  -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON
  -DWITH_GHOST_X11=ON -DWITH_GHOST_WAYLAND=ON -DWITH_GHOST_LIBDECOR=ON
  -DWITH_BUILDINFO=OFF -DPYTHON_VERSION=${py3_ver} -DPYTHON_LIBPATH=/usr/lib
- -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
- -DPYTHON_INCLUDE_DIRS=/${py3_inc}"
+ -DPYTHON_LIBRARY=python${py3_ver}${py3_abiver} -DPYTHON_INCLUDE_DIRS=/${py3_inc}
+ -DWITH_SYSTEM_LZO=ON -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON"
 hostmakedepends="pkg-config"
 makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
@@ -22,14 +22,15 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  opencolorio-devel opencollada-devel python3-numpy libXrender-devel
  OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
  pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel
- wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel"
+ wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel
+ eigen lzo-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.blender.org"
 distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=247c4c1228270c9010f4721c985cb5b628ab50abcf9f2678630737142eeb91c3
+checksum=bd7428c7e6cba5a900216269c32111dffaabaf1bdb5472f231965e615174a809
 python_version=3
 LDFLAGS="-Wl,-z,stack-size=2097152"
 # Blender tests are executed against a system installation of blender. This

From fd30a6c3e464490d64bf3a1bdbe117a7fa63ca06 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 21:50:49 -0400
Subject: [PATCH 0036/1853] alsa-lib: update to 1.2.9

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

diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index de17002ed450..576745a85219 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-lib'
 pkgname=alsa-lib
-version=1.2.8
+version=1.2.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347
+checksum=dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2
 
 alsa-lib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5790df91b3fdc8c678d542b2f5bec28a68eaaa21 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 21:51:19 -0400
Subject: [PATCH 0037/1853] alsa-utils: update to 1.2.9, adopt

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

diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 717be1947398..90cf5e61ec60 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-utils'
 pkgname=alsa-utils
-version=1.2.8
+version=1.2.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -10,11 +10,11 @@ makedepends="libsamplerate-devel ncurses-devel"
 depends="alsa-lib"
 make_dirs="/var/lib/alsa 0750 root root"
 short_desc="Advanced Linux Sound Architecture (ALSA) utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=e140fa604c351f36bd72167c8860c69d81b964ae6ab53992d6434dde38e9333c
+checksum=e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd
 
 post_install() {
 	# Install required udev rules file.

From c63bf3851661474cb3672c46a8491f03262e2e36 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 21:51:41 -0400
Subject: [PATCH 0038/1853] alsa-ucm-conf: update to 1.2.9

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

diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
index 0fa5a69c8c4c..a965973cb1dc 100644
--- a/srcpkgs/alsa-ucm-conf/template
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -1,13 +1,13 @@
 # Template file for 'alsa-ucm-conf'
 pkgname=alsa-ucm-conf
-version=1.2.8
+version=1.2.9
 revision=1
 short_desc="ALSA Use Case Manager topology configurations"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/alsa-project/alsa-ucm-conf"
 distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=711ca92a17d7519755bfd633ca819e2a4e5e40eddbde6b66d18aa1d9a5346ced
+checksum=1c40618161bc2738c55aab4dee1d0c82514e257116f296815a799adeaab5e48b
 
 do_install() {
 	vdoc ucm2/README.md

From 002c0280037dee16a93e46b16763b9bd5749817d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 21 May 2023 13:02:52 -0500
Subject: [PATCH 0039/1853] New package: grpn-1.4.1.

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

diff --git a/srcpkgs/grpn/template b/srcpkgs/grpn/template
new file mode 100644
index 000000000000..c9cb836ccfcc
--- /dev/null
+++ b/srcpkgs/grpn/template
@@ -0,0 +1,16 @@
+# Template file for 'grpn'
+pkgname=grpn
+version=1.4.1
+revision=1
+build_style=gnu-makefile
+short_desc="GTK+ RPN Calculator"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://tracker.debian.org/pkg/grpn"
+distfiles="http://deb.debian.org/debian/pool/main/g/grpn/grpn_${version}.orig.tar.gz"
+checksum=1e43c507795a9107bfb1e4f16c1da706579a22f254ef81422418121bebe60345
+
+post_install() {
+	vmkdir usr/share
+	mv $DESTDIR/usr/man/* $DESTDIR/usr/share/man
+}

From dface99600cfc5f61e67510905248c64a4698340 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 23:39:11 -0500
Subject: [PATCH 0040/1853] grpn: nocross for now

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

diff --git a/srcpkgs/grpn/template b/srcpkgs/grpn/template
index c9cb836ccfcc..8572473388df 100644
--- a/srcpkgs/grpn/template
+++ b/srcpkgs/grpn/template
@@ -1,7 +1,7 @@
 # Template file for 'grpn'
 pkgname=grpn
 version=1.4.1
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="GTK+ RPN Calculator"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
 homepage="https://tracker.debian.org/pkg/grpn"
 distfiles="http://deb.debian.org/debian/pool/main/g/grpn/grpn_${version}.orig.tar.gz"
 checksum=1e43c507795a9107bfb1e4f16c1da706579a22f254ef81422418121bebe60345
+nocross=yes # Practically abandonware, and only requested for x86
 
 post_install() {
 	vmkdir usr/share

From e67f798ae96b924e753f16367f78861db5522c4c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 23:42:03 -0500
Subject: [PATCH 0041/1853] consul: update to 1.15.2.

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

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 189ef2eaf55b..a9796ff5c796 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,17 +1,17 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.15.1
-revision=3
+version=1.15.2
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=7c04b6a0dd433619e788617434a4c236b7d4f892
+_git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 short_desc="Distributed solution to connect and configure applications"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
+checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
 
 post_install() {
 	vlicense LICENSE

From 5ca3319055e63ea9c7da18f891b41041b3604187 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 23:44:13 -0500
Subject: [PATCH 0042/1853] vault: update to 1.13.2.

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

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 2154f2fda120..efe62f6cfead 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.13.0
-revision=2
+version=1.13.2
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=a4cf0dc4437de35fce4860857b64569d092a9b5a
+_git_commit=b9b773f1628260423e6cc9745531fd903cae853f
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 depends="libcap-progs"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=ebffe482b9e23346862272fbab7d589315200f2004b63b26b2df43823a5d3fb6
+checksum=265b1632857af01984fa108644ef1e00f4545db889c21443025bf46941b9c845
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From 0cdd91288cd9293252e990cb631ba0b607e4a11b Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Fri, 24 Feb 2023 15:13:22 +1100
Subject: [PATCH 0043/1853] snapcast: update to 0.27.0

---
 srcpkgs/snapcast/patches/boost-1.81.patch     | 51 -------------------
 .../patches/meta_mpd.py-permission-fix.patch  | 19 -------
 srcpkgs/snapcast/template                     |  4 +-
 3 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 srcpkgs/snapcast/patches/boost-1.81.patch
 delete mode 100644 srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch

diff --git a/srcpkgs/snapcast/patches/boost-1.81.patch b/srcpkgs/snapcast/patches/boost-1.81.patch
deleted file mode 100644
index 032bc5213a37..000000000000
--- a/srcpkgs/snapcast/patches/boost-1.81.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: snapcast-0.26.0/server/control_session_http.cpp
-===================================================================
---- snapcast-0.26.0.orig/server/control_session_http.cpp
-+++ snapcast-0.26.0/server/control_session_http.cpp
-@@ -127,8 +127,8 @@ boost::beast::string_view mime_type(boos
- std::string path_cat(boost::beast::string_view base, boost::beast::string_view path)
- {
-     if (base.empty())
--        return path.to_string();
--    std::string result = base.to_string();
-+        return path;
-+    std::string result = base;
-     char constexpr path_separator = '/';
-     if (result.back() == path_separator)
-         result.resize(result.size() - 1);
-@@ -140,7 +140,7 @@ std::string path_cat(boost::beast::strin
- ControlSessionHttp::ControlSessionHttp(ControlMessageReceiver* receiver, tcp::socket&& socket, const ServerSettings::Http& settings)
-     : ControlSession(receiver), socket_(std::move(socket)), settings_(settings)
- {
--    LOG(DEBUG, LOG_TAG) << "ControlSessionHttp, Local IP: " << socket_.local_endpoint().address().to_string() << "\n";
-+    LOG(DEBUG, LOG_TAG) << "ControlSessionHttp, Local IP: " << socket_.local_endpoint().address() << "\n";
- }
- 
- 
-@@ -171,7 +171,7 @@ void ControlSessionHttp::handle_request(
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = why.to_string();
-+        res.body() = why;
-         res.prepare_payload();
-         return res;
-     };
-@@ -182,7 +182,7 @@ void ControlSessionHttp::handle_request(
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = "The resource '" + target.to_string() + "' was not found.";
-+        res.body() = "The resource '" + std::string{target} + "' was not found.";
-         res.prepare_payload();
-         return res;
-     };
-@@ -204,7 +204,7 @@ void ControlSessionHttp::handle_request(
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = "An error occurred: '" + what.to_string() + "'";
-+        res.body() = "An error occurred: '" + std::string{what} + "'";
-         res.prepare_payload();
-         return res;
-     };
diff --git a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch b/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch
deleted file mode 100644
index ebff8013f574..000000000000
--- a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch fixes an issue where meta_mpd.py is installed with executable
-permissions only. This results in a 'Permission denied' message for
-03-rewrite-python-shebang, and a fatal error for xbps-create when processing
-the file hash. Fixed upstream in 7ab3daa.
-
-https://github.com/badaix/snapcast/issues/1021
-
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index e1271b80..25432cd5 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -117,6 +117,6 @@ else()
-     install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-     install(FILES etc/index.html COMPONENT server DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver)
-     install(DIRECTORY etc/snapweb/ DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/snapweb)
--    install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/)
-+    install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/)
-     #install(FILES ../debian/snapserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR})
- endif()
diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template
index e330653723ed..2440d44d8f51 100644
--- a/srcpkgs/snapcast/template
+++ b/srcpkgs/snapcast/template
@@ -1,6 +1,6 @@
 # Template file for 'snapcast'
 pkgname=snapcast
-version=0.26.0
+version=0.27.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DBUILD_WITH_TREMOR=OFF
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/badaix/snapcast"
 changelog="https://raw.githubusercontent.com/badaix/snapcast/master/changelog.md"
 distfiles="https://github.com/badaix/snapcast/archive/v${version}.tar.gz"
-checksum=166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683
+checksum=c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba
 
 build_options="avahi pulseaudio"
 build_options_default="avahi pulseaudio"

From c9bb404d0139c953dc45c4428687a657225ce092 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 4 Apr 2023 09:56:44 +1000
Subject: [PATCH 0044/1853] upmpdcli: update to 1.7.9

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

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index a2a6b70054bb..68272eb96ea7 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,17 +1,17 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.7.1
+version=1.7.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
-makedepends="jsoncpp-devel libmicrohttpd-devel libmpdclient-devel libupnpp-devel"
+makedepends="jsoncpp-devel libcurl-devel libmicrohttpd-devel libmpdclient-devel libupnpp-devel"
 short_desc="UPnP Media Renderer front-end for MPD"
 maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=9a2e1322c47825f31e2f97ff8c89172e23dd0cea6763f355d7e7ecc71b168d17
+checksum=e0a92acd4c1d292d170fa5247a9014cb7f81a1288c1e4de22b5a8c052223e7b5
 python_version=3
 
 system_accounts="_upmpdcli"

From 1970221acda684b4d5eef26c54e6fb73493dcac2 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Fri, 24 Feb 2023 17:34:19 +1100
Subject: [PATCH 0045/1853] libnpupnp: update to 5.0.2

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

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index fc3b31046507..dc1496cfd692 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=5.0.0
+version=5.0.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=2e5648cf180a425ef57b8c9c0d9dbd77f0314487ea0e0a85ebc6c3ef87cab05b
+checksum=33f90fc14906f2cea1bb7af56677b4e950eed6976e07d98a8e2b2e91b0755558
 
 post_install() {
 	vlicense COPYING

From 6c01be80f439d2e1a245e71f3bf7166a2d419f5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 May 2023 14:48:01 +0200
Subject: [PATCH 0046/1853] fio: update to 3.35.

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

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 761f2c88d7b4..663bf2b08e3f 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.34
+version=3.35
 revision=1
 build_style=configure
 make_build_args="T_TEST_PROGS="
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=42ea28c78d269c4cc111b7516213f4d4b32986797a710b0ff364232cc7a3a0b7
+checksum=36b98f35622ee594364bfd9a527523a44cda0dda2455ba9f2dcae2cd7dd3859f
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in

From e981386c014f481167889ff1b060e87756a502c7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 May 2023 14:48:45 +0200
Subject: [PATCH 0047/1853] dune: update to 3.8.0.

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

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index bc60f1196445..1d38c2419cab 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.7.1
-revision=2
+version=3.8.0
+revision=1
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://dune.build/"
 changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md"
 distfiles="https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"
-checksum=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3
+checksum=f7e2970bfab99c7766ff1a05deff5ad7f82cb2471abca6f72449572293f5f6b4
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-build-info dune-configurator

From 7632cb34759f6eec69f603731176127571310597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 May 2023 00:34:10 +0200
Subject: [PATCH 0048/1853] mpd: update to 0.23.13.

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index df35e751ea60..9dbd4c935acc 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.12
-revision=2
+version=0.23.13
+revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7
+checksum=a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 1016dfc7f8826a80e388e2055617a860ce5e0667 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 2 May 2023 22:26:02 +0530
Subject: [PATCH 0049/1853] mandrel: update to 22.3.2.1.

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

diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index 503d264c2394..d75ca825cef1 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.1.0
+version=22.3.2.1
 revision=1
 _java_ver=17
-_mx_ver=6.16.0
+_mx_ver=6.20.3
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,9 +15,9 @@ homepage="https://github.com/graalvm/mandrel"
 distfiles="https://github.com/graalvm/mandrel-packaging/archive/refs/tags/mandrel-${version}-Final.tar.gz>packaging-${version}.tar.gz
  https://github.com/graalvm/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz
  https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz"
-checksum="dd37f4a8f628b8909228f489e12363427df9d0f95d1afedad39a2443b22a806d
- bfe15128e8ffb5fd108ee20477e5ee1572c63405d6d0b93d905185356128dcec
- aeec921e0669c72575dd9af54b5d5413d744dac590c82db46ae2bf60c4dfeb1b"
+checksum="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
+ 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
+ b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 

From a9463a748d8473861d6ad4f28a5d4146b77c0e96 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 5 Apr 2023 19:46:13 +0100
Subject: [PATCH 0050/1853] xfsprogs: update to 6.2.0.

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

diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 1108d9f6666d..2e55f5e0b458 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,17 +1,19 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=5.19.0
-revision=2
+version=6.2.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-editline=yes --enable-lib64=no --libdir=/usr/lib"
-hostmakedepends="gettext libuuid-devel"
-makedepends="libblkid-devel libedit-devel inih-devel liburcu-devel"
+configure_args="--enable-editline=yes --enable-lib64=no --libdir=/usr/lib
+ --enable-lto"
+hostmakedepends="gettext"
+makedepends="libblkid-devel libedit-devel inih-devel liburcu-devel
+ libuuid-devel"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=4b6c6c98c036a37f6d90c82cb7fe9405d3b5856d9345662032d01ff4b140592c
+checksum=d67dcba5a28e0904b60886b6e5f752bc7c9c3a5c7096153855b5adca9db86c51
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \

From 823351e4607400d50d67cacd6f38b1f7ff96bf33 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 6 May 2023 18:41:36 +0300
Subject: [PATCH 0051/1853] mdcat: install completions for mdless.

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

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index ef45b736e8ea..4a5e219556bf 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,7 +1,7 @@
 # Template file for 'mdcat'
 pkgname=mdcat
 version=2.0.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
@@ -22,12 +22,14 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_install() {
-	bash_completion=$(find ${wrksrc}/target -name mdcat.bash -print -quit)
-	vcompletion ${bash_completion} bash
-	zsh_completion=$(find ${wrksrc}/target -name _mdcat -print -quit)
-	vcompletion ${zsh_completion} zsh
-	fish_completion=$(find ${wrksrc}/target -name mdcat.fish -print -quit)
-	vcompletion ${fish_completion} fish
+	for command in mdcat mdless; do
+		bash_completion=$(find ${wrksrc}/target -name ${command}.bash -print -quit)
+		vcompletion ${bash_completion} bash ${command}
+		zsh_completion=$(find ${wrksrc}/target -name _${command} -print -quit)
+		vcompletion ${zsh_completion} zsh ${command}
+		fish_completion=$(find ${wrksrc}/target -name ${command}.fish -print -quit)
+		vcompletion ${fish_completion} fish ${command}
+	done
 
 	man_page=$(find ${wrksrc}/target -name mdcat.1 -print -quit)
 	vman ${man_page}

From b803f20dad002cdafa42a24d7555c7f755ae97c6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 20 May 2023 22:55:38 +0530
Subject: [PATCH 0052/1853] when: update to 1.1.46.

---
 srcpkgs/when/template | 9 +++++----
 srcpkgs/when/update   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/when/template b/srcpkgs/when/template
index fdea7a1f2424..3e7703425e20 100644
--- a/srcpkgs/when/template
+++ b/srcpkgs/when/template
@@ -1,15 +1,16 @@
 # Template file for 'when'
 pkgname=when
-version=1.1.41
+version=1.1.46
 revision=1
+_githash=a57ccbdf1d30e28a43a4bc5c68c37c171bb649ab
 hostmakedepends="perl"
 depends="perl"
 short_desc="Minimalistic personal calendar program"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://www.lightandmatter.com/when/when.html"
-distfiles="https://github.com/bcrowell/when/archive/refs/tags/${version}.tar.gz"
-checksum=78bfd3f18e0d3e42797c7aacb16829d2354d935f12e04db9e467d4bec389c884
+homepage="https://lightandmatter.com/when/when.html"
+distfiles="https://bitbucket.org/ben-crowell/when/get/${_githash}.tar.gz"
+checksum=82cd27a97df65f696d1c77762c03e847ff26e72d498f2bd1979f35bee2da021c
 
 do_build() {
 	make when.1
diff --git a/srcpkgs/when/update b/srcpkgs/when/update
index b878260a3563..b7f4537d9fec 100644
--- a/srcpkgs/when/update
+++ b/srcpkgs/when/update
@@ -1 +1 @@
-pattern='current version of When is \K[\d.]+'
+pattern='When \K[\d.]+'

From 725e58e92879ca614a2c4b3b44393750da77698f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 15:49:26 -0500
Subject: [PATCH 0053/1853] consul: Create directories/user

---
 srcpkgs/consul/files/consul/run | 2 +-
 srcpkgs/consul/template         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
index ece1efba0ce4..7583a552d939 100644
--- a/srcpkgs/consul/files/consul/run
+++ b/srcpkgs/consul/files/consul/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
 exec 2>&1
-exec consul agent -config-dir=/etc/consul.d
+exec chpst -u _consul:_consul consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index a9796ff5c796..2d032167d2a7 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -12,6 +12,9 @@ license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
+system_accounts="_consul"
+make_dirs="/etc/consul.d 0755 _consul _consul
+ /var/lib/consul 0750 _consul _consul"
 
 post_install() {
 	vlicense LICENSE

From 020c5e48d491163a66cfaabda852fa67c4bdff41 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 16:19:37 -0500
Subject: [PATCH 0054/1853] consul: Reduce permissions to data-dir

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

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 2d032167d2a7..7fbe8549d11b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -13,7 +13,7 @@ homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
 system_accounts="_consul"
-make_dirs="/etc/consul.d 0755 _consul _consul
+make_dirs="/etc/consul.d 0755 root _consul
  /var/lib/consul 0750 _consul _consul"
 
 post_install() {

From c5f46b7435d26fa8b3bef015fee92455738b6ea5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:15:36 +0100
Subject: [PATCH 0055/1853] New package: python3-calver-2022.6.26

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

diff --git a/srcpkgs/python3-calver/template b/srcpkgs/python3-calver/template
new file mode 100644
index 000000000000..d89129c203fe
--- /dev/null
+++ b/srcpkgs/python3-calver/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-calver'
+pkgname=python3-calver
+version=2022.6.26
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Setuptools extension for CalVer package versions"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="Apache-2.0"
+homepage="https://github.com/di/calver"
+changelog="https://github.com/di/calver/releases"
+distfiles="${PYPI_SITE}/c/calver/calver-${version}.tar.gz"
+checksum=e05493a3b17517ef1748fbe610da11f10485faa7c416b9d33fd4a52d74894f8b
+make_check=no # PyPI tarball has no tests.

From cf0c23fd63fd473b6a7cf5c8528a571c3641e45c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:15:42 +0100
Subject: [PATCH 0056/1853] New package: python3-trove-classifiers-2023.5.24

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

diff --git a/srcpkgs/python3-trove-classifiers/template b/srcpkgs/python3-trove-classifiers/template
new file mode 100644
index 000000000000..4a7f7d6ad635
--- /dev/null
+++ b/srcpkgs/python3-trove-classifiers/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-trove-classifiers'
+pkgname=python3-trove-classifiers
+version=2023.5.24
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-calver"
+depends="python3"
+checkdepends="${depends} python3-pytest"
+short_desc="Canonical source for classifiers on PyPI"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="Apache-2.0"
+homepage="https://github.com/pypa/trove-classifiers"
+changelog="https://github.com/pypa/trove-classifiers/releases"
+distfiles="${PYPI_SITE}/t/trove-classifiers/trove-classifiers-${version}.tar.gz"
+checksum=fd5a1546283be941f47540a135bdeae8fb261380a6a204d9c18012f2a1b0ceae

From 84c50ae0fb4ad7c148cb9c6e203b1dab38cfe358 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:15:47 +0100
Subject: [PATCH 0057/1853] hatchling: update to 1.17.0.

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

diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
index 0df8af7b1835..bb221be3e722 100644
--- a/srcpkgs/hatchling/template
+++ b/srcpkgs/hatchling/template
@@ -1,9 +1,10 @@
 # Template file for 'hatchling'
 pkgname=hatchling
-version=1.13.0
+version=1.17.0
 revision=1
 build_style=python3-pep517
-_deps="python3-editables python3-packaging python3-pathspec python3-pluggy"
+_deps="python3-editables python3-packaging python3-pathspec python3-pluggy
+ python3-trove-classifiers"
 hostmakedepends="python3-setuptools ${_deps}"
 depends="${_deps}"
 short_desc="Extensible, standards compliant build backend used by Hatch"
@@ -12,7 +13,7 @@ license="MIT"
 homepage="https://hatch.pypa.io/latest/"
 changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history/hatchling.md"
 distfiles="${PYPI_SITE}/h/hatchling/hatchling-${version}.tar.gz"
-checksum=f8d275a2cc720735286b7c2e2bc35da05761e6d3695c2fa416550395f10c53c7
+checksum=b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930
 
 post_install() {
 	vlicense LICENSE.txt

From eac6404a93f1df2754f41428393cb1a56db40ab4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 16:41:08 +0100
Subject: [PATCH 0058/1853] python3-platformdirs: update to 3.5.1.

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

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index b01996757d1f..033324479559 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.1.1
+version=3.5.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=024996549ee88ec1a9aa99ff7f8fc819bb59e2c3477b410d90a16d32d6e707aa
+checksum=412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From 8dcb9b0edb8a4ed537130558880e4448ff6fff9a Mon Sep 17 00:00:00 2001
From: Adam Saponara <as@php.net>
Date: Fri, 26 May 2023 02:18:53 -0400
Subject: [PATCH 0059/1853] mle: update to 1.7.2

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

diff --git a/srcpkgs/mle/template b/srcpkgs/mle/template
index 9a96bf5443d2..bd6e5665e861 100644
--- a/srcpkgs/mle/template
+++ b/srcpkgs/mle/template
@@ -1,16 +1,20 @@
 # Template file for 'mle'
 pkgname=mle
-version=1.5.0
+version=1.7.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="libtool"
-makedepends="termbox-devel lua54-devel pcre-devel uthash"
+makedepends="lua54-devel pcre2-devel uthash"
 short_desc="Flexible terminal-based text editor (C)"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="Apache-2.0"
 homepage="https://github.com/adsr/mle"
 distfiles="https://github.com/adsr/mle/archive/v${version}.tar.gz"
-checksum=569316485fa3775d0bb7559ac176a63adb29467c7098b14c0072c821feb6226b
+checksum=5275fcfc58d3d4890d074077d94497db488b2648287b3e48e67b00ea517b02ba
+
+do_check() {
+	make test
+}
 
 post_install() {
 	vman mle.1

From 9a385b0bb305feefcd39eeb66a64995eb2b544f4 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 27 May 2023 09:51:17 +0200
Subject: [PATCH 0060/1853] tuxedo-keyboard: update to 3.2.5

---
 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 c72f78b9c867..79d6181124b5 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.3
+version=3.2.5
 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=dcad92d748e0d28ea0fb34d2933724e870f93509c816114d56f224d5abddc4bf
+checksum=ec8f4608018d7702a8b89734b1c91152b597984bf37242924d8f76d270a74580
 
 dkms_modules="tuxedo-keyboard ${version}"
 

From aa51b45aacd003371069057351ba01daf4b6c17e Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Thu, 25 May 2023 00:03:46 -0500
Subject: [PATCH 0061/1853] Signal-Desktop: update to 6.19.0.

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index adbc695492a0..4c6722055987 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.18.1
+version=6.19.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,14 +14,15 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=1527060bb666a459f6797d7161e237095fc3665323fed30d1cc0bc0828d5311c
+checksum=965702b217b39131c61e62c63fb25b073750a8f6febdffa9db236626124c6e50
 nostrip_files="signal-desktop"
 
 post_extract() {
 	# git-lfs hook needs to be installed for one of the dependencies
 	git lfs install
 
-	vsed 's/"node": "/&>=/' -i package.json
+	#vsed 's/"node": "/&>=/' -i package.json
+	vsed 's/"node": "18.14.0"/"node": ">=16.19.0"/' -i package.json
 
 	# Dependencies have to be installed before applying patch
 	yarn install --ignore-engines --frozen-lockfile

From 446e846beb3b2a1efcb4e0431f5d05d1fa3d78c8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 14:36:31 +0100
Subject: [PATCH 0062/1853] diffutils: update to 3.10.

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

diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index 031d06d50ccc..3d0486ee01dd 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -1,7 +1,7 @@
 # Template file for 'diffutils'
 pkgname=diffutils
-version=3.9
-revision=2
+version=3.10
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="gl_cv_func_gettimeofday_clobber=no gl_cv_func_tzset_clobber=no"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/diffutils"
 distfiles="${GNU_SITE}/diffutils/diffutils-${version}.tar.xz"
-checksum=d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1
+checksum=90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e
 
 CFLAGS="-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64"
 

From 94841ee7e6b61cc3a9bdc2b17a2761af1bd8b6f0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 May 2023 23:10:54 +0200
Subject: [PATCH 0063/1853] python3-pwntools: update to 4.10.0.

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

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index 2c33922a7ea2..bfba84977284 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
-version=4.9.0
+version=4.10.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,8 +16,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
-checksum=eea67d182f9170488392998d9b2f1debb75889380505501f07707645fac7e712
-#make_check=no # needs unpackaged rpyc
+checksum=588e89ea678527c0b5b6caeeee7e76e31352e78e2f1cf3dda7bc9acf526e446d
+make_check=no
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From 045019c7b9d5374ebebcdfcbd9c680bdb6bfa5df Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Sat, 27 May 2023 18:34:56 -0400
Subject: [PATCH 0064/1853] lighttpd: update to 1.4.71

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

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 3b7158c1fbe4..04e11bd2209f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.70
+version=1.4.71
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85
+checksum=b8b6915da20396fdc354df3324d5e440169b2e5ea7859e3a775213841325afac
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

From 4bcb0d5128a6389e1e8fbda7f4376a76c4160c91 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Sat, 27 May 2023 18:36:26 -0400
Subject: [PATCH 0065/1853] lighttpd: use default mimetypes list in 1.4.71

lighttpd 1.4.71 now provides a default list of common types for
mimetype.assign if mimetype.assign is not explicitly part of config
---
 srcpkgs/lighttpd/files/lighttpd.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/lighttpd/files/lighttpd.conf b/srcpkgs/lighttpd/files/lighttpd.conf
index 6e7a6cc6c1d1..53e91fc46042 100644
--- a/srcpkgs/lighttpd/files/lighttpd.conf
+++ b/srcpkgs/lighttpd/files/lighttpd.conf
@@ -9,4 +9,3 @@ server.document-root	= "/srv/www/lighttpd"
 server.errorlog		= "/var/log/lighttpd/error.log"
 dir-listing.activate	= "enable"
 index-file.names	= ( "index.html" )
-mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" )

From 705280f476c2c4e52cb77d65ded0e1bdaffbc574 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 27 May 2023 10:59:29 -0400
Subject: [PATCH 0066/1853] iwd: update to 2.5

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

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index e925c42d9157..25f42b7d02c3 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=2.4
+version=2.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=3a9c5e7ade45162e5c78b3d7035a2f4a6e20ba6b5974097c35a8f615493012f9
+checksum=3441effed58297b63779e706c74884234acb874b07872f8b55e0da28729fda32
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 40503da30e31c41809ad217558b47c0e45fee81b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 27 May 2023 21:45:39 -0400
Subject: [PATCH 0067/1853] wireplumber: create /var/lib/wireplumber

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

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index f0ca35159469..80f8f1b7845f 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -16,6 +16,7 @@ changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
 provides="pipewire-session-manager-0_1"
+make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
 
 post_install() {
 	vlicense LICENSE

From ec4ae291e3922465c2e6bb96de4a31b28fdfcb8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 May 2023 16:35:12 +0200
Subject: [PATCH 0068/1853] libtls: update to 3.7.3.

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

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 8dbe146a61b6..1ea7763b0352 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.7.2
+version=3.7.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="libressl-${version}"
@@ -14,7 +14,7 @@ license="OpenSSL, ISC"
 homepage="http://www.libressl.org/"
 changelog="https://raw.githubusercontent.com/libressl/portable/master/ChangeLog"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
-checksum=b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7
+checksum=7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 patch_args="-Np1 --directory=${build_wrksrc}"

From a88e211d4b797657017988cf22f4bf0d38444532 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 May 2023 19:43:14 +0200
Subject: [PATCH 0069/1853] xfce4-pulseaudio-plugin: update to 0.4.6.

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

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index 0b839a9c157c..6368698f27c0 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
-version=0.4.5
+version=0.4.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/${version%.*}/xfce4-pulseaudio-plugin-${version}.tar.bz2"
-checksum=4425397dea6ba2599a91653dfb8ca91300faaf40be5bf5a73c3e6064bf13c115
+checksum=6e11c0e82444ad0f9390d526c07b67f46ff3b6bc3cd968ee7aad39b769146016

From e33b0dee8f112905d50cdbca8f7819b9dcd4ce73 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 25 May 2023 00:04:19 +0200
Subject: [PATCH 0070/1853] linux6.3: update to 6.3.4

Close: #44070
---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index efab2b7e530f..5ee6e0bed6a0 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.3
+version=6.3.4
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- 06941c036be21c9ec2f09f1e04b3e58b98c086ab6dee8d87a3a28f245259cd63"
+ aa63f11c6dfcf8ad392847fecb31e520cf57da7df096f7c1fbc4e187d1ab8996"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c4e46e2291dbf785142f34294f4dc01401211598 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 11 Nov 2022 14:10:25 +0100
Subject: [PATCH 0071/1853] bzip2-devel: add pkgconfig file

---
 srcpkgs/bzip2/files/bzip2.pc | 11 +++++++++++
 srcpkgs/bzip2/template       |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/bzip2/files/bzip2.pc

diff --git a/srcpkgs/bzip2/files/bzip2.pc b/srcpkgs/bzip2/files/bzip2.pc
new file mode 100644
index 000000000000..a4dd68259cec
--- /dev/null
+++ b/srcpkgs/bzip2/files/bzip2.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: A file compression library
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template
index c39a9427efb1..05a68132b828 100644
--- a/srcpkgs/bzip2/template
+++ b/srcpkgs/bzip2/template
@@ -1,7 +1,7 @@
 # Template file for 'bzip2'
 pkgname=bzip2
 version=1.0.8
-revision=1
+revision=2
 bootstrap=yes
 short_desc="Freely available, patent free, high-quality data compressor"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -35,6 +35,9 @@ do_install() {
 	vinstall libbz2.a 644 usr/lib
 	vinstall bzlib.h 644 usr/include
 
+	vinstall "${FILESDIR}/bzip2.pc" 644 usr/lib/pkgconfig
+	vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/lib/pkgconfig/bzip2.pc"
+
 	vman bzip2.1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1
@@ -46,6 +49,7 @@ bzip2-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}

From 9eefcc528f02929d31728447c79695542a68958e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 29 May 2023 16:08:38 +0200
Subject: [PATCH 0072/1853] ouch: rebuild for bzip2

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

diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template
index 8de1c57fc327..57205bad80ca 100644
--- a/srcpkgs/ouch/template
+++ b/srcpkgs/ouch/template
@@ -1,8 +1,9 @@
 # Template file for 'ouch'
 pkgname=ouch
 version=0.4.1
-revision=1
+revision=2
 build_style=cargo
+hostmakedepends="pkg-config"
 makedepends="liblzma-devel bzip2-devel libzip-devel"
 short_desc="CLI utility for easily compressing and decompressing files and dirs"
 maintainer="Savoy <savoy@liberation.red>"
@@ -24,5 +25,4 @@ post_install() {
 	for page in artifacts/*.1; do
 		vman ${page}
 	done
-
 }

From f9f776f49cff4a970dd0a63fe9df0084f71f33ff Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 27 May 2023 09:38:01 -0500
Subject: [PATCH 0073/1853] nvidia390: add patches for linux6.3

---
 srcpkgs/nvidia390/files/linux6.3-x64.patch    | 89 +++++++++++++++++++
 srcpkgs/nvidia390/files/linux6.3-x86.patch    | 76 ++++++++++++++++
 .../nvidia-470xx-fix-linux-6.2.patch          |  0
 srcpkgs/nvidia390/template                    | 14 ++-
 4 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nvidia390/files/linux6.3-x64.patch
 create mode 100644 srcpkgs/nvidia390/files/linux6.3-x86.patch
 rename srcpkgs/nvidia390/{patches => files}/nvidia-470xx-fix-linux-6.2.patch (100%)

diff --git a/srcpkgs/nvidia390/files/linux6.3-x64.patch b/srcpkgs/nvidia390/files/linux6.3-x64.patch
new file mode 100644
index 000000000000..f062e780d7a6
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux6.3-x64.patch
@@ -0,0 +1,89 @@
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index 2c4cb7b..f68fcf2 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47)
+ #include <linux/backlight.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
+index 725164a..c35e0ee 100644
+--- a/nvidia-drm/nvidia-drm-fb.c
++++ b/nvidia-drm/nvidia-drm-fb.c
+@@ -29,6 +29,7 @@
+ #include "nvidia-drm-fb.h"
+ #include "nvidia-drm-utils.h"
+ #include "nvidia-drm-gem.h"
++#include "nvidia-drm-helper.h"
+ 
+ #include <drm/drm_crtc_helper.h>
+ 
+diff --git a/nvidia-uvm/uvm8.c b/nvidia-uvm/uvm8.c
+index 11cb373..49e1047 100644
+--- a/nvidia-uvm/uvm8.c
++++ b/nvidia-uvm/uvm8.c
+@@ -658,7 +658,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
+     // Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
+     // so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
+     // with VM_IO, but that causes other mapping issues.
+-    vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
++    vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
+ 
+     vma->vm_ops = &uvm_vm_ops_managed;
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index 0b0a6f2..da891ff 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ int nvidia_mmap_helper(
+             addr  = mmap_start;
+             
+             // Needed for the linux kernel for mapping compound pages
+-            vma->vm_flags |= VM_MIXEDMAP;
++            vm_flags_set(vma, VM_MIXEDMAP);
+ 
+             for (j = 0; j < pages; j++)
+             {
+@@ -471,7 +471,7 @@ int nvidia_mmap_helper(
+             }
+         }
+ 
+-        vma->vm_flags |= VM_IO;
++        vm_flags_set(vma, VM_IO);
+     }
+     else
+     {
+@@ -533,15 +533,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
diff --git a/srcpkgs/nvidia390/files/linux6.3-x86.patch b/srcpkgs/nvidia390/files/linux6.3-x86.patch
new file mode 100644
index 000000000000..b6c7bb1580df
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux6.3-x86.patch
@@ -0,0 +1,76 @@
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index 2c4cb7b..f68fcf2 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47)
+ #include <linux/backlight.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
+index 725164a..c35e0ee 100644
+--- a/nvidia-drm/nvidia-drm-fb.c
++++ b/nvidia-drm/nvidia-drm-fb.c
+@@ -29,6 +29,7 @@
+ #include "nvidia-drm-fb.h"
+ #include "nvidia-drm-utils.h"
+ #include "nvidia-drm-gem.h"
++#include "nvidia-drm-helper.h"
+ 
+ #include <drm/drm_crtc_helper.h>
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index 0b0a6f2..da891ff 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ int nvidia_mmap_helper(
+             addr  = mmap_start;
+             
+             // Needed for the linux kernel for mapping compound pages
+-            vma->vm_flags |= VM_MIXEDMAP;
++            vm_flags_set(vma, VM_MIXEDMAP);
+ 
+             for (j = 0; j < pages; j++)
+             {
+@@ -471,7 +471,7 @@ int nvidia_mmap_helper(
+             }
+         }
+ 
+-        vma->vm_flags |= VM_IO;
++        vm_flags_set(vma, VM_IO);
+     }
+     else
+     {
+@@ -533,15 +533,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
diff --git a/srcpkgs/nvidia390/patches/nvidia-470xx-fix-linux-6.2.patch b/srcpkgs/nvidia390/files/nvidia-470xx-fix-linux-6.2.patch
similarity index 100%
rename from srcpkgs/nvidia390/patches/nvidia-470xx-fix-linux-6.2.patch
rename to srcpkgs/nvidia390/files/nvidia-470xx-fix-linux-6.2.patch
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 5b1900374f36..2f5088b14c01 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.157
-revision=3
+revision=4
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -28,7 +28,7 @@ else
 	checksum=162317a49aa5a521eb888ec12119bfe5a45cec4e8653efc575a2d04fb05bf581
 fi
 
-patch_args="-Np1 --directory=${XBPS_BUILDDIR}/${pkgname}-${version}/${_pkg}/kernel"
+patch_args="-Ntp1 --directory=${XBPS_BUILDDIR}/${pkgname}-${version}/${_pkg}/kernel"
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
 
 do_extract() {
@@ -39,6 +39,16 @@ do_extract() {
 	cd ${_pkg}
 }
 
+do_patch() {
+	patch ${patch_args} -i ${FILESDIR}/nvidia-470xx-fix-linux-6.2.patch
+	case "$XBPS_TARGET_MACHINE" in
+		i686)
+			patch ${patch_args} -i ${FILESDIR}/linux6.3-x86.patch ;;
+		x86_64)
+			patch ${patch_args} -i ${FILESDIR}/linux6.3-x64.patch ;;
+	esac
+}
+
 pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json

From 19337b898f06df724076f9d18fbf915daf0e04e7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 May 2023 06:16:11 -0500
Subject: [PATCH 0074/1853] nvidia470: add patch for linux 6.3

---
 srcpkgs/nvidia470/patches/linux-6.3.patch | 117 ++++++++++++++++++++++
 srcpkgs/nvidia470/template                |   2 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia470/patches/linux-6.3.patch

diff --git a/srcpkgs/nvidia470/patches/linux-6.3.patch b/srcpkgs/nvidia470/patches/linux-6.3.patch
new file mode 100644
index 000000000000..11d29cb19853
--- /dev/null
+++ b/srcpkgs/nvidia470/patches/linux-6.3.patch
@@ -0,0 +1,117 @@
+From a77f2da778f4a62695a6c7d26bba674d59ad9170 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sat, 25 Feb 2023 10:57:09 +0000
+Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.3-rc1
+
+---
+ common/inc/nv-linux.h                   | 13 +++++++++++++
+ nvidia-drm/nvidia-drm-gem-user-memory.c |  7 ++++---
+ nvidia-uvm/uvm.c                        |  2 +-
+ nvidia/nv-mmap.c                        | 12 ++++++------
+ 4 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index f8df9e3..5b22cf1 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1988,4 +1988,17 @@ static inline void nv_mutex_destroy(struct mutex *lock)
+ 
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-gem-user-memory.c b/nvidia-drm/nvidia-drm-gem-user-memory.c
+index 8824daa..3ea9099 100644
+--- a/nvidia-drm/nvidia-drm-gem-user-memory.c
++++ b/nvidia-drm/nvidia-drm-gem-user-memory.c
+@@ -35,6 +35,7 @@
+ #include "linux/dma-buf.h"
+ #include "linux/mm.h"
+ #include "nv-mm.h"
++#include "nv-linux.h"
+ 
+ static inline
+ void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
+@@ -92,9 +93,9 @@ static int __nv_drm_gem_user_memory_mmap(struct nv_drm_gem_object *nv_gem,
+         return -EINVAL;
+     }
+ 
+-    vma->vm_flags &= ~VM_PFNMAP;
+-    vma->vm_flags &= ~VM_IO;
+-    vma->vm_flags |= VM_MIXEDMAP;
++    vm_flags_clear(vma, VM_PFNMAP);
++    vm_flags_clear(vma, VM_IO);
++    vm_flags_set(vma, VM_MIXEDMAP);
+ 
+     return 0;
+ }
+diff --git a/nvidia-uvm/uvm.c b/nvidia-uvm/uvm.c
+index 3e7318d..7eddff7 100644
+--- a/nvidia-uvm/uvm.c
++++ b/nvidia-uvm/uvm.c
+@@ -812,7 +812,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
+     // Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
+     // so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
+     // with VM_IO, but that causes other mapping issues.
+-    vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
++    vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
+ 
+     vma->vm_ops = &uvm_vm_ops_managed;
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index df514c9..8f85ff6 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ static int nvidia_mmap_numa(
+     }
+ 
+     // Needed for the linux kernel for mapping compound pages
+-    vma->vm_flags |= VM_MIXEDMAP;
++    vm_flags_set(vma, VM_MIXEDMAP);
+ 
+     for (i = 0, addr = mmap_context->page_array[0]; i < pages;
+          addr = mmap_context->page_array[++i], start += PAGE_SIZE)
+@@ -596,7 +596,7 @@ int nvidia_mmap_helper(
+         }
+         up(&nvl->mmap_lock);
+ 
+-        vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND;
++        vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND);
+     }
+     else
+     {
+@@ -663,15 +663,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
+-- 
+2.39.2
+
diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index fbe3efc323a2..da0fc142c178 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.182.03
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"

From ea6314cc2e4fc5949a02921b9a693bb178e1a645 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 29 May 2023 10:42:21 +0300
Subject: [PATCH 0075/1853] openvpn: update to 2.6.4.

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

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 3667d7811a1c..f1b8a5ce2d3a 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.6.2
+version=2.6.4
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -16,7 +16,7 @@ license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
 changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst"
 distfiles="http://build.openvpn.net/downloads/releases/openvpn-${version}.tar.gz"
-checksum=42d561a9af150b21bc914e3b7aa09f88013d2ffa6d5ce75a025a3b34caa948d4
+checksum=371a2a323a99a79299b9b4caa4a31bc7b2cdff63236e68d429f3ee50e75f3dd4
 # t_net.sh fails on CI.
 make_check=ci-skip
 

From 9a000b476e7b34ae02b128b1dac32251f40d0d2a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 28 May 2023 18:56:11 +0100
Subject: [PATCH 0076/1853] ethtool: update to 6.3.

---
 srcpkgs/ethtool/patches/fix-musl.diff | 43 ---------------------------
 srcpkgs/ethtool/template              |  4 +--
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/ethtool/patches/fix-musl.diff

diff --git a/srcpkgs/ethtool/patches/fix-musl.diff b/srcpkgs/ethtool/patches/fix-musl.diff
deleted file mode 100644
index b06c86650b9f..000000000000
--- a/srcpkgs/ethtool/patches/fix-musl.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/marvell.c	2023-01-23 21:03:11.025636022 +0000
-+++ b/marvell.c	2023-01-27 14:02:36.278115472 +0000
-@@ -31,23 +31,23 @@
- static void dump_queue(const char *name, const void *a, int rx)
- {
- 	struct desc {
--		u_int32_t		ctl;
--		u_int32_t		next;
--		u_int32_t		data_lo;
--		u_int32_t		data_hi;
--		u_int32_t		status;
--		u_int32_t		timestamp;
--		u_int16_t		csum2;
--		u_int16_t		csum1;
--		u_int16_t		csum2_start;
--		u_int16_t		csum1_start;
--		u_int32_t		addr_lo;
--		u_int32_t		addr_hi;
--		u_int32_t		count_lo;
--		u_int32_t		count_hi;
--		u_int32_t               byte_count;
--		u_int32_t               csr;
--		u_int32_t               flag;
-+		uint32_t		ctl;
-+		uint32_t		next;
-+		uint32_t		data_lo;
-+		uint32_t		data_hi;
-+		uint32_t		status;
-+		uint32_t		timestamp;
-+		uint16_t		csum2;
-+		uint16_t		csum1;
-+		uint16_t		csum2_start;
-+		uint16_t		csum1_start;
-+		uint32_t		addr_lo;
-+		uint32_t		addr_hi;
-+		uint32_t		count_lo;
-+		uint32_t		count_hi;
-+		uint32_t               byte_count;
-+		uint32_t               csr;
-+		uint32_t               flag;
- 	};
- 	const struct desc *d = a;
- 
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 4ed39b335326..9e8a55fb1574 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=6.1
+version=6.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://www.kernel.org/pub/software/network/ethtool/"
 changelog="https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/plain/NEWS"
 distfiles="https://www.kernel.org/pub/software/network/ethtool/ethtool-${version}.tar.xz"
-checksum=c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90
+checksum=d9425f0a3df138734001fccc4175fe178c025f938460ac25c4ebc39960168822

From 35c9e143a52985c9e5ba9b931b3b87f675e139f5 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:45:41 +0200
Subject: [PATCH 0077/1853] blackbox: update to 1.20220610.

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

diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index c242782d7937..9cd2b3289d4a 100644
--- a/srcpkgs/blackbox/template
+++ b/srcpkgs/blackbox/template
@@ -1,14 +1,14 @@
 # Template file for 'blackbox'
 pkgname=blackbox
-version=1.20181219
-revision=3
+version=1.20220610
+revision=1
 depends="bash gnupg"
 short_desc="Safely store secrets in Git/Mercurial/Subversion"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://github.com/StackExchange/blackbox"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=afd40d1676645ce9aaf4cdbf71352bf1a8f6d426998436cea3ae536881ef5f81
+checksum=f1efcca6680159f244eb44fdb78e92b521760b875fa5a36e4c433b93ed0f87c1
 
 do_install() {
 	for f in bin/*; do

From ac91b7f839f916373f499a2591f22c47bbcc15e9 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:53:00 +0200
Subject: [PATCH 0078/1853] batman-adv: update to 2023.1.

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

diff --git a/srcpkgs/batman-adv/template b/srcpkgs/batman-adv/template
index 98b772fc75f9..d6b89a65b54a 100644
--- a/srcpkgs/batman-adv/template
+++ b/srcpkgs/batman-adv/template
@@ -1,13 +1,13 @@
 # Template file for 'batman-adv'
 pkgname=batman-adv
-version=2021.1
+version=2023.1
 revision=1
 short_desc="B.A.T.M.A.N. routing protocol kernel module"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://www.open-mesh.org/"
 distfiles="https://downloads.open-mesh.org/batman/releases/batman-adv-${version}/batman-adv-${version}.tar.gz"
-checksum=bf77843d8dead75342d673ce7021e4ad037447ce18c64056ae1e3202039934d0
+checksum=f46a7286660a5ec3506a1be7ef60b471c51ac70550597d598040479ab7b936b8
 
 dkms_modules="batman-adv ${version}"
 depends="dkms"

From f1de55ad4949984a54478d14ed3b32db37617ce2 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:55:08 +0200
Subject: [PATCH 0079/1853] batctl: update to 2023.1.

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

diff --git a/srcpkgs/batctl/template b/srcpkgs/batctl/template
index 5aee697fb8f8..462d73e86141 100644
--- a/srcpkgs/batctl/template
+++ b/srcpkgs/batctl/template
@@ -1,6 +1,6 @@
 # Template file for 'batctl'
 pkgname=batctl
-version=2021.1
+version=2023.1
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://www.open-mesh.net/"
 distfiles="http://downloads.open-mesh.net/batman/releases/batman-adv-${version}/batctl-${version}.tar.gz"
-checksum=44b28cebb46b8ba1bc170bedeef67f69d89503806c429ff8cb113cc01966e176
+checksum=e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1
 
 post_install() {
 	vlicense LICENSES/preferred/MIT

From 1b977782223fd42d48d50006a7abc5b210f01d6f Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:39:31 +0200
Subject: [PATCH 0080/1853] cmc: update to 1.2.0.

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

diff --git a/srcpkgs/cmc/template b/srcpkgs/cmc/template
index d94d241d7f56..85e939658431 100644
--- a/srcpkgs/cmc/template
+++ b/srcpkgs/cmc/template
@@ -1,13 +1,13 @@
 # Template file for 'cmc'
 pkgname=cmc
-version=1.1.4
-revision=2
+version=1.2.0
+revision=1
 short_desc="SSH ControlMaster Controller"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://github.com/TimidRobot/cmc"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a243f53317af69729d4fd6c022722f3085e3d193d5a5a9a86b59fd281a6a96e1
+checksum=ed032301ca42dd477692d9343744a4a71fa29542d96cea1561eeb5155431b642
 
 do_install() {
 	vbin cmc

From 981e9f8f02aa1478513636ca4936791f064d3c58 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 29 May 2023 15:51:08 +0200
Subject: [PATCH 0081/1853] neovim: update to 0.9.1

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

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 19e50b71d0e0..a0397a7a900f 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,6 +1,6 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -16,7 +16,7 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0, Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
-checksum=39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937
+checksum=8db17c2a1f4776dcda00e59489ea0d98ba82f7d1a8ea03281d640e58d8a3a00e
 
 build_options=luajit
 

From b320d8313f7f159d25d83648765bc25c76ecfc43 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 29 May 2023 19:59:58 +1000
Subject: [PATCH 0082/1853] kops: update to 1.26.3

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

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 25f8b2b2ac81..9ea81d46c24a 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,7 +1,7 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.26.2
-revision=2
+version=1.26.3
+revision=1
 archs="x86_64*"
 build_style=go
 go_import_path="k8s.io/kops/cmd/kops"
@@ -12,7 +12,7 @@ maintainer="Mate Gabri <iam@theguy.io>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes/kops"
 distfiles="https://github.com/kubernetes/kops/archive/refs/tags/v${version}.tar.gz"
-checksum=01d1af58b3cc2ff0917aa0ef95c7f1761bf3572b90e48608637771c2ba779813
+checksum=10959b7b59f61a6078471eb2da30ad8c839fa96f648c2c9606a3deafce36eb91
 
 post_install() {
 	${DESTDIR}/usr/bin/kops completion bash >kops-completion.bash

From 9e0db2bdc62b5efbce0a77b705791f9834fa54de Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 19:28:17 +0100
Subject: [PATCH 0083/1853] less: update to 633.

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

diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 3a6680224b55..72837b74b51c 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -1,6 +1,6 @@
 # Template file for 'less'
 pkgname=less
-version=608
+version=633
 revision=1
 build_style=gnu-configure
 configure_args="--with-regex=pcre2"
@@ -8,7 +8,10 @@ makedepends="ncurses-devel pcre2-devel"
 short_desc="Pager program similar to more(1)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.greenwoodsoftware.com/less"
+homepage="https://www.greenwoodsoftware.com/less"
 changelog="https://raw.githubusercontent.com/gwsw/less/master/NEWS"
-distfiles="http://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
-checksum=a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209
+distfiles="https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
+checksum=2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f
+# Tests intentionally not included in tarball
+# (https://github.com/gwsw/less/issues/344).
+make_check=no

From 7c74d1cabeed92fcc004559f48ef0c4f81317fd4 Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Sat, 27 May 2023 09:29:56 -0700
Subject: [PATCH 0084/1853] fzf: update to 0.41.1

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 5c52a701a309..678f11097119 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.40.0
+version=0.41.1
 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=9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65
+checksum=982682eaac377c8a55ae8d7491fcd0e888d6c13915d01da9ebb6b7c434d7f4b5
 
 post_install() {
 	cd ${wrksrc}

From c36fadc5c8f324c336031ae8e062ab10d2893c1f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 21 May 2023 16:14:25 +0100
Subject: [PATCH 0085/1853] libwacom: update to 2.7.0.

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

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 8216a58a086d..dace4de001ce 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,9 +1,8 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=meson
-build_helper="qemu"
 configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
@@ -14,9 +13,11 @@ license="MIT"
 homepage="https://github.com/linuxwacom/libwacom"
 changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
 distfiles="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${version}/libwacom-${version}.tar.xz"
-checksum=2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f
+checksum=853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf
 
-if [ -z "${XBPS_CHECK_PKGS}" ]; then
+if [ "${XBPS_CHECK_PKGS}" ]; then
+	configure_args+=" -Dtests=enabled"
+else
 	configure_args+=" -Dtests=disabled"
 fi
 

From 549671b1be2aea639c7e267e9eb263182a9599dd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 12:29:50 +0100
Subject: [PATCH 0086/1853] apparmor: update to 3.1.4.

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

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 50e2992aafbb..b81fab0d0f02 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,6 +1,6 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.3
+version=3.1.4
 revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
-checksum=b8ffac45d0b283afe574ddd5542142ba1a62c354df110cff862b99201f29c843
+checksum=6bee0c3941836dae2c635fe82f09b666123fcac16563aa0fedf4a63c22b91f40
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

From 1d9a9e2acd07cead98df8ccb9cfa469e57a0183b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 12:09:28 +0100
Subject: [PATCH 0087/1853] qca-qt5: update to 2.3.6.

---
 srcpkgs/qca-qt5/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index f2409d4a5cca..298348d66e8b 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,9 +1,9 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
-version=2.3.4
+version=2.3.6
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
+configure_args="-DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
 makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
@@ -13,12 +13,18 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://userbase.kde.org/QCA"
 distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
-checksum=6b695881a7e3fd95f73aaee6eaeab96f6ad17e515e9c2b3d4b3272d7862ff5c4
+checksum=ee59d531d4b82fb1685f4d8d74c2caa0777f501800f7426eaa372109a4305249
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
 fi
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTS=1"
+else
+	configure_args+=" -DBUILD_TESTS=0"
+fi
+
 qca-qt5-ossl_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - QCA OSSL plugin"
@@ -35,6 +41,6 @@ qca-qt5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/cmake
 		vmove usr/share/qca-qt5/mkspecs
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }

From 357979d7ed83cd3437be8595c3d042eaf6b64227 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 24 May 2023 10:40:16 +0200
Subject: [PATCH 0088/1853] intellij-idea-community-edition: update to 2023.1

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

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 1c5f9d167c22..c681412597c5 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,15 +1,15 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2022.2.2
-revision=2
+version=2023.1
+revision=1
 archs="x86_64"
-depends="jetbrains-jdk-bin giflib libXtst hicolor-icon-theme"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
 short_desc="Java integrated development environment by JetBrains"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
-distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=d645ec79bc95bc383f70c1f453b0aa6188cf6ebe086e0179662b02d9675d4737
+distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"
+checksum=e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa
 repository=nonfree
 nopie=yes
 python_version=3
@@ -22,7 +22,7 @@ do_install() {
 	vmkdir usr/share/pixmaps
 	vmkdir usr/share/icons/hicolor/scalable/apps
 
-	mv bin lib plugins product-info.json build.txt  ${DESTDIR}/usr/lib/intellij-idea
+	mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea
 	mv LICENSE.txt NOTICE.txt license ${DESTDIR}/usr/share/doc/intellij-idea
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/win -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/mac -rf

From 0010b44fa39fa5d2c5c973a05e1eda56d1598168 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 01:41:40 +0100
Subject: [PATCH 0089/1853] New package: shotman-0.4.3

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

diff --git a/srcpkgs/shotman/template b/srcpkgs/shotman/template
new file mode 100644
index 000000000000..988ac18c3e8d
--- /dev/null
+++ b/srcpkgs/shotman/template
@@ -0,0 +1,28 @@
+# Template file for 'shotman'
+pkgname=shotman
+version=0.4.3
+revision=1
+build_style=cargo
+build_helper="qemu"
+hostmakedepends="pkg-config scdoc"
+makedepends="libxkbcommon-devel"
+depends="slurp"
+short_desc="Uncompromising screenshot GUI for Wayland"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="ISC"
+homepage="https://sr.ht/~whynothugo/shotman"
+changelog="https://git.sr.ht/~whynothugo/shotman/tree/main/item/README.md#changelog"
+distfiles="https://git.sr.ht/~whynothugo/shotman/archive/v${version}.tar.gz"
+checksum=75b5999655473e83a43d029bd7880da4bb6ca7ff0da95dd4b87568a53f097155
+
+export SHOTMAN_VERSION="v${version}"
+
+post_install() {
+	scdoc <shotman.1.scd >shotman.1
+	vman shotman.1
+	vlicense LICENCE.md
+	for shell in bash fish zsh; do
+		vtargetrun "./target/${RUST_TARGET}/release/shotman_completions" "${shell}" >"completions.${shell}"
+		vcompletion "completions.${shell}" "${shell}"
+	done
+}

From f796468b49abab39e0b8d4a8cc176e9be7bbd78c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 29 May 2023 22:24:16 +0200
Subject: [PATCH 0090/1853] lagrange: update to 1.16.2.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 33cdfbe1695d..569c997fb20a 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.15.8
+version=1.16.2
 revision=1
 build_style=cmake
 configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7511afc24261439d65c51452e38d2c3ca95d97c3a8f42821ffd612274469416b
+checksum=90e3c6cec54ecd0b0afce3952494c46bc6846850da622f66a6394b62b5866c86
 
 post_install() {
 	vlicense LICENSE.md

From 89ce859a6fe78a33ae3e090c7f8a1bf3224768f7 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:18:25 +0200
Subject: [PATCH 0091/1853] haproxy: update to 2.6.13.

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

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 40833cfb9eea..fbf13377f601 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.6.9
-revision=2
+version=2.6.13
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 changelog="https://www.haproxy.org/download/${version%.*}/src/CHANGELOG"
 distfiles="https://www.haproxy.org/download/${version%.*}/src/haproxy-${version}.tar.gz"
-checksum=f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701
+checksum=d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 6a095be1d4a8994800e9d6aecbab515e7e25afd1 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:04:18 +0200
Subject: [PATCH 0092/1853] calcurse: update to 4.8.1.

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

diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template
index aefd36d204da..ef441f2c0582 100644
--- a/srcpkgs/calcurse/template
+++ b/srcpkgs/calcurse/template
@@ -1,6 +1,6 @@
 # Template file for 'calcurse'
 pkgname=calcurse
-version=4.7.1
+version=4.8.1
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -10,7 +10,7 @@ maintainer="silvernode <mollusk@homebutter.com>"
 license="BSD-2-Clause"
 homepage="https://calcurse.org"
 distfiles="https://calcurse.org/files/${pkgname}-${version}.tar.gz"
-checksum=0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
+checksum=d86bb37014fd69b8d83ccb904ac979c6b8ddf59ee3dbc80f5a274525e4d5830a
 
 post_install() {
 	vlicense COPYING

From df186d3221a7656010c94cc7a518034745bfd2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 28 May 2023 16:11:15 +0100
Subject: [PATCH 0093/1853] ImageMagick: update to 7.1.1.10.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 40cfa4db513c..cc78d87b0326 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.1.8
+version=7.1.1.10
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=cac2e4766f2cf1bd301b94ddcc86d6940d52190bfc1f31056eaa39e9cf2abe42
+checksum=5008d827a78b56d436f532e6b6f7b6d4a69aa59342ce3dae00383f4686718c89
 
 subpackages="libmagick libmagick-devel"
 

From 636468c4912ff94754993c3462c2b2dc950066a5 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 25 May 2023 22:00:16 +0300
Subject: [PATCH 0094/1853] dpkg: update to 1.21.22

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

diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template
index 7e6ffbed49bb..12e8eef40081 100644
--- a/srcpkgs/dpkg/template
+++ b/srcpkgs/dpkg/template
@@ -1,6 +1,6 @@
 # Template file for 'dpkg'
 pkgname=dpkg
-version=1.21.12
+version=1.21.22
 revision=1
 build_style=gnu-configure
 configure_args="--disable-start-stop-daemon --with-libz --with-libbz2
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://packages.debian.org/dpkg"
 changelog="https://git.dpkg.org/git/dpkg/dpkg.git/plain/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/dpkg/dpkg_${version}.tar.xz"
-checksum=ec7a0e29898f457ea21cc89826601059bce2433d2b4e578a38b2a66d8768559a
+checksum=5a1d15481bba79d7a4899fd55b4b6b18a987ca8d56ee8c43e9cab63b8a0a3545
 
 dpkg-devel_package() {
 	short_desc+=" - development files"

From 0c2acdfd40c83d5d2db2f794fce4114479bc363c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:36:33 -0400
Subject: [PATCH 0095/1853] pipewire: add example config snippet for launching
 pipewire-pulse

---
 srcpkgs/pipewire/files/20-pipewire-pulse.conf | 5 +++++
 srcpkgs/pipewire/template                     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/pipewire/files/20-pipewire-pulse.conf

diff --git a/srcpkgs/pipewire/files/20-pipewire-pulse.conf b/srcpkgs/pipewire/files/20-pipewire-pulse.conf
new file mode 100644
index 000000000000..0a1c391f64dc
--- /dev/null
+++ b/srcpkgs/pipewire/files/20-pipewire-pulse.conf
@@ -0,0 +1,5 @@
+# copy or symlink this file to /etc/pipewire/pipewire.conf.d (system configuration)
+# or ${XDG_CONFIG_HOME}/pipewire/pipewire.conf.d (per-user configuration)
+# to configure pipewire to launch pipewire-pulse directly
+
+context.exec = [ { path = "/usr/bin/pipewire" args = "-c pipewire-pulse.conf" } ]
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 92feaab2a6d7..7ad92c87fa3b 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.71
-revision=1
+revision=2
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -60,6 +60,7 @@ post_install() {
 	vsv pipewire-pulse
 	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
 	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
+	vsconf "${FILESDIR}/20-pipewire-pulse.conf"
 }
 
 libpipewire_package() {

From f1c2b0d298a8ea8ebece29fa097c5dcdde207d73 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:36:57 -0400
Subject: [PATCH 0096/1853] wireplumber: add example config snippet for
 launching wireplumber

---
 srcpkgs/wireplumber/files/10-wireplumber.conf | 5 +++++
 srcpkgs/wireplumber/template                  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wireplumber/files/10-wireplumber.conf

diff --git a/srcpkgs/wireplumber/files/10-wireplumber.conf b/srcpkgs/wireplumber/files/10-wireplumber.conf
new file mode 100644
index 000000000000..e1fdf5dac30a
--- /dev/null
+++ b/srcpkgs/wireplumber/files/10-wireplumber.conf
@@ -0,0 +1,5 @@
+# copy or symlink this file to /etc/pipewire/pipewire.conf.d (system configuration)
+# or ${XDG_CONFIG_HOME}/pipewire/pipewire.conf.d (per-user configuration)
+# to configure pipewire to launch wireplumber directly
+
+context.exec = [ { path = "/usr/bin/wireplumber" args = "" } ]
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 80f8f1b7845f..3584bf374a64 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=3
+revision=4
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -22,6 +22,7 @@ post_install() {
 	vlicense LICENSE
 	vsv wireplumber
 	vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
+	vsconf "${FILESDIR}/10-wireplumber.conf"
 }
 
 wireplumber-devel_package() {

From 4464bbe81bee857beccbdbeb6689a41f1a113d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 May 2023 11:29:37 +0700
Subject: [PATCH 0097/1853] linux6.1: update to 6.1.29.

---
 srcpkgs/linux6.1/files/i386-dotconfig   | 5 +++--
 srcpkgs/linux6.1/files/x86_64-dotconfig | 5 +++--
 srcpkgs/linux6.1/template               | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/linux6.1/files/i386-dotconfig b/srcpkgs/linux6.1/files/i386-dotconfig
index ba39fd18342b..b6996c6b7fe8 100644
--- a/srcpkgs/linux6.1/files/i386-dotconfig
+++ b/srcpkgs/linux6.1/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.1.29 Kernel Configuration
+# Linux/i386 6.1.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -8554,10 +8554,11 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
 CONFIG_TC1100_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m
diff --git a/srcpkgs/linux6.1/files/x86_64-dotconfig b/srcpkgs/linux6.1/files/x86_64-dotconfig
index 2838a50d5549..7da5bb180093 100644
--- a/srcpkgs/linux6.1/files/x86_64-dotconfig
+++ b/srcpkgs/linux6.1/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.1.29 Kernel Configuration
+# Linux/x86_64 6.1.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -8750,9 +8750,10 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 3161bbae2476..381a869231d7 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.29
+version=6.1.30
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 1b78055e7022cb929b9ceb21232e040ffe4ebe8ae946964106b45478c7e39558"
+ 5abf569ed9e144f74a0c41fa2965c8ba3a5608e155a7d81a5364fc87c83fc49a"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c921baee5d49e1f9686b6667d10a2c806b8a1241 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 0098/1853] pipewire: move system service to
 /usr/share/examples/PKGNAME/sv/

remove pipewire-pulse service. this should be launched by pipewire
config if desired
---
 srcpkgs/pipewire/files/README.voidlinux   | 9 ++++++---
 srcpkgs/pipewire/files/pipewire-pulse/run | 8 --------
 srcpkgs/pipewire/files/pipewire/control/t | 2 ++
 srcpkgs/pipewire/files/pipewire/run       | 2 +-
 srcpkgs/pipewire/template                 | 6 +++---
 5 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/pipewire/files/pipewire-pulse/run
 create mode 100755 srcpkgs/pipewire/files/pipewire/control/t
 mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire/run

diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 33892fdef84b..f2c10e37e7cd 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,9 @@ Optional dependencies:
 * `libspa-v4l2` for video camera support
 * `rtkit` for realtime priority acquisition
 
-The system services /etc/sv/pipewire and /etc/sv/pipewire-pulse are
-experimental and only needed in rare cases so using them should be
-avoided in most setups.
+The example system service /usr/share/examples/pipewire/sv/pipewire is
+experimental and only needed in rare cases, so using it should be avoided
+in most setups. To use it, pipewire needs to be configured to launch
+pipewire-pulse and wireplumber as documented at
+
+    https://docs.voidlinux.org/config/media/pipewire.html
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
deleted file mode 100644
index 6eb172b8b19f..000000000000
--- a/srcpkgs/pipewire/files/pipewire-pulse/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-# this service is experimental and most setups should start pipewire as a user,
-# for further information, please refer to the handbook
-! [ -d /run/pulse ] && install -m 755 -g _pipewire -o _pipewire -d /run/pulse
-umask 002
-export PULSE_RUNTIME_PATH=/run/pulse
-exec chpst -u _pipewire:_pipewire pipewire-pulse
diff --git a/srcpkgs/pipewire/files/pipewire/control/t b/srcpkgs/pipewire/files/pipewire/control/t
new file mode 100755
index 000000000000..a095b7bc777a
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
old mode 100644
new mode 100755
index a201626e464d..d932511a9700
--- a/srcpkgs/pipewire/files/pipewire/run
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -6,4 +6,4 @@ exec 2>&1
 umask 002
 export PIPEWIRE_RUNTIME_DIR=/run/pipewire
 export XDG_STATE_HOME=/var/lib
-exec chpst -u _pipewire:_pipewire:audio:video pipewire
+exec chpst -P -u _pipewire:_pipewire:audio:video dbus-run-session pipewire
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7ad92c87fa3b..3e0cffb69a3c 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.71
-revision=2
+revision=3
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -56,8 +56,8 @@ fi
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
-	vsv pipewire
-	vsv pipewire-pulse
+	vmkdir usr/share/examples/sv
+	vcopy ${FILESDIR}/pipewire usr/share/examples/sv/
 	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
 	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
 	vsconf "${FILESDIR}/20-pipewire-pulse.conf"

From 5fcae2816f7d6d5720dedb088b5c74d3c4804478 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 0099/1853] wireplumber: remove system service

if desired, can be launched by pipewire config
---
 srcpkgs/wireplumber/files/wireplumber/control/t |  2 --
 srcpkgs/wireplumber/files/wireplumber/run       | 10 ----------
 srcpkgs/wireplumber/template                    |  3 +--
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
 delete mode 100644 srcpkgs/wireplumber/files/wireplumber/run

diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
deleted file mode 100755
index a095b7bc777a..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
deleted file mode 100644
index 9a28ecdbe9a4..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# this service is experimental and most setups should start pipewire and wireplumber as a user,
-# for further information, please refer to the handbook
-
-sv check dbus >/dev/null 2>&1 || exit 1
-
-exec 2>&1
-
-export XDG_STATE_HOME=/var/lib/pipewire
-exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 3584bf374a64..0014c3357f7c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=4
+revision=5
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,6 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
 
 post_install() {
 	vlicense LICENSE
-	vsv wireplumber
 	vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
 	vsconf "${FILESDIR}/10-wireplumber.conf"
 }

From f4b223593888c6fed09983d869b7d35136115909 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 0100/1853] pulseaudio: move system services to
 /usr/share/examples/PKGNAME/sv/

also fix a couple things in the template
---
 srcpkgs/pulseaudio/files/README.voidlinux |  6 +++---
 srcpkgs/pulseaudio/files/pulseaudio/run   |  0
 srcpkgs/pulseaudio/template               | 14 ++++----------
 3 files changed, 7 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run

diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
 
 Optional dependencies:
 
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..1bbca888f444 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=15.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -26,7 +26,7 @@ distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
 checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
 python_version=3
 # FIXME: core-util-test fails
-make_check=yes
+make_check=no
 
 system_groups="pulse-access"
 system_accounts="pulse"
@@ -44,16 +44,10 @@ case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Db_lto=false"
 esac
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		# Disable neon optimizations for the arm* architectures
-		arm*) vsed -e '/  neon/d' -i src/pulsecore/meson.build ;;
-	esac
-}
-
 post_install() {
 	rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
-	vsv pulseaudio
+	vmkdir usr/share/examples/pulseaudio/sv/
+	vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
 	vdoc $FILESDIR/README.voidlinux
 }
 

From ae6b3653755639e2001fc41095579967a7aaa524 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 16:30:05 +0200
Subject: [PATCH 0101/1853] linux5.10: update to 5.10.181.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 5bb69d7c6f17..97c063d99aa2 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.179
+version=5.10.181
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
- d3884dcb74c51054cc11ce243caa801b91f4e1ee0d3e0bf57c84da70307f501d"
+ c04019da6ab852a66bad81382fd9ba1d3a30d1d1fd784f8a0ca4565516b36098"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From a9373694255d8ca2602b680334795a96697ad4b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 16:30:37 +0200
Subject: [PATCH 0102/1853] linux5.15: update to 5.15.114.

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

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 7f946680fa09..04706c462e21 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.111
+version=5.15.114
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- bb4edf93f6db5de96687a860ab53b7eef0ddacbc2adce865484e21247160ef12"
+ 6a252901a4d497ec0a942c009a130c36c27290ac357e22de89bbc941e6b5fe76"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From fae4c1af8f4677cb2381737d09d7771be6bc2111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 29 May 2023 09:25:14 +0700
Subject: [PATCH 0103/1853] virtualbox-ose: update to 7.0.8a.

---
 common/shlibs                                 |   1 +
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |  12 +-
 .../patches/005-gsoap-build.patch             |   6 +-
 .../patches/008-no-vboxvideo.patch            |   2 +-
 .../patches/015-no-update.patch               | 104 +++++++++++
 .../patches/051-file-prefix-map.patch         |   8 +-
 srcpkgs/virtualbox-ose/patches/052-xml.patch  | 163 ++++++++++++++++++
 srcpkgs/virtualbox-ose/template               |  53 +++---
 8 files changed, 308 insertions(+), 41 deletions(-)
 create mode 100644 srcpkgs/virtualbox-ose/patches/015-no-update.patch
 create mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch

diff --git a/common/shlibs b/common/shlibs
index f1e825819fb4..df0384d3b218 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4246,3 +4246,4 @@ 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
 libjodycode.so.2 libjodycode-2.0.1_1
+libgsoapssl++-2.8.124.so gsoap-2.8.124_1
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index b60eb09c0f5f..151892b353bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -2,15 +2,17 @@ VBOX_WITH_ADDITION_DRIVERS =
 VBOX_WITH_INSTALLER = 1
 VBOX_WITH_LINUX_ADDITIONS = 1
 VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
 VBOX_WITH_VIRTIO = 1
 VBOX_WITH_ORIGIN :=
 VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS)
+VBOX_PATH_PACKAGE_DOCS := /usr/share/doc/virtualbox
+VBOX_PATH_APP_DOCS := $(VBOX_PATH_PACKAGE_DOCS)
 VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
@@ -18,12 +20,16 @@ VBOX_NO_LEGACY_XORG_X11 = 1
 PATH_SDK_QT5_INC := /usr/include/qt5
 PATH_SDK_QT6 := /usr
 PATH_SDK_QT6_INC := /usr/include/qt6
+VBOX_WITH_QT5 := 1
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
 #VBOX_GCC_WARN =
 USERNAME = builder@void
+KBUILD_VERBOSE := 2
 
 # fix gsoap missing zlib include and produce errors with --as-needed
 VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
 VBOX_USE_SYSTEM_GL_HEADERS=true
+VBOX_WITH_DOCS :=
+VBOX_WITH_DOCS_PACKING :=
diff --git a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
index b7700e1bd98e..35fa223ab52c 100644
--- a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
+++ b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
@@ -1,11 +1,11 @@
 --- a/src/VBox/Main/webservice/Makefile.kmk
 +++ b/src/VBox/Main/webservice/Makefile.kmk
-@@ -848,7 +848,7 @@ $(if-expr !defined(VBOX_WITHOUT_NOINLINE
- 		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+@@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED
+  		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
 -	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
 +	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
- ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+  ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
  	$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
  	$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
diff --git a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
index 7838fb4e6352..79502012cbcf 100644
--- a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
+++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
@@ -7,5 +7,5 @@
 - DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
 + DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
   SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
-  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
   vboxvideo_drv_system_CFLAGS := \
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
new file mode 100644
index 000000000000..12ee94908c95
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -0,0 +1,104 @@
+
+Description: Disable "Check for Updates" action.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
+Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
+
+--- a/doc/manual/en_US/user_Introduction.xml
++++ b/doc/manual/en_US/user_Introduction.xml
+@@ -6090,14 +6090,14 @@
+           <xref linkend="specialcharacters"/>.
+         </para>
+       </listitem>
+-
++      <!--
+       <listitem>
+         <para>
+           <emphasis role="bold">Update.</emphasis> Enables you to
+           specify various settings for Automatic Updates.
+         </para>
+       </listitem>
+-
++      -->
+       <listitem>
+         <para>
+           <emphasis role="bold">Language.</emphasis> Enables you to
+--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
+ bool UIExtraDataManager::applicationUpdateEnabled()
+ {
+     /* 'True' unless 'restriction' feature allowed: */
+-    return !isFeatureAllowed(GUI_PreventApplicationUpdate);
++    return false;
+ }
+ 
+ QString UIExtraDataManager::applicationUpdateData()
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -47,10 +47,10 @@
+ #ifdef VBOX_WS_WIN
+ # include "UIGlobalSettingsInterface.h"
+ #endif
+-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-# include "UIGlobalSettingsProxy.h"
+-# include "UIGlobalSettingsUpdate.h"
+-#endif
++//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
++//# include "UIGlobalSettingsProxy.h"
++//# include "UIGlobalSettingsUpdate.h"
++//#endif
+ 
+ /* GUI includes: Machine Settings: */
+ #include "UIMachineSettingsAudio.h"
+@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+ 
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* Update page: */
+-    m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
++    //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
+ #endif
+ 
+     /* Language page: */
+@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+ 
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* Proxy page: */
+-    m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
++    //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
+ #endif
+ 
+ #ifdef VBOX_WS_WIN
+@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+                 }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+                 /* Update page: */
+-                case GlobalSettingsPageType_Update:
++                /*case GlobalSettingsPageType_Update:
+                 {
+                     pSettingsPage = new UIGlobalSettingsUpdate;
+                     addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
+                             iPageIndex, "#update", pSettingsPage);
+                     addPageHelpKeyword(iPageIndex, "preferences");
+                     break;
+-                }
++                }*/
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+                 /* Language page: */
+                 case GlobalSettingsPageType_Language:
+@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+                 }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+                 /* Proxy page: */
+-                case GlobalSettingsPageType_Proxy:
++                /*case GlobalSettingsPageType_Proxy:
+                 {
+                     pSettingsPage = new UIGlobalSettingsProxy;
+                     addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
+                             iPageIndex, "#proxy", pSettingsPage);
+                     addPageHelpKeyword(iPageIndex, "preferences");
+                     break;
+-                }
++                }*/
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifdef VBOX_WS_WIN
+                 /* Interface page: */
diff --git a/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch b/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch
index 36952e8321d6..1b65c8bae068 100644
--- a/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch
+++ b/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch
@@ -1,10 +1,8 @@
 Technically -ffile-prefix-map is not OPTimisation flags,
 but it's the easiest flags to be plugged in for all objects
-Index: virtualbox-ose-7.0.4/Config.kmk
-===================================================================
---- virtualbox-ose-7.0.4.orig/Config.kmk
-+++ virtualbox-ose-7.0.4/Config.kmk
-@@ -3680,7 +3680,7 @@ else
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -3721,7 +3721,7 @@ else
   # We should use -fomit-frame-pointer for GCC / -Oy for VCC.
   # -funwind-tables provides support for backtraces in gdb then.
   VBOX_GCC_FP     ?= -fno-omit-frame-pointer
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
new file mode 100644
index 000000000000..81f93ba7a5eb
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/052-xml.patch
@@ -0,0 +1,163 @@
+Fix ftbfs
+From: nezos@hotmail.com
+--- a/doc/manual/en_US/user_VBoxManage.xml
++++ b/doc/manual/en_US/user_VBoxManage.xml
+@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
+       on your particular host.
+     </para>
+ 
+-    <xi:include href="overview_man_VBoxManage-common.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-common.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-list.xml"           xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-list.xml"           xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-showvminfo.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-showvminfo.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-registervm.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-registervm.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-unregistervm.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-unregistervm.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-createvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-createvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-modifyvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-modifyvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-clonevm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-clonevm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-movevm.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-movevm.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-encryptvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-encryptvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-cloud.xml"          xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-cloud.xml"          xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-cloudprofile.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-cloudprofile.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-import.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-import.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-export.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-export.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-signova.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-signova.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-startvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-startvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-controlvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-controlvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-unattended.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-unattended.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-discardstate.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-discardstate.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-adoptstate.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-adoptstate.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-snapshot.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-snapshot.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-closemedium.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-closemedium.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-storageattach.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-storageattach.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-storagectl.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-storagectl.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-bandwidthctl.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-bandwidthctl.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-createmedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-createmedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-modifymedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-modifymedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-clonemedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-clonemedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-encryptmedium.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-encryptmedium.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-mediumio.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-mediumio.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-setextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-setextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-getextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-getextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-setproperty.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-setproperty.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-usbfilter.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-usbfilter.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-sharedfolder.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-sharedfolder.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-guestproperty.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-guestproperty.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-guestcontrol.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-guestcontrol.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-debugvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-debugvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-metrics.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-metrics.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-natnetwork.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-natnetwork.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-hostonlyif.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-hostonlyif.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-hostonlynet.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-hostonlynet.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-dhcpserver.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-dhcpserver.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-usbdevsource.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-usbdevsource.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-extpack.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-extpack.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-updatecheck.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-updatecheck.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-modifynvram.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-modifynvram.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+     <para>
+       Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 4efc26f7da06..c4bc1aa0289a 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,14 +1,14 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=7.0.6
+version=7.0.8a
 revision=1
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
-distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff
+distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
+checksum=7de37359518d467b7f888235175cd388f66e9f16bd9359dd6265fbc95933c1e6
 
 nopie=yes
 lib32disabled=yes
@@ -33,24 +33,22 @@ system_groups="vboxusers"
 
 do_configure() {
 	cp ${FILESDIR}/LocalConfig.kmk .
-	ln -s /bin/echo makeself
-	./configure --disable-docs --disable-java --enable-vde \
+	./configure \
+		--disable-docs --disable-java --enable-vde \
+		--with-makeself="/bin/echo" \
 		--disable-python --disable-kmods --nofatal --enable-webservice
 }
 
 do_build() {
 	export USERNAME="builder@void"
 	vsed -i  src/VBox/Main/webservice/Makefile.kmk \
-		-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
-		-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
+		-e '/webtest_LIBS/,/^webtest_/{/ z$/!s/.*LIB_.*/& z/ }' \
+		-e '/vboxwebsrv_LIBS/,/^vboxwebsrv_/{/ z$/!s/.*LIB_.*/& z/}'
 	source ./env.sh
-	kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all
-	# kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
+	kmk ${makejobs} all
 }
 
 do_install() {
-	local f _osedir _guestdir
-
 	source ./env.sh
 	#
 	# virtualbox-ose.
@@ -129,15 +127,14 @@ virtualbox-ose-dkms_package() {
 		source ${wrksrc}/env.sh
 
 		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
-		local _osedir=${PKGDESTDIR}/usr/src/${sourcepkg}-${version}
-
-		install -d ${_osedir}
-		cp -a . ${_osedir}
-		cp -a ${wrksrc}/include ${_osedir}
-		rm -f ${_osedir}/do_dkms
-		install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf
-		vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \
-			usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules
+
+		rm -f do_dkms
+		sed -s "s/#MODULE_VERSION#/$version/" ${FILESDIR}/${pkgname}.dkms >dkms.conf
+		vmkdir "usr/src/${pkgname%-dkms}-${version}"
+		vcopy . "usr/src/${pkgname%-dkms}-${version}"
+		vcopy ${wrksrc}/include "usr/src/${pkgname%-dkms}-${version}"
+		vinstall ${FILESDIR}/${pkgname}.udev 644 \
+			usr/lib/udev/rules.d 60-${pkgname}.rules
 	}
 }
 virtualbox-ose-guest_package() {
@@ -176,14 +173,12 @@ virtualbox-ose-guest-dkms_package() {
 		source ${wrksrc}/env.sh
 
 		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
-		local _guestdir=${PKGDESTDIR}/usr/src/${sourcepkg}-guest-${version}
-
-		install -d ${_guestdir}
-		cp -a . ${_guestdir}
-		rm -f ${_guestdir}/do_dkms
-		install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.dkms \
-			${_guestdir}/dkms.conf
-		vinstall ${FILESDIR}/${sourcepkg}-guest-dkms.udev 644 \
-			usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules
+
+		sed -s "s/#MODULE_VERSION#/$version/" ${FILESDIR}/${pkgname}.dkms >dkms.conf
+		rm -f do_dkms
+		vmkdir "usr/src/${pkgname%-dkms}-${version}"
+		vcopy . "usr/src/${pkgname%-dkms}-${version}"
+		vinstall ${FILESDIR}/${pkgname}.udev 644 \
+			usr/lib/udev/rules.d 60-${pkgname}.rules
 	}
 }

From d0cb2f2b0fac1b0a92bf72da1c6730fd872ef73a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 30 May 2023 18:00:32 +0200
Subject: [PATCH 0104/1853] github-cli: update to 2.30.0

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index fadddfd0fa2c..f70306706384 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.29.0
+version=2.30.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=f77718f109ff5817cde33eb004137f58bdcd5934b921aed1440c6b3e93e1df27
+checksum=5e66be97f51559dcea3621c8cc3cf2f67bf47bf2e1902014b3ec5689ab4e8add
 
 pre_build() {
 	local _date

From a3e35aa10cb4eb1c9f1e4c67405d64565ba1cc37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 30 May 2023 19:50:16 +0200
Subject: [PATCH 0105/1853] libmicrohttpd: update to 0.9.77.

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

diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template
index 48c1b7d73e1e..3764646cec11 100644
--- a/srcpkgs/libmicrohttpd/template
+++ b/srcpkgs/libmicrohttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'libmicrohttpd'
 pkgname=libmicrohttpd
-version=0.9.76
-revision=2
+version=0.9.77
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-largefile
@@ -11,11 +11,12 @@ hostmakedepends="texinfo"
 makedepends="libgcrypt-devel gnutls-devel"
 checkdepends="libcurl-devel"
 short_desc="Library embedding HTTP server functionality"
-maintainer="Duncaen <Duncaen@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/libmicrohttpd/"
+changelog="https://git.gnunet.org/libmicrohttpd.git/plain/ChangeLog"
 distfiles="${GNU_SITE}/libmicrohttpd/libmicrohttpd-${version}.tar.gz"
-checksum=f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c
+checksum=9e7023a151120060d2806a6ea4c13ca9933ece4eacfc5c9464d20edddb76b0a0
 
 libmicrohttpd-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 61a95357b6209894aa02a6e7de8f6c6dd72638ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 16:32:38 +0200
Subject: [PATCH 0106/1853] python3-versioningit: update to 2.2.0.

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

diff --git a/srcpkgs/python3-versioningit/template b/srcpkgs/python3-versioningit/template
index 7c4ab452b8c2..5fc38e4e6378 100644
--- a/srcpkgs/python3-versioningit/template
+++ b/srcpkgs/python3-versioningit/template
@@ -1,17 +1,25 @@
 # Template file for 'python3-versioningit'
 pkgname=python3-versioningit
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
-depends="python3-packaging python3-setuptools python3-tomli"
+depends="python3-packaging"
+checkdepends="python3-pytest python3-pydantic python3-pytest-mock"
 short_desc="Versioning It with your Version In Git"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/jwodder/versioningit"
 changelog="https://raw.githubusercontent.com/jwodder/versioningit/master/CHANGELOG.md"
 distfiles="https://github.com/jwodder/versioningit/archive/refs/tags/v$version.tar.gz"
-checksum=6379b15a701836a00654a4c3ff82e72f591461289d2718789c1be9af67be7a2f
+checksum=1e7d80cdeee2dbcebaf61d25205c9faac268a1926ff43fc5c7236f45639c3782
+make_check=no # FIXME
+
+pre_check() {
+	vsed -e '/    --cov/d' \
+		-e '/    --no-cov-on-fail/d' \
+		-i tox.ini
+}
 
 post_install() {
 	vlicense LICENSE

From ad9ebffede2446f5c39ae6fe68a32cbd9d7a513b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 16:29:49 +0200
Subject: [PATCH 0107/1853] streamlink: update to 5.5.1.

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

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 5c82d253dd5f..426d74ceb7b7 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=5.4.0
+version=5.5.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-versioningit"
@@ -15,7 +15,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/$version/streamlink-$version.tar.gz"
-checksum=d854348c19e032140d06ba13ee4d9b96fa838b979b689133dfd9bbdda474310b
+checksum=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
 make_check_pre="env PYTHONPATH=src"
 make_check=ci-skip # some tests fail when running as root
 

From 4f95f90bd1be645bf1678d9c59378643bf035a29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 20:41:56 +0200
Subject: [PATCH 0108/1853] python3-astroid: update to 2.15.5.

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

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 5c0678f2d82a..9f76303e85b4 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.15.4
+version=2.15.5
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
 distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=a2b2d239476464c63fbfbd0dbebe589cf5ecd48820015dbb9f1c1c986fd2d6dc
+checksum=c819b8f9c97a8365d907d837f1655dca3a0052a494e0c91ec9ad5df48f7a4101

From 434610fe70aa8db54d2709f50efe5a322ec07bfb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 20:41:59 +0200
Subject: [PATCH 0109/1853] python3-mypy: update to 1.3.0.

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

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 7b77c480709f..bba64448036b 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=python3-module
 # fails in ci
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://www.mypy-lang.org"
 changelog="https://mypy-lang.blogspot.com"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=f70a40410d774ae23fcb4afbbeca652905a04de7948eaf0b1789c8d1426b72d1
+checksum=e1f4d16e296f5135624b34e8fb741eb0eadedca90862405b1f1fde2040b9bd11
 
 post_install() {
 	make -C docs man

From 3adf0b446cb92961b6e712bf7a31f58e35c17941 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 21:20:02 +0200
Subject: [PATCH 0110/1853] qemu: fix build with gcc 12

---
 srcpkgs/qemu/patches/gcc12.patch | 72 ++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 srcpkgs/qemu/patches/gcc12.patch

diff --git a/srcpkgs/qemu/patches/gcc12.patch b/srcpkgs/qemu/patches/gcc12.patch
new file mode 100644
index 000000000000..2a4b2bd03609
--- /dev/null
+++ b/srcpkgs/qemu/patches/gcc12.patch
@@ -0,0 +1,72 @@
+From 5cb993ff131fca2abef3ce074a20258fd6fce557 Mon Sep 17 00:00:00 2001
+From: Bernhard Beschow <shentey@gmail.com>
+Date: Sat, 18 Mar 2023 19:59:31 +0100
+Subject: [PATCH] qemu/osdep: Switch position of "extern" and "G_NORETURN"
+
+Fixes the Windows build under msys2 using GCC 12 which fails with the following
+error:
+
+  [184/579] Compiling C++ object qga/vss-win32/qga-vss.dll.p/install.cpp.obj
+  FAILED: qga/vss-win32/qga-vss.dll.p/install.cpp.obj
+  "c++" "-m64" "-mcx16" "-Iqga/vss-win32/qga-vss.dll.p" "-Iqga/vss-win32" "-I../src/qga/vss-win32" "-I." "-Iqapi" "-Itrace" "-Iui" "-Iui/shader" "-IC:/msys64/mingw64/include/glib-2.0" "-IC:/msys64/mingw64/lib/glib-2.0/include" "-fdiagnostics-color=auto" "-Wall" "-Winvalid-pch" "-Wnon-virtual-dtor" "-Werror" "-std=gnu++11" "-g" "-iquote" "." "-iquote" "C:/msys64/home/shentey/Projects/qemu/src" "-iquote" "C:/msys64/home/shentey/Projects/qemu/src/include" "-iquote" "C:/msys64/home/shentey/Projects/qemu/src/tcg/i386" "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS" "-D__STDC_FORMAT_MACROS" "-fno-pie" "-no-pie" "-D_GNU_SOURCE" "-D_FILE_OFFSET_BITS=64" "-D_LARGEFILE_SOURCE" "-fno-strict-aliasing" "-fno-common" "-fwrapv" "-Wundef" "-Wwrite-strings" "-Wtype-limits" "-Wformat-security" "-Wformat-y2k" "-Winit-self" "-Wignored-qualifiers" "-Wempty-body" "-Wendif-labels" "-Wexpansion-to-defined" "-Wimplicit-fallthrough=2" "-Wmissing-format-attribute" "-Wno-missing-include-dirs" "-Wno-shift-negative-value" "-Wno-psabi" "-fstack-protector-strong" "-Wno-unknown-pragmas" "-Wno-delete-non-virtual-dtor" "-Wno-non-virtual-dtor" -MD -MQ qga/vss-win32/qga-vss.dll.p/install.cpp.obj -MF "qga/vss-win32/qga-vss.dll.p/install.cpp.obj.d" -o qga/vss-win32/qga-vss.dll.p/install.cpp.obj "-c" ../src/qga/vss-win32/install.cpp
+  In file included from C:/msys64/mingw64/lib/glib-2.0/include/glibconfig.h:9,
+              from C:/msys64/mingw64/include/glib-2.0/glib/gtypes.h:34,
+              from C:/msys64/mingw64/include/glib-2.0/glib/galloca.h:34,
+              from C:/msys64/mingw64/include/glib-2.0/glib.h:32,
+              from C:/msys64/home/shentey/Projects/qemu/src/include/glib-compat.h:32,
+              from C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:144,
+              from ../src/qga/vss-win32/install.cpp:13:
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: standard attributes in middle of decl-specifiers
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: note: standard attributes must precede the decl-specifiers to apply to the declaration, or follow them to apply to the type
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: attribute ignored [-Werror=attributes]
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: note: an attribute that appertains to a type-specifier is ignored
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  cc1plus.exe: all warnings being treated as errors
+
+Apparently it also fixes the compilation with Clang 15 (see
+https://gitlab.com/qemu-project/qemu/-/issues/1541 ).
+
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1541
+Signed-off-by: Bernhard Beschow <shentey@gmail.com>
+Message-Id: <20230318185931.181659-1-shentey@gmail.com>
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+---
+ include/qemu/osdep.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
+index f68b5d8708c..9eff0be95bd 100644
+--- a/include/qemu/osdep.h
++++ b/include/qemu/osdep.h
+@@ -237,7 +237,7 @@ extern "C" {
+  * supports QEMU_ERROR, this will be reported at compile time; otherwise
+  * this will be reported at link time due to the missing symbol.
+  */
+-extern G_NORETURN
++G_NORETURN extern
+ void QEMU_ERROR("code path is reachable")
+     qemu_build_not_reached_always(void);
+ #if defined(__OPTIMIZE__) && !defined(__NO_INLINE__)
+-- 
+GitLab
+

From 7acb33e3d70aabf74f265bc3ea7da4b906d1e86c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 21:25:18 +0200
Subject: [PATCH 0111/1853] chatty: fix build

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

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index a237d134d69b..80a7c3d5ea6f 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -2,7 +2,7 @@
 pkgname=chatty
 version=0.22
 revision=1
-hostmakedepends="gradle"
+hostmakedepends="gradle openjdk8"
 depends="virtual?java-runtime"
 short_desc="Twitch Chat Client for Desktop"
 maintainer="Frank Steinborn <steinex@nognu.de>"

From f6c4b2a053a42077cc144d17cccb30ae8919bc0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 22:15:32 +0200
Subject: [PATCH 0112/1853] linux5.15: refresh x86_64-dotconfig.

---
 srcpkgs/linux5.15/files/x86_64-dotconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 0b8a930c9085..1d82b2cabc1e 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.102 Kernel Configuration
+# Linux/x86_64 5.15.114 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=123
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -8310,9 +8310,10 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m

From 7a68f2d255f0b14f48085c476215fbecc2eb81a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 22:17:23 +0200
Subject: [PATCH 0113/1853] linux5.15: refresh i386-dotconfig.

---
 srcpkgs/linux5.15/files/i386-dotconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 6bed18940e59..04fdd1093e91 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.102 Kernel Configuration
+# Linux/i386 5.15.114 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=123
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -8156,10 +8156,11 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
 CONFIG_TC1100_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m

From ba1c9408600b81cb671d205869c43c6a7a59e835 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 22:16:18 +0200
Subject: [PATCH 0114/1853] kodi: fix build with mesa 22.3

---
 srcpkgs/kodi/patches/mesa-22.3.patch | 54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 srcpkgs/kodi/patches/mesa-22.3.patch

diff --git a/srcpkgs/kodi/patches/mesa-22.3.patch b/srcpkgs/kodi/patches/mesa-22.3.patch
new file mode 100644
index 000000000000..f95aab7750bd
--- /dev/null
+++ b/srcpkgs/kodi/patches/mesa-22.3.patch
@@ -0,0 +1,54 @@
+From 5449652abf0bb9dddd0d796de4120e60f19f89a5 Mon Sep 17 00:00:00 2001
+From: Alan Swanson <reiver@improbability.net>
+Date: Mon, 19 Dec 2022 21:28:13 +0200
+Subject: [PATCH] Work around Mesa eglchromium.h removal
+
+I have polished Alan's snippet to buildable state and tested
+on Kodi from Debian sid.
+
+Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
+---
+ cmake/modules/FindEGL.cmake       | 6 ++++++
+ xbmc/windowing/X11/GLContextEGL.h | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake
+index b00fe08a25f95..a68a8db901222 100644
+--- a/cmake/modules/FindEGL.cmake
++++ b/cmake/modules/FindEGL.cmake
+@@ -9,6 +9,7 @@
+ # EGL_INCLUDE_DIRS - the EGL include directory
+ # EGL_LIBRARIES - the EGL libraries
+ # EGL_DEFINITIONS - the EGL definitions
++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h
+ #
+ # and the following imported targets::
+ #
+@@ -35,6 +36,11 @@ if(EGL_FOUND)
+   set(EGL_LIBRARIES ${EGL_LIBRARY})
+   set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
+   set(EGL_DEFINITIONS -DHAS_EGL=1)
++  include(CheckIncludeFiles)
++  check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE)
++  if(HAVE_EGLEXTANGLE)
++    list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1")
++  endif()
+ 
+   if(NOT TARGET EGL::EGL)
+     add_library(EGL::EGL UNKNOWN IMPORTED)
+diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h
+index 99a6a9024e8c6..afea0b7c43eac 100644
+--- a/xbmc/windowing/X11/GLContextEGL.h
++++ b/xbmc/windowing/X11/GLContextEGL.h
+@@ -13,7 +13,11 @@
+ #include "threads/CriticalSection.h"
+ 
+ #include <EGL/eglext.h>
++#ifdef HAVE_EGLEXTANGLE
++#include <EGL/eglext_angle.h>
++#else
+ #include <EGL/eglextchromium.h>
++#endif
+ #include <X11/Xutil.h>
+ 
+ class CGLContextEGL : public CGLContext

From 2f66b6eafbead910220c91e55ae0b8d53a6d8ec4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 22:43:11 +0200
Subject: [PATCH 0115/1853] mopidy: fix build

---
 srcpkgs/mopidy/patches/new-sphinx.patch | 37 +++++++++++++++++++++++++
 srcpkgs/mopidy/template                 |  7 ++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/mopidy/patches/new-sphinx.patch

diff --git a/srcpkgs/mopidy/patches/new-sphinx.patch b/srcpkgs/mopidy/patches/new-sphinx.patch
new file mode 100644
index 000000000000..ae9b5cc1dd51
--- /dev/null
+++ b/srcpkgs/mopidy/patches/new-sphinx.patch
@@ -0,0 +1,37 @@
+From 1b7330884b996e13944e9680b0c0d01f4907b6b5 Mon Sep 17 00:00:00 2001
+From: Stein Magnus Jodal <stein.magnus@jodal.no>
+Date: Sun, 19 Mar 2023 01:52:12 +0100
+Subject: [PATCH] Fix extlinks crash in docs build
+
+Ref https://github.com/sphinx-doc/sphinx/issues/11094
+---
+ docs/conf.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index f17b3c9ae..58bfa70b3 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -131,14 +131,17 @@ def setup(app):
+ # -- Options for extlink extension --------------------------------------------
+ 
+ extlinks = {
+-    "issue": ("https://github.com/mopidy/mopidy/issues/%s", "#"),
+-    "commit": ("https://github.com/mopidy/mopidy/commit/%s", "commit "),
+-    "js": ("https://github.com/mopidy/mopidy.js/issues/%s", "mopidy.js#"),
++    "issue": ("https://github.com/mopidy/mopidy/issues/%s", "#%s"),
++    "commit": ("https://github.com/mopidy/mopidy/commit/%s", "commit %s"),
++    "js": ("https://github.com/mopidy/mopidy.js/issues/%s", "mopidy.js#%s"),
+     "mpris": (
+         "https://github.com/mopidy/mopidy-mpris/issues/%s",
+-        "mopidy-mpris#",
++        "mopidy-mpris#%s",
++    ),
++    "discuss": (
++        "https://discourse.mopidy.com/t/%s",
++        "discourse.mopidy.com/t/%s",
+     ),
+-    "discuss": ("https://discourse.mopidy.com/t/%s", "discourse.mopidy.com/t/"),
+ }
+ 
+ 
diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template
index 292354f84fa9..e5a3dbf917a9 100644
--- a/srcpkgs/mopidy/template
+++ b/srcpkgs/mopidy/template
@@ -31,11 +31,10 @@ post_install() {
 	vbin extra/mopidyctl/mopidyctl
 	vman extra/mopidyctl/mopidyctl.8
 	python3 setup.py build
-	python3 setup.py build_sphinx -b man
-	python3 setup.py build_sphinx -b html
-	vman build/sphinx/man/mopidy.1
+	make -C docs html man
+	vman docs/_build/man/mopidy.1
 	vmkdir usr/share/doc/mopidy/
-	cp -r build/sphinx/html/* ${DESTDIR}/usr/share/doc/mopidy/
+	cp -r docs/_build/html/* ${DESTDIR}/usr/share/doc/mopidy/
 	vinstall ${FILESDIR}/mopidy.conf 644 etc/mopidy/
 	vinstall ${FILESDIR}/logging.conf 644 etc/mopidy/
 	vsv mopidy

From e630406443b3910e8308b563e8688caebb7e59f5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 22:48:49 +0200
Subject: [PATCH 0116/1853] opensonic: fix build

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

diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template
index 36f17b23e5a5..2466a962cb5e 100644
--- a/srcpkgs/opensonic/template
+++ b/srcpkgs/opensonic/template
@@ -2,6 +2,8 @@
 pkgname=opensonic
 version=0.1.4
 revision=10
+_loggcompat_ver=4.4.2
+build_wrksrc="opensnc-src-${version}"
 build_style=cmake
 configure_args="-DCMAKE_C_STANDARD_LIBRARIES=-lalleg"
 hostmakedepends="allegro4-devel cmake"
@@ -11,17 +13,18 @@ short_desc="Open-source game based on the Sonic the Hedgehog universe"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://opensnc.sourceforge.net/"
-_loggcompat_ver=4.4.2
 distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz
  https://github.com/t6/loggcompat/archive/${_loggcompat_ver}.tar.gz"
 checksum="3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
  481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e"
+patch_args="-Np1 --directory=${build_wrksrc}"
 
 replaces="opensonic-data>=0"
 CFLAGS="-I./../loggcompat-${_loggcompat_ver}"
 
 post_extract() {
-	mv ${XBPS_BUILDDIR}/loggcompat-${_loggcompat_ver} .
+	cd ${build_wrksrc}
+	mv ${wrksrc}/loggcompat-${_loggcompat_ver} .
 }
 
 pre_configure() {

From bbeb3b4b2dd15cbcf9ac3710366c26e1297f68f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 23:19:59 +0200
Subject: [PATCH 0117/1853] perl-WWW-Curl: fix build with curl 7.87.0

---
 .../perl-WWW-Curl/patches/curl-7.87.0.patch   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch

diff --git a/srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch b/srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch
new file mode 100644
index 000000000000..54eb52a1697d
--- /dev/null
+++ b/srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch
@@ -0,0 +1,40 @@
+From 4d8ca056c900cdb08556bbae2470ebb858369576 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 20 Jan 2023 14:26:50 +0100
+Subject: [PATCH] Adapt to curl-7.87.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+curl-7.87.0 added CURLOPTDEPRECATED and some other helping macros for
+hinting a compiler to produce deprecation warnings. Those are not
+constants for libcurl and clobbered generated curlopt-constants.c
+file:
+
+curlopt-constants.c:19:51: error: 'CURL_DEPRECATED' undeclared (first use in this function)
+   19 |             if (strEQ(name, "DEPRECATED")) return CURL_DEPRECATED;
+      |                                                   ^~~~~~~~~~~~~~~
+
+This patch adjusts curl.h parser in Makefile.PL to skip them.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index b9e6a46..311b03a 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+-- 
+2.39.1
+

From 5b816d6706f7e250a88cab850229d7caa35a6cc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 23:32:19 +0200
Subject: [PATCH 0118/1853] cloudflared: update to 2023.5.1, unbreak

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

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index 9bb5281ad6eb..d93781c62d33 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,6 +1,6 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
-version=2023.2.1
+version=2023.5.1
 revision=1
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
@@ -12,8 +12,7 @@ license="Apache-2.0"
 homepage="https://developers.cloudflare.com/argo-tunnel/"
 changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
 distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=468b0953eca6ab189859073067857062c91ed9adb18e12a43527e0dba3aa6409
-broken="doesn't build with go 1.20 due to an old custom version of quic-go https://github.com/cloudflare/cloudflared/issues/888"
+checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""

From f96a99f59fa46cd19bd7ea97362c1e30224c3932 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 23:38:24 +0200
Subject: [PATCH 0119/1853] wuzz: move go mod tidy to a patch

using go mod tidy while building fixes the build, but checksums are not
checked and xbps-src extract does not work with -I
---
 srcpkgs/wuzz/patches/go-mod-tidy.patch | 81 ++++++++++++++++++++++++++
 srcpkgs/wuzz/template                  |  7 +--
 2 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/wuzz/patches/go-mod-tidy.patch

diff --git a/srcpkgs/wuzz/patches/go-mod-tidy.patch b/srcpkgs/wuzz/patches/go-mod-tidy.patch
new file mode 100644
index 000000000000..6d32b4de6b23
--- /dev/null
+++ b/srcpkgs/wuzz/patches/go-mod-tidy.patch
@@ -0,0 +1,81 @@
+--- a/go.mod
++++ b/go.mod
+@@ -13,6 +13,7 @@ require (
+ 	github.com/mitchellh/go-homedir v1.1.0
+ 	github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1
+ 	github.com/nwidger/jsoncolor v0.3.0
++	github.com/stretchr/testify v1.8.4 // indirect
+ 	github.com/tidwall/gjson v1.6.0
+ 	github.com/tidwall/pretty v1.0.1 // indirect
+ 	github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0
+--- /dev/null
++++ b/go.sum
+@@ -0,0 +1,68 @@
++github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
++github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
++github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
++github.com/alessio/shellescape v1.2.2 h1:8LnL+ncxhWT2TR00dfJRT25JWWrhkMZXneHVWnetDZg=
++github.com/alessio/shellescape v1.2.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
++github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
++github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
++github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
++github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
++github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
++github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
++github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
++github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
++github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
++github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
++github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
++github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
++github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
++github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
++github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
++github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
++github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
++github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 h1:lh3PyZvY+B9nFliSGTn5uFuqQQJGuNrD0MLCokv09ag=
++github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
++github.com/nwidger/jsoncolor v0.3.0 h1:VdTH8Dc0SJoq4pJ8pRxxFZW0/5Ng5akbN4YToCBJDSU=
++github.com/nwidger/jsoncolor v0.3.0/go.mod h1:Cs34umxLbJvgBMnVNVqhji9BhoT/N/KinHqZptQ7cf4=
++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
++github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
++github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
++github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
++github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
++github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
++github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
++github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
++github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
++github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
++github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
++github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
++github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8=
++github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
++github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0 h1:eViiK7U+LXJuAEcnOdp+5jIDp7j9iE2FE8YfWoLExTE=
++github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0/go.mod h1:pUZuomyrQzbA0SQPSwAnDB3TgChnUMfZnSSfcAzpVh8=
++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
++golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
++golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index e48819301dc0..734963b93e21 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -4,18 +4,13 @@ version=0.5.0
 revision=2
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
-hostmakedepends="git"
 short_desc="Interactive cli tool for HTTP inspection"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/asciimoo/wuzz"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+distfiles="https://github.com/asciimoo/wuzz/archive/v${version}.tar.gz"
 checksum=721ea7343698e9f3c69e09eab86b9b1fef828057655f7cebc1de728c2f75151e
 
-post_extract() {
-	go mod tidy
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 7268c4613461faeba56dd0a65392f87d6cc3ad68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 09:29:30 +0700
Subject: [PATCH 0120/1853] linux6.3: update to 6.3.5.

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

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 5ee6e0bed6a0..35b5178363f6 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.4
+version=6.3.5
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- aa63f11c6dfcf8ad392847fecb31e520cf57da7df096f7c1fbc4e187d1ab8996"
+ bf66d350e6a4727b8ddbd3a14ddc9033c4b80ffb6d4688269917e1a1a5e4578a"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From b58aba2b1fe33a26f808069f9ad56bfecc483f1a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 25 May 2023 18:29:20 +0200
Subject: [PATCH 0121/1853] qt6ct: bump for qt 6.5.0

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

diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index 64f166fb4767..34f7947920dc 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6ct'
 pkgname=qt6ct
 version=0.7
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="qt6-tools qt6-base"
 makedepends="qt6-base-devel"

From 3420be33056db15b0a7474657428cb7cc01c02f0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 May 2023 19:23:08 +0530
Subject: [PATCH 0122/1853] common/xbps-src/shutils/update_check.sh: fix url
 for gitlab

---
 common/xbps-src/shutils/update_check.sh | 2 +-
 srcpkgs/goimapnotify/update             | 2 --
 srcpkgs/megapixels/update               | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 srcpkgs/goimapnotify/update
 delete mode 100644 srcpkgs/megapixels/update

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index cd3bb369bdb3..e656cf06fbcc 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -136,7 +136,7 @@ update_check() {
                     */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";;
                     *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";;
                 esac
-                url="$pkgurlname/tags"
+                url="$pkgurlname/-/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
diff --git a/srcpkgs/goimapnotify/update b/srcpkgs/goimapnotify/update
deleted file mode 100644
index b9a4e2b6728e..000000000000
--- a/srcpkgs/goimapnotify/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://gitlab.com/shackra/goimapnotify/-/tags/"
-pattern="goimapnotify-\K[\d.]*(?=\.tar\.gz)"
diff --git a/srcpkgs/megapixels/update b/srcpkgs/megapixels/update
deleted file mode 100644
index 3172862eef09..000000000000
--- a/srcpkgs/megapixels/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://gitlab.com/postmarketOS/megapixels/-/tags"

From 2bbe7a5a12cf852a3673b449e16e8fcc781d3aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 09:49:58 +0700
Subject: [PATCH 0123/1853] ruby-mime-types-data: update to 3.2023.0218.1.

---
 srcpkgs/ruby-mime-types-data/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index fd6da7ef3a8a..111bba9e5960 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
-version=3.2022.0105
-revision=2
+version=3.2023.0218.1
+revision=1
 build_style=gem
 short_desc="Registry for MIME media type definitions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mime-types/mime-types-data/"
 changelog="https://raw.githubusercontent.com/mime-types/mime-types-data/main/History.md"
-checksum=d8c401ba9ea8b648b7145b90081789ec714e91fd625d82c5040079c5ea696f00
+checksum=e90f027e54346bbbf7bd993a97e9cb7270cd4fe41c535ef84bf5d1aefe1e7ede
 
 post_install() {
 	vlicense Licence.md

From 71aabd08cb810f1069e9fc3f33179752615d5196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 09:43:35 +0700
Subject: [PATCH 0124/1853] mime-types: update to 2.1.54.

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

diff --git a/srcpkgs/mime-types/template b/srcpkgs/mime-types/template
index 92bd95c09eca..8012c539ea4d 100644
--- a/srcpkgs/mime-types/template
+++ b/srcpkgs/mime-types/template
@@ -1,7 +1,7 @@
 # Template file for 'mime-types'
 pkgname=mime-types
 reverts="9_1 9_2 9_3 9_4 9_5"
-version=2.1.53
+version=2.1.54
 revision=1
 # conf_files="/etc/mime.types /etc/nginx/mime.types"
 conf_files="/etc/mime.types"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, MIT"
 homepage="https://pagure.io/mailcap"
 distfiles="https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"
-checksum=5eea2ef17b304977ba3ecb87afad4319fa0440f825e4f6fba6e8fa2ffeb88785
+checksum=9a4032202fc0d2b0858f41b167389a9cfe52ac24ec282e6479b90765319de113
 
 do_build() {
 	: sh generate-nginx-mimetypes.sh <mime.types >mime.types.nginx

From 1a721aad5769d61e0bb101ea60c326d3711ee168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 12:53:31 +0700
Subject: [PATCH 0125/1853] linux6.1: update to 6.1.31.

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

diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 381a869231d7..632c671f13b7 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.30
+version=6.1.31
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 5abf569ed9e144f74a0c41fa2965c8ba3a5608e155a7d81a5364fc87c83fc49a"
+ 2d5754525d09d6696e190bca06d9a466ba3f502976ce89f4f2c5f618e8a288f6"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From f15b2b8643e363053c9962cad3a3c87273bb2764 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 28 Apr 2023 09:38:01 +0200
Subject: [PATCH 0126/1853] grafana: update to 8.5.24.

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

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index e7abc0a50086..4f1340bcca40 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
-version=8.5.3
-revision=2
+version=8.5.24
+revision=1
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server"
@@ -12,8 +12,8 @@ license="Apache-2.0"
 homepage="https://grafana.com"
 distfiles="https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz
 https://github.com/grafana/grafana/archive/v${version}.tar.gz"
-checksum="94c723358742b7da67323eb8ede32fa51519bca4e907e387f071afd8d8a62220
-39060b9636ac272dea93b5611aefab375cd754ff094975f246f914f2ae33124f"
+checksum="ff088012f356bcece24e5c89f924fed83a3b63736ec2cc9bc2a66341bf8fe00c
+9332fea516f617e6f9b418f28154f4f8f162c2abb3b739cc6ae7fedac21ddc41"
 
 system_accounts="_grafana"
 _grafana_homedir="/var/lib/grafana"

From 194bd970cef0cbbfe3a3479a663313588f73ea80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Dec 2021 20:20:09 -0300
Subject: [PATCH 0127/1853] givaro: update to 4.2.0.

---
 srcpkgs/givaro/patches/197.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/givaro/template          |  9 ++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/givaro/patches/197.patch

diff --git a/srcpkgs/givaro/patches/197.patch b/srcpkgs/givaro/patches/197.patch
new file mode 100644
index 000000000000..bafaff3efbd9
--- /dev/null
+++ b/srcpkgs/givaro/patches/197.patch
@@ -0,0 +1,28 @@
+From ab3d332508c21daff41fb64a8658cdc7cc74fc47 Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Thu, 16 Dec 2021 17:12:25 +0100
+Subject: [PATCH] dom_power argument is now an uint64_t to avoid problem with
+ 32bit machine
+
+---
+ src/kernel/system/givpower.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kernel/system/givpower.h b/src/kernel/system/givpower.h
+index eb784872..5644264d 100644
+--- a/src/kernel/system/givpower.h
++++ b/src/kernel/system/givpower.h
+@@ -71,11 +71,11 @@ namespace Givaro {
+ 
+     //! dom_power
+     template<class D, class TT>
+-    TT& dom_power(TT& res, const TT& n, long l, const D& F)
++    TT& dom_power(TT& res, const TT& n, uint64_t l, const D& F)
+     {
+         if (l == 0) return F.assign(res,F.one) ;
+ 
+-        unsigned long p = (unsigned long) l ;
++        uint64_t p = l;
+         bool is_assg = false ;
+ 
+         TT puiss; F.init(puiss); F.assign(puiss,n) ;
diff --git a/srcpkgs/givaro/template b/srcpkgs/givaro/template
index 9c16de5b1974..52457c02a1ed 100644
--- a/srcpkgs/givaro/template
+++ b/srcpkgs/givaro/template
@@ -1,6 +1,6 @@
 # Template file for 'givaro'
 pkgname=givaro
-version=4.1.1
+version=4.2.0
 revision=1
 build_style=gnu-configure
 makedepends="gmpxx-devel"
@@ -8,16 +8,15 @@ short_desc="C++ library for arithmetic and algebraic computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="CECILL-B"
 homepage="https://github.com/linbox-team/givaro"
+changelog="https://github.com/linbox-team/givaro/raw/master/ChangeLog"
 distfiles="https://github.com/linbox-team/givaro/releases/download/v${version}/givaro-${version}.tar.gz"
-checksum=628049899386e91da245aee6cd446350fbca87e94863bc0d815066c08150487f
+checksum=865e228812feca971dfb6e776a7bc7ac959cf63ebd52b4f05492730a46e1f189
 nocross=yes
 
 build_options="native_build"
 
 if [ -z "$build_option_native_build" ]; then
-	configure_args="--enable-sse --enable-sse2
-	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
-	  --disable-avx --disable-avx2 --disable-fma --disable-fma4"
+	configure_args="--without-archnative"
 fi
 
 post_install() {

From 6757094c2d43a7dee7224c4284633d8831ecd843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Dec 2021 20:20:17 -0300
Subject: [PATCH 0128/1853] fflas-ffpack: update to 2.5.0.

---
 srcpkgs/fflas-ffpack/patches/357.patch | 35 ++++++++++++++++++++++++++
 srcpkgs/fflas-ffpack/template          | 12 ++++-----
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/fflas-ffpack/patches/357.patch

diff --git a/srcpkgs/fflas-ffpack/patches/357.patch b/srcpkgs/fflas-ffpack/patches/357.patch
new file mode 100644
index 000000000000..99fd34efd93b
--- /dev/null
+++ b/srcpkgs/fflas-ffpack/patches/357.patch
@@ -0,0 +1,35 @@
+From 9b6083c663096e9ca85775b79f1f27c848dbeb98 Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Fri, 17 Dec 2021 10:27:02 +0100
+Subject: [PATCH] Fix SimdChooser: on not x86_64 machines its value could be an
+ nonexistant struct
+
+---
+ fflas-ffpack/fflas/fflas_simd.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/fflas-ffpack/fflas/fflas_simd.h b/fflas-ffpack/fflas/fflas_simd.h
+index bf5d30211..84ced0fd8 100644
+--- a/fflas-ffpack/fflas/fflas_simd.h
++++ b/fflas-ffpack/fflas/fflas_simd.h
+@@ -384,6 +384,20 @@ struct SimdChooser<T, true, true> // integral number
+ #endif
+ };
+ 
++#ifndef __x86_64__
++template <>
++struct SimdChooser<uint64_t, true, true>
++{
++    using value = NoSimd<uint64_t>;
++};
++
++template <>
++struct SimdChooser<int64_t, true, true>
++{
++    using value = NoSimd<int64_t>;
++};
++#endif
++
+ template <class T> using Simd = typename SimdChooser<T>::value;
+ 
+ // template <class T> struct SimdChooser<T, true> {
diff --git a/srcpkgs/fflas-ffpack/template b/srcpkgs/fflas-ffpack/template
index 557c644c00a4..2aa599703585 100644
--- a/srcpkgs/fflas-ffpack/template
+++ b/srcpkgs/fflas-ffpack/template
@@ -1,6 +1,6 @@
 # Template file for 'fflas-ffpack'
 pkgname=fflas-ffpack
-version=2.4.3
+version=2.5.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,15 +10,13 @@ short_desc="Finite Field Linear Algebra Subroutines / Package"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="http://linbox-team.github.io/fflas-ffpack/"
-distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/${version}/fflas-ffpack-${version}.tar.gz"
-checksum=f372783a17a9899ee9f88d4c9421d80facccb95556146dad7020d07a03791cc9
+changelog="https://github.com/linbox-team/fflas-ffpack/raw/master/ChangeLog"
+distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/v${version}/fflas-ffpack-${version}.tar.gz"
+checksum=dafb4c0835824d28e4f823748579be6e4c8889c9570c6ce9cce1e186c3ebbb23
 nocross=yes
 
 build_options="native_build"
 
 if [ -z "$build_option_native_build" ]; then
-	configure_args="--enable-sse --enable-sse2
-	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
-	  --disable-avx --disable-avx2 --disable-fma --disable-fma4
-	  --disable-avx512f --disable-avx512dq --disable-avx512vl"
+	configure_args="--without-archnative"
 fi

From a90c6118f220c586ca722b2c74cb35e58312681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Dec 2021 20:20:20 -0300
Subject: [PATCH 0129/1853] linbox: update to 1.7.0.

---
 srcpkgs/linbox/patches/292.patch              | 24 ++++++++++++
 srcpkgs/linbox/patches/294.patch              | 38 +++++++++++++++++++
 ...8adade10641f1f04f04b589753d928fb5443.patch | 35 -----------------
 .../remove-linboxsage-libs-from-pc.patch      | 23 -----------
 srcpkgs/linbox/template                       | 11 +++---
 5 files changed, 67 insertions(+), 64 deletions(-)
 create mode 100644 srcpkgs/linbox/patches/292.patch
 create mode 100644 srcpkgs/linbox/patches/294.patch
 delete mode 100644 srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
 delete mode 100644 srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch

diff --git a/srcpkgs/linbox/patches/292.patch b/srcpkgs/linbox/patches/292.patch
new file mode 100644
index 000000000000..d3333cc23d0b
--- /dev/null
+++ b/srcpkgs/linbox/patches/292.patch
@@ -0,0 +1,24 @@
+From 49b9cccd0286980c1c1811c3b03df883ef0164df Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Tue, 14 Dec 2021 16:22:33 -0500
+Subject: [PATCH] Only register uint128_t as a TypeName when it's available.
+
+Otherwise, test-fft will fail when it isn't.
+---
+ tests/test-fft.C | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-fft.C b/tests/test-fft.C
+index d19184c2d..5811ebc5d 100644
+--- a/tests/test-fft.C
++++ b/tests/test-fft.C
+@@ -55,7 +55,9 @@ REGISTER_TYPE_NAME(double);
+ REGISTER_TYPE_NAME(uint16_t);
+ REGISTER_TYPE_NAME(uint32_t);
+ REGISTER_TYPE_NAME(uint64_t);
++#ifdef __FFLASFFPACK_HAVE_INT128
+ REGISTER_TYPE_NAME(uint128_t);
++#endif
+ REGISTER_TYPE_NAME(Modular);
+ REGISTER_TYPE_NAME(ModularExtended);
+ 
diff --git a/srcpkgs/linbox/patches/294.patch b/srcpkgs/linbox/patches/294.patch
new file mode 100644
index 000000000000..7c645f165d39
--- /dev/null
+++ b/srcpkgs/linbox/patches/294.patch
@@ -0,0 +1,38 @@
+From f81a1f4a5e0835b7a0f3bb88a0fcbbaa32174cfa Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Wed, 15 Dec 2021 16:00:39 +0100
+Subject: [PATCH] Only register uint128_t as a TypeName when it's available
+
+---
+ benchmarks/benchmark-fft.C                       | 2 ++
+ benchmarks/benchmark-polynomial-matrix-mul-fft.C | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/benchmarks/benchmark-fft.C b/benchmarks/benchmark-fft.C
+index 39b86c9d9..59a8be57c 100644
+--- a/benchmarks/benchmark-fft.C
++++ b/benchmarks/benchmark-fft.C
+@@ -54,7 +54,9 @@ REGISTER_TYPE_NAME(double);
+ REGISTER_TYPE_NAME(uint16_t);
+ REGISTER_TYPE_NAME(uint32_t);
+ REGISTER_TYPE_NAME(uint64_t);
++#ifdef __FFLASFFPACK_HAVE_INT128
+ REGISTER_TYPE_NAME(uint128_t);
++#endif
+ REGISTER_TYPE_NAME(Modular);
+ REGISTER_TYPE_NAME(ModularExtended);
+ 
+diff --git a/benchmarks/benchmark-polynomial-matrix-mul-fft.C b/benchmarks/benchmark-polynomial-matrix-mul-fft.C
+index e9b184bcf..7bf17f33e 100644
+--- a/benchmarks/benchmark-polynomial-matrix-mul-fft.C
++++ b/benchmarks/benchmark-polynomial-matrix-mul-fft.C
+@@ -65,7 +65,9 @@ REGISTER_TYPE_NAME(double);
+ REGISTER_TYPE_NAME(uint16_t);
+ REGISTER_TYPE_NAME(uint32_t);
+ REGISTER_TYPE_NAME(uint64_t);
++#ifdef __FFLASFFPACK_HAVE_INT128
+ REGISTER_TYPE_NAME(uint128_t);
++#endif
+ REGISTER_TYPE_NAME(Modular);
+ REGISTER_TYPE_NAME(ModularExtended);
+ 
diff --git a/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch b/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
deleted file mode 100644
index 5afa078ec7b8..000000000000
--- a/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 892f8adade10641f1f04f04b589753d928fb5443 Mon Sep 17 00:00:00 2001
-From: Doug Torrance <dtorrance@piedmont.edu>
-Date: Sun, 9 May 2021 12:14:19 -0400
-Subject: [PATCH] Use std::ptrdiff_t for vector iterator difference type
-
-It was previously long (64-bit integers), but this will not be the
-case on 32-bit systems.
-
-Closes: #273
----
- linbox/vector/bit-vector.inl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/linbox/vector/bit-vector.inl b/linbox/vector/bit-vector.inl
-index 5fa84b421..23a22ba47 100644
---- a/linbox/vector/bit-vector.inl
-+++ b/linbox/vector/bit-vector.inl
-@@ -46,7 +46,7 @@ namespace std
- 		typedef LinBox::BitVector::reference reference;
- 		typedef bool *pointer;
- 		typedef bool value_type;
--		typedef long difference_type;
-+		typedef std::ptrdiff_t difference_type;
- 	};
- 
- 	template <>
-@@ -56,7 +56,7 @@ namespace std
- 		typedef LinBox::BitVector::const_reference reference;
- 		typedef const bool *pointer;
- 		typedef bool value_type;
--		typedef long difference_type;
-+		typedef std::ptrdiff_t difference_type;
- 	};
- }
- 
diff --git a/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch b/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch
deleted file mode 100644
index c93915fb1b06..000000000000
--- a/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Backported from:
-
-From 426eb97ba762c7663884f57ead0909f2aa3cd6a5 Mon Sep 17 00:00:00 2001
-From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
-Date: Thu, 17 Jan 2019 16:32:19 +0100
-Subject: [PATCH] Remove @LINBOXSAGE_LIBS@ from linbox.pc.in
-
----
- linbox.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linbox.pc.in b/linbox.pc.in
-index 278f127e4..c6b8091eb 100644
---- a/linbox.pc.in
-+++ b/linbox.pc.in
-@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library
- URL: http://github.com/linbox-team/linbox
- Version: @VERSION@
- Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0
--Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
-+Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
- Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@  @IML_CFLAGS@ @FLINT_CFLAGS@ 
- \-------------------------------------------------------
diff --git a/srcpkgs/linbox/template b/srcpkgs/linbox/template
index 096a15b3390b..e6edacdd0a74 100644
--- a/srcpkgs/linbox/template
+++ b/srcpkgs/linbox/template
@@ -1,7 +1,7 @@
 # Template file for 'linbox'
 pkgname=linbox
-version=1.6.3
-revision=2
+version=1.7.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fflas-ffpack"
@@ -9,16 +9,15 @@ short_desc="C++ library for exact, high-performance linear algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://linalg.org"
+changelog="https://github.com/linbox-team/linbox/raw/master/ChangeLog"
 distfiles="https://github.com/linbox-team/linbox/releases/download/v${version}/linbox-${version}.tar.gz"
-checksum=a58a188307b07c57964e844bceb99321d3043a8a4a1fccc082a54928bb9a0057
+checksum=6d2159fd395be0298362dd37f6c696676237bc8e2757341fbc46520e3b466bcc
 nocross=yes
 
 build_options="native_build"
 
 if [ -z "$build_option_native_build" ]; then
-	configure_args="--enable-sse --enable-sse2
-	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
-	  --disable-avx --disable-avx2 --disable-fma --disable-fma4"
+	configure_args="--without-archnative"
 fi
 
 linbox-devel_package() {

From 585b7441860aedbbce08fdb02fcd83b3ca7e571f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Apr 2022 14:25:08 -0300
Subject: [PATCH 0130/1853] maxima: update to 5.46.0, adopt.

Also:
 - disable sbcl on aarch64
 - don't makedepends on emacs (avoid a nocross build dep)
 - move maxima-emacs files to main pkg
---
 ...a43e5234305bd6f1de5909d4ce5d7e1ea864.patch | 24 -------------------
 srcpkgs/maxima/template                       | 20 ++++++++--------
 2 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch

diff --git a/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch b/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch
deleted file mode 100644
index e1ac1e5f6086..000000000000
--- a/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864
-Author: Robert Dodier <robert_dodier@users.sourceforge.net>
-Date:   Mon Oct 11 22:40:13 2021 -0700
-
-    Apply patch #80: "Build a FASL library, needed by SageMath"
-    
-    This modifies maxima.system for ECL only.
-
-diff --git a/src/maxima.system b/src/maxima.system
-index d954bc2b9..525fb778e 100644
---- a/src/maxima.system
-+++ b/src/maxima.system
-@@ -75,6 +75,11 @@
- 			     ;; Convert dir/foo.fas to dir/foo.o
- 			     (make-pathname :type "o" :defaults p))
- 			 files)))
-+	(c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+			  :ld-flags
-+			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+							      (find-package "MAXIMA")))))
-+			    (if (and x (not (string= x ""))) (list x))))
- 	(c::build-program "binary-ecl/maxima" :lisp-files obj
- 			  :ld-flags
- 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 69e85ec833e8..f67b469e3dda 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,19 +1,21 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.45.1
-revision=4
+version=5.46.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
-hostmakedepends="python3 perl emacs texinfo patchelf"
+hostmakedepends="python3 perl texinfo patchelf $(vopt_if ecl ecl)"
 makedepends="$(vopt_if clisp clisp) $(vopt_if sbcl sbcl) $(vopt_if ecl ecl)"
 depends="$(vopt_if clisp clisp) rlwrap"
 checkdepends="gnuplot"
 short_desc="Computer Algebra System"
-maintainer="Bosco Garcia <jboscogg@gmail.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
+changelog="https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${version%.*}.md?format=raw"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=fe9016276970bef214a1a244348558644514d7fdfaa4fc8b9d0e87afcbb4e7dc
+checksum=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07
+nocross=yes
 
 # maxima-sbcl is nopie and should NOT be stripped or it won't work
 nostrip_files=/usr/lib/maxima/$version/binary-sbcl/maxima
@@ -32,7 +34,7 @@ build_options_default="ecl"
 
 # sbcl is only available for these architectures
 case "$XBPS_TARGET_MACHINE" in
-	i686|x86_64*|armv7l|aarch64|ppc64le*)
+	i686|x86_64*|armv7l|ppc64le*)
 		build_options_default+=" sbcl"
 		;;
 esac
@@ -113,11 +115,9 @@ maxima-src_package() {
 }
 
 maxima-emacs_package() {
-	short_desc+=" - Emacs interface"
+	short_desc+=" - transitional dummy package"
 	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
-	pkg_install() {
-		vmove usr/share/emacs
-	}
+	build_style=meta
 }
 
 xmaxima_package() {

From 75e07f4e1b9e4be232c4a9cc72d6d3f348ca30e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Feb 2023 22:53:33 -0300
Subject: [PATCH 0131/1853] sagemath: update to 10.0.

Also:
 - support networkx 3.1 (sagemath#35584)
 - support linbox 1.7.0 (sagemath#35612)
 - support maxima 5.46.0 (sagemath#35619)
 - support sympy 1.12 (sagemath#35635)
---
 srcpkgs/sagemath/files/sage_conf.py           |    1 -
 srcpkgs/sagemath/files/timings2.json          |  405 ++---
 ...-support_singular_4.3.1.p3-5e5737a0c.patch |  205 ---
 .../34980-avoid_factoring_in_is_prime.patch   |   49 -
 .../patches/34994-fix_tests_numpy_1.24.patch  |   58 -
 .../34995-support_tachyon_0.99.2.patch        |   57 -
 ...34997-fix_edge_case_of_integer_check.patch |   36 -
 .../35058-skip_unstable_tests_klyachko.patch  |   22 -
 .../35068-fix_tests_giac_1.9.0.35.patch       |   62 -
 .../patches/35094-support_gap_4.12.patch      | 1303 -----------------
 .../35127-fix_very_slow_test_stream.py.patch  |   15 -
 .../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 |   35 +-
 .../sagemath/patches/35612-linbox_1.7.0.patch |   64 +
 .../patches/35619-maxima_5.46.0.patch         |  569 +++++++
 .../sagemath/patches/35635-sympy_1.12.patch   |   54 +
 srcpkgs/sagemath/patches/get_patches          |   48 +-
 srcpkgs/sagemath/template                     |    8 +-
 23 files changed, 828 insertions(+), 2469 deletions(-)
 delete mode 100644 srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
 delete mode 100644 srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
 delete mode 100644 srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch
 delete mode 100644 srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch
 delete mode 100644 srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch
 delete mode 100644 srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch
 delete mode 100644 srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch
 delete mode 100644 srcpkgs/sagemath/patches/35094-support_gap_4.12.patch
 delete mode 100644 srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch
 delete mode 100644 srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
 delete mode 100644 srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
 delete mode 100644 srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
 delete mode 100644 srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
 delete mode 100644 srcpkgs/sagemath/patches/35423-ipython_8.12.patch
 delete mode 100644 srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
 create mode 100644 srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35635-sympy_1.12.patch

diff --git a/srcpkgs/sagemath/files/sage_conf.py b/srcpkgs/sagemath/files/sage_conf.py
index 00de40f1ee4f..bc5388de8956 100644
--- a/srcpkgs/sagemath/files/sage_conf.py
+++ b/srcpkgs/sagemath/files/sage_conf.py
@@ -1,4 +1,3 @@
 # configuration for sage on void linux
 SAGE_SHARE = "/usr/share/sagemath"
 GAP_SHARE_DIR = "/usr/share/gap"
-GAP_LIB_DIR = "/usr/lib/gap"
diff --git a/srcpkgs/sagemath/files/timings2.json b/srcpkgs/sagemath/files/timings2.json
index bb3098680502..b2b3fe818a20 100644
--- a/srcpkgs/sagemath/files/timings2.json
+++ b/srcpkgs/sagemath/files/timings2.json
@@ -1,281 +1,152 @@
 {
-  "doc.ca.intro.index": {"walltime": 8},
-  "doc.en.constructions.calculus": {"walltime": 64},
-  "doc.en.constructions.plotting": {"walltime": 32},
-  "doc.en.prep.Advanced-2DPlotting": {"walltime": 16},
-  "doc.en.prep.Calculus": {"walltime": 8},
-  "doc.en.prep.Symbolics-and-Basic-Plotting": {"walltime": 8},
-  "doc.en.thematic_tutorials.explicit_methods_in_number_theory.birds_other": {"walltime": 8},
-  "doc.en.thematic_tutorials.explicit_methods_in_number_theory.elliptic_curves": {"walltime": 8},
-  "doc.en.thematic_tutorials.geometry.polyhedra_tutorial": {"walltime": 16},
-  "doc.en.thematic_tutorials.sandpile": {"walltime": 16},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_advanced": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_cartesian": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_change": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_curvilinear": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_plane": {"walltime": 16},
-  "doc.ja.tutorial.tour_plotting": {"walltime": 8},
-  "sage.algebras.cluster_algebra": {"walltime": 8},
   "sage.algebras.commutative_dga": {"walltime": 16},
-  "sage.algebras.hecke_algebras.ariki_koike_algebra": {"walltime": 8},
-  "sage.algebras.iwahori_hecke_algebra": {"walltime": 8},
-  "sage.algebras.lie_algebras.classical_lie_algebra": {"walltime": 128},
-  "sage.algebras.lie_algebras.nilpotent_lie_algebra": {"walltime": 16},
-  "sage.algebras.quantum_clifford": {"walltime": 16},
-  "sage.algebras.quantum_groups.fock_space": {"walltime": 8},
-  "sage.algebras.quatalg.quaternion_algebra": {"walltime": 8},
-  "sage.algebras.steenrod.steenrod_algebra": {"walltime": 64},
-  "sage.algebras.steenrod.steenrod_algebra_bases": {"walltime": 8},
-  "sage.algebras.yangian": {"walltime": 8},
-  "sage.arith.misc": {"walltime": 32},
+  "sage.algebras.fusion_rings.f_matrix": {"walltime": 16},
+  "sage.algebras.fusion_rings.fusion_ring": {"walltime": 16},
+  "sage.algebras.hecke_algebras.cubic_hecke_algebra": {"walltime": 8},
+  "sage.algebras.lie_conformal_algebras.n2_lie_conformal_algebra": {"walltime": 8},
+  "sage.algebras.quantum_clifford": {"walltime": 8},
+  "sage.algebras.steenrod.steenrod_algebra": {"walltime": 8},
   "sage.calculus.calculus": {"walltime": 16},
   "sage.calculus.desolvers": {"walltime": 8},
-  "sage.calculus.functional": {"walltime": 8},
-  "sage.calculus.riemann": {"walltime": 64},
-  "sage.calculus.tests": {"walltime": 16},
-  "sage.calculus.transforms.dwt": {"walltime": 16},
+  "sage.calculus.riemann": {"walltime": 8},
   "sage.calculus.transforms.fft": {"walltime": 8},
   "sage.categories.coxeter_groups": {"walltime": 8},
-  "sage.categories.finite_monoids": {"walltime": 16},
-  "sage.categories.lie_conformal_algebras": {"walltime": 8},
+  "sage.categories.finite_monoids": {"walltime": 8},
   "sage.categories.loop_crystals": {"walltime": 8},
-  "sage.categories.pushout": {"walltime": 8},
-  "sage.categories.super_hopf_algebras_with_basis": {"walltime": 32},
-  "sage.categories.super_lie_conformal_algebras": {"walltime": 8},
-  "sage.coding.ag_code": {"walltime": 64},
-  "sage.coding.ag_code_decoders": {"walltime": 128},
-  "sage.coding.binary_code": {"walltime": 8},
-  "sage.coding.linear_code": {"walltime": 16},
-  "sage.combinat.backtrack": {"walltime": 32},
-  "sage.combinat.chas.wqsym": {"walltime": 32},
-  "sage.combinat.cluster_algebra_quiver.cluster_seed": {"walltime": 64},
-  "sage.combinat.cluster_algebra_quiver.quiver": {"walltime": 128},
-  "sage.combinat.crystals.affine_factorization": {"walltime": 16},
-  "sage.combinat.crystals.alcove_path": {"walltime": 32},
-  "sage.combinat.crystals.highest_weight_crystals": {"walltime": 8},
-  "sage.combinat.crystals.kirillov_reshetikhin": {"walltime": 16},
-  "sage.combinat.crystals.letters": {"walltime": 8},
-  "sage.combinat.crystals.littelmann_path": {"walltime": 16},
-  "sage.combinat.crystals.mv_polytopes": {"walltime": 16},
-  "sage.combinat.crystals.pbw_crystal": {"walltime": 16},
-  "sage.combinat.crystals.star_crystal": {"walltime": 8},
-  "sage.combinat.designs.bibd": {"walltime": 8},
-  "sage.combinat.designs.database": {"walltime": 16},
+  "sage.coding.ag_code": {"walltime": 32},
+  "sage.coding.ag_code_decoders": {"walltime": 32},
+  "sage.coding.linear_code": {"walltime": 32},
+  "sage.combinat.designs.database": {"walltime": 8},
   "sage.combinat.designs.difference_family": {"walltime": 8},
-  "sage.combinat.designs.gen_quadrangles_with_spread": {"walltime": 128},
-  "sage.combinat.designs.orthogonal_arrays_build_recursive": {"walltime": 16},
-  "sage.combinat.designs.orthogonal_arrays_find_recursive": {"walltime": 8},
-  "sage.combinat.diagram_algebras": {"walltime": 64},
-  "sage.combinat.fqsym": {"walltime": 32},
-  "sage.combinat.free_prelie_algebra": {"walltime": 8},
-  "sage.combinat.fully_commutative_elements": {"walltime": 8},
-  "sage.combinat.grossman_larson_algebras": {"walltime": 8},
-  "sage.combinat.interval_posets": {"walltime": 8},
+  "sage.combinat.designs.orthogonal_arrays_build_recursive": {"walltime": 8},
   "sage.combinat.k_regular_sequence": {"walltime": 8},
   "sage.combinat.k_tableau": {"walltime": 16},
   "sage.combinat.matrices.hadamard_matrix": {"walltime": 8},
   "sage.combinat.multiset_partition_into_sets_ordered": {"walltime": 8},
-  "sage.combinat.ncsf_qsym.ncsf": {"walltime": 16},
-  "sage.combinat.ncsf_qsym.qsym": {"walltime": 16},
-  "sage.combinat.partition": {"walltime": 16},
-  "sage.combinat.partition_kleshchev": {"walltime": 16},
+  "sage.combinat.ncsf_qsym.ncsf": {"walltime": 8},
+  "sage.combinat.ncsf_qsym.qsym": {"walltime": 8},
+  "sage.combinat.partition": {"walltime": 8},
   "sage.combinat.partition_tuple": {"walltime": 8},
-  "sage.combinat.posets.moebius_algebra": {"walltime": 16},
+  "sage.combinat.permutation": {"walltime": 8},
   "sage.combinat.posets.posets": {"walltime": 8},
-  "sage.combinat.rigged_configurations.kr_tableaux": {"walltime": 32},
-  "sage.combinat.rigged_configurations.rigged_configurations": {"walltime": 16},
-  "sage.combinat.rigged_configurations.tensor_product_kr_tableaux": {"walltime": 16},
+  "sage.combinat.rigged_configurations.kr_tableaux": {"walltime": 8},
   "sage.combinat.root_system.associahedron": {"walltime": 8},
-  "sage.combinat.root_system.branching_rules": {"walltime": 8},
-  "sage.combinat.root_system.fusion_ring": {"walltime": 8},
-  "sage.combinat.root_system.integrable_representations": {"walltime": 16},
-  "sage.combinat.root_system.non_symmetric_macdonald_polynomials": {"walltime": 16},
-  "sage.combinat.root_system.pieri_factors": {"walltime": 8},
-  "sage.combinat.root_system.plot": {"walltime": 32},
-  "sage.combinat.root_system.root_lattice_realization_algebras": {"walltime": 16},
-  "sage.combinat.root_system.root_lattice_realizations": {"walltime": 16},
-  "sage.combinat.root_system.root_system": {"walltime": 8},
-  "sage.combinat.root_system.weyl_group": {"walltime": 8},
-  "sage.combinat.rsk": {"walltime": 32},
-  "sage.combinat.sf.classical": {"walltime": 16},
-  "sage.combinat.sf.jack": {"walltime": 16},
-  "sage.combinat.sf.k_dual": {"walltime": 16},
-  "sage.combinat.sf.llt": {"walltime": 16},
-  "sage.combinat.sf.macdonald": {"walltime": 64},
-  "sage.combinat.sf.new_kschur": {"walltime": 8},
-  "sage.combinat.sf.sfa": {"walltime": 32},
-  "sage.combinat.shifted_primed_tableau": {"walltime": 16},
+  "sage.combinat.root_system.non_symmetric_macdonald_polynomials": {"walltime": 8},
+  "sage.combinat.root_system.plot": {"walltime": 16},
+  "sage.combinat.root_system.root_lattice_realizations": {"walltime": 8},
+  "sage.combinat.rsk": {"walltime": 8},
+  "sage.combinat.sf.k_dual": {"walltime": 8},
+  "sage.combinat.sf.sf": {"walltime": 8},
+  "sage.combinat.sf.sfa": {"walltime": 8},
+  "sage.combinat.shifted_primed_tableau": {"walltime": 8},
   "sage.combinat.skew_tableau": {"walltime": 8},
-  "sage.combinat.symmetric_group_algebra": {"walltime": 16},
-  "sage.combinat.tableau": {"walltime": 32},
-  "sage.combinat.tableau_tuple": {"walltime": 32},
-  "sage.combinat.tiling": {"walltime": 16},
-  "sage.combinat.tutorial": {"walltime": 16},
-  "sage.combinat.words.paths": {"walltime": 64},
-  "sage.crypto.block_cipher.des": {"walltime": 16},
-  "sage.crypto.mq.sr": {"walltime": 64},
-  "sage.crypto.sbox": {"walltime": 16},
+  "sage.combinat.species.generating_series": {"walltime": 8},
+  "sage.combinat.tableau": {"walltime": 8},
+  "sage.combinat.tableau_tuple": {"walltime": 8},
+  "sage.combinat.tiling": {"walltime": 8},
+  "sage.combinat.tutorial": {"walltime": 8},
   "sage.crypto.sboxes": {"walltime": 8},
   "sage.doctest.forker": {"walltime": 16},
-  "sage.doctest.sources": {"walltime": 64},
-  "sage.doctest.test": {"walltime": 128},
-  "sage.dynamics.arithmetic_dynamics.projective_ds": {"walltime": 64},
-  "sage.dynamics.arithmetic_dynamics.wehlerK3": {"walltime": 8},
-  "sage.dynamics.cellular_automata.glca": {"walltime": 8},
+  "sage.dynamics.arithmetic_dynamics.projective_ds": {"walltime": 32},
   "sage.dynamics.cellular_automata.solitons": {"walltime": 8},
-  "sage.dynamics.complex_dynamics.mandel_julia": {"walltime": 16},
   "sage.functions.bessel": {"walltime": 16},
-  "sage.functions.exp_integral": {"walltime": 8},
   "sage.functions.hypergeometric": {"walltime": 8},
+  "sage.functions.orthogonal_polys": {"walltime": 8},
   "sage.functions.other": {"walltime": 16},
   "sage.functions.piecewise": {"walltime": 8},
-  "sage.games.quantumino": {"walltime": 8},
-  "sage.geometry.cone": {"walltime": 32},
-  "sage.geometry.fan": {"walltime": 8},
   "sage.geometry.hyperbolic_space.hyperbolic_geodesic": {"walltime": 8},
-  "sage.geometry.hyperplane_arrangement.arrangement": {"walltime": 16},
-  "sage.geometry.hyperplane_arrangement.library": {"walltime": 8},
+  "sage.geometry.hyperplane_arrangement.arrangement": {"walltime": 8},
   "sage.geometry.hyperplane_arrangement.plot": {"walltime": 8},
-  "sage.geometry.lattice_polytope": {"walltime": 16},
-  "sage.geometry.polyhedral_complex": {"walltime": 8},
-  "sage.geometry.polyhedron.base": {"walltime": 32},
-  "sage.geometry.polyhedron.library": {"walltime": 32},
-  "sage.geometry.polyhedron.plot": {"walltime": 8},
+  "sage.geometry.polyhedron.base": {"walltime": 8},
+  "sage.geometry.polyhedron.base5": {"walltime": 8},
+  "sage.geometry.polyhedron.base6": {"walltime": 16},
+  "sage.geometry.polyhedron.library": {"walltime": 16},
   "sage.geometry.riemannian_manifolds.parametrized_surface3d": {"walltime": 16},
-  "sage.geometry.triangulation.base": {"walltime": 32},
-  "sage.geometry.triangulation.point_configuration": {"walltime": 16},
-  "sage.graphs.chrompoly": {"walltime": 8},
-  "sage.graphs.connectivity": {"walltime": 16},
-  "sage.graphs.generators.basic": {"walltime": 16},
-  "sage.graphs.generators.classical_geometries": {"walltime": 32},
-  "sage.graphs.generators.distance_regular": {"walltime": 256},
-  "sage.graphs.generators.families": {"walltime": 32},
-  "sage.graphs.generators.smallgraphs": {"walltime": 16},
-  "sage.graphs.generic_graph": {"walltime": 32},
-  "sage.graphs.genus": {"walltime": 16},
+  "sage.graphs.connectivity": {"walltime": 8},
+  "sage.graphs.generators.classical_geometries": {"walltime": 8},
+  "sage.graphs.generators.distance_regular": {"walltime": 32},
+  "sage.graphs.generators.smallgraphs": {"walltime": 8},
+  "sage.graphs.generic_graph": {"walltime": 16},
   "sage.graphs.graph": {"walltime": 16},
-  "sage.graphs.graph_generators": {"walltime": 8},
   "sage.graphs.graph_list": {"walltime": 8},
   "sage.graphs.graph_plot": {"walltime": 8},
-  "sage.graphs.strongly_regular_db": {"walltime": 16},
-  "sage.groups.cubic_braid": {"walltime": 16},
-  "sage.groups.fqf_orthogonal": {"walltime": 16},
-  "sage.groups.libgap_mixin": {"walltime": 8},
-  "sage.groups.libgap_morphism": {"walltime": 8},
-  "sage.groups.lie_gps.nilpotent_lie_group": {"walltime": 16},
-  "sage.groups.matrix_gps.finitely_generated": {"walltime": 8},
-  "sage.groups.matrix_gps.heisenberg": {"walltime": 32},
-  "sage.groups.matrix_gps.linear": {"walltime": 8},
-  "sage.groups.perm_gps.cubegroup": {"walltime": 16},
-  "sage.groups.perm_gps.partn_ref.refinement_graphs": {"walltime": 8},
+  "sage.graphs.strongly_regular_db": {"walltime": 8},
+  "sage.groups.cactus_group": {"walltime": 8},
+  "sage.groups.cubic_braid": {"walltime": 8},
+  "sage.groups.lie_gps.nilpotent_lie_group": {"walltime": 8},
+  "sage.groups.matrix_gps.finitely_generated_gap": {"walltime": 8},
   "sage.groups.perm_gps.permgroup": {"walltime": 8},
   "sage.groups.perm_gps.permgroup_named": {"walltime": 8},
-  "sage.homology.hochschild_complex": {"walltime": 8},
   "sage.homology.homology_vector_space_with_basis": {"walltime": 8},
-  "sage.interacts.test_jupyter": {"walltime": 16},
-  "sage.interfaces.ecm": {"walltime": 8},
-  "sage.interfaces.expect": {"walltime": 8},
-  "sage.interfaces.gap": {"walltime": 16},
-  "sage.interfaces.maxima": {"walltime": 8},
-  "sage.interfaces.maxima_abstract": {"walltime": 64},
-  "sage.interfaces.psage": {"walltime": 8},
-  "sage.interfaces.sage0": {"walltime": 8},
-  "sage.lfunctions.zero_sums": {"walltime": 8},
-  "sage.libs.eclib.interface": {"walltime": 16},
+  "sage.interfaces.gap": {"walltime": 8},
+  "sage.interfaces.gap_workspace": {"walltime": 8},
+  "sage.interfaces.sage0": {"walltime": 16},
+  "sage.libs.eclib.interface": {"walltime": 32},
   "sage.libs.eclib.mwrank": {"walltime": 16},
-  "sage.libs.gap.test_long": {"walltime": 32},
-  "sage.libs.giac": {"walltime": 32},
   "sage.manifolds.catalog": {"walltime": 8},
-  "sage.manifolds.chart": {"walltime": 32},
+  "sage.manifolds.chart": {"walltime": 16},
   "sage.manifolds.chart_func": {"walltime": 8},
   "sage.manifolds.continuous_map": {"walltime": 8},
-  "sage.manifolds.differentiable.affine_connection": {"walltime": 128},
+  "sage.manifolds.differentiable.affine_connection": {"walltime": 32},
   "sage.manifolds.differentiable.automorphismfield": {"walltime": 32},
-  "sage.manifolds.differentiable.automorphismfield_group": {"walltime": 8},
   "sage.manifolds.differentiable.bundle_connection": {"walltime": 8},
-  "sage.manifolds.differentiable.characteristic_cohomology_class": {"walltime": 64},
+  "sage.manifolds.differentiable.characteristic_cohomology_class": {"walltime": 8},
   "sage.manifolds.differentiable.curve": {"walltime": 16},
-  "sage.manifolds.differentiable.degenerate": {"walltime": 32},
-  "sage.manifolds.differentiable.degenerate_submanifold": {"walltime": 16},
-  "sage.manifolds.differentiable.diff_form": {"walltime": 64},
+  "sage.manifolds.differentiable.degenerate": {"walltime": 16},
+  "sage.manifolds.differentiable.degenerate_submanifold": {"walltime": 8},
+  "sage.manifolds.differentiable.diff_form": {"walltime": 32},
   "sage.manifolds.differentiable.diff_map": {"walltime": 8},
   "sage.manifolds.differentiable.examples.euclidean": {"walltime": 32},
   "sage.manifolds.differentiable.examples.sphere": {"walltime": 32},
   "sage.manifolds.differentiable.integrated_curve": {"walltime": 32},
-  "sage.manifolds.differentiable.levi_civita_connection": {"walltime": 32},
-  "sage.manifolds.differentiable.manifold": {"walltime": 16},
-  "sage.manifolds.differentiable.manifold_homset": {"walltime": 16},
+  "sage.manifolds.differentiable.levi_civita_connection": {"walltime": 16},
+  "sage.manifolds.differentiable.manifold": {"walltime": 8},
+  "sage.manifolds.differentiable.manifold_homset": {"walltime": 8},
   "sage.manifolds.differentiable.metric": {"walltime": 64},
   "sage.manifolds.differentiable.mixed_form": {"walltime": 16},
-  "sage.manifolds.differentiable.mixed_form_algebra": {"walltime": 8},
   "sage.manifolds.differentiable.multivectorfield": {"walltime": 64},
-  "sage.manifolds.differentiable.pseudo_riemannian": {"walltime": 16},
-  "sage.manifolds.differentiable.pseudo_riemannian_submanifold": {"walltime": 128},
-  "sage.manifolds.differentiable.scalarfield": {"walltime": 16},
+  "sage.manifolds.differentiable.pseudo_riemannian": {"walltime": 8},
+  "sage.manifolds.differentiable.pseudo_riemannian_submanifold": {"walltime": 32},
+  "sage.manifolds.differentiable.scalarfield": {"walltime": 8},
   "sage.manifolds.differentiable.scalarfield_algebra": {"walltime": 8},
-  "sage.manifolds.differentiable.tangent_vector": {"walltime": 16},
+  "sage.manifolds.differentiable.tangent_vector": {"walltime": 8},
   "sage.manifolds.differentiable.tensorfield": {"walltime": 128},
   "sage.manifolds.differentiable.tensorfield_paral": {"walltime": 16},
-  "sage.manifolds.differentiable.vector_bundle": {"walltime": 16},
-  "sage.manifolds.differentiable.vectorfield": {"walltime": 64},
-  "sage.manifolds.differentiable.vectorframe": {"walltime": 8},
+  "sage.manifolds.differentiable.vectorfield": {"walltime": 16},
   "sage.manifolds.point": {"walltime": 16},
   "sage.manifolds.scalarfield": {"walltime": 16},
-  "sage.manifolds.scalarfield_algebra": {"walltime": 8},
-  "sage.manifolds.section": {"walltime": 32},
-  "sage.manifolds.trivialization": {"walltime": 8},
-  "sage.manifolds.vector_bundle": {"walltime": 8},
-  "sage.matrix.benchmark": {"walltime": 8},
+  "sage.manifolds.section": {"walltime": 16},
   "sage.matrix.matrix2": {"walltime": 16},
-  "sage.matrix.matrix_integer_dense": {"walltime": 16},
-  "sage.matrix.matrix_integer_dense_hnf": {"walltime": 32},
-  "sage.matrix.matrix_mod2_dense": {"walltime": 8},
   "sage.matrix.matrix_rational_dense": {"walltime": 8},
   "sage.matrix.special": {"walltime": 8},
-  "sage.matroids.catalog": {"walltime": 64},
   "sage.misc.cachefunc": {"walltime": 16},
-  "sage.misc.cython": {"walltime": 8},
   "sage.misc.functional": {"walltime": 8},
   "sage.misc.randstate": {"walltime": 16},
-  "sage.misc.sagedoc": {"walltime": 64},
-  "sage.misc.sageinspect": {"walltime": 32},
-  "sage.modular.abvar.abvar": {"walltime": 16},
+  "sage.misc.sagedoc": {"walltime": 16},
+  "sage.misc.sageinspect": {"walltime": 16},
+  "sage.misc.trace": {"walltime": 8},
+  "sage.modular.abvar.abvar": {"walltime": 8},
   "sage.modular.abvar.homspace": {"walltime": 8},
-  "sage.modular.abvar.lseries": {"walltime": 8},
-  "sage.modular.arithgroup.arithgroup_perm": {"walltime": 8},
-  "sage.modular.arithgroup.tests": {"walltime": 8},
-  "sage.modular.btquotients.pautomorphicform": {"walltime": 32},
-  "sage.modular.hypergeometric_motive": {"walltime": 16},
-  "sage.modular.local_comp.local_comp": {"walltime": 32},
-  "sage.modular.local_comp.type_space": {"walltime": 16},
-  "sage.modular.modform.ambient_R": {"walltime": 16},
-  "sage.modular.modform.constructor": {"walltime": 8},
-  "sage.modular.modform.cuspidal_submodule": {"walltime": 16},
-  "sage.modular.modform.element": {"walltime": 64},
-  "sage.modular.modform.ring": {"walltime": 64},
-  "sage.modular.modform.space": {"walltime": 8},
+  "sage.modular.btquotients.btquotient": {"walltime": 8},
+  "sage.modular.btquotients.pautomorphicform": {"walltime": 16},
+  "sage.modular.hecke.submodule": {"walltime": 8},
+  "sage.modular.hypergeometric_motive": {"walltime": 8},
+  "sage.modular.local_comp.local_comp": {"walltime": 16},
+  "sage.modular.local_comp.type_space": {"walltime": 8},
+  "sage.modular.modform.element": {"walltime": 32},
   "sage.modular.modform_hecketriangle.abstract_space": {"walltime": 16},
   "sage.modular.modform_hecketriangle.graded_ring_element": {"walltime": 16},
   "sage.modular.modform_hecketriangle.hecke_triangle_group_element": {"walltime": 32},
   "sage.modular.modform_hecketriangle.readme": {"walltime": 16},
-  "sage.modular.modform_hecketriangle.space": {"walltime": 8},
   "sage.modular.modsym.ambient": {"walltime": 16},
   "sage.modular.modsym.space": {"walltime": 8},
-  "sage.modular.pollack_stevens.modsym": {"walltime": 64},
-  "sage.modular.pollack_stevens.padic_lseries": {"walltime": 32},
-  "sage.modules.finite_submodule_iter": {"walltime": 16},
-  "sage.modules.free_module": {"walltime": 16},
-  "sage.modules.free_module_element": {"walltime": 8},
-  "sage.modules.free_module_integer": {"walltime": 32},
-  "sage.modules.free_quadratic_module_integer_symmetric": {"walltime": 8},
-  "sage.modules.torsion_quadratic_module": {"walltime": 16},
+  "sage.modular.overconvergent.genus0": {"walltime": 8},
+  "sage.modular.pollack_stevens.modsym": {"walltime": 8},
+  "sage.modules.fp_graded.morphism": {"walltime": 8},
+  "sage.modules.free_module": {"walltime": 8},
   "sage.parallel.map_reduce": {"walltime": 8},
-  "sage.plot.animate": {"walltime": 16},
-  "sage.plot.arrow": {"walltime": 8},
-  "sage.plot.circle": {"walltime": 8},
-  "sage.plot.complex_plot": {"walltime": 8},
+  "sage.plot.complex_plot": {"walltime": 16},
   "sage.plot.contour_plot": {"walltime": 32},
-  "sage.plot.density_plot": {"walltime": 8},
   "sage.plot.graphics": {"walltime": 32},
   "sage.plot.line": {"walltime": 8},
   "sage.plot.matrix_plot": {"walltime": 16},
@@ -283,115 +154,53 @@
   "sage.plot.plot": {"walltime": 64},
   "sage.plot.plot3d.base": {"walltime": 8},
   "sage.plot.plot3d.implicit_plot3d": {"walltime": 16},
-  "sage.plot.plot3d.implicit_surface": {"walltime": 8},
-  "sage.plot.plot3d.parametric_plot3d": {"walltime": 8},
+  "sage.plot.plot3d.parametric_plot3d": {"walltime": 16},
   "sage.plot.plot3d.parametric_surface": {"walltime": 8},
   "sage.plot.plot3d.plot3d": {"walltime": 16},
-  "sage.plot.plot3d.tachyon": {"walltime": 8},
-  "sage.plot.plot3d.transform": {"walltime": 32},
   "sage.plot.point": {"walltime": 8},
   "sage.plot.polygon": {"walltime": 8},
   "sage.plot.streamline_plot": {"walltime": 8},
-  "sage.quadratic_forms.genera.genus": {"walltime": 16},
-  "sage.quadratic_forms.quadratic_form__automorphisms": {"walltime": 8},
-  "sage.quadratic_forms.quadratic_form__local_representation_conditions": {"walltime": 64},
-  "sage.quadratic_forms.quadratic_form__neighbors": {"walltime": 8},
-  "sage.quadratic_forms.quadratic_form__siegel_product": {"walltime": 8},
   "sage.repl.ipython_extension": {"walltime": 8},
-  "sage.rings.asymptotic.asymptotic_expansion_generators": {"walltime": 64},
+  "sage.rings.asymptotic.asymptotic_expansion_generators": {"walltime": 16},
   "sage.rings.asymptotic.asymptotic_ring": {"walltime": 8},
-  "sage.rings.asymptotic.asymptotics_multivariate_generating_functions": {"walltime": 32},
-  "sage.rings.asymptotic.term_monoid": {"walltime": 8},
-  "sage.rings.continued_fraction": {"walltime": 8},
+  "sage.rings.asymptotic.asymptotics_multivariate_generating_functions": {"walltime": 8},
   "sage.rings.finite_rings.finite_field_base": {"walltime": 8},
-  "sage.rings.function_field.function_field": {"walltime": 128},
-  "sage.rings.function_field.function_field_valuation": {"walltime": 64},
+  "sage.rings.function_field.function_field": {"walltime": 8},
   "sage.rings.function_field.ideal": {"walltime": 8},
-  "sage.rings.function_field.place": {"walltime": 8},
-  "sage.rings.integer": {"walltime": 64},
-  "sage.rings.invariants.invariant_theory": {"walltime": 8},
-  "sage.rings.number_field.bdd_height": {"walltime": 8},
-  "sage.rings.number_field.number_field": {"walltime": 64},
-  "sage.rings.number_field.number_field_element": {"walltime": 16},
-  "sage.rings.number_field.splitting_field": {"walltime": 8},
-  "sage.rings.number_field.totallyreal": {"walltime": 16},
-  "sage.rings.number_field.totallyreal_rel": {"walltime": 8},
-  "sage.rings.padics.padic_base_leaves": {"walltime": 64},
-  "sage.rings.padics.padic_extension_leaves": {"walltime": 64},
-  "sage.rings.padics.padic_generic_element": {"walltime": 16},
-  "sage.rings.padics.padic_lattice_element": {"walltime": 32},
-  "sage.rings.padics.relative_extension_leaves": {"walltime": 32},
+  "sage.rings.lazy_series": {"walltime": 8},
+  "sage.rings.lazy_series_ring": {"walltime": 32},
+  "sage.rings.number_field.number_field": {"walltime": 32},
+  "sage.rings.number_field.number_field_element": {"walltime": 8},
+  "sage.rings.padics.padic_base_leaves": {"walltime": 8},
+  "sage.rings.padics.padic_generic_element": {"walltime": 8},
   "sage.rings.polynomial.multi_polynomial_ideal": {"walltime": 8},
-  "sage.rings.polynomial.multi_polynomial_sequence": {"walltime": 8},
-  "sage.rings.polynomial.ore_function_element": {"walltime": 8},
   "sage.rings.polynomial.polynomial_element": {"walltime": 16},
-  "sage.rings.polynomial.polynomial_rational_flint": {"walltime": 8},
   "sage.rings.qqbar": {"walltime": 16},
-  "sage.rings.tests": {"walltime": 16},
-  "sage.rings.valuation.augmented_valuation": {"walltime": 32},
-  "sage.rings.valuation.mapped_valuation": {"walltime": 64},
-  "sage.rings.valuation.valuation": {"walltime": 8},
-  "sage.sandpiles.sandpile": {"walltime": 16},
+  "sage.sandpiles.sandpile": {"walltime": 8},
   "sage.schemes.curves.affine_curve": {"walltime": 16},
   "sage.schemes.curves.closed_point": {"walltime": 8},
   "sage.schemes.curves.projective_curve": {"walltime": 32},
-  "sage.schemes.cyclic_covers.cycliccover_finite_field": {"walltime": 64},
   "sage.schemes.elliptic_curves.BSD": {"walltime": 8},
   "sage.schemes.elliptic_curves.Qcurves": {"walltime": 8},
-  "sage.schemes.elliptic_curves.constructor": {"walltime": 32},
-  "sage.schemes.elliptic_curves.ell_curve_isogeny": {"walltime": 16},
-  "sage.schemes.elliptic_curves.ell_egros": {"walltime": 32},
-  "sage.schemes.elliptic_curves.ell_finite_field": {"walltime": 8},
+  "sage.schemes.elliptic_curves.ell_curve_isogeny": {"walltime": 8},
   "sage.schemes.elliptic_curves.ell_generic": {"walltime": 8},
-  "sage.schemes.elliptic_curves.ell_modular_symbols": {"walltime": 16},
-  "sage.schemes.elliptic_curves.ell_number_field": {"walltime": 128},
+  "sage.schemes.elliptic_curves.ell_modular_symbols": {"walltime": 8},
   "sage.schemes.elliptic_curves.ell_point": {"walltime": 8},
-  "sage.schemes.elliptic_curves.ell_rational_field": {"walltime": 128},
-  "sage.schemes.elliptic_curves.gal_reps_number_field": {"walltime": 32},
-  "sage.schemes.elliptic_curves.gp_simon": {"walltime": 16},
-  "sage.schemes.elliptic_curves.heegner": {"walltime": 32},
-  "sage.schemes.elliptic_curves.height": {"walltime": 64},
-  "sage.schemes.elliptic_curves.isogeny_class": {"walltime": 32},
-  "sage.schemes.elliptic_curves.isogeny_small_degree": {"walltime": 64},
-  "sage.schemes.elliptic_curves.kraus": {"walltime": 16},
+  "sage.schemes.elliptic_curves.ell_rational_field": {"walltime": 32},
+  "sage.schemes.elliptic_curves.height": {"walltime": 8},
+  "sage.schemes.elliptic_curves.isogeny_small_degree": {"walltime": 16},
   "sage.schemes.elliptic_curves.mod_sym_num": {"walltime": 8},
   "sage.schemes.elliptic_curves.padic_lseries": {"walltime": 8},
-  "sage.schemes.elliptic_curves.padics": {"walltime": 16},
-  "sage.schemes.elliptic_curves.saturation": {"walltime": 16},
-  "sage.schemes.elliptic_curves.sha_tate": {"walltime": 32},
-  "sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field": {"walltime": 64},
-  "sage.schemes.hyperelliptic_curves.hyperelliptic_generic": {"walltime": 8},
-  "sage.schemes.hyperelliptic_curves.hyperelliptic_padic_field": {"walltime": 32},
-  "sage.schemes.hyperelliptic_curves.monsky_washnitzer": {"walltime": 8},
-  "sage.schemes.projective.projective_rational_point": {"walltime": 8},
-  "sage.schemes.riemann_surfaces.riemann_surface": {"walltime": 64},
+  "sage.schemes.elliptic_curves.padics": {"walltime": 8},
+  "sage.schemes.elliptic_curves.sha_tate": {"walltime": 16},
+  "sage.schemes.hyperelliptic_curves.hyperelliptic_padic_field": {"walltime": 16},
+  "sage.schemes.riemann_surfaces.riemann_surface": {"walltime": 32},
   "sage.schemes.toric.chow_group": {"walltime": 8},
-  "sage.schemes.toric.sheaf.klyachko": {"walltime": 8},
-  "sage.stats.distributions.discrete_gaussian_integer": {"walltime": 8},
-  "sage.stats.time_series": {"walltime": 8},
-  "sage.structure.coerce_dict": {"walltime": 32},
   "sage.structure.element": {"walltime": 16},
-  "sage.structure.sage_object": {"walltime": 8},
   "sage.symbolic.expression": {"walltime": 32},
-  "sage.symbolic.integration.integral": {"walltime": 32},
-  "sage.symbolic.random_tests": {"walltime": 32},
+  "sage.symbolic.integration.integral": {"walltime": 16},
   "sage.symbolic.relation": {"walltime": 8},
-  "sage.tests.book_schilling_zabrocki_kschur_primer": {"walltime": 32},
-  "sage.tests.book_stein_ent": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.combinat_doctest": {"walltime": 32},
-  "sage.tests.books.computational-mathematics-with-sagemath.float_doctest": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.graphique_doctest": {"walltime": 32},
-  "sage.tests.books.computational-mathematics-with-sagemath.graphtheory_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.integration_doctest": {"walltime": 32},
-  "sage.tests.books.computational-mathematics-with-sagemath.mpoly_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.nonlinear_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.recequadiff_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.sol.graphique_doctest": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.sol.numbertheory_doctest": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.sol.polynomes_doctest": {"walltime": 16},
-  "sage.tests.cmdline": {"walltime": 64},
-  "sage.tests.gosper-sum": {"walltime": 16},
-  "sage.tests.parigp": {"walltime": 8},
-  "sage.topology.simplicial_complex": {"walltime": 8},
-  "sage.topology.simplicial_complex_examples": {"walltime": 16}
+  "sage.tests.book_schilling_zabrocki_kschur_primer": {"walltime": 16},
+  "sage.tests.book_stein_ent": {"walltime": 8},
+  "sage.topology.simplicial_complex": {"walltime": 16}
 }
diff --git a/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch b/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
deleted file mode 100644
index f2f825e4fb10..000000000000
--- a/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini
-index 2e33a405d36..313463d2fea 100644
---- a/build/pkgs/singular/checksums.ini
-+++ b/build/pkgs/singular/checksums.ini
-@@ -1,5 +1,5 @@
- tarball=singular-VERSION.tar.gz
--sha1=6c2b622d3681e2de3d58d30c654d43d3e32b720c
--md5=abb1e37c794472e7760655358ab66054
--cksum=17455733
-+sha1=28bb3ee97ef48d04dfa96de182fd93eebe08426c
-+md5=fc0a4f5720dadba45a52ee94324ce00c
-+cksum=1573851737
- upstream_url=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-1/singular-VERSION.tar.gz
-diff --git a/build/pkgs/singular/package-version.txt b/build/pkgs/singular/package-version.txt
-index 11300c77e7d..66e2bede53a 100644
---- a/build/pkgs/singular/package-version.txt
-+++ b/build/pkgs/singular/package-version.txt
-@@ -1 +1 @@
--4.3.1p1
-+4.3.1p3
-diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd
-index 8e3ac314b67..747a6b1e2fb 100644
---- a/src/sage/libs/singular/decl.pxd
-+++ b/src/sage/libs/singular/decl.pxd
-@@ -574,7 +574,7 @@ cdef extern from "singular/Singular/libsingular.h":
- 
-     # gets a component out of a polynomial vector
- 
--    poly *pTakeOutComp1(poly **, int)
-+    poly *pTakeOutComp(poly **, int)
- 
-     # deep copy p
- 
-diff --git a/src/sage/libs/singular/singular.pyx b/src/sage/libs/singular/singular.pyx
-index d8ea7b07f3c..3a1271cd59f 100644
---- a/src/sage/libs/singular/singular.pyx
-+++ b/src/sage/libs/singular/singular.pyx
-@@ -1726,20 +1726,21 @@ cdef int overflow_check(unsigned long e, ring *_ring) except -1:
- 
-     Whether an overflow occurs or not partially depends
-     on the number of variables in the ring. See trac ticket
--    :trac:`11856`. With Singular 4, it is by default optimized
--    for at least 4 variables on 64-bit and 2 variables on 32-bit,
--    which in both cases makes a maximal default exponent of
--    2^16-1.
-+    :trac:`11856`.
- 
-     EXAMPLES::
- 
-         sage: P.<x,y> = QQ[]
--        sage: y^(2^16-1)
--        y^65535
--        sage: y^2^16
-+        sage: y^(2^30)
-+        Traceback (most recent call last):             # 32-bit
-+        ...                                            # 32-bit
-+        OverflowError: exponent overflow (1073741824)  # 32-bit
-+        y^1073741824  # 64-bit
-+        sage: y^2^32
-         Traceback (most recent call last):
-         ...
--        OverflowError: exponent overflow (65536)
-+        OverflowError: Python int too large to convert to C unsigned long  # 32-bit
-+        OverflowError: exponent overflow (4294967296)  # 64-bit
-     """
-     if unlikely(e > _ring.bitmask):
-         raise OverflowError("exponent overflow (%d)"%(e))
-diff --git a/src/sage/rings/polynomial/multi_polynomial_ideal.py b/src/sage/rings/polynomial/multi_polynomial_ideal.py
-index 7dc058a22f0..71494eddbc0 100644
---- a/src/sage/rings/polynomial/multi_polynomial_ideal.py
-+++ b/src/sage/rings/polynomial/multi_polynomial_ideal.py
-@@ -60,7 +60,7 @@
- Note that the result of a computation is not necessarily reduced::
- 
-     sage: (a+b)^17
--    256*a*b^16 + 256*b^17
-+    a*b^16 + b^17
-     sage: S(17) == 0
-     True
- 
-diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-index 4dad016b33f..9bf67dd1425 100644
---- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-+++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-@@ -193,7 +193,7 @@ from sage.libs.singular.decl cimport (
-     p_IsUnit, p_IsOne, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete,
-     p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize,
-     idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD,
--    p_LmIsConstant, pTakeOutComp1, singclap_gcd, pp_Mult_qq, p_GetMaxExp,
-+    p_LmIsConstant, pTakeOutComp, singclap_gcd, pp_Mult_qq, p_GetMaxExp,
-     pLength, kNF, p_Neg, p_Minus_mm_Mult_qq, p_Plus_mm_Mult_qq,
-     pDiff, singclap_resultant, p_Normalize,
-     prCopyR, prCopyR_NoSort)
-@@ -1587,7 +1587,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             9/4
- 
-             sage: P.monomial_quotient(x,y) # Note the wrong result
--            x*y^65535*z^65535
-+            x*y^65535*z^65535      # 32-bit
-+            x*y^1048575*z^1048575  # 64-bit
- 
-             sage: P.monomial_quotient(x,P(1))
-             x
-@@ -2247,10 +2248,11 @@ cdef class MPolynomial_libsingular(MPolynomial):
-             9/4*x^2 - 1/4*y^2 - y - 1
- 
-             sage: P.<x,y> = PolynomialRing(QQ,order='lex')
--            sage: (x^2^15) * x^2^15
-+            sage: (x^2^32) * x^2^32
-             Traceback (most recent call last):
-             ...
--            OverflowError: exponent overflow (...)
-+            OverflowError: Python int too large to convert to C unsigned long  # 32-bit
-+            OverflowError: exponent overflow (...)  # 64-bit
-         """
-         # all currently implemented rings are commutative
-         cdef poly *_p
-@@ -2371,10 +2373,11 @@ cdef class MPolynomial_libsingular(MPolynomial):
-             ValueError: not a 2nd power
- 
-             sage: P.<x,y> = PolynomialRing(QQ,order='lex')
--            sage: (x+y^2^15)^10
-+            sage: (x+y^2^32)^10
-             Traceback (most recent call last):
-             ....
--            OverflowError: exponent overflow (...)
-+            OverflowError: Python int too large to convert to C unsigned long  # 32-bit
-+            OverflowError: exponent overflow (...)  # 64-bit
- 
-         Test fractional powers (:trac:`22329`)::
- 
-@@ -3461,7 +3464,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
-             x^10000
-             no overflow
- 
--            sage: n = 1000
-+            sage: n = 100000
-             sage: try:
-             ....:     f = x^n
-             ....:     f.subs(x = x^n)
-@@ -4567,7 +4570,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
-         l = []
-         for i from 0 <= i < IDELEMS(res):
-             for j from 1 <= j <= IDELEMS(_I):
--                l.append( new_MP(parent, pTakeOutComp1(&res.m[i], j)) )
-+                l.append( new_MP(parent, pTakeOutComp(&res.m[i], 1)) )
- 
-         id_Delete(&fI, r)
-         id_Delete(&_I, r)
-@@ -4635,7 +4638,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
- 
-             sage: f = 3*x
-             sage: f.reduce([2*x,y])
--            3*x
-+            x
- 
-         The reduction is not canonical when ``I`` is not a Groebner
-         basis::
-diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx
-index 1c9f35e56ba..587511c3888 100644
---- a/src/sage/rings/polynomial/plural.pyx
-+++ b/src/sage/rings/polynomial/plural.pyx
-@@ -1619,10 +1619,10 @@ cdef class NCPolynomial_plural(RingElement):
-             sage: P = A.g_algebra(relations={y*x:-x*y + z},  order='lex')
-             sage: P.inject_variables()
-             Defining x, z, y
--            sage: (x^2^15) * x^2^15
-+            sage: (x^2^31) * x^2^31
-             Traceback (most recent call last):
-             ...
--            OverflowError: exponent overflow (65536)
-+            OverflowError: exponent overflow (2147483648)
-         """
-         # all currently implemented rings are commutative
-         cdef poly *_p
-@@ -1689,10 +1689,10 @@ cdef class NCPolynomial_plural(RingElement):
-             sage: P = A.g_algebra(relations={y*x:-x*y + z},  order='lex')
-             sage: P.inject_variables()
-             Defining x, z, y
--            sage: (x+y^2^15)^10
-+            sage: (x+y^2^31)^10
-             Traceback (most recent call last):
-             ....
--            OverflowError: exponent overflow (327680)
-+            OverflowError: exponent overflow (2147483648)
-         """
-         if type(exp) is not Integer:
-             try:
-diff --git a/src/sage/structure/element.pyx b/src/sage/structure/element.pyx
-index b5d83ef71b6..5c45b3fb528 100644
---- a/src/sage/structure/element.pyx
-+++ b/src/sage/structure/element.pyx
-@@ -2705,10 +2705,10 @@ cdef class RingElement(ModuleElement):
-         with Singular 4::
- 
-             sage: K.<x,y> = ZZ[]
--            sage: (x^12345)^54321
-+            sage: (x^123456)^654321
-             Traceback (most recent call last):
-             ...
--            OverflowError: exponent overflow (670592745)
-+            OverflowError: exponent overflow (...)
-         """
-         return arith_generic_power(self, n)
- 
diff --git a/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch b/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
deleted file mode 100644
index ee0f0e656b28..000000000000
--- a/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/sage/rings/number_field/number_field_ideal.py b/src/sage/rings/number_field/number_field_ideal.py
-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,38 @@ def is_prime(self):
-             False
-             sage: K.ideal(17).is_prime()  # ramified
-             False
-+
-+        TESTS:
-+
-+        Check that we do not factor the norm of the ideal, this used
-+        to take half an hour, see :trac:`33360`::
-+
-+            sage: K.<a,b,c> = NumberField([x^2-2,x^2-3,x^2-5])
-+            sage: t = (((-2611940*c + 1925290/7653)*b - 1537130/7653*c
-+            ....:       + 10130950)*a + (1343014/7653*c - 8349770)*b
-+            ....:       + 6477058*c - 2801449990/4002519)
-+            sage: t.is_prime()
-+            False
-         """
-         try:
-             return self._pari_prime is not None
-         except AttributeError:
--            F = self.factor()  # factorization with caching
--            if len(F) != 1 or F[0][1] != 1:
--                self._pari_prime = None
--            else:
--                self._pari_prime = F[0][0]._pari_prime
--            return self._pari_prime is not None
-+            pass
-+
-+        K = self.number_field().pari_nf()
-+        I = self.pari_hnf()
-+
-+        candidate = K.idealismaximal(I) or None
-+
-+        # PARI uses probabilistic primality testing inside idealismaximal().
-+        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
- 
-     def pari_prime(self):
-         r"""
diff --git a/srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch b/srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch
deleted file mode 100644
index 91f06fd4d173..000000000000
--- a/srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/sage/misc/persist.pyx b/src/sage/misc/persist.pyx
-index 3ac5f1cc2b0..cb1f327c199 100644
---- a/src/sage/misc/persist.pyx
-+++ b/src/sage/misc/persist.pyx
-@@ -157,7 +157,7 @@ def load(*filename, compress=True, verbose=True, **kwargs):
-         ....:     _ = f.write(code)
-         sage: load(t)
-         sage: hello
--        <fortran object>
-+        <fortran ...>
-     """
-     import sage.repl.load
-     if len(filename) != 1:
-diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
-index 6f0aeab87ae..b77c69b2f77 100644
---- a/src/sage/plot/complex_plot.pyx
-+++ b/src/sage/plot/complex_plot.pyx
-@@ -461,6 +461,8 @@ def complex_to_rgb(z_values, contoured=False, tiled=False,
-             rgb[i, j, 2] = b
- 
-     sig_off()
-+    nan_indices = np.isnan(rgb).any(-1)     # Mask for undefined points
-+    rgb[nan_indices] = 1                    # Make nan_indices white
-     return rgb
- 
- 
-diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py
-index 3bc2b76b58e..388c2d1391d 100644
---- a/src/sage/plot/histogram.py
-+++ b/src/sage/plot/histogram.py
-@@ -87,13 +87,8 @@ def get_minmax_data(self):
- 
-         TESTS::
- 
--            sage: h = histogram([10,3,5], normed=True)[0]
--            doctest:warning...:
--            DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead.
--            See https://trac.sagemath.org/25260 for details.
-+            sage: h = histogram([10,3,5], density=True)[0]
-             sage: h.get_minmax_data()
--            doctest:warning ...
--            ...VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy.
-             {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0}
-         """
-         import numpy
-diff --git a/src/sage/repl/ipython_extension.py b/src/sage/repl/ipython_extension.py
-index 798671aab42..cad6a47ca8b 100644
---- a/src/sage/repl/ipython_extension.py
-+++ b/src/sage/repl/ipython_extension.py
-@@ -405,7 +405,7 @@ def fortran(self, line, cell):
-             ....: C END FILE FIB1.F
-             ....: ''')
-             sage: fib
--            <fortran object>
-+            <fortran ...>
-             sage: from numpy import array
-             sage: a = array(range(10), dtype=float)
-             sage: fib(a, 10)
diff --git a/srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch b/srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch
deleted file mode 100644
index 2769e87f6a4b..000000000000
--- a/srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py
-index 23671e50892..ce1d50f71bc 100644
---- a/src/sage/interfaces/tachyon.py
-+++ b/src/sage/interfaces/tachyon.py
-@@ -683,12 +683,14 @@
- #*****************************************************************************
- 
- import os
-+import re
- 
- from sage.cpython.string import bytes_to_str
- from sage.misc.pager import pager
- from sage.misc.superseded import deprecation
- from sage.misc.temporary_file import tmp_filename
- from sage.structure.sage_object import SageObject
-+from sage.misc.cachefunc import cached_method
- 
- 
- class TachyonRT(SageObject):
-@@ -799,6 +801,11 @@ def __call__(self, model, outfile='sage.png', verbose=1, extra_opts=''):
-             Parser failed due to an input file syntax error.
-             Aborting render.
-         """
-+        if self.version() >= '0.99.2':
-+            # this keyword was changed in 0.99.2
-+            model = model.replace(
-+                    "              focallength ",
-+                    "              focaldist ")
-         modelfile = tmp_filename(ext='.dat')
-         with open(modelfile, 'w') as file:
-             file.write(model)
-@@ -851,6 +858,25 @@ def usage(self, use_pager=True):
-         else:
-             print(r)
- 
-+    @cached_method
-+    def version(self):
-+        """
-+        Returns the version of the Tachyon raytracer being used.
-+
-+        TESTS::
-+
-+            sage: tachyon_rt.version()  # random
-+            0.98.9
-+            sage: tachyon_rt.version() >= '0.98.9'
-+            True
-+        """
-+        with os.popen('tachyon') as f:
-+            r = f.readline()
-+        res = re.search(r"Version ([\d.]*)", r)
-+        # debian patches tachyon so it won't report the version
-+        # we hardcode '0.99' since that's indeed the version they ship
-+        return res[1] if res else '0.99'
-+
-     def help(self, use_pager=True):
-         """
-         Deprecated: type 'sage.interfaces.tachyon?' for help
diff --git a/srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch b/srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch
deleted file mode 100644
index 11eb20d4f735..000000000000
--- a/srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/sage/arith/long.pxd b/src/sage/arith/long.pxd
-index 1c9a53387a0..d96b98f247c 100644
---- a/src/sage/arith/long.pxd
-+++ b/src/sage/arith/long.pxd
-@@ -270,6 +270,17 @@ cdef inline bint integer_check_long_py(x, long* value, int* err):
-         sage: L += [-x for x in L] + [0, long_min()]
-         sage: for v in L:
-         ....:     assert check_long_py(int(v)) == v
-+        sage: check_long_py(int(2^60))
-+        1152921504606846976                 # 64-bit
-+        'Overflow (...)'                    # 32-bit
-+        sage: check_long_py(int(2^61))
-+        2305843009213693952                 # 64-bit
-+        'Overflow (...)'                    # 32-bit
-+        sage: check_long_py(int(2^62))
-+        4611686018427387904                 # 64-bit
-+        'Overflow (...)'                    # 32-bit
-+        sage: check_long_py(int(2^63))
-+        'Overflow (...)'
-         sage: check_long_py(int(2^100))
-         'Overflow (...)'
-         sage: check_long_py(int(long_max() + 1))
-@@ -309,7 +320,12 @@ cdef inline bint integer_check_long_py(x, long* value, int* err):
- 
-     cdef long lead
-     cdef long lead_2_overflow = (<long>1) << (BITS_IN_LONG - PyLong_SHIFT)
--    cdef long lead_3_overflow = (<long>1) << (BITS_IN_LONG - 2 * PyLong_SHIFT)
-+    cdef long lead_3_overflow
-+    if BITS_IN_LONG < 2 * PyLong_SHIFT:
-+        # in this case 3 digit is always overflow
-+        lead_3_overflow = 0
-+    else:
-+        lead_3_overflow = (<long>1) << (BITS_IN_LONG - 2 * PyLong_SHIFT)
-     if size == 0:
-         value[0] = 0
-         err[0] = 0
diff --git a/srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch b/srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch
deleted file mode 100644
index c4d7d5c779d1..000000000000
--- a/srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/sage/schemes/toric/sheaf/klyachko.py b/src/sage/schemes/toric/sheaf/klyachko.py
-index b1304a16913..77fae4b7545 100644
---- a/src/sage/schemes/toric/sheaf/klyachko.py
-+++ b/src/sage/schemes/toric/sheaf/klyachko.py
-@@ -26,7 +26,7 @@
-     (0, 0, 18, 16, 1)
-     sage: Gtilde = G_sum.random_deformation()
-     sage: V = Gtilde.wedge(2) * K                     # long time
--    sage: V.cohomology(dim=True, weight=(0,0,0,0))    # long time
-+    sage: V.cohomology(dim=True, weight=(0,0,0,0))    # long time  # random failure (see #32773)
-     (0, 0, 3, 0, 0)
- 
- REFERENCES:
-@@ -948,7 +948,7 @@ def random_deformation(self, epsilon=None):
-            sage: V.cohomology(dim=True, weight=(0,))
-            (1, 0)
-            sage: Vtilde = V.random_deformation()
--           sage: Vtilde.cohomology(dim=True, weight=(0,))
-+           sage: Vtilde.cohomology(dim=True, weight=(0,))  # random failure (see #32773)
-            (1, 0)
-         """
-         filt = self._filt.random_deformation(epsilon)
diff --git a/srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch b/srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch
deleted file mode 100644
index d9a9835c696b..000000000000
--- a/srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9ac7840134054155545e24fa3e66402d42b91c0f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 20 Jan 2023 21:36:27 +0100
-Subject: [PATCH] Fix tests with giac 1.9.0.35
-
----
- src/sage/libs/giac/giac.pyx   |  3 +--
- src/sage/symbolic/relation.py | 15 +++++----------
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/sage/libs/giac/giac.pyx b/src/sage/libs/giac/giac.pyx
-index 4e451dba5e7..ccad5169836 100644
---- a/src/sage/libs/giac/giac.pyx
-+++ b/src/sage/libs/giac/giac.pyx
-@@ -374,8 +374,7 @@ def _giac(s):
- 
-         sage: x = libgiac('x')
-         sage: (1+2*sin(3*x)).solve(x).simplify()
--        Warning, argument is not an equation, solving 1+2*sin(3*x)=0
--        list[-pi/18,7*pi/18]
-+        ...list[-pi/18,7*pi/18]
- 
-         sage: libgiac.solve('sin(3*x)>2*sin(x)',x)
-         Traceback (most recent call last):
-diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
-index e9dbc0fea30..b8896a94be9 100644
---- a/src/sage/symbolic/relation.py
-+++ b/src/sage/symbolic/relation.py
-@@ -935,8 +935,7 @@ def solve(f, *args, **kwds):
- 
-         sage: f = (sin(x) - 8*cos(x)*sin(x))*(sin(x)^2 + cos(x)) - (2*cos(x)*sin(x) - sin(x))*(-2*sin(x)^2 + 2*cos(x)^2 - cos(x))
-         sage: solve(f, x, algorithm='giac')
--        ...
--        [-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
-+        ...[-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
- 
-         sage: x, y = SR.var('x,y')
-         sage: solve([x+y-4,x*y-3],[x,y],algorithm='giac')
-@@ -1440,19 +1439,15 @@ def _giac_solver(f, x, solution_dict=False):
-     EXAMPLES::
- 
-         sage: solve([(2/3)^x-2], [x], algorithm='giac')
--        ...
--        [[-log(2)/(log(3) - log(2))]]
-+        ...[[-log(2)/(log(3) - log(2))]]
-         sage: solve([(2/3)^x-2], [x], algorithm='giac', solution_dict=True)
--        ...
--        [{x: -log(2)/(log(3) - log(2))}]
-+        ...[{x: -log(2)/(log(3) - log(2))}]
- 
-         sage: f = (sin(x) - 8*cos(x)*sin(x))*(sin(x)^2 + cos(x)) - (2*cos(x)*sin(x) - sin(x))*(-2*sin(x)^2 + 2*cos(x)^2 - cos(x))
-         sage: solve(f, x, algorithm='giac')
--        ...
--        [-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
-+        ...[-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
-         sage: solve(f, x, algorithm='giac', solution_dict=True)
--        ...
--        [{x: -2*arctan(sqrt(2))}, {x: 0}, {x: 2*arctan(sqrt(2))}, {x: pi}]
-+        ...[{x: -2*arctan(sqrt(2))}, {x: 0}, {x: 2*arctan(sqrt(2))}, {x: pi}]
- 
-         sage: x, y = SR.var('x,y')
-         sage: solve([x+y-7,x*y-10],[x,y],algorithm='giac')
diff --git a/srcpkgs/sagemath/patches/35094-support_gap_4.12.patch b/srcpkgs/sagemath/patches/35094-support_gap_4.12.patch
deleted file mode 100644
index 499e0c71e256..000000000000
--- a/srcpkgs/sagemath/patches/35094-support_gap_4.12.patch
+++ /dev/null
@@ -1,1303 +0,0 @@
-diff --git a/build/pkgs/gap/checksums.ini b/build/pkgs/gap/checksums.ini
-index 066e943308a..b0ea8ba8818 100644
---- a/build/pkgs/gap/checksums.ini
-+++ b/build/pkgs/gap/checksums.ini
-@@ -1,5 +1,5 @@
- tarball=gap-VERSION.tar.gz
--sha1=4ecdd281b8f430282fb9b12690b06e0a26abde10
--md5=85dc9e459d5b6c66fcad9f468afd3e3e
--cksum=1351843158
-+sha1=a6e36f3f874a2c46f51561402634497eab705cca
-+md5=c5cd9f272f2703d7a3649ad7193b2d90
-+cksum=2760477284
- upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz
-diff --git a/build/pkgs/gap/package-version.txt b/build/pkgs/gap/package-version.txt
-index d782fca8f64..f1cd7de1de5 100644
---- a/build/pkgs/gap/package-version.txt
-+++ b/build/pkgs/gap/package-version.txt
-@@ -1 +1 @@
--4.11.1
-+4.12.2
-diff --git a/build/pkgs/gap/spkg-check.in b/build/pkgs/gap/spkg-check.in
-index d9791d33293..d2fccda6e04 100644
---- a/build/pkgs/gap/spkg-check.in
-+++ b/build/pkgs/gap/spkg-check.in
-@@ -3,6 +3,13 @@ cd src
- # #28728: Fix test failure in tst/testinstall/strings.tst
- export LC_CTYPE=en_US.UTF-8
- 
-+# #34391: in GAP 4.12 some packages need GAP package io
-+#         to let tests run, otherwise this hangs. Thus we install io here.
-+cd pkg/io
-+./configure --with-gaproot=../..
-+make
-+cd ../..
-+
- make testinstall
- if [[ $? -ne 0 ]]; then
-     exit 1
-diff --git a/build/pkgs/gap/spkg-install.in b/build/pkgs/gap/spkg-install.in
-index 2ceadf99db4..e2c8b4dca54 100644
---- a/build/pkgs/gap/spkg-install.in
-+++ b/build/pkgs/gap/spkg-install.in
-@@ -8,8 +8,7 @@ export CFLAGS=$CFLAGS_NON_NATIVE
- export CXXFLAGS=$CXXFLAGS_NON_NATIVE
- 
- GAP_BUILD_ROOT="$(pwd)"
--GAP_ROOT="$SAGE_LOCAL/share/gap"
--DESTDIR_GAP_ROOT="$SAGE_DESTDIR$GAP_ROOT"
-+GAP_ROOT="$SAGE_LOCAL/lib/gap"
- 
- # Enable debug info if requested.
- # Note that -g3 allows you to use preprocessor macros in gdb which are widely used
-@@ -17,37 +16,17 @@ if [ "$SAGE_DEBUG" = yes ] ; then
-     export CFLAGS="-O0 -g3 -DDEBUG_MASTERPOINTERS -DDEBUG_GLOBAL_BAGS -DDEBUG_FUNCTIONS_BAGS $CFLAGS"
- fi
- 
--sdh_configure $SAGE_CONFIGURE_GMP
--sdh_make -j1
-+# LDFLAGS hack below needed by Semigroups package
-+sdh_configure $SAGE_CONFIGURE_GMP LDFLAGS="-pthread" --prefix=$SAGE_LOCAL
-+sdh_make
- 
--# GAP's "make install" is work in progress; we use bits and pieces of it
--# but we install many things manually.
--sdh_make install-headers install-libgap
--
--# Install config.h, which is not currently handled by `make install-headers`
--sdh_install gen/config.h "$SAGE_LOCAL/include/gap"
--
--# Now install the gap executable as "gap-bin"; it will be called normally
--# through our wrapper script that sets the appropriate GAP_ROOT
--SAGE_BIN="$SAGE_LOCAL/bin"
--mkdir -p "$SAGE_DESTDIR$SAGE_BIN" || sdh_die "Failed to create the directory $SAGE_BIN"
--
--./libtool --mode=install install gap "$SAGE_DESTDIR$SAGE_BIN/gap-bin" || \
--    sdh_die "Failed to install gap-bin to $SAGE_BIN"
--
--./libtool --mode=install install gac "$SAGE_DESTDIR$SAGE_BIN/gac" || \
--    sdh_die "Failed to install gac to $SAGE_BIN"
--
--# Now copy additional files GAP needs to run (and a few optional bits) into
--# GAP_ROOT; we don't need everything from the source tree
--sdh_install bin doc gen grp lib src tst sysinfo.gap "$GAP_ROOT"
--
--# GAP's copy of libtool is also used by the toolchain for build GAP packages
--# (i.e. by gac)
--sdh_install libtool "$GAP_ROOT"
-+sdh_make_install
-+# sdh_make install-headers install-libgap
-+# The 'packagemanager' package expects this https://github.com/gap-packages/PackageManager/issues/105
-+mkdir -p "$SAGE_LOCAL/lib/gap/bin"
- 
- # Install only the minimal packages GAP needs to run
--sdh_install pkg/GAPDoc-* pkg/primgrp-* pkg/SmallGrp-* pkg/transgrp "$GAP_ROOT"/pkg
-+sdh_install pkg/gapdoc pkg/primgrp pkg/smallgrp pkg/transgrp "$GAP_ROOT"/pkg
- 
- # Install additional packages that are not strictly required, but that are
- # typically "expected" to be loaded: These are the default packages that are
-@@ -58,50 +37,25 @@ sdh_install pkg/GAPDoc-* pkg/primgrp-* pkg/SmallGrp-* pkg/transgrp "$GAP_ROOT"/p
- # Also include atlasrep which is a dependency of tomlib
- sdh_install \
-     pkg/atlasrep \
--    pkg/autpgrp-* \
--    pkg/alnuth-* \
--    pkg/crisp-* \
--    pkg/ctbllib-* \
--    pkg/FactInt-* \
-+    pkg/autodoc \
-+    pkg/autpgrp \
-+    pkg/alnuth \
-+    pkg/crisp \
-+    pkg/ctbllib \
-+    pkg/factint \
-     pkg/fga \
--    pkg/irredsol-* \
--    pkg/laguna-* \
--    pkg/PackageManager-* \
--    pkg/polenta-* \
--    pkg/polycyclic-* \
--    pkg/resclasses-* \
--    pkg/sophus-* \
--    pkg/tomlib-* \
-+    pkg/irredsol \
-+    pkg/laguna \
-+    pkg/packagemanager \
-+    pkg/polenta \
-+    pkg/polycyclic \
-+    pkg/radiroot \
-+    pkg/resclasses \
-+    pkg/sophus \
-+    pkg/tomlib \
-+    pkg/utils \
-     "$GAP_ROOT"/pkg
- 
--# Install the GAP startup script; ensure it is executable
--sdh_install -T ../gap "$SAGE_BIN/gap"
--chmod +x "$SAGE_DESTDIR$SAGE_BIN/gap"
--
--# Create symlinks under $GAP_ROOT for these executables, as they are expected
--# (especially when building kernel packages) to exist
--ln -sf "../../bin/gap-bin" "$DESTDIR_GAP_ROOT/gap"
--ln -sf "../../bin/gac" "$DESTDIR_GAP_ROOT/gac"
--
--# Fix the $GAP_ROOT/bin/<arch>/src symlink to be relative (otherwise it links
--# to the actual path of the sources GAP was compiled from)
--for srclink in "$DESTDIR_GAP_ROOT"/bin/*/src; do
--    rm -f "$srclink"
--    ln -s "../../src" "$srclink"
--done
--
--# Additional fixups for some files after they have been copied into their
--# destination directory.  gac and sysinfo.gap are generated files that contain
--# in them hard-coded references to the GAP build directory, which will soon
--# be going away.  This breaks the build toolchain for some compiled GAP
--# packages.  We need to replace these paths with the final GAP_ROOT path.  The
--# below will work so long as neither of these paths contain '|', and if they do
--# then god help you.  https://trac.sagemath.org/ticket/27218
--sed -i -e "s|$GAP_BUILD_ROOT|$GAP_ROOT|g" \
--    "$SAGE_DESTDIR$SAGE_BIN/gac" "$DESTDIR_GAP_ROOT/sysinfo.gap" \
--    "$DESTDIR_GAP_ROOT/bin/gap.sh" "$DESTDIR_GAP_ROOT/doc/make_doc" || \
--    sdh_die "Failed to fix up hard-coded paths in GAP build tools."
--
- # TODO: This seems unnecessary--we are already installing all of doc/ to
- # GAP_ROOT, which is necessary for some functionality in GAP to work.  Do
- # we need this?  Maybe doc/gap could just be a symlink to gap/doc??
-diff --git a/build/pkgs/gap/spkg-legacy-uninstall b/build/pkgs/gap/spkg-legacy-uninstall
-index d17eb939eb7..a8e5c59e1fb 100755
---- a/build/pkgs/gap/spkg-legacy-uninstall
-+++ b/build/pkgs/gap/spkg-legacy-uninstall
-@@ -4,6 +4,8 @@ rm -rf "$SAGE_LOCAL/gap/gap-4."*
- rm -rf "$SAGE_SHARE/gap"
- rm -f "$SAGE_LOCAL/gap/latest"
- rm -f "$SAGE_LOCAL/bin/gap"
-+rm -f "$SAGE_LOCAL/bin/gac"
- 
--# Remove old libgap headers
-+# Remove old libgap headers and library
- rm -rf "$SAGE_LOCAL/include/gap"
-+rm -rf "$SAGE_LOCAL/lib/gap"
-diff --git a/build/pkgs/gap/spkg-prerm.in b/build/pkgs/gap/spkg-prerm.in
-deleted file mode 100644
-index 661d92621fa..00000000000
---- a/build/pkgs/gap/spkg-prerm.in
-+++ /dev/null
-@@ -1,6 +0,0 @@
--# These generated files are placed in directory provided by the SPKG, so
--# delete the generated files first so that their parent directories can be
--# removed during installation
--GAP_ROOT="$SAGE_LOCAL/share/gap"
--rm -f "$GAP_ROOT/pkg/atlasrep/datagens/"*.*
--rm -f "$GAP_ROOT/pkg/atlasrep/dataword/"*.*
-diff --git a/build/pkgs/gap_packages/patches/cohomolo-gcc10.patch b/build/pkgs/gap_packages/patches/cohomolo-gcc10.patch
-deleted file mode 100644
-index e45fe7d9c6f..00000000000
---- a/build/pkgs/gap_packages/patches/cohomolo-gcc10.patch
-+++ /dev/null
-@@ -1,150 +0,0 @@
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c b/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c
--index 3bbdc45..7df699f 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c
--@@ -8,9 +8,8 @@ extern short sp[],**mat[],*psp[],**imcos[],**cpco[],lorb[],
-- short *cst,**cpst,***cdpst,**svptr,*cp,*rel;
-- short *spst,**pspst,**pptr,**cpptr,npt,nb,nph,nph2,npg,npg2,
--       rno,orno,coh_index,*invg;
---FILE  *ip,*op;
-- 
---void seeknln (void) { while (getc(ip)!='\n'); }
--+void seeknln (FILE *ip) { while (getc(ip)!='\n'); }
-- 
-- /* This program differs from most other permutation programs in that perms are
--    all stored in the single array sp. Schreier vectors are stored in the short
--@@ -23,13 +22,14 @@ void seeknln (void) { while (getc(ip)!='\n'); }
-- int 
-- crprog1 (void)
-- { short *pc,*qc,ex,neg; int x;
--+  FILE  *ip,*op;
--   short i,j,k,l,m,n,cl,rl,*p,ocl,im,pt,pt1,pn,ipt;
--   if ((ip=fopen(inf2,"r"))== 0)
--   { fprintf(stderr,"Cannot open %s.\n",inf2); return(-1);}
--   fscanf(ip,"%hd%hd%hd%hd",&npt,&nph,&nb,&k);
--   if (nb>=mb) {fprintf(stderr,"nb too big. Increase MB.\n"); return(-1);}
--   if (k<=2) {fprintf(stderr,"inf2 has illegal format.\n"); return(-1); }
---  seeknln(); seeknln();
--+  seeknln(ip); seeknln(ip);
--   for (i=1;i<=nb;i++) fscanf(ip,"%hd",lorb+i);
--   pptr=psp-1; pspst=psp+nph; svptr=cpsp-1;  cpst=cpsp+nb;
--   invg=sp; nph2=2*nph; spst=sp+nph2;
--@@ -37,7 +37,7 @@ crprog1 (void)
--   { pptr[i]=spst+(i-1)*npt-1; p=pptr[i];
--     for (j=1;j<=npt;j++) {fscanf(ip,"%hd",&k); p[k]=j; }
--     invg[2*i-2]=2*i-1; invg[2*i-1]=2*i-2;
---    seeknln();
--+    seeknln(ip);
--   }
--   spst+=(npt*nph);
--   for (i=1;i<=nb;i++)
--@@ -75,7 +75,7 @@ crprog1 (void)
--   strcpy(inf1,inf0); strcat(inf1,".rel");
--   if ((ip=fopen(inf1,"r"))==0)
--   { fprintf(stderr,"Cannot open %s.\n",inf1); return(-1);}
---  fscanf(ip,"%hd%hd",&k,&rno); seeknln();
--+  fscanf(ip,"%hd%hd",&k,&rno); seeknln(ip);
--   op=fopen(outft,"w");
-- /* Now we have read everything in, and the computation can start */
--   orno=0;
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c b/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c
--index a7396b2..658496f 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c
--@@ -20,8 +20,6 @@ short  mexp=MEXP,mcl=MCL,no,rel[RSP],wt[MEXP],exp,*rpf,*rpb,
-- extern short  prime,dim,*spv,**spm,mspace[],*vec[],**mat[],cp[],pinv[],opmats,
--         mm,mv;
-- extern int msp;
---FILE *ip,*op;
---
-- 
-- int 
-- calcmats (void)
--@@ -59,7 +57,7 @@ calcmats (void)
--   }
--   for (i=1;i<=exp;i++) trans(mat[i+exp],mat[i]);
--   if (opmats)
---  { op=fopen(outf,"w");
--+  { FILE *op=fopen(outf,"w");
--     fprintf(op,"%4d%4d%4d\n",prime,dim,exp);
--     for (i=1;i<=exp;i++) printmat(mat[i]); 
--     fclose(op);
--@@ -71,6 +69,7 @@ int
-- rdmats (void)
-- /* reads matrices of generators of P */
-- { short i; int quot;
--+  FILE *ip;
--   ip=fopen(inf4,"r");
--   if (ip==0)
--   { fprintf(stderr,"Cannot open %s\n ",inf4); return(-1); }
--@@ -90,12 +89,12 @@ rdmats (void)
--   fclose(ip);
--   return(0);
-- }
---FILE *ip;
-- 
-- int 
-- ingp (int inp)
-- /* Read in output of respcrun -s */
-- { short i,j,k,l,m,*orpf,**pcp;
--+  FILE *ip;
--   ip=fopen(inf3,"r");
--   if (ip==0) { fprintf(stderr,"Cannot open %s\n",inf3); return(-1); }
--   fscanf(ip,"%hd%hd%hd%hd%hd%hd",&prime,&exp,&i,&no,&j,&m);
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c
--index 0896551..6841bc8 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c
--@@ -9,7 +9,6 @@ extern short  intexp,mexp,mng,wksp,
--        spugen[],*tlintg[];
-- extern int ptrsp,rsp;
-- short  fac;
---FILE *ip,*op;
-- 
-- int 
-- ingp (void)
--@@ -18,6 +17,7 @@ ingp (void)
--    of nqrun, and tails are also read in.
-- */
-- { short i,j,k,l,m,x,y,no,*orpf,*orpb,**pcp;  char tails;
--+  FILE *ip;
--   if ((ip=fopen(inf1,"r"))==0)
--   { fprintf(stderr,"Cannot open %s.\n",inf1); return(-1); }
--   fscanf(ip,"%hd%hd%hd%hd%hd%hd",&prime,&exp,&nng,&no,&class,&m);
--@@ -89,6 +89,7 @@ int
-- outgp (void)
-- /* The PCP is output, together with tails */
-- { short i,k,l,**pcp,*b,*e,*c;
--+  FILE *op;
--   op=fopen(outf,"w");
--   fprintf(op,"%4d%4d%4d%4d%4d%4d\n",prime,exp,nng,exp,class,1);
--   for (i=1;i<=exp;i++) fprintf(op,"%4d",wt[i]); fprintf(op,"\n");
--@@ -379,7 +380,7 @@ restart:
--     nng--; mnng--; enexpnt--;
--     if (nng==0)
--     { if (gap)
---      { op=fopen(outfm,"w"); fprintf(op,"COHOMOLO.Multiplier:=[];\n");
--+      { FILE *op=fopen(outfm,"w"); fprintf(op,"COHOMOLO.Multiplier:=[];\n");
--         fclose(op);
--         printf("All new generators eliminated. Multiplier is trivial.\n");
--       }
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c
--index 01cf914..0144883 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c
--@@ -9,7 +9,6 @@ extern short  intexp,mng,mexp,wksp,
--        spugen[],*intg[],*imintg[],*tlintg[];
-- extern int ptrsp,rsp;
-- short  *wf,*wc; char norm;
---FILE *ip,*op;
-- 
-- /* The data structures for this program and for nqrun are similar.
--    d1 and d2 contain definitions of generators. (Def. comes from commutator
--@@ -35,6 +34,7 @@ nqmprog (void)
-- { short i,j,k,l,m,d,*gi,*gj,*ti,*tj,cl,def,*ps,*pf,**dp,*nrpb,*p,*orpf,*orpb,
--         nb,np,k1,*rno,*covrel,**pgen,tdef,sgn;
--   char nt;
--+  FILE *ip,*op;
--   if (ingp() == -1) {fprintf(stderr,"Input error.\n"); return(-1); }
--   eexpnt=expnt+exp; enexpnt=nexpnt+nng;
-- 
-diff --git a/build/pkgs/gap_packages/patches/guava_leon_includes.patch b/build/pkgs/gap_packages/patches/guava_leon_includes.patch
-deleted file mode 100644
-index cdcd19cc3e8..00000000000
---- a/build/pkgs/gap_packages/patches/guava_leon_includes.patch
-+++ /dev/null
-@@ -1,13 +0,0 @@
----- a/pkg/guava-3.15/src/leon/src/generate.c	Sat Feb 29 09:02:10 2020
----- b/pkg/guava-3.15/src/leon/src/generate.c	Thu Sep 24 13:58:36 2020
--***************
--*** 115,120 ****
----- 115,122 ----
--  #include "groupio.h"
--  #include "enum.h"
--  #include "storage.h"
--+ #include "chbase.h"
--+ #include "inform.h"
--  
--  #ifdef ALT_TIME_HEADER
--  #include "cputime.h"
-diff --git a/build/pkgs/gap_packages/spkg-install.in b/build/pkgs/gap_packages/spkg-install.in
-index 168e6b11532..6dff182a48f 100644
---- a/build/pkgs/gap_packages/spkg-install.in
-+++ b/build/pkgs/gap_packages/spkg-install.in
-@@ -1,4 +1,4 @@
--GAP_ROOT="$SAGE_LOCAL/share/gap"
-+GAP_ROOT="$SAGE_LOCAL/lib/gap"
- PKG_DIR="$GAP_ROOT/pkg"
- 
- PKG_SRC_DIR="$(pwd)/src/pkg"
-@@ -11,33 +11,31 @@ cd "$PKG_SRC_DIR"
- #    (GAP 4.8.6 still had it, but this is gone in 4.10)
- 
- sdh_install \
--    aclib-* \
--    AutoDoc-* \
--    corelg-* \
--    crime-* \
-+    aclib \
-+    corelg \
-+    crime \
-     cryst \
-     crystcat \
--    design-* \
-+    design \
-     gbnp \
--    genss-* \
--    hap-* \
--    hapcryst-* \
--    hecke-* \
--    images-* \
--    liealgdb-* \
--    liepring-* \
--    liering-* \
--    loops-* \
--    MapClass-* \
--    polymaking-* \
--    qpa-* \
--    quagroup-* \
--    radiroot-* \
--    repsn-* \
--    sla-* \
--    sonata-* \
--    Toric-* \
--    utils-* \
-+    genss \
-+    hap \
-+    hapcryst \
-+    hecke \
-+    images \
-+    liealgdb \
-+    liepring \
-+    liering \
-+    loops \
-+    mapclass \
-+    polymaking \
-+    qpa \
-+    quagroup \
-+    repsn \
-+    singular \
-+    sla \
-+    sonata \
-+    toric \
-     "$PKG_DIR"
- 
- install_compiled_pkg()
-@@ -45,27 +43,23 @@ install_compiled_pkg()
-     local pkg="$1"
-     # Install the bin/ dir (where compiled modules should end up)
-     # under <prefix>/lib/gap; we then symlink to it later
--    sdh_install bin "$SAGE_LOCAL/lib/gap/pkg/$pkg"
-+    sdh_install * "$SAGE_LOCAL/lib/gap/pkg/$pkg"
- 
-+    # TODO:
-     # Clean up any build artificts before installing the rest of the package
-     # Also remove configure/Makefiles
-     # Note: None, if any of the packages really have a proper install target
--    make clean  # Works for some packages but not all
--    rm -rf bin/
--    rm -rf configure configure.* config.* autogen.sh *.m4 Makefile* m4/
-+    #make clean  # Works for some packages but not all
-+    #rm -rf bin/
-+    #rm -rf configure configure.* config.* autogen.sh *.m4 Makefile* m4/
- 
--    # Create the bin/ symlink
--    ln -s "$SAGE_LOCAL/lib/gap/pkg/$pkg/bin" bin
--
--    # Install the rest of the package files
--    sdh_install * "$PKG_DIR/$pkg"
- }
- 
- # Build and install compiled packages:
- #
- # These packages have an old ./configure that take the GAP_ROOT as a positional
- # argument
--for pkg in cohomolo-* crypting-* grape-* guava-* orb-* datastructures-*
-+for pkg in cohomolo crypting grape guava orb datastructures
- do
-     echo "Building GAP package $pkg"
-     CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
-@@ -91,7 +85,7 @@ pararr=( " " " " "--with-external-planarity" "--with-external-libsemigroups" )
- ##############################################################################
- 
- parind=0
--for pkg in nq-* io-* digraphs-* semigroups-*
-+for pkg in nq io digraphs semigroups
- do
-     echo "Building GAP package $pkg"
-     cd "$PKG_SRC_DIR/$pkg"
-diff --git a/build/pkgs/libsemigroups/checksums.ini b/build/pkgs/libsemigroups/checksums.ini
-index 62c4268515f..4e13a36cb35 100644
---- a/build/pkgs/libsemigroups/checksums.ini
-+++ b/build/pkgs/libsemigroups/checksums.ini
-@@ -1,5 +1,5 @@
- tarball=libsemigroups-VERSION.tar.gz
--sha1=2b16c095cc5ffd3f77a71dfbf48cce188e054c03
--md5=7082cadcf7a195ccb93175cd72b6db95
--cksum=1501022358
-+sha1=86375824b47ce4b0e23570122e873f67136d0c0a
-+md5=ff79ad5fbc8bfeb64d48faaf24106b98
-+cksum=2845045455
- upstream_url=https://github.com/libsemigroups/libsemigroups/releases/download/vVERSION/libsemigroups-VERSION.tar.gz
-diff --git a/build/pkgs/libsemigroups/package-version.txt b/build/pkgs/libsemigroups/package-version.txt
-index 9084fa2f716..f90b1afc082 100644
---- a/build/pkgs/libsemigroups/package-version.txt
-+++ b/build/pkgs/libsemigroups/package-version.txt
-@@ -1 +1 @@
--1.1.0
-+2.3.2
-diff --git a/build/pkgs/libsemigroups/spkg-install.in b/build/pkgs/libsemigroups/spkg-install.in
-index 2aaf0e99043..128b54d2f99 100644
---- a/build/pkgs/libsemigroups/spkg-install.in
-+++ b/build/pkgs/libsemigroups/spkg-install.in
-@@ -1,4 +1,4 @@
- cd src
--sdh_configure
-+sdh_configure --disable-eigen
- sdh_make
- sdh_make_install
-diff --git a/build/pkgs/singular/spkg-configure.m4 b/build/pkgs/singular/spkg-configure.m4
-index d4d145defe3..6a85631f624 100644
---- a/build/pkgs/singular/spkg-configure.m4
-+++ b/build/pkgs/singular/spkg-configure.m4
-@@ -9,52 +9,7 @@ SAGE_SPKG_CONFIGURE([singular], [
-        AC_MSG_CHECKING([that Singular's help is working])
-        AS_IF([test x`printf "system(\"--browser\", \"builtin\"); \n help;" | Singular 2>&1 | grep "error occurred"` = x], [
-         AC_MSG_RESULT(yes)
--        dnl We have Singular. Now determine the shared library path on
--        dnl platforms on which sage.libs.singular needs to reload the library with RTLD_GLOBAL.
--        AS_CASE([$host_os],
--          [cygwin*], [dnl Nothing to do
--                     ],
--                     [dnl Use pkg-config to get singular's libdir while we're at it. As a
--                      dnl moral compromise for using pkg-config, this ultimately allows us
--                      dnl to pass an absolute path to dlopen(), which is the only approach
--                      dnl that POSIX guarantees will work.
--                      PKG_CHECK_VAR([SINGULAR_LIB_DIR], [Singular], [libdir])
--                      dnl The acl_shlibext variable is set in the top-level configure.ac.
--                      AC_LANG_PUSH(C)
--                      ORIG_LIBS="${LIBS}"
--                      LIBS="${LIBS} -ldl"
--                      AC_MSG_CHECKING([if we can dlopen($LIBSINGULAR_PATH)])
--                      LIBSINGULAR_PATH="${SINGULAR_LIB_DIR}/libSingular.${acl_shlibext}"
--
--                      dnl if we can dlopen() it, substitute the name for sage_conf;
--                      dnl otherwise, fall back to using the SPKG.
--                      AC_RUN_IFELSE(
--                        [AC_LANG_PROGRAM(
--                          [[#include <dlfcn.h>]],
--                          [[void* h = dlopen("${LIBSINGULAR_PATH}", RTLD_LAZY | RTLD_GLOBAL);
--                            if (h == 0) { return 1; } else { return dlclose(h); }]]
--                        )], [
--                          AC_MSG_RESULT(yes)
--                        ], [
--                          dnl try Debian-specific name
--                          LIBSINGULAR_PATH="${SINGULAR_LIB_DIR}/libsingular-Singular.${acl_shlibext}"
--                          AC_RUN_IFELSE(
--                           [AC_LANG_PROGRAM(
--                             [[#include <dlfcn.h>]],
--                             [[void* h = dlopen("${LIBSINGULAR_PATH}", RTLD_LAZY | RTLD_GLOBAL);
--                               if (h == 0) { return 1; } else { return dlclose(h); }]]
--                           )], [
--                             AC_MSG_RESULT(yes)
--                           ], [
--                            AC_MSG_RESULT(no)
--                            sage_spkg_install_singular=yes
--                          ], [AC_MSG_RESULT(yes)])
--                        ], [AC_MSG_RESULT(yes)])
--
--                      AC_LANG_POP()
--                      LIBS="${ORIG_LIBS}"
--                     ]
--       )], [
-+       ], [
-        AC_MSG_RESULT(no)
-        sage_spkg_install_singular=yes
-        ]
-@@ -64,20 +19,4 @@ SAGE_SPKG_CONFIGURE([singular], [
-       ])
-     ])
-   ])
--],[],[],[
--  dnl Post-check phase
--  dnl We make the sage_conf substitutions here, because the "default"
--  dnl substitution needs to be made even if we skipped the system-Singular
--  dnl checks themselves.
--  AS_IF([test "x${sage_spkg_install_singular}" = "xyes"], [
--    AS_CASE([$host_os],
--      [cygwin*], [dnl Nothing to do
--                 ],
--                 [dnl Set shared library path, needed for reloading the library with RTLD_GLOBAL
--                  LIBSINGULAR_PATH="\$SAGE_LOCAL/lib/libSingular.${acl_shlibext}"
--                 ]
--    )
--  ])
--
--  AC_SUBST(LIBSINGULAR_PATH, "${LIBSINGULAR_PATH}")
- ])
-diff --git a/pkgs/sage-conf/_sage_conf/_conf.py.in b/pkgs/sage-conf/_sage_conf/_conf.py.in
-index 6cd28f558a8..d66bdb3d264 100644
---- a/pkgs/sage-conf/_sage_conf/_conf.py.in
-+++ b/pkgs/sage-conf/_sage_conf/_conf.py.in
-@@ -55,9 +55,6 @@ THREEJS_DIR = SAGE_LOCAL + "/share/threejs-sage"
- OPENMP_CFLAGS = "@OPENMP_CFLAGS@"
- OPENMP_CXXFLAGS = "@OPENMP_CXXFLAGS@"
- 
--# The full absolute path to the main Singular library.
--LIBSINGULAR_PATH = "@LIBSINGULAR_PATH@".replace('$SAGE_LOCAL', SAGE_LOCAL)
--
- # Installation location of wheels. This is determined at configuration time
- # and does not depend on the installation location of sage-conf.
- SAGE_SPKG_WHEELS = "@SAGE_VENV@".replace('${SAGE_LOCAL}', SAGE_LOCAL) + "/var/lib/sage/wheels"
-diff --git a/src/doc/en/thematic_tutorials/lie/weyl_groups.rst b/src/doc/en/thematic_tutorials/lie/weyl_groups.rst
-index c917338e444..182e74aad20 100644
---- a/src/doc/en/thematic_tutorials/lie/weyl_groups.rst
-+++ b/src/doc/en/thematic_tutorials/lie/weyl_groups.rst
-@@ -139,12 +139,12 @@ string, which you can print::
-     X.1      1  1  1  1  1  1  1  1  1  1  1  1  1
-     X.2      1 -1  1  1 -1  1  1 -1 -1 -1  1  1  1
-     X.3      2  .  2 -1  .  2  2  .  .  . -1  2  2
--    X.4      3 -1 -1  .  1 -1  3 -1  1 -1  . -1  3
--    X.5      3 -1 -1  .  1  3 -1 -1 -1  1  . -1  3
--    X.6      3  1 -1  . -1 -1  3  1 -1  1  . -1  3
--    X.7      3  1 -1  . -1  3 -1  1  1 -1  . -1  3
--    X.8      3 -1  3  . -1 -1 -1 -1  1  1  . -1  3
--    X.9      3  1  3  .  1 -1 -1  1 -1 -1  . -1  3
-+    X.4      3 -1 -1  .  1  3 -1 -1 -1  1  . -1  3
-+    X.5      3  1 -1  . -1  3 -1  1  1 -1  . -1  3
-+    X.6      3 -1  3  . -1 -1 -1 -1  1  1  . -1  3
-+    X.7      3 -1 -1  .  1 -1  3 -1  1 -1  . -1  3
-+    X.8      3  1  3  .  1 -1 -1  1 -1 -1  . -1  3
-+    X.9      3  1 -1  . -1 -1  3  1 -1  1  . -1  3
-     X.10     4 -2  . -1  .  .  .  2  .  .  1  . -4
-     X.11     4  2  . -1  .  .  . -2  .  .  1  . -4
-     X.12     6  . -2  .  . -2 -2  .  .  .  .  2  6
-diff --git a/src/sage/coding/codecan/autgroup_can_label.pyx b/src/sage/coding/codecan/autgroup_can_label.pyx
-index de5db985e0b..c83b9264e44 100644
---- a/src/sage/coding/codecan/autgroup_can_label.pyx
-+++ b/src/sage/coding/codecan/autgroup_can_label.pyx
-@@ -76,7 +76,7 @@ columns do share the same coloring::
-     ((1,),
-      (2,),
-      (3, 5, 4),
--     (6, 19, 16, 9, 21, 10, 8, 15, 14, 11, 20, 13, 12, 7, 17, 18))
-+     (6, 19, 16, 21, 9, 10, 15, 8, 20, 11, 14, 13, 7, 12, 18, 17))
- 
- We can also restrict the group action to linear isometries::
- 
-diff --git a/src/sage/coding/linear_code.py b/src/sage/coding/linear_code.py
-index a3ac3ca1547..bfb9f8696e8 100644
---- a/src/sage/coding/linear_code.py
-+++ b/src/sage/coding/linear_code.py
-@@ -465,27 +465,27 @@ def automorphism_group_gens(self, equivalence="semilinear"):
-             0
-             sage: C = codes.HammingCode(GF(4, 'z'), 3)
-             sage: C.automorphism_group_gens()
--            ([((1, 1, 1, 1, 1, z + 1, z, z + 1, z, z, z, 1, 1, z + 1, z + 1, z, z + 1, z, z + 1, z + 1, z + 1); (1,14,6,7,4,10,11,19)(2,8,16,13,3,17,21,15)(9,12,18,20), Ring endomorphism of Finite Field in z of size 2^2
-+            ([((1, 1, 1, z, z + 1, 1, 1, 1, 1, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z); (1,13,14,20)(2,21,8,18,7,16,19,15)(3,10,5,12,17,9,6,4), Ring endomorphism of Finite Field in z of size 2^2
-+                Defn: z |--> z + 1),
-+              ((z, 1, z, z, z, z + 1, z, z, z, z, z, z, z + 1, z, z, z, z, z + 1, z, z, z); (1,11,5,12,3,19)(2,8)(6,18,13)(7,17,15)(9,10,14,16,20,21), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z + 1),
--              ((z + 1, 1, 1, z, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z + 1, 1, z, z + 1, z + 1, z); (1,18,6,19,2,9,17,10,13,14,21,11,4,5,12)(3,20,7,16,8), Ring endomorphism of Finite Field in z of size 2^2
--                Defn: z |--> z),
-               ((z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z); (), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z)],
-              362880)
-             sage: C.automorphism_group_gens(equivalence="linear")
--            ([((z + 1, 1, z + 1, z + 1, z + 1, z, 1, z, 1, 1, 1, 1, z + 1, z + 1, z + 1, z, z, 1, z, z, z); (1,15,2,8,16,18,3)(4,9,12,13,20,10,11)(5,21,14,6,7,19,17), Ring endomorphism of Finite Field in z of size 2^2
-+            ([((z, 1, z + 1, z + 1, 1, z + 1, z, 1, z + 1, z + 1, 1, z, 1, z + 1, z, 1, z, 1, z + 1, 1, 1); (1,12,11,10,6,8,9,20,13,21,5,14,3,16,17,19,7,4,2,15,18), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
--              ((z + 1, z + 1, z + 1, z + 1, z + 1, 1, z, 1, z, z, z, 1, z, 1, 1, 1, z + 1, z + 1, z + 1, 1, z); (1,15,21,8,9)(2,18,5,3,11,16,7,10,19,13,12,4,17,6,20), Ring endomorphism of Finite Field in z of size 2^2
-+              ((z + 1, z + 1, z + 1, z, 1, 1, z, z, 1, z + 1, z, 1, 1, z, 1, z + 1, z, z + 1, z + 1, 1, z); (1,3,18,2,17,6,19)(4,15,13,20,7,14,16)(5,11,8,21,12,9,10), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
-               ((z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1); (), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z)],
-              181440)
-             sage: C.automorphism_group_gens(equivalence="permutational")
--            ([((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,19)(3,17)(4,21)(5,20)(7,14)(9,12)(10,16)(11,15), Ring endomorphism of Finite Field in z of size 2^2
-+            ([((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,11)(3,10)(4,9)(5,7)(12,21)(14,20)(15,19)(16,17), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
--              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,11)(3,10)(4,9)(5,7)(12,21)(14,20)(15,19)(16,17), Ring endomorphism of Finite Field in z of size 2^2
-+              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (2,18)(3,19)(4,10)(5,16)(8,13)(9,14)(11,21)(15,20), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
--              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,17)(2,8)(3,14)(4,10)(7,12)(9,19)(13,18)(15,20), Ring endomorphism of Finite Field in z of size 2^2
-+              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,19)(3,17)(4,21)(5,20)(7,14)(9,12)(10,16)(11,15), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
-               ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (2,13)(3,14)(4,20)(5,11)(8,18)(9,19)(10,15)(16,21), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z)],
-@@ -691,10 +691,10 @@ def _canonize(self, equivalence):
-             sage: C_iso == aut_group_can_label.get_canonical_form()
-             True
-             sage: aut_group_can_label.get_autom_gens()
--            [((1, 1, 1, 1, 1, z + 1, z, z + 1, z, z, z, 1, 1, z + 1, z + 1, z, z + 1, z, z + 1, z + 1, z + 1); (1,14,6,7,4,10,11,19)(2,8,16,13,3,17,21,15)(9,12,18,20), Ring endomorphism of Finite Field in z of size 2^2
-+            [((1, 1, 1, z, z + 1, 1, 1, 1, 1, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z); (1,13,14,20)(2,21,8,18,7,16,19,15)(3,10,5,12,17,9,6,4), Ring endomorphism of Finite Field in z of size 2^2
-+               Defn: z |--> z + 1),
-+             ((z, 1, z, z, z, z + 1, z, z, z, z, z, z, z + 1, z, z, z, z, z + 1, z, z, z); (1,11,5,12,3,19)(2,8)(6,18,13)(7,17,15)(9,10,14,16,20,21), Ring endomorphism of Finite Field in z of size 2^2
-                Defn: z |--> z + 1),
--             ((z + 1, 1, 1, z, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z + 1, 1, z, z + 1, z + 1, z); (1,18,6,19,2,9,17,10,13,14,21,11,4,5,12)(3,20,7,16,8), Ring endomorphism of Finite Field in z of size 2^2
--               Defn: z |--> z),
-              ((z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z); (), Ring endomorphism of Finite Field in z of size 2^2
-                Defn: z |--> z)]
-         """
-diff --git a/src/sage/combinat/posets/posets.py b/src/sage/combinat/posets/posets.py
-index 2836d59d960..8c882d5ac3b 100644
---- a/src/sage/combinat/posets/posets.py
-+++ b/src/sage/combinat/posets/posets.py
-@@ -8813,7 +8813,7 @@ def _libgap_(self):
-             sage: libgap(P)  # optional - gap_packages
-             <A poset on 5 points>
-             sage: A = libgap(GF(2)).PosetAlgebra(P); A  # optional - gap_packages
--            <GF(2)[<quiver with 5 vertices and 5 arrows>]/<two-sided ideal in <GF(2)[<quiver with 5 vertices and 5 arrows>]>, (1 generators)>>
-+            <GF(2)[<quiver with 5 vertices and 5 arrows>]/<two-sided ideal in <GF(2)[<quiver with 5 vertices and 5 arrows>]>, (1 generator)>>
-             sage: A.Dimension()  # optional - gap_packages
-             13
-         """
-diff --git a/src/sage/combinat/root_system/hecke_algebra_representation.py b/src/sage/combinat/root_system/hecke_algebra_representation.py
-index 6b756bafc30..8ac99319bec 100644
---- a/src/sage/combinat/root_system/hecke_algebra_representation.py
-+++ b/src/sage/combinat/root_system/hecke_algebra_representation.py
-@@ -357,7 +357,7 @@ def Tw(self, word, signs=None, scalar=None):
-             sage: q1, q2 = K.gens()
-             sage: KW = W.algebra(K)
-             sage: x = KW.an_element(); x
--            123 + 3*32 + 2*3 + e
-+            123 + 3*2312 + 2*31 + e
- 
-             sage: T = KW.demazure_lusztig_operators(q1,q2)
-             sage: T12 = T.Tw( (1,2) )
-diff --git a/src/sage/combinat/symmetric_group_algebra.py b/src/sage/combinat/symmetric_group_algebra.py
-index b8a0bebab44..9bccba124c8 100644
---- a/src/sage/combinat/symmetric_group_algebra.py
-+++ b/src/sage/combinat/symmetric_group_algebra.py
-@@ -101,7 +101,7 @@ def SymmetricGroupAlgebra(R, W, category=None):
-         sage: SGA.group()
-         Weyl Group of type ['A', 3] (as a matrix group acting on the ambient space)
-         sage: SGA.an_element()
--        s1*s2*s3 + 3*s3*s2 + 2*s3 + 1
-+        s1*s2*s3 + 3*s2*s3*s1*s2 + 2*s3*s1 + 1
- 
-     The preferred way to construct the symmetric group algebra is to
-     go through the usual ``algebra`` method::
-diff --git a/src/sage/env.py b/src/sage/env.py
-index 911f34b1bc6..5f7aca8599c 100644
---- a/src/sage/env.py
-+++ b/src/sage/env.py
-@@ -197,7 +197,8 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
- GRAPHS_DATA_DIR = var("GRAPHS_DATA_DIR", join(SAGE_SHARE, "graphs"))
- ELLCURVE_DATA_DIR = var("ELLCURVE_DATA_DIR", join(SAGE_SHARE, "ellcurves"))
- POLYTOPE_DATA_DIR = var("POLYTOPE_DATA_DIR", join(SAGE_SHARE, "reflexive_polytopes"))
--GAP_ROOT_DIR = var("GAP_ROOT_DIR", join(SAGE_SHARE, "gap"))
-+GAP_LIB_DIR = var("GAP_LIB_DIR", join(SAGE_LOCAL, "lib", "gap"))
-+GAP_SHARE_DIR = var("GAP_SHARE_DIR", join(SAGE_SHARE, "gap"))
- THEBE_DIR = var("THEBE_DIR", join(SAGE_SHARE, "thebe"))
- COMBINATORIAL_DESIGN_DATA_DIR = var("COMBINATORIAL_DESIGN_DATA_DIR", join(SAGE_SHARE, "combinatorial_designs"))
- CREMONA_MINI_DATA_DIR = var("CREMONA_MINI_DATA_DIR", join(SAGE_SHARE, "cremona"))
-@@ -229,12 +230,6 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
- LIE_INFO_DIR = var("LIE_INFO_DIR", join(SAGE_LOCAL, "lib", "LiE"))
- SINGULAR_BIN = var("SINGULAR_BIN") or "Singular"
- 
--# The path to libSingular, to be passed to dlopen(). This will
--# typically be set to an absolute path in sage_conf, but the relative
--# fallback path here works on systems where dlopen() searches the
--# system's library locations.
--LIBSINGULAR_PATH = var("LIBSINGULAR_PATH", "libSingular.so")
--
- # OpenMP
- OPENMP_CFLAGS = var("OPENMP_CFLAGS", "")
- OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "")
-@@ -255,81 +250,6 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
- SAGE_GAP_COMMAND = var('SAGE_GAP_COMMAND', _gap_cmd)
- 
- 
--def _get_shared_lib_path(*libnames: str) -> Optional[str]:
--    """
--    Return the full path to a shared library file installed in
--    ``$SAGE_LOCAL/lib`` or the directories associated with the
--    Python sysconfig.
--
--    This can also be passed more than one library name (e.g. for cases where
--    some library may have multiple names depending on the platform) in which
--    case the first one found is returned.
--
--    This supports most *NIX variants (in which ``lib<libname>.so`` is found
--    under ``$SAGE_LOCAL/lib``), macOS (same, but with the ``.dylib``
--    extension), and Cygwin (under ``$SAGE_LOCAL/bin/cyg<libname>.dll``,
--    or ``$SAGE_LOCAL/bin/cyg<libname>-*.dll`` for versioned DLLs).
--
--    For distributions like Debian that use a multiarch layout, we also try the
--    multiarch lib paths (i.e. ``/usr/lib/<arch>/``).
--
--    This returns ``None`` if no matching library file could be found.
--
--    EXAMPLES::
--
--        sage: from sage.env import _get_shared_lib_path
--        sage: "gap" in _get_shared_lib_path("gap")
--        True
--        sage: _get_shared_lib_path("an_absurd_lib") is None
--        True
--
--    """
--
--    for libname in libnames:
--        search_directories: List[Path] = []
--        patterns: List[str] = []
--        if sys.platform == 'cygwin':
--            # Later down we take the first matching DLL found, so search
--            # SAGE_LOCAL first so that it takes precedence
--            if SAGE_LOCAL:
--                search_directories.append(Path(SAGE_LOCAL) / 'bin')
--            search_directories.append(Path(sysconfig.get_config_var('BINDIR')))
--            # Note: The following is not very robust, since if there are multible
--            # versions for the same library this just selects one more or less
--            # at arbitrary. However, practically speaking, on Cygwin, there
--            # will only ever be one version
--            patterns = [f'cyg{libname}.dll', f'cyg{libname}-*.dll']
--        else:
--            if sys.platform == 'darwin':
--                ext = 'dylib'
--            else:
--                ext = 'so'
--
--            if SAGE_LOCAL:
--                search_directories.append(Path(SAGE_LOCAL) / 'lib')
--            libdir = sysconfig.get_config_var('LIBDIR')
--            if libdir is not None:
--                libdir = Path(libdir)
--                search_directories.append(libdir)
--
--                multiarchlib = sysconfig.get_config_var('MULTIARCH')
--                if multiarchlib is not None:
--                    search_directories.append(libdir / multiarchlib),
--
--            patterns = [f'lib{libname}.{ext}']
--
--        for directory in search_directories:
--            for pattern in patterns:
--                path = next(directory.glob(pattern), None)
--                if path is not None:
--                    return str(path.resolve())
--
--    # Just return None if no files were found
--    return None
--
--# locate libgap shared object
--GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", ""))
--
- # post process
- if DOT_SAGE is not None and ' ' in DOT_SAGE:
-     if UNAME[:6] == 'CYGWIN':
-diff --git a/src/sage/groups/abelian_gps/abelian_group_gap.py b/src/sage/groups/abelian_gps/abelian_group_gap.py
-index a4b047113c5..86090b43535 100644
---- a/src/sage/groups/abelian_gps/abelian_group_gap.py
-+++ b/src/sage/groups/abelian_gps/abelian_group_gap.py
-@@ -338,7 +338,7 @@ def _element_constructor_(self, x, check=True):
-         if isinstance(x, AbelianGroupElement_gap):
-             try:
-                 if x in self._cover:
--                    x = self.gap().NaturalHomomorphism().Image(x.gap())
-+                    x = self._cover.gap().NaturalHomomorphismByNormalSubgroup(self._relations).Image(x.gap())
-                 else:
-                     x = x.gap()
-             except AttributeError:
-@@ -1043,7 +1043,7 @@ def natural_homomorphism(self):
-             From: Abelian group with gap, generator orders (4,)
-             To:   Quotient abelian group with generator orders (2,)
-         """
--        phi = self.gap().NaturalHomomorphism()
-+        phi = self._cover.gap().NaturalHomomorphismByNormalSubgroup(self._relations)
-         Hom = self._cover.Hom(self)
-         return Hom(phi)
- 
-diff --git a/src/sage/groups/finitely_presented.py b/src/sage/groups/finitely_presented.py
-index 8d6e443683c..1beb01af87f 100644
---- a/src/sage/groups/finitely_presented.py
-+++ b/src/sage/groups/finitely_presented.py
-@@ -596,9 +596,9 @@ def gap(self):
-             sage: k = G.rewriting_system()
-             sage: k.gap()
-             Knuth Bendix Rewriting System for Monoid( [ a, A, b, B ] ) with rules
--            [ [ a^2, <identity ...> ], [ a*A, <identity ...> ],
--              [ A*a, <identity ...> ], [ b^2, <identity ...> ],
--              [ b*B, <identity ...> ], [ B*b, <identity ...> ] ]
-+            [ [ a*A, <identity ...> ], [ A*a, <identity ...> ],
-+              [ b*B, <identity ...> ], [ B*b, <identity ...> ],
-+              [ a^2, <identity ...> ], [ b^2, <identity ...> ] ]
-         """
-         return self._gap
- 
-diff --git a/src/sage/groups/fqf_orthogonal.py b/src/sage/groups/fqf_orthogonal.py
-index 7fc4dbe7548..e5eccd45942 100644
---- a/src/sage/groups/fqf_orthogonal.py
-+++ b/src/sage/groups/fqf_orthogonal.py
-@@ -143,7 +143,7 @@ class FqfOrthogonalGroup(AbelianGroupAutomorphismGroup_subgroup):
-         [2/3   0   0]
-         [  0 2/3   0]
-         [  0   0 4/3]
--        generated by 2 elements
-+        generated by 3 elements
-         sage: q = matrix.diagonal(QQ, [3/2, 1/4, 1/4])
-         sage: T = TorsionQuadraticForm(q)
-         sage: T.orthogonal_group().order()
-diff --git a/src/sage/groups/libgap_wrapper.pyx b/src/sage/groups/libgap_wrapper.pyx
-index d25121aa792..dc81b71635b 100644
---- a/src/sage/groups/libgap_wrapper.pyx
-+++ b/src/sage/groups/libgap_wrapper.pyx
-@@ -25,7 +25,7 @@ Note how we call the constructor of both superclasses to initialize
- its output via LibGAP::
- 
-     sage: FooGroup()
--    <pc group of size 3 with 1 generators>
-+    <pc group of size 3 with 1 generator>
-     sage: type(FooGroup().gap())
-     <class 'sage.libs.gap.element.GapElement'>
- 
-@@ -106,7 +106,7 @@ class ParentLibGAP(SageObject):
-         ....:         ParentLibGAP.__init__(self, lg)
-         ....:         Group.__init__(self)
-         sage: FooGroup()
--        <pc group of size 3 with 1 generators>
-+        <pc group of size 3 with 1 generator>
-     """
- 
-     def __init__(self, libgap_parent, ambient=None):
-@@ -461,7 +461,7 @@ cdef class ElementLibGAP(MultiplicativeGroupElement):
-         ....:         ParentLibGAP.__init__(self, lg)
-         ....:         Group.__init__(self)
-         sage: FooGroup()
--        <pc group of size 3 with 1 generators>
-+        <pc group of size 3 with 1 generator>
-         sage: FooGroup().gens()
-         (f1,)
-     """
-diff --git a/src/sage/groups/matrix_gps/finitely_generated.py b/src/sage/groups/matrix_gps/finitely_generated.py
-index a6d3dc02513..63956ad5f10 100644
---- a/src/sage/groups/matrix_gps/finitely_generated.py
-+++ b/src/sage/groups/matrix_gps/finitely_generated.py
-@@ -563,9 +563,6 @@ def as_permutation_group(self, algorithm=None, seed=None):
-             21499084800
-             sage: P = G.as_permutation_group()
-             sage: Psmaller = G.as_permutation_group(algorithm="smaller", seed=6)
--            sage: P == Psmaller  # see the note below
--            True
--            sage: Psmaller = G.as_permutation_group(algorithm="smaller")
-             sage: P == Psmaller
-             False
-             sage: P.cardinality()
-diff --git a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx
-index f2ccca042ac..47d6862333c 100644
---- a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx
-+++ b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx
-@@ -427,7 +427,7 @@ cdef class LabelledBranching:
-             sage: from sage.groups.perm_gps.partn_ref2.refinement_generic import LabelledBranching
-             sage: L = LabelledBranching(3)
-             sage: L.small_generating_set()
--            []
-+            [()]
-             sage: L.add_gen(libgap.eval('(1,2,3)'))
-             sage: L.small_generating_set()
-             [(1,2,3)]
-diff --git a/src/sage/groups/perm_gps/permgroup.py b/src/sage/groups/perm_gps/permgroup.py
-index ebdf7c4c6eb..fb14008c8e0 100644
---- a/src/sage/groups/perm_gps/permgroup.py
-+++ b/src/sage/groups/perm_gps/permgroup.py
-@@ -926,7 +926,7 @@ def _coerce_map_from_(self, G):
-            sage: f = PG._coerce_map_from_(MG)
-            sage: mg = MG.an_element()
-            sage: p = f(mg); p
--           (2,33,32,23,31,55)(3,49,38,44,40,28)(4,17,59,62,58,46)(5,21,47,20,43,8)(6,53,50)(7,37,12,57,14,29)(9,41,56,34,64,10)(11,25,19)(13,61,26,51,22,15)(16,45,36)(18,27,35,48,52,54)(24,63,42)(30,39,60)
-+           (1,2,6,19,35,33)(3,9,26,14,31,23)(4,13,5)(7,22,17)(8,24,12)(10,16,32,27,20,28)(11,30,18)(15,25,36,34,29,21)
-            sage: PG(p._gap_()) == p
-            True
- 
-@@ -972,12 +972,12 @@ def _coerce_map_from_(self, G):
-             sage: P = G.as_permutation_group(algorithm='smaller', seed=5)
-             sage: P1 = G.as_permutation_group()
-             sage: P == P1
--            False
-+            True
-             sage: g1, g2, g3 = G.gens()
-             sage: P(g1*g2)
--            (1,3,7,12)(2,4,8,10)(5,11)(6,9)
-+            (1,4,13,11)(2,5,14,18)(3,15,8,16)(6,7)(9,20,19,12)(10,17)
-             sage: P1(g1*g2)
--            (2,29,25,68)(3,57,13,54)(4,11,72,37)(5,39,60,23)(6,64,75,63)(7,21,50,73)(8,46,38,32)(9,74,35,18)(10,44,49,48)(12,16,34,71)(14,79,27,40)(15,26)(17,62,59,76)(19,78,70,65)(20,22,58,51)(24,33,36,43)(28,81,80,52)(30,53,56,69)(31,61)(41,42,67,55)(45,77)(47,66)
-+            (1,4,13,11)(2,5,14,18)(3,15,8,16)(6,7)(9,20,19,12)(10,17)
- 
-         Another check for :trac:`5583`::
- 
-@@ -1302,7 +1302,7 @@ def gens_small(self):
-             sage: G.gens_small() # random
-             [('b','c'), ('a','c','b')] ## (on 64-bit Linux)
-             [('a','b'), ('a','c','b')] ## (on Solaris)
--            sage: len(G.gens_small()) == 2
-+            sage: len(G.gens_small()) == 2 # random
-             True
-         """
-         gens = self._libgap_().SmallGeneratingSet()
-@@ -4370,17 +4370,23 @@ def is_transitive(self, domain=None):
- 
-         ::
- 
--            sage: G = PermutationGroup([[(1,2,3,4,5)],[(1,2)]]) #S_5 on [1..5]
--            sage: G.is_transitive([1,4,5])
-+            sage: G = PermutationGroup([[(1,2,3,4,5)],[(1,2)],[(6,7)]])
-+            sage: G.is_transitive([1,2,3,4,5])
-             True
--            sage: G.is_transitive([2..6])
-+            sage: G.is_transitive([1..7])
-             False
-             sage: G.is_transitive(G.non_fixed_points())
--            True
-+            False
-             sage: H = PermutationGroup([[(1,2,3)],[(4,5,6)]])
-             sage: H.is_transitive(H.non_fixed_points())
-             False
- 
-+        If `G` does not act on the domain, it always returns ``False``::
-+
-+            sage: G = PermutationGroup([[(1,2,3,4,5)],[(1,2)]]) #S_5 on [1..5]
-+            sage: G.is_transitive([1,4,5])
-+            False
-+
-         Note that this differs from the definition in GAP, where
-         ``IsTransitive`` returns whether the group is transitive on the
-         set of points moved by the group.
-@@ -4436,12 +4442,16 @@ def is_primitive(self, domain=None):
-             sage: G = PermutationGroup([[(1,2,3,4)],[(2,4)]])
-             sage: G.is_primitive([1..4])
-             False
--            sage: G.is_primitive([1,2,3])
--            True
-             sage: G = PermutationGroup([[(3,4,5,6)],[(3,4)]]) #S_4 on [3..6]
-             sage: G.is_primitive(G.non_fixed_points())
-             True
- 
-+        If `G` does not act on the domain, it always returns ``False``::
-+
-+            sage: G = PermutationGroup([[(1,2,3,4)],[(2,4)]])
-+            sage: G.is_primitive([1,2,3])
-+            False
-+
-         """
-         #If the domain is not a subset of self.domain(), then the
-         #action isn't primitive.
-diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py
-index 7ae1792e9de..ecaa9fd2341 100644
---- a/src/sage/interfaces/gap.py
-+++ b/src/sage/interfaces/gap.py
-@@ -1512,6 +1512,8 @@ def gap_reset_workspace(max_workspace_size=None, verbose=False):
-     """
-     # Create new workspace with filename WORKSPACE
-     g = Gap(use_workspace_cache=False, max_workspace_size=None)
-+    g.eval('ColorPrompt(false)')
-+    g.eval('SetUserPreference("UseColorPrompt", false)')
-     g.eval('SetUserPreference("HistoryMaxLines", 30)')
-     from sage.tests.gap_packages import all_installed_packages
-     for pkg in all_installed_packages(gap=g):
-diff --git a/src/sage/interfaces/gap_workspace.py b/src/sage/interfaces/gap_workspace.py
-index 33a87dd5076..03b40be6856 100644
---- a/src/sage/interfaces/gap_workspace.py
-+++ b/src/sage/interfaces/gap_workspace.py
-@@ -16,7 +16,8 @@
- import os
- import time
- import hashlib
--from sage.env import DOT_SAGE, GAP_SO
-+import subprocess
-+from sage.env import DOT_SAGE, HOSTNAME, GAP_LIB_DIR, GAP_SHARE_DIR
- 
- 
- def gap_workspace_file(system="gap", name="workspace", dir=None):
-@@ -59,11 +60,13 @@ def gap_workspace_file(system="gap", name="workspace", dir=None):
-     if dir is None:
-         dir = os.path.join(DOT_SAGE, 'gap')
- 
--    if GAP_SO:
--        h = hashlib.sha1(GAP_SO.encode('utf-8')).hexdigest()
--    else:
--        h = 'unknown'
--    return os.path.join(dir, '%s-%s-%s' % (system, name, h))
-+    data = f'{GAP_LIB_DIR}:{GAP_SHARE_DIR}'
-+    for path in GAP_LIB_DIR, GAP_SHARE_DIR:
-+        sysinfo = os.path.join(path, "sysinfo.gap")
-+        if os.path.exists(sysinfo):
-+            data += subprocess.getoutput(f'. "{sysinfo}" && echo ":$GAP_VERSION:$GAParch"')
-+    h = hashlib.sha1(data.encode('utf-8')).hexdigest()
-+    return os.path.join(dir, f'{system}-{name}-{HOSTNAME}-{h}')
- 
- 
- def prepare_workspace_dir(dir=None):
-diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx
-index c555ea0333c..e3db3934baf 100644
---- a/src/sage/libs/gap/element.pyx
-+++ b/src/sage/libs/gap/element.pyx
-@@ -130,6 +130,7 @@ cdef char *capture_stdout(Obj func, Obj obj):
-     """
-     cdef Obj s, stream, output_text_string
-     cdef UInt res
-+    cdef TypOutputFile output
-     # The only way to get a string representation of an object that is truly
-     # consistent with how it would be represented at the GAP REPL is to call
-     # ViewObj on it.  Unfortunately, ViewObj *prints* to the output stream,
-@@ -145,12 +146,12 @@ cdef char *capture_stdout(Obj func, Obj obj):
-         output_text_string = GAP_ValueGlobalVariable("OutputTextString")
-         stream = CALL_2ARGS(output_text_string, s, GAP_True)
- 
--        if not OpenOutputStream(stream):
-+        if not OpenOutputStream(&output, stream):
-             raise GAPError("failed to open output capture stream for "
-                            "representing GAP object")
- 
-         CALL_1ARGS(func, obj)
--        CloseOutput()
-+        CloseOutput(&output)
-         return CSTR_STRING(s)
-     finally:
-         GAP_Leave()
-diff --git a/src/sage/libs/gap/gap_includes.pxd b/src/sage/libs/gap/gap_includes.pxd
-index 6d22e32540b..6111d18a5c7 100644
---- a/src/sage/libs/gap/gap_includes.pxd
-+++ b/src/sage/libs/gap/gap_includes.pxd
-@@ -76,8 +76,10 @@ cdef extern from "gap/intobj.h" nogil:
- 
- 
- cdef extern from "gap/io.h" nogil:
--    UInt OpenOutputStream(Obj stream)
--    UInt CloseOutput()
-+    ctypedef struct TypOutputFile:
-+        pass
-+    UInt OpenOutputStream(TypOutputFile* output, Obj stream)
-+    UInt CloseOutput(TypOutputFile* output)
- 
- 
- cdef extern from "gap/libgap-api.h" nogil:
-diff --git a/src/sage/libs/gap/libgap.pyx b/src/sage/libs/gap/libgap.pyx
-index b1a64e57939..6a36613aa8c 100644
---- a/src/sage/libs/gap/libgap.pyx
-+++ b/src/sage/libs/gap/libgap.pyx
-@@ -695,7 +695,7 @@ class Gap(Parent):
-             sage: libgap.List
-             <Gap function "List">
-             sage: libgap.GlobalRandomSource
--            <RandomSource in IsGlobalRandomSource>
-+            <RandomSource in IsGAPRandomSource>
-         """
-         if name in dir(self.__class__):
-             return getattr(self.__class__, name)
-diff --git a/src/sage/libs/gap/saved_workspace.py b/src/sage/libs/gap/saved_workspace.py
-index ad5adec36d0..7636707f557 100644
---- a/src/sage/libs/gap/saved_workspace.py
-+++ b/src/sage/libs/gap/saved_workspace.py
-@@ -8,7 +8,7 @@
- 
- import os
- import glob
--from sage.env import GAP_ROOT_DIR
-+from sage.env import GAP_LIB_DIR
- from sage.interfaces.gap_workspace import gap_workspace_file
- 
- 
-@@ -31,7 +31,7 @@ def timestamp():
-     """
-     libgap_dir = os.path.dirname(__file__)
-     libgap_files = glob.glob(os.path.join(libgap_dir, '*'))
--    gap_packages = glob.glob(os.path.join(GAP_ROOT_DIR, 'pkg', '*'))
-+    gap_packages = glob.glob(os.path.join(GAP_LIB_DIR, 'pkg', '*'))
-     files = libgap_files + gap_packages
-     if len(files) == 0:
-         print('Unable to find LibGAP files.')
-diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
-index 344ab88c42a..eaa659d64c7 100644
---- a/src/sage/libs/gap/util.pyx
-+++ b/src/sage/libs/gap/util.pyx
-@@ -13,7 +13,7 @@ Utility functions for GAP
- #*****************************************************************************
- 
- from libc.signal cimport signal, SIGCHLD, SIG_DFL
--from posix.dlfcn cimport dlopen, dlclose, RTLD_NOW, RTLD_GLOBAL
-+from posix.dlfcn cimport dlopen, dlclose, dlerror, RTLD_LAZY, RTLD_GLOBAL
- 
- from cpython.exc cimport PyErr_Fetch, PyErr_Restore
- from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE
-@@ -164,33 +164,6 @@ cdef void gasman_callback() with gil:
- ### Initialization of GAP ##################################################
- ############################################################################
- 
--def gap_root():
--    """
--    Find the location of the GAP root install which is stored in the gap
--    startup script.
--
--    EXAMPLES::
--
--        sage: from sage.libs.gap.util import gap_root
--        sage: gap_root()   # random output
--        '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
--    """
--    if os.path.exists(sage.env.GAP_ROOT_DIR):
--        return sage.env.GAP_ROOT_DIR
--
--    # Attempt to figure out the appropriate GAP_ROOT by reading the
--    # local/bin/gap shell script; this is an ugly hack that exists for
--    # historical reasons; the best approach to setting where Sage looks for
--    # the appropriate GAP_ROOT is to set the GAP_ROOT_DIR variable
--    SAGE_LOCAL = sage.env.SAGE_LOCAL
--    with open(os.path.join(SAGE_LOCAL, 'bin', 'gap')) as f:
--        gap_sh = f.read().splitlines()
--    gapdir = next(x for x in gap_sh if x.strip().startswith('GAP_ROOT'))
--    gapdir = gapdir.split('"')[1]
--    gapdir = gapdir.replace('$SAGE_LOCAL', SAGE_LOCAL)
--    return gapdir
--
--
- # To ensure that we call initialize_libgap only once.
- cdef bint _gap_is_initialized = False
- 
-@@ -232,12 +205,12 @@ cdef initialize():
-     # this isn't portable
- 
-     cdef void* handle
--    libgapname = str_to_bytes(sage.env.GAP_SO)
--    handle = dlopen(libgapname, RTLD_NOW | RTLD_GLOBAL)
-+    # reload the current module to force reload of libgap (see #33446)
-+    lib = str_to_bytes(__loader__.path, FS_ENCODING, "surrogateescape")
-+    handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
-     if handle is NULL:
--        raise RuntimeError(
--                "Could not dlopen() libgap even though it should already "
--                "be loaded!")
-+        err = dlerror()
-+        raise RuntimeError(f"Could not reload gap library with RTLD_GLOBAL ({err})")
-     dlclose(handle)
- 
-     # Define argv variable, which we will pass in to
-@@ -245,7 +218,7 @@ cdef initialize():
-     cdef char* argv[16]
-     argv[0] = "sage"
-     argv[1] = "-l"
--    s = str_to_bytes(gap_root(), FS_ENCODING, "surrogateescape")
-+    s = str_to_bytes(sage.env.GAP_LIB_DIR + ";" + sage.env.GAP_SHARE_DIR, FS_ENCODING, "surrogateescape")
-     argv[2] = s
- 
-     argv[3] = "-m"
-@@ -362,15 +335,9 @@ cdef Obj gap_eval(str gap_string) except? NULL:
-         GAPError: Error, Variable: 'Complex' must have a value
-         Syntax error: ; expected in stream:1
-         Complex Field with 53 bits of precision;;
--         ^^^^^^^^^^^^
-+                ^^^^^
-         Error, Variable: 'with' must have a value
--        Syntax error: ; expected in stream:1
--        Complex Field with 53 bits of precision;;
--         ^^^^^^^^^^^^^^^^^^^^
-         Error, Variable: 'bits' must have a value
--        Syntax error: ; expected in stream:1
--        Complex Field with 53 bits of precision;;
--         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-         Error, Variable: 'precision' must have a value
- 
-     Test that on a subsequent attempt we get the same message (no garbage was
-diff --git a/src/sage/libs/singular/singular.pyx b/src/sage/libs/singular/singular.pyx
-index d8ea7b07f3c..4beb1774df9 100644
---- a/src/sage/libs/singular/singular.pyx
-+++ b/src/sage/libs/singular/singular.pyx
-@@ -1705,14 +1705,7 @@ cdef object si2sa_intvec(intvec *v):
- cdef extern from *: # hack to get at cython macro
-     int unlikely(int)
- 
--cdef extern from "dlfcn.h":
--    void *dlopen(char *, long)
--    char *dlerror()
--    void dlclose(void *handle)
--
--cdef extern from "dlfcn.h":
--    cdef long RTLD_LAZY
--    cdef long RTLD_GLOBAL
-+from posix.dlfcn cimport dlopen, dlclose, dlerror, RTLD_LAZY, RTLD_GLOBAL
- 
- cdef int overflow_check(unsigned long e, ring *_ring) except -1:
-     """
-@@ -1762,8 +1755,6 @@ cdef init_libsingular():
- 
-     cdef void *handle = NULL
- 
--    from sage.env import LIBSINGULAR_PATH
--    lib = str_to_bytes(LIBSINGULAR_PATH, FS_ENCODING, "surrogateescape")
- 
-     # This is a workaround for https://github.com/Singular/Singular/issues/1113
-     # and can be removed once that fix makes it into release of Singular that
-@@ -1780,10 +1771,12 @@ cdef init_libsingular():
- 
-     import platform
-     if not platform.system().startswith("CYGWIN"):
-+        # reload the current module to force reload of libSingular (see #33446)
-+        lib = str_to_bytes(__loader__.path, FS_ENCODING, "surrogateescape")
-         handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
-         if not handle:
-             err = dlerror()
--            raise ImportError(f"cannot load Singular library from {LIBSINGULAR_PATH} ({err})")
-+            raise RuntimeError(f"Could not reload Singular library with RTLD_GLOBAL ({err})")
- 
-     # load SINGULAR
-     siInit(lib)
-diff --git a/src/sage/tests/gap_packages.py b/src/sage/tests/gap_packages.py
-index 2e4518ca226..c302b169b8a 100644
---- a/src/sage/tests/gap_packages.py
-+++ b/src/sage/tests/gap_packages.py
-@@ -103,7 +103,7 @@ def all_installed_packages(ignore_dot_gap=False, gap=None):
- 
-         sage: from sage.tests.gap_packages import all_installed_packages
-         sage: all_installed_packages()
--        (...'GAPDoc'...)
-+        (...'gapdoc'...)
-         sage: all_installed_packages(ignore_dot_gap=True) == all_installed_packages(gap=gap, ignore_dot_gap=True)
-         True
-     """
diff --git a/srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch b/srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch
deleted file mode 100644
index d331a6573e1c..000000000000
--- a/srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/sage/data_structures/stream.py b/src/sage/data_structures/stream.py
-index f8f6dc6a186..002e925f02f 100644
---- a/src/sage/data_structures/stream.py
-+++ b/src/sage/data_structures/stream.py
-@@ -2090,8 +2090,8 @@ def compute_product(self, n, la):
-             sage: f = Stream_exact([1]) # irrelevant for this test
-             sage: g = Stream_function(lambda n: s[n], True, 0)
-             sage: h = Stream_plethysm(f, g, True, p)
--            sage: B = p[2, 2, 1](sum(s[i] for i in range(7)))
--            sage: all(h.compute_product(k, Partition([2, 2, 1])) == B.restrict_degree(k) for k in range(7))
-+            sage: B = p[2, 2, 1](sum(p(s[i]) for i in range(7)))  # long time
-+            sage: all(h.compute_product(k, Partition([2, 2, 1])) == B.restrict_degree(k) for k in range(7))  # long time
-             True
-         """
-         # This is the approximate order of the result
diff --git a/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch b/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
deleted file mode 100644
index 007f3324cfe4..000000000000
--- a/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index 1e0a708e8068..000000000000
--- a/srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index fc3e40da2a88..000000000000
--- a/srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index ea210e20ae52..000000000000
--- a/srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 46bda084e48e..000000000000
--- a/srcpkgs/sagemath/patches/35423-ipython_8.12.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 2cdc674d4f9e..000000000000
--- a/srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
index 66eedecff7c6..9331258986d3 100644
--- a/srcpkgs/sagemath/patches/35584-networkx_3.1.patch
+++ b/srcpkgs/sagemath/patches/35584-networkx_3.1.patch
@@ -1,8 +1,8 @@
 diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py
-index c2e42bcbd3..b6a10efbf4 100644
+index c2e42bcbd38..0d13f071dc4 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):
+@@ -6786,13 +6786,26 @@ 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}
@@ -18,15 +18,20 @@ index c2e42bcbd3..b6a10efbf4 100644
 +        if cliques is None:
 +            cliques = self.cliques_maximal()
 +
-+        if vertices in self: # single vertex
++        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 }
++
++        from collections import Counter
++        count = Counter()
++
++        for c in cliques:
++            count.update(c)
++
++        return {v : count[v] 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):
+@@ -7493,17 +7506,32 @@ def cliques_containing_vertex(self, vertices=None, cliques=None):
  
              sage: C = Graph('DJ{')
              sage: C.cliques_containing_vertex()
@@ -62,7 +67,7 @@ index c2e42bcbd3..b6a10efbf4 100644
  
          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):
+@@ -7518,8 +7546,20 @@ 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)]]
          """
@@ -71,11 +76,17 @@ index c2e42bcbd3..b6a10efbf4 100644
 +        if cliques is None:
 +            cliques = self.cliques_maximal()
 +
-+        if vertices in self: # single vertex
++        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 }
++
++        from collections import defaultdict
++        d = defaultdict(list)
++
++        for c in cliques:
++            for v in c:
++                d[v].append(c)
++
++        return {v : d[v] for v in vertices or self}
  
      @doc_index("Clique-related methods")
      def clique_complex(self):
diff --git a/srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch b/srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch
new file mode 100644
index 000000000000..58dddf34a69d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch
@@ -0,0 +1,64 @@
+diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
+index 7794c9edc39..1753277b1f1 100644
+--- a/src/sage/libs/linbox/conversion.pxd
++++ b/src/sage/libs/linbox/conversion.pxd
+@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
+     - v -- linbox vector
+     """
+     cdef Vector_integer_dense res = P()
+-    cdef cppvector[Integer] * vec = &v.refRep()
+     cdef size_t i
+     for i in range(<size_t> res._degree):
+-        mpz_set(res._entries[i], vec[0][i].get_mpz_const())
++        mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
+ 
+     return res
+diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
+index 9112d151f8b..bfeda4b6042 100644
+--- a/src/sage/libs/linbox/linbox.pxd
++++ b/src/sage/libs/linbox/linbox.pxd
+@@ -32,7 +32,6 @@ cdef extern from "linbox/matrix/dense-matrix.h":
+         ctypedef Modular_double Field
+         ctypedef double Element
+         DenseMatrix_Modular_double(Field F, size_t m, size_t n)
+-        DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
+         void setEntry(size_t i, size_t j, Element& a)
+         Element &getEntry(size_t i, size_t j)
+ 
+@@ -42,7 +41,6 @@ cdef extern from "linbox/matrix/dense-matrix.h":
+         ctypedef Modular_float Field
+         ctypedef float Element
+         DenseMatrix_Modular_float(Field F, size_t m, size_t n)
+-        DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
+         void setEntry(size_t i, size_t j, Element& a)
+         Element &getEntry(size_t i, size_t j)
+ 
+@@ -101,7 +99,6 @@ cdef extern from "linbox/vector/vector.h":
+         DenseVector_integer (Field &F)
+         DenseVector_integer (Field &F, long& m)
+         DenseVector_integer (Field &F, cppvector[Integer]&)
+-        cppvector[Element]& refRep()
+         size_t size()
+         void resize(size_t)
+         void resize(size_t n, const Element&)
+diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
+index abf29badce6..68b869ce314 100644
+--- a/src/sage/matrix/matrix_modn_dense_template.pxi
++++ b/src/sage/matrix/matrix_modn_dense_template.pxi
+@@ -221,9 +221,14 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
+         return 0,[]
+ 
+     cdef ModField *F = new ModField(<long>modulus)
+-    cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols)
+-    cdef Py_ssize_t r = reducedRowEchelonize(A[0])
++    cdef DenseMatrix *A = new DenseMatrix(F[0], nrows, ncols)
++
+     cdef Py_ssize_t i,j
++    for i in range(nrows):
++        for j in range(ncols):
++            A.setEntry(i, j, entries[i*ncols+j])
++
++    cdef Py_ssize_t r = reducedRowEchelonize(A[0])
+     for i in range(nrows):
+         for j in range(ncols):
+             entries[i*ncols+j] = <celement>A.getEntry(i,j)
diff --git a/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
new file mode 100644
index 000000000000..0220b4300c30
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
@@ -0,0 +1,569 @@
+diff --git a/build/pkgs/ecl/dependencies b/build/pkgs/ecl/dependencies
+index cda6316bf5a..51a953403e9 100644
+--- a/build/pkgs/ecl/dependencies
++++ b/build/pkgs/ecl/dependencies
+@@ -1,4 +1,4 @@
+-$(MP_LIBRARY) readline gc libffi
++$(MP_LIBRARY) readline gc libffi info
+ 
+ ----------
+ All lines of this file are ignored except the first.
+diff --git a/build/pkgs/ecl/spkg-configure.m4 b/build/pkgs/ecl/spkg-configure.m4
+index ae1e0ac5e1a..7dbcfa6377b 100644
+--- a/build/pkgs/ecl/spkg-configure.m4
++++ b/build/pkgs/ecl/spkg-configure.m4
+@@ -35,10 +35,7 @@ SAGE_SPKG_CONFIGURE([ecl], [
+     AC_SUBST(SAGE_ECL_CONFIG, [$ECL_CONFIG])
+   fi
+ 
+-  # Maxima cannot yet be provided by the system, so we always use
++  # Kenzo cannot yet be provided by the system, so we always use
+   # the SAGE_LOCAL path for now.
+-  AC_SUBST(SAGE_MAXIMA_FAS, ['${prefix}'/lib/ecl/maxima.fas])
+-
+-  # Likewise for the optional Kenzo SPKG
+   AC_SUBST(SAGE_KENZO_FAS, ['${prefix}'/lib/ecl/kenzo.fas])
+ ])
+diff --git a/build/pkgs/ecl/spkg-install.in b/build/pkgs/ecl/spkg-install.in
+index ee1667aec16..72083337942 100644
+--- a/build/pkgs/ecl/spkg-install.in
++++ b/build/pkgs/ecl/spkg-install.in
+@@ -31,18 +31,6 @@ cp "$SAGE_ROOT"/config/config.* src
+ 
+ if [ x"$SAGE_SPKG_INSTALL_DOCS" != xyes ] ; then
+     ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
+-else
+-    # ECL 2020 needs modern makeinfo
+-    command -v texi2any >/dev/null 2>&1
+-    if [ $? -ne 0 ]; then # texi2any not found -> makeinfo too old, if present
+-        ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
+-    else
+-        if makeinfo -c foo 2>&1 | grep -q invalid; then
+-            # makeinfo found but does not support all options that ecl
+-            # likes to use
+-            ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
+-        fi
+-    fi
+ fi
+ 
+ sdh_configure $SAGE_CONFIGURE_GMP \
+diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4
+index 5859e35f12e..b677184b7be 100644
+--- a/build/pkgs/giac/spkg-configure.m4
++++ b/build/pkgs/giac/spkg-configure.m4
+@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([giac], [
+        m4_pushdef([GIAC_MAX_VERSION], [1.9.999])
+        AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
+          AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
+-            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
++            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n -1)
+             AS_IF([test -n "$giac_version"], [
+                 AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
+                     AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [
+diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
+index 0980a4b8ef8..85fe1ea4731 100644
+--- a/build/pkgs/info/spkg-configure.m4
++++ b/build/pkgs/info/spkg-configure.m4
+@@ -1,4 +1,14 @@
+ SAGE_SPKG_CONFIGURE([info], [
+   AC_PATH_PROG(INFO, info)
+-  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes])
++  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes
++    ], [
++     dnl very old makeinfo are not texi2any, newer are symlinks to texi2any
++     AC_PATH_PROG(TEXI2ANY, texi2any)
++     AS_IF([test -z "${TEXI2ANY}"], [sage_spkg_install_info=yes
++       ], [
++        AS_IF([makeinfo -c foo 2>&1 | grep -q invalid], [
++         dnl makeinfo found, but too old, and  does not support all options that ecl likes to use
++         sage_spkg_install_info=yes])
++       ])
++    ])
+ ])
+diff --git a/build/pkgs/info/spkg-install.in b/build/pkgs/info/spkg-install.in
+index 8086e4b2ec8..3ea8c053669 100644
+--- a/build/pkgs/info/spkg-install.in
++++ b/build/pkgs/info/spkg-install.in
+@@ -1,2 +1,2 @@
+-cd src/info
++cd src
+ sdh_make_install
+diff --git a/build/pkgs/info/type b/build/pkgs/info/type
+index 134d9bc32d5..a6a7b9cd726 100644
+--- a/build/pkgs/info/type
++++ b/build/pkgs/info/type
+@@ -1 +1 @@
+-optional
++standard
+diff --git a/build/pkgs/maxima/checksums.ini b/build/pkgs/maxima/checksums.ini
+index a804c7b831f..0f594389fe6 100644
+--- a/build/pkgs/maxima/checksums.ini
++++ b/build/pkgs/maxima/checksums.ini
+@@ -1,5 +1,5 @@
+ tarball=maxima-VERSION.tar.gz
+-sha1=ed15d5285794413ba94412079eca3d0fa55a47bf
+-md5=9b9ae1dace55b1386739dabaa9122e60
+-cksum=1765409766
++sha1=1010594e6d6082bbd8efaac1b7756ec1721a4ed5
++md5=3c01f1daa6936e11d8713fef7751d3fe
++cksum=2420393096
+ upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
+diff --git a/build/pkgs/maxima/distros/arch.txt b/build/pkgs/maxima/distros/arch.txt
+index 6400290f44d..6ac052fa62b 100644
+--- a/build/pkgs/maxima/distros/arch.txt
++++ b/build/pkgs/maxima/distros/arch.txt
+@@ -1 +1 @@
+-maxima-ecl
++maxima-fas
+diff --git a/build/pkgs/maxima/distros/cygwin.txt b/build/pkgs/maxima/distros/cygwin.txt
+new file mode 100644
+index 00000000000..f5fe3fdc6cb
+--- /dev/null
++++ b/build/pkgs/maxima/distros/cygwin.txt
+@@ -0,0 +1 @@
++maxima
+diff --git a/build/pkgs/maxima/distros/freebsd.txt b/build/pkgs/maxima/distros/freebsd.txt
+new file mode 100644
+index 00000000000..766a71b5074
+--- /dev/null
++++ b/build/pkgs/maxima/distros/freebsd.txt
+@@ -0,0 +1 @@
++math/maxima
+diff --git a/build/pkgs/maxima/distros/gentoo.txt b/build/pkgs/maxima/distros/gentoo.txt
+new file mode 100644
+index 00000000000..85fb33f1610
+--- /dev/null
++++ b/build/pkgs/maxima/distros/gentoo.txt
+@@ -0,0 +1,2 @@
++sci-mathematics/maxima[ecls]
++
+diff --git a/build/pkgs/maxima/package-version.txt b/build/pkgs/maxima/package-version.txt
+index 83476624dc0..5681375f3be 100644
+--- a/build/pkgs/maxima/package-version.txt
++++ b/build/pkgs/maxima/package-version.txt
+@@ -1 +1 @@
+-5.45.0.p0
++5.46.0
+diff --git a/build/pkgs/maxima/patches/matrixexp.patch b/build/pkgs/maxima/patches/matrixexp.patch
+deleted file mode 100644
+index 5c8527c33bf..00000000000
+--- a/build/pkgs/maxima/patches/matrixexp.patch
++++ /dev/null
+@@ -1,15 +0,0 @@
+-diff --git a/share/linearalgebra/matrixexp.lisp b/share/linearalgebra/matrixexp.lisp
+-index 218bf35..f2fd468 100644
+---- a/share/linearalgebra/matrixexp.lisp
+-+++ b/share/linearalgebra/matrixexp.lisp
+-@@ -138,8 +138,8 @@
+- 	   (print `(ratvars = ,$ratvars gcd = '$gcd algebraic = ,$algebraic))
+- 	   (print `(ratfac = ,$ratfac))
+- 	   (merror "Unable to find the spectrum")))
+--   
+--    (setq res ($fullratsimp (ncpower (sub (mult z ($ident n)) mat) -1) z))
+-+
+-+    (setq res ($fullratsimp ($invert_by_lu (sub (mult z ($ident n)) mat) '$crering) z))
+-     (setq m (length sp))
+-     (dotimes (i m)
+-       (setq zi (nth i sp))
+diff --git a/build/pkgs/maxima/patches/maxima.system.patch b/build/pkgs/maxima/patches/maxima.system.patch
+deleted file mode 100644
+index 74db62e7f9f..00000000000
+--- a/build/pkgs/maxima/patches/maxima.system.patch
++++ /dev/null
+@@ -1,25 +0,0 @@
+-diff --git a/src/maxima.system b/src/maxima.system
+-index 76f2452..cf25f51 100644
+---- a/src/maxima.system
+-+++ b/src/maxima.system
+-@@ -1,5 +1,8 @@
+- ;;; -*- Lisp -*-
+- 
+-+(require :cmp)
+-+(setf c::*compile-in-constants* t)
+-+
+- (in-package :cl-user)
+- 
+- (pushnew :cl *features*)
+-@@ -75,6 +78,11 @@
+- 			     ;; Convert dir/foo.fas to dir/foo.o
+- 			     (make-pathname :type "o" :defaults p))
+- 			 files)))
+-+	(c::build-fasl "binary-ecl/maxima" :lisp-files obj
+-+			  :ld-flags
+-+			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+-+							      (find-package "MAXIMA")))))
+-+			    (if (and x (not (string= x ""))) (list x))))
+- 	(c::build-program "binary-ecl/maxima" :lisp-files obj
+- 			  :ld-flags
+- 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+diff --git a/build/pkgs/maxima/spkg-configure.m4 b/build/pkgs/maxima/spkg-configure.m4
+new file mode 100644
+index 00000000000..dc54525320e
+--- /dev/null
++++ b/build/pkgs/maxima/spkg-configure.m4
+@@ -0,0 +1,46 @@
++SAGE_SPKG_CONFIGURE([maxima], [
++  m4_pushdef([SAGE_MAXIMA_MINVER],["5.45.0"])dnl this version and higher allowed
++  SAGE_SPKG_DEPCHECK([ecl], [
++    dnl First check for the "maxima" executable in the user's PATH, because
++    dnl we still use pexpect to communicate with it in a few places.
++    AC_CACHE_CHECK([for Maxima >= $SAGE_MAXIMA_MINVER], [ac_cv_path_MAXIMA], [
++        AC_PATH_PROGS_FEATURE_CHECK([MAXIMA], [maxima], [
++            maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n -1\
++                | $SED -n -e 's/Maxima *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
++            AS_IF([test -n "$maxima_version"], [
++                AX_COMPARE_VERSION([$maxima_version], [ge], [SAGE_MAXIMA_MINVER], [
++                    ac_cv_path_MAXIMA="$ac_path_MAXIMA"
++                    ac_path_MAXIMA_found=:
++                ])
++            ])
++        ])
++    ])
++    SAGE_MAXIMA="$ac_cv_path_MAXIMA"
++    AS_IF([test -z "${SAGE_MAXIMA}"], [
++      sage_spkg_install_maxima=yes
++    ],[
++      dnl If we have the executable, check also for the ECL library.
++      AC_MSG_CHECKING([if ECL can "require" the maxima module])
++      AS_IF([ecl --eval "(require 'maxima)" --eval "(quit)" \
++               >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD], [
++        AC_MSG_RESULT(yes)
++      ], [
++        AC_MSG_RESULT(no)
++        sage_spkg_install_maxima=yes
++      ])
++    ])
++  ])
++  m4_popdef([SAGE_MAXIMA_MINVER])
++],[],[],[
++  # post-check
++  AS_IF([test x$sage_spkg_install_maxima = xyes], [
++    dnl Leaving this variable empty will tell sagelib to load
++    dnl the maxima library (within ECL) by name instead of by
++    dnl absolute path.
++    SAGE_MAXIMA='${prefix}'/bin/maxima
++    SAGE_MAXIMA_FAS='${prefix}'/lib/ecl/maxima.fas
++  ])
++
++  AC_SUBST(SAGE_MAXIMA, "${SAGE_MAXIMA}")
++  AC_SUBST(SAGE_MAXIMA_FAS, "${SAGE_MAXIMA_FAS}")
++])
+diff --git a/build/pkgs/maxima/spkg-install.in b/build/pkgs/maxima/spkg-install.in
+index 3ae6382f9ba..cdb6fbf2069 100644
+--- a/build/pkgs/maxima/spkg-install.in
++++ b/build/pkgs/maxima/spkg-install.in
+@@ -28,28 +28,6 @@ echo
+ echo "Now configuring Maxima..."
+ sdh_configure --enable-ecl git_found=false
+ 
+-# Note the following is regression in maxima build system
+-# see https://sourceforge.net/p/maxima/bugs/3278/
+-# and https://sourceforge.net/p/maxima/bugs/2878/
+-# For the previous time it was fixed.
+-#---------------------------------------------------------------
+-# Touching html and info file to avoid to regenerate them.
+-# This must be done after configuration since the timestamp need
+-# to be later than include-maxima.texi which is generated at
+-# configuration time
+-for i in doc/info/*.html ; do
+-    touch "${i}"
+-done
+-touch doc/info/maxima.info*
+-# Maxima 5.44.0 build_html.sh is not compatible with makeinfo 4.8
+-# (which is /usr/bin/makeinfo on macOS).  #30063
+-# Do not build the HTML docs unless the user asks for it,
+-# in which case it is their problem to install a better
+-# makeinfo version.
+-if [[ "$SAGE_SPKG_INSTALL_DOCS" != yes ]] ; then
+-touch doc/info/maxima_toc.html interfaces/xmaxima/doc/xmaxima.html
+-fi
+-
+ #---------------------------------------------------------------
+ 
+ sdh_make
+diff --git a/build/pkgs/tox/spkg-configure.m4 b/build/pkgs/tox/spkg-configure.m4
+index 7d8ade4c14b..3de0b9b710d 100644
+--- a/build/pkgs/tox/spkg-configure.m4
++++ b/build/pkgs/tox/spkg-configure.m4
+@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([tox], [
+        m4_pushdef([TOX4_MIN_VERSION], [4.0.15])
+        AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [
+          AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [
+-            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -1)
++            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n -1)
+             AS_IF([test -n "$tox_version"], [
+                 AX_COMPARE_VERSION([$tox_version], [lt], [4], [
+                     AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [
+diff --git a/pkgs/sage-conf/_sage_conf/_conf.py.in b/pkgs/sage-conf/_sage_conf/_conf.py.in
+index d66bdb3d264..f2e197b45ed 100644
+--- a/pkgs/sage-conf/_sage_conf/_conf.py.in
++++ b/pkgs/sage-conf/_sage_conf/_conf.py.in
+@@ -9,9 +9,11 @@ VERSION = "@PACKAGE_VERSION@"
+ SAGE_LOCAL = "@prefix@"
+ SAGE_ROOT = "@SAGE_ROOT@"
+ 
+-MAXIMA = "@prefix@/bin/maxima"
++# The path to the standalone maxima executable.
++MAXIMA = "@SAGE_MAXIMA@".replace('${prefix}', SAGE_LOCAL)
+ 
+-# Delete this line if your ECL can load maxima without further prodding.
++# Set this to the empty string if your ECL can load maxima without
++# further prodding.
+ MAXIMA_FAS = "@SAGE_MAXIMA_FAS@".replace('${prefix}', SAGE_LOCAL)
+ 
+ # Delete this line if your ECL can load Kenzo without further prodding.
+diff --git a/src/bin/sage-env b/src/bin/sage-env
+index a7da60df28f..13b54fa7e92 100644
+--- a/src/bin/sage-env
++++ b/src/bin/sage-env
+@@ -440,9 +440,6 @@ if [ -d "$DOT_SAGE" ] ; then
+     fi
+ fi
+ 
+-if [ -n "$SAGE_LOCAL" ]; then
+-    export MAXIMA_PREFIX="$SAGE_LOCAL"
+-fi
+ export MAXIMA_USERDIR="$DOT_SAGE/maxima"
+ 
+ if [ -n "$SAGE_LOCAL" ]; then
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index dae380180ac..ee8f632e94c 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -136,10 +136,11 @@
+     [          1/2*(e^(2*sqrt(x)) + 1)*e^(x - sqrt(x)) 1/2*(x*e^(2*sqrt(x)) - x)*sqrt(x)*e^(x - sqrt(x))]
+     [  1/2*(e^(2*sqrt(x)) - 1)*e^(x - sqrt(x))/x^(3/2)           1/2*(e^(2*sqrt(x)) + 1)*e^(x - sqrt(x))]
+ 
+-And complex exponentiation works now::
++Complex exponentiation works, but may require a patched version of
++maxima (:trac:`32898`) for now::
+ 
+     sage: M = i*matrix([[pi]])
+-    sage: e^M
++    sage: e^M  # not tested, requires patched maxima
+     [-1]
+     sage: M = i*matrix([[pi,0],[0,2*pi]])
+     sage: e^M
+@@ -1186,8 +1187,18 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+         e
+         sage: f.limit(x=5)
+         7776/3125
+-        sage: f.limit(x=1.2)
++
++    Domain to real, a regression in 5.46.0, see https://sf.net/p/maxima/bugs/4138 ::
++
++        sage: maxima_calculus.eval("domain:real")
++        ...
++        sage: f.limit(x=1.2).n()
+         2.06961575467...
++        sage: maxima_calculus.eval("domain:complex");
++        ...
++
++    Otherwise, it works ::
++
+         sage: f.limit(x=I, taylor=True)
+         (-I + 1)^I
+         sage: f(x=1.2)
+@@ -1215,7 +1226,7 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+     With this example, Maxima is looking for a LOT of information::
+ 
+         sage: assume(a>0)
+-        sage: limit(x^a,x=0)
++        sage: limit(x^a,x=0)  # random - maxima 5.46.0 does not need extra assumption
+         Traceback (most recent call last):
+         ...
+         ValueError: Computation failed since Maxima requested additional
+@@ -1224,7 +1235,7 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+          more details)
+         Is a an integer?
+         sage: assume(a,'integer')
+-        sage: limit(x^a, x=0)
++        sage: limit(x^a, x=0)  # random - maxima 5.46.0 does not need extra assumption
+         Traceback (most recent call last):
+         ...
+         ValueError: Computation failed since Maxima requested additional
+@@ -2251,10 +2262,10 @@ def symbolic_expression_from_maxima_string(x, equals_sub=False, maxima=maxima):
+         True
+         sage: sefms("x # 3") == SR(x != 3)
+         True
+-        sage: solve([x != 5], x)
+-        [[x - 5 != 0]]
++        sage: solve([x != 5], x) in [[[x - 5 != 0]], [[x < 5], [5 < x]]]
++        True
+         sage: solve([2*x==3, x != 5], x)
+-        [[x == (3/2), (-7/2) != 0]]
++        [[x == (3/2)...
+ 
+     Make sure that we don't accidentally pick up variables in the maxima namespace (:trac:`8734`)::
+ 
+diff --git a/src/sage/functions/exp_integral.py b/src/sage/functions/exp_integral.py
+index e6c888c64b6..f314e525145 100644
+--- a/src/sage/functions/exp_integral.py
++++ b/src/sage/functions/exp_integral.py
+@@ -601,8 +601,8 @@ class Function_log_integral_offset(BuiltinFunction):
+         1/log(x)
+         sage: f.integrate(x)
+         -x*log_integral(2) + x*log_integral(x) - Ei(2*log(x))
+-        sage: Li(x).integrate(x,2.0,4.5)
+-        -2.5*log_integral(2) + 5.799321147411334
++        sage: Li(x).integrate(x,2.0,4.5).n(digits=10)
++        3.186411697
+         sage: N(f.integrate(x,2.0,3.0))   # abs tol 1e-15
+         0.601621785860587
+ 
+diff --git a/src/sage/interfaces/expect.py b/src/sage/interfaces/expect.py
+index 68ae715e4c3..84adf0341b5 100644
+--- a/src/sage/interfaces/expect.py
++++ b/src/sage/interfaces/expect.py
+@@ -620,7 +620,7 @@ def quit(self, verbose=False):
+ 
+             sage: a = maxima('y')
+             sage: maxima.quit(verbose=True)
+-            Exiting Maxima with PID ... running .../bin/maxima...
++            Exiting Maxima with PID ... running ...maxima...
+             sage: a._check_valid()
+             Traceback (most recent call last):
+             ...
+diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py
+index 27b1e98a6ac..4829560f98b 100644
+--- a/src/sage/interfaces/maxima.py
++++ b/src/sage/interfaces/maxima.py
+@@ -622,11 +622,6 @@ def _start(self):
+             sage: m.is_running()
+             True
+ 
+-        Test that we can use more than 256MB RAM (see :trac:`6772`)::
+-
+-            sage: a = maxima(10)^(10^5)
+-            sage: b = a^600              # long time -- about 10-15 seconds
+-
+         """
+         Expect._start(self)
+         self._sendline(r":lisp (defun tex-derivative (x l r) (tex (if $derivabbrev (tex-dabbrev x) (tex-d x '\\partial)) l r lop rop ))")
+@@ -634,9 +629,6 @@ def _start(self):
+         # Don't use ! for factorials (#11539)
+         self._sendline(":lisp (remprop 'mfactorial 'grind)")
+ 
+-        # Remove limit on the max heapsize (since otherwise it defaults
+-        # to 256MB with ECL).
+-        self._sendline(":lisp (ext:set-limit 'ext:heap-size 0)")
+         self._eval_line('0;')
+ 
+         # set random seed
+diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
+index c263ac65f02..bba8504aa92 100644
+--- a/src/sage/interfaces/maxima_lib.py
++++ b/src/sage/interfaces/maxima_lib.py
+@@ -934,8 +934,15 @@ def sr_limit(self, expr, v, a, dir=None):
+             e
+             sage: limit(f,x = 5)
+             7776/3125
+-            sage: limit(f,x = 1.2)
++
++        Domain to real, a regression in 5.46.0, see https://sf.net/p/maxima/bugs/4138 ::
++
++            sage: maxima_calculus.eval("domain:real")
++            ...
++            sage: limit(f,x = 1.2).n()
+             2.06961575467...
++            sage: maxima_calculus.eval("domain:complex");
++            ...
+             sage: var('a')
+             a
+             sage: limit(x^a,x=0)
+@@ -947,7 +954,7 @@ def sr_limit(self, expr, v, a, dir=None):
+             for more details)
+             Is a positive, negative or zero?
+             sage: assume(a>0)
+-            sage: limit(x^a,x=0)
++            sage: limit(x^a,x=0)  # random - not needed for maxima 5.46.0
+             Traceback (most recent call last):
+             ...
+             ValueError: Computation failed ...
+diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx
+index e2e6449dfa9..15914b0be3e 100644
+--- a/src/sage/matrix/matrix2.pyx
++++ b/src/sage/matrix/matrix2.pyx
+@@ -15425,9 +15425,10 @@ cdef class Matrix(Matrix1):
+ 
+         TESTS:
+ 
+-        Check that sparse matrices are handled correctly (:trac:`28935`)::
++        Sparse matrices are handled correctly (:trac:`28935`), but may
++        require a patched version of maxima (:trac:`32898`) for now::
+ 
+-            sage: matrix.diagonal([0], sparse=True).exp()
++            sage: matrix.diagonal([0], sparse=True).exp()  # not tested, requires patched maxima
+             [1]
+             sage: matrix.zero(CBF, 2, sparse=True).exp()
+             [1.000000000000000                 0]
+diff --git a/src/sage/matrix/matrix_symbolic_dense.pyx b/src/sage/matrix/matrix_symbolic_dense.pyx
+index 19ca5c85cb2..58a25e002f6 100644
+--- a/src/sage/matrix/matrix_symbolic_dense.pyx
++++ b/src/sage/matrix/matrix_symbolic_dense.pyx
+@@ -402,7 +402,8 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             [1/2*(e^(2*x) + 1)*e^(-x) 1/2*(e^(2*x) - 1)*e^(-x)]
+             [1/2*(e^(2*x) - 1)*e^(-x) 1/2*(e^(2*x) + 1)*e^(-x)]
+ 
+-        Exp works on 0x0 and 1x1 matrices::
++        Exponentiation works on 0x0 and 1x1 matrices, but the 1x1 example
++        requires a patched version of maxima (:trac:`32898`) for now::
+ 
+             sage: m = matrix(SR,0,[]); m
+             []
+@@ -410,7 +411,7 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             []
+             sage: m = matrix(SR,1,[2]); m
+             [2]
+-            sage: m.exp()
++            sage: m.exp()  # not tested, requires patched maxima
+             [e^2]
+ 
+         Commuting matrices `m, n` have the property that
+@@ -451,7 +452,6 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             [                       0 1/2*(e^(2*x) + 1)*e^(-x) 1/2*(e^(2*x) - 1)*e^(-x)                        0]
+             [                       0 1/2*(e^(2*x) - 1)*e^(-x) 1/2*(e^(2*x) + 1)*e^(-x)                        0]
+             [1/2*(e^(2*x) - 1)*e^(-x)                        0                        0 1/2*(e^(2*x) + 1)*e^(-x)]
+-
+         """
+         if not self.is_square():
+             raise ValueError("exp only defined on square matrices")
+diff --git a/src/sage/symbolic/integration/integral.py b/src/sage/symbolic/integration/integral.py
+index c82e9ed73c3..e84ad357ee2 100644
+--- a/src/sage/symbolic/integration/integral.py
++++ b/src/sage/symbolic/integration/integral.py
+@@ -741,14 +741,14 @@ def integrate(expression, v=None, a=None, b=None, algorithm=None, hold=False):
+ 
+         sage: _ = var('x,y')
+         sage: f = log(x^2+y^2)
+-        sage: res = integral(f,x,0.0001414, 1.); res
++        sage: res = integral(f,x,1414/10^7, 1); res
+         Traceback (most recent call last):
+         ...
+-        ValueError: Computation failed since Maxima requested additional constraints; using the 'assume' command before evaluation *may* help (example of legal syntax is 'assume(50015104*y^2-50015103>0)', see `assume?` for more details)
+-        Is 50015104*y^2-50015103 positive, negative or zero?
++        ValueError: Computation failed since Maxima requested additional constraints; using the 'assume' command before evaluation *may* help ...
++        Is ... positive, negative or zero?
+         sage: assume(y>1)
+-        sage: res = integral(f,x,0.0001414, 1.); res
+-        2*y*arctan(1.0/y) - 2*y*arctan(0.0001414/y) + 1.0*log(1.0*y^2 + 1.0) - 0.0001414*log(1.0*y^2 + 1.9993959999999997e-08) - 1.9997172
++        sage: res = integral(f,x,1414/10^7, 1); res
++        -2*y*arctan(707/5000000/y) + 2*y*arctan(1/y) + log(y^2 + 1) - 707/5000000*log(y^2 + 499849/25000000000000) - 4999293/2500000
+         sage: nres = numerical_integral(f.subs(y=2), 0.0001414, 1.); nres
+         (1.4638323264144..., 1.6251803529759...e-14)
+         sage: res.subs(y=2).n()
+diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
+index 94813315181..a72ab547c76 100644
+--- a/src/sage/symbolic/relation.py
++++ b/src/sage/symbolic/relation.py
+@@ -1787,8 +1787,8 @@ def solve_ineq_fourier(ineq, vars=None):
+         sage: y = var('y')
+         sage: solve_ineq_fourier([x+y<9,x-y>4],[x,y])
+         [[y + 4 < x, x < -y + 9, y < (5/2)]]
+-        sage: solve_ineq_fourier([x+y<9,x-y>4],[y,x])
+-        [[y < min(x - 4, -x + 9)]]
++        sage: solve_ineq_fourier([x+y<9,x-y>4],[y,x])[0][0](x=42)
++        y < -33
+ 
+         sage: solve_ineq_fourier([x^2>=0])
+         [[x < +Infinity]]
diff --git a/srcpkgs/sagemath/patches/35635-sympy_1.12.patch b/srcpkgs/sagemath/patches/35635-sympy_1.12.patch
new file mode 100644
index 000000000000..9cfc69c2adb6
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35635-sympy_1.12.patch
@@ -0,0 +1,54 @@
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index dae380180ac..ca3c59e63d2 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -1690,8 +1690,11 @@ def laplace(ex, t, s, algorithm='maxima'):
+ 
+     Testing SymPy::
+ 
+-        sage: laplace(t^n, t, s, algorithm='sympy')
+-        (gamma(n + 1)/(s*s^n), 0, re(n) > -1)
++        sage: F, a, cond = laplace(t^n, t, s, algorithm='sympy')
++        sage: a, cond
++        (0, re(n) > -1)
++        sage: F.simplify()
++        s^(-n - 1)*gamma(n + 1)
+ 
+     Testing Maxima::
+ 
+@@ -1700,17 +1703,19 @@ def laplace(ex, t, s, algorithm='maxima'):
+ 
+     Check that :trac:`24212` is fixed::
+ 
+-        sage: laplace(cos(t^2), t, s, algorithm='sympy')
+-        (-1/2*sqrt(pi)*(sqrt(2)*cos(1/4*s^2)*fresnel_sin(1/2*sqrt(2)*s/sqrt(pi)) -
+-        sqrt(2)*fresnel_cos(1/2*sqrt(2)*s/sqrt(pi))*sin(1/4*s^2) - cos(1/4*pi + 1/4*s^2)),
+-        0, True)
++        sage: F, a, cond = laplace(cos(t^2), t, s, algorithm='sympy')
++        sage: a, cond
++        (0, True)
++        sage: F._sympy_().simplify()
++        sqrt(pi)*(sqrt(2)*sin(s**2/4)*fresnelc(sqrt(2)*s/(2*sqrt(pi))) -
++        sqrt(2)*cos(s**2/4)*fresnels(sqrt(2)*s/(2*sqrt(pi))) + cos(s**2/4 + pi/4))/2
+ 
+     Testing result from SymPy that Sage doesn't know how to handle::
+ 
+         sage: laplace(cos(-1/t), t, s, algorithm='sympy')
+         Traceback (most recent call last):
+         ...
+-        AttributeError: Unable to convert SymPy result (=meijerg(((), ()), ((-1/2, 0, 1/2), (0,)), s**2/16)/4) into Sage
++        AttributeError: Unable to convert SymPy result (=meijerg(((), ()), ((-1/2, 0, 1/2), (0,)), ...)/4) into Sage
+     """
+     if not isinstance(ex, (Expression, Function)):
+         ex = SR(ex)
+@@ -1817,8 +1822,8 @@ def inverse_laplace(ex, s, t, algorithm='maxima'):
+ 
+     Transform an expression involving a time-shift, via SymPy::
+ 
+-        sage: inverse_laplace(1/s^2*exp(-s), s, t, algorithm='sympy')
+-        -(log(e^(-t)) + 1)*heaviside(t - 1)
++        sage: inverse_laplace(1/s^2*exp(-s), s, t, algorithm='sympy').simplify()
++        (t - 1)*heaviside(t - 1)
+ 
+     The same instance with Giac::
+ 
diff --git a/srcpkgs/sagemath/patches/get_patches b/srcpkgs/sagemath/patches/get_patches
index 871ae38577fd..049694826d20 100755
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 URL_BASE_PR="https://github.com/sagemath/sage/pull/"
-URL_BASE_COMPARE="https://github.com/sagemath/sage/compare/9.8..."
+URL_BASE_COMPARE="https://github.com/sagemath/sage/compare/10.0..."
 
 case "$1" in
 	-n)  DO=echo ;;
@@ -15,49 +15,13 @@ get_pr() {
 	$DO wget "$URL_BASE_PR$pr.$ext" -O "$pr-$desc.patch"
 }
 
-get_trac() {
-	ticket=$1
-	desc=$(echo "$2" | sed -e 's/ /_/g')
-	commit=$3
-	$DO wget "$URL_BASE_COMPARE$commit.diff" -O "$ticket-$desc-$commit.patch"
-}
-
 # run from patches dir
 cd $(dirname "$0")
 
-# merged in 10.0.beta0
-get_trac 34851 "support singular 4.3.1.p3" 5e5737a0c
-get_pr 35068 "fix tests giac 1.9.0.35" patch
-
-# 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"
-
-# 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"
+# positive review
+get_pr 35584 "networkx 3.1"
+get_pr 35612 "linbox 1.7.0"
+get_pr 35635 "sympy 1.12"
 
 # needs review
-get_pr 35584 "networkx 3.1"
+get_pr 35619 "maxima 5.46.0"
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 66a543efd21d..6fc7c3b2b4a8 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
-version=9.8
-revision=2
+version=10.0
+revision=1
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
 _bindir=/usr/lib/sagemath/$version/bin
@@ -31,8 +31,10 @@ short_desc="Open source mathematics software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="http://sagemath.org/"
+changelog="https://github.com/sagemath/sage/releases"
 distfiles="https://github.com/sagemath/sage/archive/refs/tags/$version.tar.gz"
-checksum=2aff28bd1d18c2d526581f5298acb8336f5b92db5675a7403dec8eaf9a86bc4c
+checksum=60858efd0d1f2526486740962bf72c99f9141a56caf8395f3291fded276faf55
+nocross="due to ntl (flintlib), fflas-ffpack, givaro, linbox, cysignals, sympow, maxima"
 
 do_configure() {
 	# git tree needs bootstrapping

From 07c3beb58d81668931db0769967e8ed3b77776d3 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Tue, 30 May 2023 08:38:01 -0400
Subject: [PATCH 0132/1853] font-iosevka: update to 24.1.0.

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 988e59ad4a0b..55aba82b0fe2 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=22.0.1
+version=24.1.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
 changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
 distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="d9ab0abfb29f5fc0605d83728609dedaeb1bb855135a21621b179062a365ef35
- b7ebe51edf62d9d1dbcfb9478628492fe819638923ccf2f7fcf428ecf9cbb449"
+checksum="52207eccbf8dc8cad208f55efb6ba692361ef6de12faa0716b36a2a123db5522
+ 01cdb5c52ada9275e8a30878ef1b709283694a23b877e2f2519fe1940c6b2136"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 2a693c2ff5ce928a20c742d77312332f26add25d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 May 2023 22:30:13 -0400
Subject: [PATCH 0133/1853] davmail: update to 6.1.0.

Closes: #44161.
---
 srcpkgs/davmail/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template
index 9659b4f14dd4..1652c266ecfe 100644
--- a/srcpkgs/davmail/template
+++ b/srcpkgs/davmail/template
@@ -1,16 +1,17 @@
 # Template file for 'davmail'
 pkgname=davmail
-version=6.0.1
+version=6.1.0
 revision=1
-_commit=3390
+_commit=3423
 hostmakedepends="openjdk8 apache-ant"
+depends="virtual?java-runtime"
 short_desc="POP/IMAP/SMTP/Caldav/Carddav/LDAP exchange gateway"
 maintainer="Anachron <gith@cron.world>"
 license="GPL-2.0-only"
 homepage="https://davmail.sourceforge.net"
 changelog="https://raw.githubusercontent.com/mguessan/davmail/master/RELEASE-NOTES.md"
 distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz"
-checksum=ce3b33cd187787a30ccc136e75f1cdf197b0a2874c20ab3f3ea3e426b32b9ab1
+checksum=08e7103d14e9f05ec269caceef7585dcf8be202a35c471fa6fc12729cf99ef2f
 
 do_build() {
 	. /etc/profile.d/openjdk.sh
@@ -24,11 +25,11 @@ do_install() {
 	vmkdir usr/share/davmail/lib
 	vcopy "lib/*" usr/share/davmail/lib
 	vbin src/bin/davmail
-}
 
-post_install() {
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64) return 0 ;;
+		x86_64) ;;
+		*) rm -f ${DESTDIR}/usr/share/davmail/lib/swt-* ;;
 	esac
-	rm -f ${DESTDIR}/usr/share/davmail/lib/swt-*
+
+	vsconf src/etc/davmail.properties
 }

From 9fab13e5c6edb5d2d069c36bccd1b42e34435f98 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 31 May 2023 21:10:45 +0200
Subject: [PATCH 0134/1853] wine: update to 8.9.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7877166ba57c..785393a98776 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.8
+version=8.9
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="d40b083c57639eb5e252452143c9ec34b7b2bce43e30822586eea37f0c63b3c7
- e92c6560ae6d6e72a28ef5606cd5f847d70833ad6c60e79a744aa5840e7628e6"
+checksum="8cdf86b250d9080fcd4e3b939680fcd38ebf0f274a7afa2dcc65f74fa2c1b320
+ ad5fef3487240033aed83c0a7d5b449c85b2d1af5aeb7efe02db12903221a9d4"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 01f525578a95d31b8f043131d4398dcfd7e9e247 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 31 May 2023 21:16:01 +0200
Subject: [PATCH 0135/1853] linux5.4: update to 5.4.244.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 086a942c2a48..e1e9d22352c9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.243
+version=5.4.244
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- abebc3a5d9f564288af5ef8bb4a87683c46c297506d6ebf980617822a63a457e"
+ c1055b17cae94cefd31aac8da0cd4099f607c38765c8b1e590a760c0370ab7cc"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From a8ff8c8263121746a117fa6ec046dd7e3b1d37e5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 31 May 2023 21:18:19 +0200
Subject: [PATCH 0136/1853] linux4.19: update to 4.19.284.

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

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a99e036ad5d7..3128f4bd1480 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.283
+version=4.19.284
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 987395f7696c4fa35fc80beacfbaf4ca44e89b080686b96721ee792e5d599bd1"
+ 1ddfab2ee12c010d3291716d0d03f485d50b8c69e0afb0111bec16acdc9d4be2"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 74eda941ea09d68c4ecd3fbcbad4d7dcd13ddb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Finbar=20=C3=93=20Deaghaidh?= <finbar@tutanota.com>
Date: Fri, 7 Apr 2023 16:40:32 +0100
Subject: [PATCH 0137/1853] New package: spotify-player-0.14.0

---
 srcpkgs/spotify-player/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/spotify-player/template

diff --git a/srcpkgs/spotify-player/template b/srcpkgs/spotify-player/template
new file mode 100644
index 000000000000..9716e81041ad
--- /dev/null
+++ b/srcpkgs/spotify-player/template
@@ -0,0 +1,18 @@
+# Template file for 'spotify-player'
+pkgname=spotify-player
+version=0.14.0
+revision=1
+build_style=cargo
+make_install_args="--path spotify_player"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel alsa-lib-devel dbus-devel"
+short_desc="Command driven spotify player"
+maintainer="Thang Pham <phamducthang1234@gmail.com>"
+license="MIT"
+homepage="https://github.com/aome510/spotify-player"
+distfiles="https://github.com/aome510/spotify-player/archive/refs/tags/v${version}.tar.gz"
+checksum=3cb80919faacc0b50537b6161a464a27818b3fbf916f44e47290cf9bab7bf490
+
+post_install() {
+	vlicense LICENSE
+}

From 19abc55bff484a7bb87b5c5f1e2fb26c4985fdef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:40:00 -0400
Subject: [PATCH 0138/1853] maturin: update to 1.0.1.

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

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index c8863f56181e..210d359f7e56 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.15.2
+version=1.0.1
 revision=1
 build_style=python3-pep517
 build_helper="qemu rust"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=605cfe879c68295eedcf0e874676c469dab34f293d58c496ad9c99e64da9cc0e
+checksum=c4141615078313a5afbb581fefc4b3673c24466d37c939dc44a816a265067c74
 # Tests use unstable features and fail to build
 make_check=no
 

From 70d0fd4f52ccae249a2e93d5f0c8e51a002ebcce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:41:37 -0400
Subject: [PATCH 0139/1853] python-Cython: update to 0.29.35.

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

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 0b5f7582fea7..5248a14c8bca 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.34
+version=0.29.35
 revision=1
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=1909688f5d7b521a60c396d20bba9e47a1b2d2784bfb085401e1e1e7d29a29a8
+checksum=6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527
 # Tests are flaky
 make_check=no
 

From dc837ff3c096b8fce647cfe8a2cf6dbbaa7e2e9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:41:55 -0400
Subject: [PATCH 0140/1853] python3-deprecated: update to 1.2.14.

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

diff --git a/srcpkgs/python3-deprecated/template b/srcpkgs/python3-deprecated/template
index 01e4d5c5357a..e3c260b6448f 100644
--- a/srcpkgs/python3-deprecated/template
+++ b/srcpkgs/python3-deprecated/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-deprecated'
 pkgname=python3-deprecated
-version=1.2.13
-revision=2
+version=1.2.14
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-wrapt"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/tantale/deprecated"
 changelog="https://raw.githubusercontent.com/tantale/deprecated/master/CHANGELOG.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=771e20e93bb4bc497bd9955829d36074dd7608962846c0b34a92ff68ed7ebad9
+checksum=3309fa073e6c13a126be9fb88959a02689b15a066fa7e222a07b62325e9673a7
 
 post_install() {
 	vlicense LICENSE.rst

From ad91bea21ac44c2dbecee37b805a7ed3d906d575 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:42:46 -0400
Subject: [PATCH 0141/1853] python3-imageio: update to 2.30.0.

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

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 28cd2454bea9..ad3e419c67fd 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.28.1
+version=2.30.0
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=27c7c0004c62fc890198e0534177b4fad1a31d2ee9cfe0e957abacf597e37230
+checksum=15e8ae8a63575040253a772cb476b7ce4e4d762200fb6086e08802784c7d394b
 
 post_install() {
 	vlicense LICENSE

From 035db8d6535ed0b415a3b9e8ec0da45d584e0567 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:49:16 -0400
Subject: [PATCH 0142/1853] python3-pandas: update to 2.0.2.

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

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index ef9c866929ae..db885e486567 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-versioneer"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=821ea98fc1ed84ec53546a1526b2b373c2101d4a9736b4384f10cd9fd5ae12a6
+checksum=44f41cb263726716ff513081bf57ea62fec704f367e3fc8adb15e54991c98273
 # Builds seem to sometimes have missing symbol problems;
 # the intermittent nature suggests this might be a race
 disable_parallel_build=yes

From 3dcea6c48660a6937d198bba34fc8e36feb88fed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:50:12 -0400
Subject: [PATCH 0143/1853] python3-pyzmq: update to 25.1.0.

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

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 8d3372c02333..d7403f464dff 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=25.0.2
+version=25.1.0
 revision=1
 build_style=python3-module
 make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
@@ -14,7 +14,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6b8c1bbb70e868dc88801aa532cae6bd4e3b5233784692b786f17ad2962e5149
+checksum=80c41023465d36280e801564a69cbfce8ae85ff79b080e1913f6e90481fb8957
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From e285c437aecaf22816026626e67bcbd8c5780456 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:50:32 -0400
Subject: [PATCH 0144/1853] python3-setuptools: update to 67.8.0.

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

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 67404db9c06c..77bf9caa877e 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=67.7.2
+version=67.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990
+checksum=62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 5887e715922df4a5b7f57de7bcb35363057dc7f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:54:20 -0400
Subject: [PATCH 0145/1853] python3-xyzservices: update to 2023.5.0.

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

diff --git a/srcpkgs/python3-xyzservices/template b/srcpkgs/python3-xyzservices/template
index 7dd8a79f6839..5cb6c8803baf 100644
--- a/srcpkgs/python3-xyzservices/template
+++ b/srcpkgs/python3-xyzservices/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-xyzservices'
 pkgname=python3-xyzservices
-version=2023.2.0
+version=2023.5.0
 revision=1
 build_style=python3-module
 # Provider tests require unpackaged 'mercantile'
 make_check_args="--ignore=xyzservices/tests/test_providers.py"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3"
 checkdepends="python3-pytest python3-requests"
 short_desc="Source of XYZ tiles providers"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://xyzservices.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/geopandas/xyzservices/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/x/xyzservices/xyzservices-${version}.tar.gz"
-checksum=3342bba410d7941290eed0e58a2e5aadb0f7b97863ec4283b283c406ee723a28
+checksum=f0ffaeb7f1c090cff98de6e9a5d4c1c3dde5a8c30f98044dc1e12b11d4576ebc
 
 post_install() {
 	vlicense LICENSE

From f296f57e23f8e7f20b5a366676aeb1e25bddfe9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 14:08:34 -0400
Subject: [PATCH 0146/1853] xpra: update to 4.4.5.

---
 srcpkgs/xpra/patches/setup.patch | 16 ++++++++--------
 srcpkgs/xpra/template            |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xpra/patches/setup.patch b/srcpkgs/xpra/patches/setup.patch
index 39e063654625..237f04308b1a 100644
--- a/srcpkgs/xpra/patches/setup.patch
+++ b/srcpkgs/xpra/patches/setup.patch
@@ -2,9 +2,9 @@ Make sure the build script pulls the right CFLAGS and prevent -Werror. In
 addition, remove a stray CUDA README that is only supposed to installed when
 CUDA is actually available.
 
---- ./setup.py
-+++ ./setup.py
-@@ -710,7 +710,7 @@
+--- a/setup.py
++++ b/setup.py
+@@ -750,7 +750,7 @@
      #we have to add the python cflags:
      if not (is_Fedora() or is_Debian() or is_CentOS() or is_RedHat() or is_AlmaLinux() or is_RockyLinux() or is_OracleLinux() or is_openSUSE()):
          import sysconfig
@@ -13,7 +13,7 @@ CUDA is actually available.
              add_to_keywords(kw, 'extra_compile_args', cflag)
  
      def add_tokens(s, add_to="extra_link_args"):
-@@ -769,7 +769,7 @@
+@@ -809,7 +809,7 @@
              #as of Cython 0.26 + clang 4.0. Other version combinations may require
              #(un)commenting other switches.
              if not hascflag("-Wno-error"):
@@ -22,7 +22,7 @@ CUDA is actually available.
              addcflags(
                  "-Wno-deprecated-register",
                  "-Wno-unused-command-line-argument",
-@@ -783,7 +783,7 @@
+@@ -823,7 +823,7 @@
                  )
          else:
              if not hascflag("-Wno-error"):
@@ -31,12 +31,12 @@ CUDA is actually available.
              if NETBSD:
                  #see: http://trac.cython.org/ticket/395
                  addcflags("-fno-strict-aliasing")
-@@ -2213,8 +2213,6 @@
+@@ -2252,8 +2252,6 @@
          if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED:
              add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll"))
  
 -add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"])
 -
- tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc")
+ tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc",
+      extra_compile_args="-Wno-error=sign-compare" if get_gcc_version()<(8, ) else None)
  
- toggle_packages(argb_ENABLED, "xpra.codecs.argb")
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 38f83283b1e5..ee8ce4ec78a9 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.4.4
+version=4.4.5
 revision=1
 build_style=python3-module
 make_build_args="--without-cuda_kernels --without-cuda_rebuild"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=63f6b82efde9393a42bbeefc1a35926d636decf32f9b2076800b999d7b418cfc
+checksum=591bd39953cebbfba1a4543bab280b7c1065c3179318f37a41539e954d0709a2
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 # Tests don't run properly without package installed
 make_check=no

From 9d5dd8063d345468ed753efe37824701e489cb93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 31 May 2023 22:16:04 +0200
Subject: [PATCH 0147/1853] gdb: update to 13.2.

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

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 37d43a994294..0712062a82dc 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=13.1
+version=13.2
 revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
@@ -21,7 +21,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0
+checksum=fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
 make_check=extended  # Tests take too long, not all of them pass.
 
 python_version="3"

From 35ea0fd45e2b6b1c200b581f31b52a627585a075 Mon Sep 17 00:00:00 2001
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
Date: Wed, 31 May 2023 16:09:44 +0300
Subject: [PATCH 0148/1853] libmicrohttpd: remove unused dependencies, fix

Closes: https://github.com/void-linux/void-packages/pull/44191
---
 srcpkgs/libmicrohttpd/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template
index 3764646cec11..a13b5cbd02b0 100644
--- a/srcpkgs/libmicrohttpd/template
+++ b/srcpkgs/libmicrohttpd/template
@@ -1,20 +1,18 @@
 # Template file for 'libmicrohttpd'
 pkgname=libmicrohttpd
 version=0.9.77
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
- --enable-largefile
  --enable-https
  --enable-messages"
-hostmakedepends="texinfo"
-makedepends="libgcrypt-devel gnutls-devel"
+makedepends="gnutls-devel"
 checkdepends="libcurl-devel"
 short_desc="Library embedding HTTP server functionality"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/libmicrohttpd/"
-changelog="https://git.gnunet.org/libmicrohttpd.git/plain/ChangeLog"
+changelog="https://git.gnunet.org/libmicrohttpd.git/plain/ChangeLog?h=v${version}"
 distfiles="${GNU_SITE}/libmicrohttpd/libmicrohttpd-${version}.tar.gz"
 checksum=9e7023a151120060d2806a6ea4c13ca9933ece4eacfc5c9464d20edddb76b0a0
 

From 30b3517297bfa3ff9810b825798be55ff6c2c4e4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 30 May 2023 22:00:52 +0100
Subject: [PATCH 0149/1853] libvterm: update to 0.3.2.

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

diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index a7a7042e0e23..ff5976ef63d5 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,6 +1,6 @@
 # Template file for 'libvterm'
 pkgname=libvterm
-version=0.3.1
+version=0.3.2
 revision=1
 build_style=gnu-makefile
 make_install_target="install-lib install-inc"
@@ -10,13 +10,13 @@ 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=25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397
+checksum=91eb5088069f4e6edab69e14c4212f6da0192e65695956dc048016a0dab8bcf6
 
 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
+		vsed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool
+		vsed -e "s,libtool,./libtool,g" -i Makefile
 	fi
 }
 
@@ -29,8 +29,8 @@ libvterm-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}
 }

From b605edd4109e919a3dc85c1c2ed2789deb39333d Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 21 May 2023 00:39:37 +0200
Subject: [PATCH 0150/1853] lf: update to r30.

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

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

From 7dc0ee51229621d5c3c82989d366c45ad831ed60 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 21 May 2023 03:39:46 +0300
Subject: [PATCH 0151/1853] Komikku: update to 1.21.1

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 3ca825a50a39..8214aedeb432 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.19.0
+version=1.21.1
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
@@ -17,4 +17,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=e30234915397584bf7b09c50daf99a75692eaff4b7212551e6272fdf17fe8d37
+checksum=303919974aa860b542e486d0321149a882f3f667309b2216899ea5f1633c860f

From e4266b039b435bce4bfb918c559e2566d76ccc11 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 10 Feb 2023 21:01:57 +0530
Subject: [PATCH 0152/1853] zstd: update to 1.5.5.

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

diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 2c6bb5a9cda9..ae4776940811 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.5.2
+version=1.5.5
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -8,9 +8,10 @@ checkdepends="gtest-devel tar"
 short_desc="Fast real-time compression algorithm - CLI tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
-homepage="http://www.zstd.net"
+homepage="https://facebook.github.io/zstd/"
+changelog="https://raw.githubusercontent.com/facebook/zstd/dev/CHANGELOG"
 distfiles="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz"
-checksum=7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0
+checksum=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4
 
 do_build() {
 	make ${makejobs} PREFIX=/usr lib-mt

From 7247e059b74cb15a2651e8a6cc38ef02622e154e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 1 Jun 2023 06:47:42 -0500
Subject: [PATCH 0153/1853] python3-rich: update to 13.4.1.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 521205268be3..914fac194563 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=13.3.5
+version=13.4.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=2d11b9b8dd03868f09b4fffadc84a6a8cda574e40dc90821bd845720ebb8e89c
+checksum=76f6b65ea7e5c5d924ba80e322231d7cb5b5981aa60bfc1e694f1bc097fe6fe1
 make_check=extended # some checks only work on windows
 
 post_install() {

From 48df7da012d2e3e945aca51d76d083d39b5ff681 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 1 Jun 2023 06:48:11 -0500
Subject: [PATCH 0154/1853] xml2rfc: update to 3.17.2.

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

diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 6ed6c1c8fabc..1058373efeee 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
 # Template file for 'xml2rfc'
 pkgname=xml2rfc
-version=3.17.1
+version=3.17.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ietf-tools.github.io/xml2rfc/"
 distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=977e5de43c6eb2855f20cd69fa4634912daa312334b3e6d7495c1e6946e267c2
+checksum=168183289de769bf53adb80f02986f73bb4e6934fa73a85c89a82be7a2b6f01d
 make_check=no # too many dependencies
 
 post_install() {

From b6b7f173c596186ee773f22fa086b40e172e88a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 May 2023 15:54:39 +0200
Subject: [PATCH 0155/1853] libuninameslist: update to 20230523.

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

diff --git a/srcpkgs/libuninameslist/template b/srcpkgs/libuninameslist/template
index 526ec6e0449e..e74ddb282f61 100644
--- a/srcpkgs/libuninameslist/template
+++ b/srcpkgs/libuninameslist/template
@@ -1,6 +1,6 @@
 # Template file for 'libuninameslist'
 pkgname=libuninameslist
-version=20221022
+version=20230523
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/fontforge/libuninameslist"
 distfiles="https://github.com/fontforge/libuninameslist/archive/${version}.tar.gz"
-checksum=eb9e77ef3f4212f42e82004f04dd7766d4c153faa22c6b379c0a1516d6370a7c
+checksum=612936a22dddf6ef2c8a6739185d9d749cb409ebc658d232eb418f78820c7a18
 
 pre_configure() {
 	autoreconf -fi

From 4c583cb674f1a16f060c301c3707fd9712b220e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 May 2023 15:56:41 +0200
Subject: [PATCH 0156/1853] minify: update to 2.12.6.

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

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 063fc8108beb..3d71f543e395 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.12.5
-revision=2
+version=2.12.6
+revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=b4c91412320138564ee6c208b498ad9f8118465932f6c3664cabbdc5735f677d
+checksum=c5ab7bc5f71e2b9686db73d46013bc2ad15e97824acf477508ae5a39bae920d2
 
 post_install() {
 	vlicense LICENSE

From 90f85c48cbfa8eeeffd4d35b18b9c386e602794e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Jun 2023 13:52:34 +0200
Subject: [PATCH 0157/1853] sbcl: update to 2.3.5.

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

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index f0b3c905a115..9ce15d3284f5 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.3.4
+version=2.3.5
 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=f11b4764c6eabdb27e5a9c46b217204d11bcda534e73bf97073d57831d209c4e
+checksum=89c90720cf9d05dbcd90d690e381a2514c0f1807159e0d7222220c5a8c2d5186
 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+=" 2ea6f7648f05aa1384c83331f1b6d7b018f20fbe621f7d3e57bab7c5c2899508"
+	checksum+=" c4a9f2b30eeb74db0f069538458b955cfef46eecccc771b17ab250e9c144122d"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From c26ca9daf3e3dde1a488d416b06b547bbd765a4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Jun 2023 13:57:39 +0200
Subject: [PATCH 0158/1853] perl-Locale-gettext: fix distfile url.

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

diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index 584ddbe176bd..bfa895f47353 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Locale-gettext'
 pkgname=perl-Locale-gettext
 version=1.07
-revision=12
+revision=13
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
@@ -9,6 +9,6 @@ depends="${makedepends}"
 short_desc="Permits access from Perl to the gettext() family of functions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
-homepage="https://metacpan.org/release/gettext"
-distfiles="${CPAN_SITE}/Locale/gettext-${version}.tar.gz"
+homepage="https://metacpan.org/release/Locale-gettext"
+distfiles="${CPAN_SITE}/Locale/PVANDRY/Locale-gettext-${version}.tar.gz"
 checksum=909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15

From 112e12707b2b958e2e39a74c211c4ad721390d2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Jun 2023 14:16:06 +0200
Subject: [PATCH 0159/1853] libX11: update to 1.8.5.

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

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 12f6460344f4..c87251bc7f32 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.8.4
+version=1.8.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libx11"
 distfiles="${XORG_SITE}/lib/libX11-${version}.tar.xz"
-checksum=c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518
+checksum=e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561
 
 post_install() {
 	vlicense COPYING

From 3df00d9f53c95a16e995f8ab90cb9bd8e2d81df1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 17 May 2023 10:29:21 -0400
Subject: [PATCH 0160/1853] python3-cryptography_vectors: update to 41.0.0.

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

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 03820c77e330..8a900ad9d118 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,16 +1,16 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=39.0.2
+version=41.0.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 short_desc="Test vectors for python3-cryptography"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=a68f106f7a4322cf1e7ed51e3fc6d5c1e0b11d337ed918ec879e8afe0c2a5220
+checksum=7c77787f6f1e3065aed0af9b0113d3736f2d0a80e0ed1ddbd296cf5ac638df00
 
 post_install() {
 	vlicense LICENSE

From e82215ce376d11fd4d42081e78eda8ab0bed8c52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 17 May 2023 10:38:16 -0400
Subject: [PATCH 0161/1853] python3-cryptography: update to 41.0.0.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index c20ac3848c02..f5a45e5277a5 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,23 +1,23 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=39.0.2
+version=41.0.0
 revision=1
 build_style=python3-module
 build_helper="rust"
 make_check_args="--ignore tests/bench/test_x509.py --ignore tests/bench/test_aead.py"
-hostmakedepends="python3-setuptools-rust python3-cffi cargo"
+hostmakedepends="python3-setuptools-rust python3-cffi cargo pkg-config"
 makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytest-xdist
  python3-iso8601 python3-pytz python3-cryptography_vectors
- python3-pretend python3-hypothesis $depends"
+ python3-pretend python3-hypothesis python3-pytest-benchmark $depends"
 short_desc="Python3 library that provides cryptographic recipes and primitives"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=bc5b871e977c8ee5a1bbc42fa8d19bcc08baf0c51cbf1586b0e87a2694dde42f
+checksum=6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 6ac0c96a4d1d96db798bb3d09abd2e8a93df5114 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 09:51:52 -0400
Subject: [PATCH 0162/1853] python3-PyJWT: update to 2.7.0.

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

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index f9ad9a2125fa..4cfacce25953 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
-version=2.1.0
-revision=3
+version=2.7.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://pyjwt.readthedocs.io/"
 distfiles="https://github.com/jpadilla/pyjwt/archive/${version}.tar.gz"
-checksum=054d212924baff4052fc587d71b8d489082e675c22d86a035a133b119e79bb29
+checksum=9a4e2843c027dc4ee0c0b514e3b21b7549b40b75fd8f50351f6b6e9ab2807f40
 
 post_install() {
 	vlicense LICENSE

From d1ba1b9f4adc9d1064281416bb38d71778d51c2b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 09:52:18 -0400
Subject: [PATCH 0163/1853] python3-openssl: update to 23.2.0.

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

diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
index e21b02bf2942..0823e4fa891a 100644
--- a/srcpkgs/python3-openssl/template
+++ b/srcpkgs/python3-openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-openssl'
 pkgname=python3-openssl
-version=23.1.1
+version=23.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
-checksum=841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7
+checksum=276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	# https://github.com/pyca/pyopenssl/issues/974

From 961b9d81511bee471e3f9638e47c6f03bb2c7be3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 10:04:52 -0400
Subject: [PATCH 0164/1853] python3-fido2: update to 1.1.1.

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

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index c63372c96a19..e0153c6fa3a9 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-fido2'
 pkgname=python3-fido2
 _pkgname=fido2
-version=1.1.0
+version=1.1.1
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3-six python3-cryptography python3-pyscard"
 # Missing fakefs will be pulled from pypi
 checkdepends="$depends python3-mock python3-pytest"
@@ -13,12 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/Yubico/python-fido2"
 distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2b4b4e620c2100442c20678e0e951ad6d1efb3ba5ca8ebb720c4c8d543293674
-
-post_extract() {
-	# pytest mis-recognises this file as a test case
-	rm -f examples/test_config.py
-}
+checksum=5dc495ca8c59c1c337383b4b8c314d46b92d5c6fc650e71984c6d7f954079fc3
 
 post_install() {
 	vlicense COPYING

From 62beb260a26de9b0bc494a933219294a5676f603 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 10:07:26 -0400
Subject: [PATCH 0165/1853] python3-ntlm-auth: enable tests

---
 srcpkgs/python3-ntlm-auth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-ntlm-auth/template b/srcpkgs/python3-ntlm-auth/template
index 81dba6f7dcef..0f9f4950039c 100644
--- a/srcpkgs/python3-ntlm-auth/template
+++ b/srcpkgs/python3-ntlm-auth/template
@@ -5,6 +5,7 @@ revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-six python3-cryptography"
+checkdepends="python3-pytest python3-requests $depends"
 short_desc="Creates NTLM authentication structures"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 70d5c30693fd888823a34952d82c2f4bb9a9b5b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 10:11:06 -0400
Subject: [PATCH 0166/1853] yubikey-manager: update to 5.1.1.

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

diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
index 0792f9e3a4c0..e744cfeb88ff 100644
--- a/srcpkgs/yubikey-manager/template
+++ b/srcpkgs/yubikey-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'yubikey-manager'
 pkgname=yubikey-manager
-version=5.0.0
+version=5.1.1
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="libfido2 python3-click python3-fido2 python3-cryptography
  python3-setuptools python3-keyring python3-pyscard"
 checkdepends="$depends python3-pytest python3-makefun"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://developers.yubico.com/yubikey-manager/"
 distfiles="https://developers.yubico.com/yubikey-manager/Releases/${pkgname/-/_}-${version}.tar.gz"
-checksum=c741747200ced1b5803dfdef6718b07a41e109ccb03dd7b72d3a307a3fb33bb5
+checksum=6487db976d8b5b52965db55d084f9d2aef2b96f77da785dc13f6dfdd3302aace
 
 post_install() {
 	vman man/ykman.1

From b5e5d96b26ef9728d790b98849c1328679a9ad70 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Fri, 19 May 2023 23:38:31 -0500
Subject: [PATCH 0167/1853] easyrsa: update to 3.1.4.

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

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 6fb6ad6faa42..8c43250148a0 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,6 +1,6 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
-version=3.1.2
+version=3.1.4
 revision=1
 depends="openssl"
 short_desc="Simple shell based CA utility"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, ISC"
 homepage="https://github.com/OpenVPN/easy-rsa"
 changelog="https://github.com/OpenVPN/easy-rsa/raw/master/ChangeLog"
 distfiles="https://github.com/OpenVPN/easy-rsa/releases/download/v${version}/EasyRSA-${version}.tgz"
-checksum="d63cf129490ffd6d8792ede7344806c506c82c32428b5bb609ad97ca6a6e4499"
+checksum=4f987a4b5209b934440b6469a38e99c40964b973f2d296a0ddb72464b41dfe48
 conf_files="/etc/easyrsa/vars /etc/easyrsa/openssl-easyrsa.cnf /etc/easyrsa/x509-types/*"
 
 do_install() {

From ebfe96b31c0b06762945b2cb91c2ce66e175c390 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 27 May 2023 21:07:16 +0530
Subject: [PATCH 0168/1853] gallery-dl: update to 1.25.5.

---
 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 19fda8b0e952..d782205eb048 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.4
+version=1.25.5
 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=57aebeaa508ed537fe9b12ab1d045bc250e8f87bd980b470f973b981718a2f70
+checksum=a6a036c19702a48709130db07468e9716277915ad4e5ea37cb63abdc8321fd87
 
 pre_build() {
 	make man completion

From efd8ff49cfe15611c83a608c9700bf3d23816e8e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 May 2023 03:02:11 -0700
Subject: [PATCH 0169/1853] gtk4: fix TreeList item order

This also fixes an issue in nautilus where removed items appear at the front of
the file list.
---
 ...7d7f1d0f1aea8a5697a50299594ef523faf7.patch | 100 ++++++++++++++++++
 srcpkgs/gtk4/template                         |   2 +-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch

diff --git a/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch b/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
new file mode 100644
index 000000000000..6232575a9395
--- /dev/null
+++ b/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
@@ -0,0 +1,100 @@
+From 4f47683710bbb4b56c286c6ee6a5c394fcf2b755 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 29 Mar 2023 02:23:46 +0000
+Subject: [PATCH] Merge branch 'wip/otte/trelistmodel-fixage' into 'main'
+
+treelistmodel: Don't add items in reverse
+
+Closes #5707
+
+See merge request GNOME/gtk!5744
+
+(cherry picked from commit c5a53f235a2ed1b0acd0a8c29153e62377262d04)
+
+1718db14 treelistmodel: Don't add items in reverse
+cd860beb Add a test for splicing treelistmodel
+---
+ gtk/gtktreelistmodel.c        |  2 +-
+ testsuite/gtk/treelistmodel.c | 46 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 47 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
+index dd3b3009ccc..1e55323c0a4 100644
+--- a/gtk/gtktreelistmodel.c
++++ b/gtk/gtktreelistmodel.c
+@@ -357,7 +357,7 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
+     }
+ 
+   tree_added = added;
+-  for (i = 0; i < added; i++)
++  for (i = added; i-- > 0;)
+     {
+       child = gtk_rb_tree_insert_before (node->children, child);
+       child->parent = node;
+diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c
+index 941ac3d306b..98493a3ba56 100644
+--- a/testsuite/gtk/treelistmodel.c
++++ b/testsuite/gtk/treelistmodel.c
+@@ -261,6 +261,51 @@ test_remove_some (void)
+   g_object_unref (tree);
+ }
+ 
++static void
++splice (GListStore *store,
++        guint       pos,
++        guint       removed,
++        guint      *numbers,
++        guint       added)
++{
++  GObject **objects = g_newa (GObject *, added);
++  guint i;
++
++  for (i = 0; i < added; i++)
++    {
++      /* 0 cannot be differentiated from NULL, so don't use it */
++      g_assert_cmpint (numbers[i], !=, 0);
++      objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
++      g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
++    }
++
++  g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
++
++  for (i = 0; i < added; i++)
++    g_object_unref (objects[i]);
++}
++
++static void
++test_splice (void)
++{
++  GtkTreeListModel *tree = new_model (100, TRUE);
++  gpointer item;
++
++  assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
++  assert_changes (tree, "");
++
++  item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
++  g_assert_true (G_IS_LIST_MODEL (item));
++  splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
++  /* expected */
++  assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
++  /* real outcome */
++  // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
++  assert_changes (tree, "2-5+5");
++
++  g_object_unref (tree);
++}
++
+ /* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
+ typedef struct _DemoNode DemoNode;
+ 
+@@ -391,6 +436,7 @@ main (int argc, char *argv[])
+ 
+   g_test_add_func ("/treelistmodel/expand", test_expand);
+   g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
++  g_test_add_func ("/treelistmodel/remove_splice", test_splice);
+   g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
+ 
+   return g_test_run ();
+-- 
+GitLab
+
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index a2566d4042d3..5fafa50f6f33 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=4.10.3
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dman-pages=true -Dgtk_doc=true

From 144be636c3a0ba48745d49d10b8fbae771b78664 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Jun 2023 16:07:29 +0200
Subject: [PATCH 0170/1853] libvirt: update to 9.4.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index e1cd1aa616f0..7e29d08bda26 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=9.3.0
+version=9.4.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=751179b08e5a73b6cfd93200d110df199eaa3973f3554ba2ebcbd71e272bebe1
+checksum=4862a82f76f3e40f6046e58c8acda281bd5935d1d33eb211d198c856456fd6a5
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From cbe35f8d1302cabac48c12ded0eb04f55cc733d5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Jun 2023 16:13:34 +0200
Subject: [PATCH 0171/1853] libvirt-python3: update to 9.4.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 2ec08b26459a..ea6323be55fd 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.3.0
+version=9.4.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=9c761d88b4ddcf65b324043944da4f18f82471c74d9371d2372d3b4e0f19861b
+checksum=2d0adcb54ca1dd1ddc72b45a39894941ff3659f18d61382229ed9029f6274a7f
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 79fdff831f409998246408aac5ba9885fac9ae15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 2 Jun 2023 22:35:39 +0700
Subject: [PATCH 0172/1853] wireplumber: add elogind modules

---
 srcpkgs/wireplumber-elogind  |  1 +
 srcpkgs/wireplumber/template | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/wireplumber-elogind

diff --git a/srcpkgs/wireplumber-elogind b/srcpkgs/wireplumber-elogind
new file mode 120000
index 000000000000..00ad6b20db5e
--- /dev/null
+++ b/srcpkgs/wireplumber-elogind
@@ -0,0 +1 @@
+wireplumber
\ No newline at end of file
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 0014c3357f7c..5d7510f0d9bb 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,12 +1,12 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=5
+revision=6
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
 hostmakedepends="pkg-config glib-devel python3-lxml doxygen gettext"
-makedepends="libglib-devel pipewire-devel lua54-devel"
+makedepends="libglib-devel pipewire-devel lua54-devel elogind-devel"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -25,7 +25,7 @@ post_install() {
 }
 
 wireplumber-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -34,3 +34,11 @@ wireplumber-devel_package() {
 		vmove usr/share/gir-1.0
 	}
 }
+
+wireplumber-elogind_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - elogind integration"
+	pkg_install() {
+		vmove "usr/lib/wireplumber-${version%.*}/libwireplumber-module-logind.so"
+	}
+}

From 084808aef1feb33269bc432794e264d1c1e5d932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 2 Jun 2023 22:35:17 +0700
Subject: [PATCH 0173/1853] git: update to 2.41.0.

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

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index c97868e23fcf..65b72ea703e1 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.40.1
+version=2.41.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2
+checksum=e748bafd424cfe80b212cbc6f1bbccc3a47d4862fb1eb7988877750478568040
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 553716847d246cf839507028708c5274113f01fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 0174/1853] shotwell: update to 0.32.1.

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

diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 0a5f0718780c..2e1dc4287794 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,14 +1,15 @@
 # Template file for 'shotwell'
 pkgname=shotwell
-version=0.31.5
+version=0.32.1
 revision=1
 build_style=meson
 hostmakedepends="gcr-devel gettext glib-devel itstool
- libgee08-devel libgexiv2-devel pkg-config vala-devel"
+ libgee-devel libgexiv2-devel pkg-config vala-devel"
 makedepends="gst-plugins-base1-devel libgdata-devel
- libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel
+ libgee-devel libgexiv2-devel libgphoto2-devel libgudev-devel
  libraw-devel libsecret-devel libchamplain-devel libwebp-devel
- rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel"
+ rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel
+ libportal-gtk3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Open source photo manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +17,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
 changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19
+checksum=4ac4517416ad8aa23b44e75c34bd6e16bab7363fa20991bb09bacdfab3f763ce
 lib32disabled=yes
 
 post_extract() {

From 3ca5bb335018003ce4b4789221bd5db2ecb4ab0d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jun 2023 20:26:23 +0200
Subject: [PATCH 0175/1853] fotoxx: remove unused libraw build dep

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

diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 881aa8f3891d..ffee06a684f6 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libchamplain-devel libraw-devel"
+makedepends="libchamplain-devel"
 depends="desktop-file-utils exiftool xdg-utils dcraw"
 short_desc="Free open source program for image editing and collection management"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"

From 1f369ab44317cb75d22829b76f3a51e1a80d7335 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH 0176/1853] chronograf: update to 1.10.1, makedepends on
 nodejs, python3

---
 srcpkgs/chronograf/patches/lmdb.patch      | 11 +++++++++++
 srcpkgs/chronograf/patches/noscripts.patch | 10 ++++++++++
 srcpkgs/chronograf/template                | 19 +++++++------------
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/chronograf/patches/lmdb.patch
 create mode 100644 srcpkgs/chronograf/patches/noscripts.patch

diff --git a/srcpkgs/chronograf/patches/lmdb.patch b/srcpkgs/chronograf/patches/lmdb.patch
new file mode 100644
index 000000000000..f79ff3fb11ac
--- /dev/null
+++ b/srcpkgs/chronograf/patches/lmdb.patch
@@ -0,0 +1,11 @@
+--- a/package.json	2023-05-11 10:30:54.448958871 -0400
++++ b/package.json	2023-05-11 10:31:44.786945716 -0400
+@@ -32,5 +32,8 @@
+     "process": "^0.11.10",
+     "querystring-es3": "^0.2.1",
+     "util": "^0.12.4"
++  },
++  "resolutions": {
++     "lmdb": "^2.8.0"
+   }
+ }
diff --git a/srcpkgs/chronograf/patches/noscripts.patch b/srcpkgs/chronograf/patches/noscripts.patch
new file mode 100644
index 000000000000..ef7c67e74857
--- /dev/null
+++ b/srcpkgs/chronograf/patches/noscripts.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2023-05-09 14:10:03.975291850 -0400
++++ b/Makefile	2023-05-09 14:13:17.400831107 -0400
+@@ -72,7 +72,7 @@
+ ifndef YARN
+ 	$(error Please install yarn 1.19.1+)
+ else
+-	cd ui && yarn --no-progress --no-emoji
++	cd ui && yarn --no-progress --no-emoji --ignore-scripts
+ 	@touch .jsdep
+ endif
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..ef562ad65c9e 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,19 +1,19 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"
 go_ldflags="-X main.version=${version}"
-hostmakedepends="dep go-bindata nodejs-lts yarn"
+hostmakedepends="dep go-bindata nodejs yarn python3"
 short_desc="Open source monitoring and visualization UI for the TICK stack"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
-distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
@@ -24,12 +24,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
 }
 
 post_install() {

From 55059bd0e3d8b9b1f69781ac2419e8a6214a6f26 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 2 Jun 2023 22:45:37 +0200
Subject: [PATCH 0177/1853] wireplumber: do not use make_dirs with account from
 different package

Closes: https://github.com/void-linux/void-packages/issues/44231
---
 srcpkgs/wireplumber/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 5d7510f0d9bb..bb0c9f8d785f 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=6
+revision=7
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -16,7 +16,6 @@ changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
 provides="pipewire-session-manager-0_1"
-make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
 
 post_install() {
 	vlicense LICENSE

From 94eedc6def7785ecceae679f2dbc3728686c3d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jun 2023 09:11:38 +0700
Subject: [PATCH 0178/1853] libxfce4ui: update to 4.18.4.

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

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 3c3f495a78aa..909c8e284d8e 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,6 +1,6 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
-version=4.18.3
+version=4.18.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=afa3a46eeed3ab612d2f7e1308edaf5819f6c33ccc16c13080efabd58f010abd
+checksum=87eefe797c6d26de3f754de48872faf131f1b5fc93fb88e22f5c7886a842cb4c
 
 # Package build options
 build_options="gir"

From 62002a2ccb2e6c991f5794630db7b9a0b441f9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jun 2023 09:11:33 +0700
Subject: [PATCH 0179/1853] xfce4-session: update to 4.18.3.

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

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 29778465e4c7..66eb0aa43cd1 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
-version=4.18.2
+version=4.18.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
@@ -14,4 +14,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=01ff7fe8d4c2091adefc2925c6b7bb93152ba0732e95c9b9e64d8207fdbdeb8a
+checksum=382f93e096ec6493098719cab8cc31b93ad9bb469c0715c0c5117d75fe7394ec

From 7803aedd8660013caac641ccb94409d1a99f3b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jun 2023 09:11:30 +0700
Subject: [PATCH 0180/1853] xfce4-panel: update to 4.18.4.

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

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 18d06d914bed..90ebda66bd07 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.18.3
+version=4.18.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b
+checksum=32304f82094ea3779741f968dc851032d8790eb78f3aa01676520b96cfacfb54
 
 # Package build options
 build_options="gir"

From d2949ca4e7b0eea942aaf2d085aab016122ea9f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Jun 2023 11:06:59 +0200
Subject: [PATCH 0181/1853] perl-Module-Build-Tiny: update to 0.046.

---
 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 2a3c60d55d25..8f12c01fdca6 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.045
+version=0.046
 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=d20692eee246d0b329b7f7659f36286b14ae0696fe91078a64b7078f8876d300
+checksum=be193027e2debb4c9926434aaf1aa46c9fc7bf4db83dcc347eb6e359ee878289

From 86adaea52382c407d243330237bd6591d0f632f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 3 Jun 2023 15:08:29 +0200
Subject: [PATCH 0182/1853] opam: update to 2.1.5.

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

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index e0765733c350..46e4a305f2b9 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,6 +1,6 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.4
+version=2.1.5
 revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="https://opam.ocaml.org/"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=06aa6c96ccf68bb8be3864d984bd7c54329eabb4082d7c07232cd4d18c55e7c4
+checksum=2eb2a21f4d64d1eb2eece2e8d28678be823d3f6846c28fc0fbd5645738fe0f81
 nocross=yes
 disable_parallel_build=yes
 make_check=ci-skip # uses bwrap

From a0c170ee0e6168da63431504f876134a3d6cff2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:48:29 +0200
Subject: [PATCH 0183/1853] libraw: update to 0.21.1.

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

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..16eefd439b2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -915,8 +915,8 @@ libdiscid.so.0 libdiscid-0.2.2_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
-libraw.so.20 libraw-0.20.2_1
-libraw_r.so.20 libraw-0.20.2_1
+libraw.so.23 libraw-0.21.0_1
+libraw_r.so.23 libraw-0.21.0_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index b5393b77b7e7..3e72337dfbdc 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -1,6 +1,6 @@
 # Template file for 'libraw'
 pkgname=libraw
-version=0.20.2
+version=0.21.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -11,7 +11,7 @@ license="LGPL-2.1-only, CDDL-1.0"
 homepage="https://www.libraw.org"
 changelog="https://github.com/LibRaw/LibRaw/raw/${version%.*}-stable/Changelog.txt"
 distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz"
-checksum=dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6
+checksum=630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd
 
 pre_configure() {
 	autoreconf -fi

From f7ef23d44aa0de3ce872d7d4c01b321185564760 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:39 +0200
Subject: [PATCH 0184/1853] efl: revbump for libraw 0.21

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index c3ef8348c196..db34290abbe1 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.26.2
-revision=4
+revision=5
 build_style=meson
 configure_args="
  -Dbuild-examples=false

From 770637babf74eb9d3e6173724bc1cb604e7e0716 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 0185/1853] gegl: revbump for libraw 0.21

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

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index ab5dcdae833b..ce14c44fc7f4 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.44
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=true -Dvapigen=enabled

From e64f6ba4421a1df82b7942baf1e9a2032cb22361 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 0186/1853] gthumb: revbump for libraw 0.21

---
 srcpkgs/gthumb/patches/libraw-0.21.patch | 67 ++++++++++++++++++++++++
 srcpkgs/gthumb/template                  |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gthumb/patches/libraw-0.21.patch

diff --git a/srcpkgs/gthumb/patches/libraw-0.21.patch b/srcpkgs/gthumb/patches/libraw-0.21.patch
new file mode 100644
index 000000000000..ee1faf6b07cf
--- /dev/null
+++ b/srcpkgs/gthumb/patches/libraw-0.21.patch
@@ -0,0 +1,67 @@
+From da0d3f22a5c3a141211d943e7d963d14090011ec Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Fri, 23 Dec 2022 17:37:03 +0100
+Subject: [PATCH] Fixed build with libraw 0.21
+
+---
+ extensions/raw_files/gth-metadata-provider-raw.c | 2 +-
+ extensions/raw_files/gth-metadata-provider-raw.h | 7 +++++++
+ extensions/raw_files/main.c                      | 4 ++--
+ 3 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/raw_files/gth-metadata-provider-raw.c b/extensions/raw_files/gth-metadata-provider-raw.c
+index 2d9f5020c..1aa8a727e 100644
+--- a/extensions/raw_files/gth-metadata-provider-raw.c
++++ b/extensions/raw_files/gth-metadata-provider-raw.c
+@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self,
+ 	if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
+ 		return;
+ 
+-	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++	raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+ 	if (raw_data == NULL)
+ 		goto fatal_error;
+ 
+diff --git a/extensions/raw_files/gth-metadata-provider-raw.h b/extensions/raw_files/gth-metadata-provider-raw.h
+index 6406c68bf..cf19434df 100644
+--- a/extensions/raw_files/gth-metadata-provider-raw.h
++++ b/extensions/raw_files/gth-metadata-provider-raw.h
+@@ -25,6 +25,13 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <gthumb.h>
++#include <libraw.h>
++
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
++#else
++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
++#endif
+ 
+ #define GTH_TYPE_METADATA_PROVIDER_RAW         (gth_metadata_provider_raw_get_type ())
+ #define GTH_METADATA_PROVIDER_RAW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_METADATA_PROVIDER_RAW, GthMetadataProviderRaw))
+diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
+index 25829c120..0673c2c75 100644
+--- a/extensions/raw_files/main.c
++++ b/extensions/raw_files/main.c
+@@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 	size_t         size;
+ 	GthImage      *image = NULL;
+ 
+-	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++	raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+ 	if (raw_data == NULL) {
+ 		_libraw_set_gerror (error, errno);
+ 		goto fatal_error;
+@@ -300,7 +300,7 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 		if ((original_width != NULL) && (original_height != NULL)) {
+ 			libraw_close (raw_data);
+ 
+-			raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++			raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+ 			if (raw_data == NULL)
+ 				goto fatal_error;
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index 4da54add6ae8..7e8de5b6817a 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,7 +1,7 @@
 # Template file for 'gthumb'
 pkgname=gthumb
 version=3.12.2
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
 makedepends="webkit2gtk-devel json-glib-devel libsecret-devel librsvg-devel

From d8197d09bf424340202065e4e9a2770bc0132c23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 0187/1853] io.elementary.photos: revbump for libraw 0.21

---
 srcpkgs/io.elementary.photos/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 606b6ba2edc5..42237ef45750 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.photos'
 pkgname=io.elementary.photos
 version=2.7.5
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
  glib-devel python3-scour"

From 2e01cc5cbb1c0c4cd5b808c33986722ec13ee45d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 0188/1853] kimageformats: revbump for libraw 0.21

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index f42919b9a60f..4e4a02383fd3 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.105.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From a7cdc6e2a554dfe51feafd6d061acee62f9dc0d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 0189/1853] krita: revbump for libraw 0.21

---
 srcpkgs/krita/patches/libraw-0.21.patch | 28 +++++++++++++++++++++++++
 srcpkgs/krita/template                  |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/krita/patches/libraw-0.21.patch

diff --git a/srcpkgs/krita/patches/libraw-0.21.patch b/srcpkgs/krita/patches/libraw-0.21.patch
new file mode 100644
index 000000000000..fd2d40e5cc7b
--- /dev/null
+++ b/srcpkgs/krita/patches/libraw-0.21.patch
@@ -0,0 +1,28 @@
+From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 16:28:38 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa71..71425f909c2 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+     d->setProgress(0.3);
+ 
+     raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++    raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+     raw.imgdata.params.shot_select = shotSelect;
++#endif
+     ret                            = raw.unpack();
+ 
+     if (ret != LIBRAW_SUCCESS)
+-- 
+GitLab
+
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1ca223394960..f070ef21bfb3 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=5
+revision=6
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 1b0671ac49cbfc593ea4e13cbbb60deedc6f699f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 0190/1853] kstars: revbump for libraw 0.21

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

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 661cbdcde170..29d6ae2f997c 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
 # Template file for 'kstars'
 pkgname=kstars
 version=3.6.0
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
  kconfig"
@@ -19,3 +19,4 @@ license="GPL-2.0-or-later"
 homepage="https://edu.kde.org/kstars/"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=c1dbf64ce38f201dd5446dd732ce7c8bf1ef30367dc2f11102105036c949db91
+make_check=no # FIXME

From 51db3585e1673fd75304ae630227603f85191e81 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:42 +0200
Subject: [PATCH 0191/1853] libkdcraw5: revbump for libraw 0.21

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

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 9287282dc3dc..27e416dca9f8 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
 version=23.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
  gettext"

From 0fb5b3e17d55dd5ebf1656b7ae84ff031730d98a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:42 +0200
Subject: [PATCH 0192/1853] nomacs: revbump for libraw 0.21

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

diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index ce4e7f7093da..57d3a1e98e84 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,7 +1,7 @@
 # Template file for 'nomacs'
 pkgname=nomacs
 version=3.16.224
-revision=4
+revision=5
 build_wrksrc=ImageLounge
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_TRANSLATIONS=1

From b88f0b9cd14cc26b3c5202bb037565f1f7343f2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 0193/1853] openimageio: revbump for libraw 0.21

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

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 9b38ace50f7e..c2d36b4b3539 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From aa0d0959f3d0e3c2cef4c1f78512806ef3fc2b59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 0194/1853] siril: revbump for libraw 0.21

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

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index e88f30fb6178..84332f79d060 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=9
+revision=10
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From 39799f22f642f03e1329dcf11a4f524798487725 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jun 2023 20:47:11 +0200
Subject: [PATCH 0195/1853] shotwell: revbump for libraw 0.21

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

diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 2e1dc4287794..60ee544de0be 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,7 +1,7 @@
 # Template file for 'shotwell'
 pkgname=shotwell
 version=0.32.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gcr-devel gettext glib-devel itstool
  libgee-devel libgexiv2-devel pkg-config vala-devel"

From 5017b1a58971950afe0c5b0ea200778ab4cb6dae Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 3 Jun 2023 09:39:08 -0500
Subject: [PATCH 0196/1853] delta: update to 0.16.4.

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

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 154bbaa578c5..ab06413387f0 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.15.1
+version=0.16.4
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,12 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
-checksum=b9afd2f80ae1d57991a19832d6979c7080a568d42290a24e59d6a2a82cbc1728
-
-post_patch() {
-	# fixes an indexmap error when cross compiling
-	cargo update --package autocfg@1.0.1 --precise 1.1.0
-}
+checksum=66380e92d422881fae6526aee14bedf8124ea17903bcf6d22633e658bd509190
 
 pre_build() {
 	export RUSTONIG_SYSTEM_LIBONIG=1

From 5901a0279c686c06fa0d5f210203092e594d318c Mon Sep 17 00:00:00 2001
From: Andrew B <abenson+void@gmail.com>
Date: Sat, 3 Jun 2023 10:01:24 -0500
Subject: [PATCH 0197/1853] sqlmap: update to 1.7.6.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 86788928ca40..e3b3a0fde44a 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.7.5
+version=1.7.6
 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=0bed6c991d02efa39deaa93293ef1183e6d54b63c1c12b585f5ffc0e9dee20e9
+checksum=035df3f8d3eda65723318d3e1faa5e271e82774a151f4ff706e79ed5b49e2b27
 python_version=3
 
 do_install() {

From 7021fe80f9219e6d5c70c27d04a47307001a0230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 19 May 2023 15:50:26 +0200
Subject: [PATCH 0198/1853] homebank: update to 5.6.4.

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

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 98c88597e494..0f2226d38d81 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.6.3
+version=5.6.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 changelog="http://homebank.free.fr/ChangeLog"
 distfiles="http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"
-checksum=419475f564bbd9be7f4101b1197ce53ea21e8374bcf0505391406317ed823828
+checksum=81e1ff4186cf1fa90b48978272011887fa7c0b7b066438bd494f4a0f80ff95b9
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 620b20e4bd26e795d683aeb7ab657d60846f7791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 20 May 2023 17:11:10 +0200
Subject: [PATCH 0199/1853] doctl: update to 1.96.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index f14a0aca930b..03c6ca38bb4f 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.95.0
+version=1.96.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -15,4 +15,4 @@ license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 changelog="https://raw.githubusercontent.com/digitalocean/doctl/main/CHANGELOG.md"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=1b3d054fd18f2b4c424b0fd116ee298881f3954075194c6cbaf3bbdb03fdb22c
+checksum=5963bfb113632df33d0ef6c2d076cedd180f73ce82f3162e7d1bc93b190a9951

From 288f7dd58a6288c498641ad7b8d234278e3ea7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 22 May 2023 13:08:54 +0200
Subject: [PATCH 0200/1853] python3-dominate: update to 2.8.0.

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

diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template
index c38fa2d9d35a..19e0f070382a 100644
--- a/srcpkgs/python3-dominate/template
+++ b/srcpkgs/python3-dominate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dominate'
 pkgname=python3-dominate
-version=2.7.0
-revision=2
+version=2.8.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -11,4 +11,12 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Knio/dominate"
 distfiles="https://github.com/Knio/dominate/archive/${version}.tar.gz"
-checksum=f2bf3f12c10e25b9d632d20f1560fa9a1c91409f47e8f64e0fa0b9e12aedc20f
+checksum=4e55f84b8446fe4338a7acaf60bbb1cb133a81c4c7a46a196b904c9f8387d377
+
+pre_check() {
+	# this fix the failed test in i686
+	# https://github.com/Knio/dominate/issues/175
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		vsed -i '/3713141171098444831/i  \\t\t1692341442, # i686' tests/test_dom_tag.py
+	fi
+}

From 369fd5d765c13a6186d33f8c3074cd7a36df7e9a Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 31 May 2023 18:20:33 -0500
Subject: [PATCH 0201/1853] Signal-Desktop: update to 6.20.0.

---
 srcpkgs/Signal-Desktop/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 4c6722055987..fec02583a29a 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,34 +1,38 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.19.0
+version=6.20.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
 # https://git.alpinelinux.org/aports/tree/testing/signal-desktop
 # ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
 archs="x86_64"
-hostmakedepends="git git-lfs nodejs python3 tar yarn"
+hostmakedepends="git git-lfs nodeenv python3 tar"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
 maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=965702b217b39131c61e62c63fb25b073750a8f6febdffa9db236626124c6e50
+checksum=fc92011c51da6792215eb92d48afc17f1967caeade1307daaa13884244d7a3b0
 nostrip_files="signal-desktop"
 
 post_extract() {
 	# git-lfs hook needs to be installed for one of the dependencies
 	git lfs install
 
-	#vsed 's/"node": "/&>=/' -i package.json
-	vsed 's/"node": "18.14.0"/"node": ">=16.19.0"/' -i package.json
+	# use nodeenv since we have that in the repos already
+	nodeenv --node='18.14.0' signal-node
+	. ./signal-node/bin/activate
+
+	npm install -g yarn
 
 	# Dependencies have to be installed before applying patch
 	yarn install --ignore-engines --frozen-lockfile
 }
 
 do_build() {
+	. ./signal-node/bin/activate
 	yarn generate
 	yarn build-release
 }

From 108ccdbcb29f52098c3bcd8bfe890e310e773a88 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 20 Nov 2022 19:47:36 +0100
Subject: [PATCH 0202/1853] nodejs: merge with nodejs-lts

nodejs 16 is an LTS version and nodejs-lts version 12 is EOL
---
 srcpkgs/nodejs-lts                            |   1 +
 srcpkgs/nodejs-lts-devel                      |   2 +-
 .../patches/ppc-fixes-for-older-models.patch  | 847 ------------------
 srcpkgs/nodejs-lts/patches/ppc32.patch        |  20 -
 srcpkgs/nodejs-lts/patches/shared-uv.patch    |  25 -
 .../patches/xxx-ppc-hwcap-musl.patch          |  24 -
 srcpkgs/nodejs-lts/template                   | 104 ---
 srcpkgs/nodejs-lts/update                     |   2 -
 srcpkgs/nodejs/template                       |  18 +-
 9 files changed, 17 insertions(+), 1026 deletions(-)
 create mode 120000 srcpkgs/nodejs-lts
 delete mode 100644 srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
 delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
 delete mode 100644 srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch
 delete mode 100644 srcpkgs/nodejs-lts/template
 delete mode 100644 srcpkgs/nodejs-lts/update

diff --git a/srcpkgs/nodejs-lts b/srcpkgs/nodejs-lts
new file mode 120000
index 000000000000..0c524b775308
--- /dev/null
+++ b/srcpkgs/nodejs-lts
@@ -0,0 +1 @@
+nodejs
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-devel b/srcpkgs/nodejs-lts-devel
index c9a495a2e35b..0c524b775308 120000
--- a/srcpkgs/nodejs-lts-devel
+++ b/srcpkgs/nodejs-lts-devel
@@ -1 +1 @@
-nodejs-lts
\ No newline at end of file
+nodejs
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch b/srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
deleted file mode 100644
index 3a3630f1ad4d..000000000000
--- a/srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
+++ /dev/null
@@ -1,847 +0,0 @@
-Fix PowerPC CPU detection and codegen to work with more processors.
-
-This patch defines the correct optional Power ISA features that the
-PPC code generator needs in order to run without crashing on v2.01
-and older CPUs such as PPC 970 (G5) or NXP e6500, and to run more
-efficiently on CPUs with features that weren't being used before.
-
-PowerPC ISA v2.01 and older CPUs don't have FP round to int instructions,
-and PowerPC ISA v2.06 and older are missing support for unsigned 64-bit
-to/from double, as well as integer to/from single-precision float.
-
-Add a new FP_ROUND_TO_INT CPU feature to determine whether to generate
-FP round to int, and add a new PPC_7_PLUS feature to determine whether
-to use the v2.06 FPR conversion instructions or generate an alternate
-sequence to handle large 64-bit unsigned ints, and single-precision 
-using the v2.01 instructions with handling for large uint64_t values
-as well as rounding results from double to single-precision.
-
-Also add a new POP_COUNT feature for the popcnt opcodes added in v2.06,
-which are also present in the NXP e5500 and e6500 cores, which are
-otherwise missing many of the features added since v2.01.
-
-By defining an ICACHE_SNOOP feature bit to replace the poorly-named
-"LWSYNC", the meaning of the instruction cache flushing fast path,
-and the CPUs that can use it, are more clearly defined. In addition,
-for the other PowerPC chips, the loop to flush the data and instruction
-cache blocks has been split into two loops, with a single "sync" and
-"isync" after each loop, which should be more efficient, and also handles
-the few CPUs with differing data and instruction cache line sizes.
-
-In the macro assembler methods, in addition to providing an alternate
-path for FP conversion opcodes added in POWER7 (ISA v2.06), unnecessary
-instructions to move sp down and then immediately back up were replaced
-with negative offsets from the current sp. This should be faster, and also
-sp is supposed to point to a back chain at all times (V8 may not do this).
-
-This patch also fixes ppc64 big-endian ELFv1 builds (not needed for Void).
-
---- a/deps/v8/src/base/cpu.cc	2022-02-15 21:11:46.291387457 -0800
-+++ b/deps/v8/src/base/cpu.cc	2022-02-17 23:01:40.624597523 -0800
-@@ -10,7 +10,7 @@
- #if V8_OS_LINUX
- #include <linux/auxvec.h>  // AT_HWCAP
- #endif
--#if V8_GLIBC_PREREQ(2, 16)
-+#if V8_GLIBC_PREREQ(2, 16) || (V8_OS_LINUX && V8_HOST_ARCH_PPC)
- #include <sys/auxv.h>  // getauxval()
- #endif
- #if V8_OS_QNX
-@@ -611,57 +611,56 @@
- 
- #ifndef USE_SIMULATOR
- #if V8_OS_LINUX
--  // Read processor info from /proc/self/auxv.
--  char* auxv_cpu_type = nullptr;
--  FILE* fp = fopen("/proc/self/auxv", "r");
--  if (fp != nullptr) {
--#if V8_TARGET_ARCH_PPC64
--    Elf64_auxv_t entry;
--#else
--    Elf32_auxv_t entry;
--#endif
--    for (;;) {
--      size_t n = fread(&entry, sizeof(entry), 1, fp);
--      if (n == 0 || entry.a_type == AT_NULL) {
--        break;
--      }
--      switch (entry.a_type) {
--        case AT_PLATFORM:
--          auxv_cpu_type = reinterpret_cast<char*>(entry.a_un.a_val);
--          break;
--        case AT_ICACHEBSIZE:
--          icache_line_size_ = entry.a_un.a_val;
--          break;
--        case AT_DCACHEBSIZE:
--          dcache_line_size_ = entry.a_un.a_val;
--          break;
--      }
--    }
--    fclose(fp);
--  }
-+  // Read processor info from getauxval() (needs at least glibc 2.18 or musl).
-+  icache_line_size_ = static_cast<int>(getauxval(AT_ICACHEBSIZE));
-+  dcache_line_size_ = static_cast<int>(getauxval(AT_DCACHEBSIZE));
-+  const unsigned long hwcap = getauxval(AT_HWCAP);
-+  const unsigned long hwcap2 = getauxval(AT_HWCAP2);
-+  const char* platform = reinterpret_cast<const char*>(getauxval(AT_PLATFORM));
-+
-+  // NOTE: AT_HWCAP ISA version bits aren't cumulative, so it's necessary
-+  // to compare against a mask of all supported versions and CPUs, up to
-+  // ISA v2.06, which *is* set for later CPUs. In contrast, the AT_HWCAP2
-+  // ISA version bits from v2.07 onward are set cumulatively, so POWER10
-+  // will set the ISA version bits from v2.06 (in AT_HWCAP) through v3.1.
-+
-+  // i-cache coherency requires Power ISA v2.02 or later; has its own flag.
-+  has_icache_snoop_ = (hwcap & PPC_FEATURE_ICACHE_SNOOP);
-+
-+  // requires Power ISA v2.03 or later, or the HAS_ISEL bit (e.g. e6500).
-+  has_isel_ = (hwcap & (PPC_FEATURE_POWER5_PLUS | PPC_FEATURE_ARCH_2_05 |
-+      PPC_FEATURE_PA6T | PPC_FEATURE_POWER6_EXT | PPC_FEATURE_ARCH_2_06)) ||
-+      (hwcap2 & PPC_FEATURE2_HAS_ISEL);
-+
-+  // hwcap mask for older 64-bit PPC CPUs with Altivec, e.g. G5, Cell.
-+  static const unsigned long kHwcapMaskPPCG5 =
-+      (PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC);
- 
-   part_ = -1;
--  if (auxv_cpu_type) {
--    if (strcmp(auxv_cpu_type, "power10") == 0) {
--      part_ = PPC_POWER10;
--    }
--    else if (strcmp(auxv_cpu_type, "power9") == 0) {
--      part_ = PPC_POWER9;
--    } else if (strcmp(auxv_cpu_type, "power8") == 0) {
--      part_ = PPC_POWER8;
--    } else if (strcmp(auxv_cpu_type, "power7") == 0) {
--      part_ = PPC_POWER7;
--    } else if (strcmp(auxv_cpu_type, "power6") == 0) {
--      part_ = PPC_POWER6;
--    } else if (strcmp(auxv_cpu_type, "power5") == 0) {
--      part_ = PPC_POWER5;
--    } else if (strcmp(auxv_cpu_type, "ppc970") == 0) {
--      part_ = PPC_G5;
--    } else if (strcmp(auxv_cpu_type, "ppc7450") == 0) {
--      part_ = PPC_G4;
--    } else if (strcmp(auxv_cpu_type, "pa6t") == 0) {
--      part_ = PPC_PA6T;
--    }
-+  if (hwcap2 & PPC_FEATURE2_ARCH_3_1) {
-+    part_ = PPC_POWER10;
-+  } else if (hwcap2 & PPC_FEATURE2_ARCH_3_00) {
-+    part_ = PPC_POWER9;
-+  } else if (hwcap2 & PPC_FEATURE2_ARCH_2_07) {
-+    part_ = PPC_POWER8;
-+  } else if (hwcap & PPC_FEATURE_ARCH_2_06) {
-+    part_ = PPC_POWER7;
-+  } else if (hwcap & PPC_FEATURE_ARCH_2_05) {
-+    part_ = PPC_POWER6;
-+  } else if (hwcap & (PPC_FEATURE_POWER5 | PPC_FEATURE_POWER5_PLUS)) {
-+    part_ = PPC_POWER5;
-+  } else if (hwcap & PPC_FEATURE_PA6T) {
-+    part_ = PPC_PA6T;
-+  } else if (strcmp(platform, "ppce6500") == 0) {
-+    part_ = PPC_E6500;
-+  } else if (strcmp(platform, "ppce5500") == 0) {
-+    part_ = PPC_E5500;
-+  } else if ((hwcap & kHwcapMaskPPCG5) == kHwcapMaskPPCG5) {
-+    part_ = PPC_G5;
-+  } else if (hwcap & PPC_FEATURE_HAS_ALTIVEC) {
-+    part_ = PPC_G4;
-+  } else {
-+    part_ = PPC_G3;
-   }
- 
- #elif V8_OS_AIX
-@@ -682,9 +681,13 @@
-       part_ = PPC_POWER6;
-       break;
-     case POWER_5:
-+    default:
-       part_ = PPC_POWER5;
-       break;
-   }
-+
-+  has_icache_snoop_ = true;
-+  has_isel_ = (part_ != PPC_POWER5);    // isel was added in POWER5+ (v2.03)
- #endif  // V8_OS_AIX
- #endif  // !USE_SIMULATOR
- #endif  // V8_HOST_ARCH_PPC
---- a/deps/v8/src/base/cpu.h	2022-02-15 21:11:46.291387457 -0800
-+++ b/deps/v8/src/base/cpu.h	2022-02-17 19:54:08.768614805 -0800
-@@ -71,9 +71,12 @@
-     PPC_POWER8,
-     PPC_POWER9,
-     PPC_POWER10,
-+    PPC_G3,
-     PPC_G4,
-     PPC_G5,
--    PPC_PA6T
-+    PPC_PA6T,
-+    PPC_E5500,
-+    PPC_E6500
-   };
- 
-   // General features
-@@ -116,6 +119,10 @@
-   bool is_fp64_mode() const { return is_fp64_mode_; }
-   bool has_msa() const { return has_msa_; }
- 
-+  // PowerPC features
-+  bool has_icache_snoop() const { return has_icache_snoop_; }
-+  bool has_isel() const { return has_isel_; }
-+
-  private:
-   char vendor_[13];
-   int stepping_;
-@@ -157,6 +164,8 @@
-   bool is_fp64_mode_;
-   bool has_non_stop_time_stamp_counter_;
-   bool has_msa_;
-+  bool has_icache_snoop_;
-+  bool has_isel_;
- };
- 
- }  // namespace base
---- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc	2022-02-01 10:53:09.000000000 -0800
-+++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc	2022-02-18 22:55:36.676461343 -0800
-@@ -706,13 +706,25 @@
- 
- void TurboAssembler::ConvertIntToFloat(Register src, DoubleRegister dst) {
-   MovIntToDouble(dst, src, r0);
--  fcfids(dst, dst);
-+
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    fcfids(dst, dst);
-+  } else {
-+    fcfid(dst, dst);
-+    frsp(dst, dst);
-+  }
- }
- 
- void TurboAssembler::ConvertUnsignedIntToFloat(Register src,
-                                                DoubleRegister dst) {
-   MovUnsignedIntToDouble(dst, src, r0);
--  fcfids(dst, dst);
-+
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    fcfids(dst, dst);
-+  } else {
-+    fcfid(dst, dst);
-+    frsp(dst, dst);
-+  }
- }
- 
- #if V8_TARGET_ARCH_PPC64
-@@ -724,20 +736,52 @@
- 
- void TurboAssembler::ConvertUnsignedInt64ToFloat(Register src,
-                                                  DoubleRegister double_dst) {
--  MovInt64ToDouble(double_dst, src);
--  fcfidus(double_dst, double_dst);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    MovInt64ToDouble(double_dst, src);
-+    fcfidus(double_dst, double_dst);
-+  } else {
-+    ConvertUnsignedInt64ToDouble(src, double_dst);
-+    frsp(double_dst, double_dst);
-+  }
- }
- 
- void TurboAssembler::ConvertUnsignedInt64ToDouble(Register src,
-                                                   DoubleRegister double_dst) {
--  MovInt64ToDouble(double_dst, src);
--  fcfidu(double_dst, double_dst);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    MovInt64ToDouble(double_dst, src);
-+    fcfidu(double_dst, double_dst);
-+  } else {
-+    Label negative;
-+    Label done;
-+    cmpi(src, Operand::Zero());
-+    blt(&negative);
-+    std(src, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    lfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    fcfid(double_dst, double_dst);
-+    b(&done);
-+    bind(&negative);
-+    // Note: GCC saves the lowest bit, then ORs it after shifting right 1 bit,
-+    // presumably for better rounding. This version only shifts right 1 bit.
-+    srdi(r0, src, Operand(1));
-+    std(r0, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    lfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    fcfid(double_dst, double_dst);
-+    fadd(double_dst, double_dst, double_dst);
-+    bind(&done);
-+   }
- }
- 
- void TurboAssembler::ConvertInt64ToFloat(Register src,
-                                          DoubleRegister double_dst) {
-   MovInt64ToDouble(double_dst, src);
--  fcfids(double_dst, double_dst);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    fcfids(double_dst, double_dst);
-+  } else {
-+    fcfid(double_dst, double_dst);
-+    frsp(double_dst, double_dst);
-+  }
- }
- #endif
- 
-@@ -767,15 +811,56 @@
- void TurboAssembler::ConvertDoubleToUnsignedInt64(
-     const DoubleRegister double_input, const Register dst,
-     const DoubleRegister double_dst, FPRoundingMode rounding_mode) {
--  if (rounding_mode == kRoundToZero) {
--    fctiduz(double_dst, double_input);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    if (rounding_mode == kRoundToZero) {
-+      fctiduz(double_dst, double_input);
-+    } else {
-+      SetRoundingMode(rounding_mode);
-+      fctidu(double_dst, double_input);
-+      ResetRoundingMode();
-+    }
-+
-+    MovDoubleToInt64(dst, double_dst);
-   } else {
--    SetRoundingMode(rounding_mode);
--    fctidu(double_dst, double_input);
--    ResetRoundingMode();
-+    Label safe_size;
-+    Label done;
-+    mov(dst, Operand(1593835520));  // bit pattern for 2^63 as a float
-+    stw(dst, MemOperand(sp, -kFloatSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    lfs(double_dst, MemOperand(sp, -kFloatSize));
-+    fcmpu(double_input, double_dst);
-+    blt(&safe_size);
-+    // Subtract 2^63, then OR the top bit of the uint64 to add back
-+    fsub(double_dst, double_input, double_dst);
-+    if (rounding_mode == kRoundToZero) {
-+      fctidz(double_dst, double_dst);
-+    } else {
-+      SetRoundingMode(rounding_mode);
-+      fctid(double_dst, double_dst);
-+      ResetRoundingMode();
-+    }
-+    // set r0 to -1, then clear all but the MSB.
-+    mov(r0, Operand(-1));
-+    rldicr(r0, r0, 0, 0);
-+    stfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    ld(dst, MemOperand(sp, -kDoubleSize));
-+    xor_(dst, dst, r0);
-+    b(&done);
-+    // Handling for values smaller than 2^63.
-+    bind(&safe_size);
-+    if (rounding_mode == kRoundToZero) {
-+      fctidz(double_dst, double_input);
-+    } else {
-+      SetRoundingMode(rounding_mode);
-+      fctid(double_dst, double_input);
-+      ResetRoundingMode();
-+    }
-+    stfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    ld(dst, MemOperand(sp, -kDoubleSize));
-+    bind(&done);
-   }
--
--  MovDoubleToInt64(dst, double_dst);
- }
- #endif
- 
-@@ -2097,19 +2182,17 @@
-   }
- #endif
- 
--  addi(sp, sp, Operand(-kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
-   mov(scratch, Operand(litVal.ival));
--  std(scratch, MemOperand(sp));
-+  std(scratch, MemOperand(sp, -kDoubleSize));
- #else
-   LoadIntLiteral(scratch, litVal.ival[0]);
--  stw(scratch, MemOperand(sp, 0));
-+  stw(scratch, MemOperand(sp, -kDoubleSize));
-   LoadIntLiteral(scratch, litVal.ival[1]);
--  stw(scratch, MemOperand(sp, 4));
-+  stw(scratch, MemOperand(sp, -kDoubleSize + 4));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(result, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(result, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovIntToDouble(DoubleRegister dst, Register src,
-@@ -2123,18 +2206,16 @@
- #endif
- 
-   DCHECK(src != scratch);
--  subi(sp, sp, Operand(kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
-   extsw(scratch, src);
--  std(scratch, MemOperand(sp, 0));
-+  std(scratch, MemOperand(sp, -kDoubleSize));
- #else
-   srawi(scratch, src, 31);
--  stw(scratch, MemOperand(sp, Register::kExponentOffset));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovUnsignedIntToDouble(DoubleRegister dst, Register src,
-@@ -2148,18 +2229,16 @@
- #endif
- 
-   DCHECK(src != scratch);
--  subi(sp, sp, Operand(kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
-   clrldi(scratch, src, Operand(32));
--  std(scratch, MemOperand(sp, 0));
-+  std(scratch, MemOperand(sp, -kDoubleSize));
- #else
-   li(scratch, Operand::Zero());
--  stw(scratch, MemOperand(sp, Register::kExponentOffset));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovInt64ToDouble(DoubleRegister dst,
-@@ -2174,16 +2253,14 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
--  std(src, MemOperand(sp, 0));
-+  std(src, MemOperand(sp, -kDoubleSize));
- #else
--  stw(src_hi, MemOperand(sp, Register::kExponentOffset));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- #if V8_TARGET_ARCH_PPC64
-@@ -2198,12 +2275,10 @@
-     return;
-   }
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stw(src_hi, MemOperand(sp, Register::kExponentOffset));
--  stw(src_lo, MemOperand(sp, Register::kMantissaOffset));
-+  stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src_lo, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- #endif
- 
-@@ -2218,12 +2293,10 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(dst, MemOperand(sp));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stfd(dst, MemOperand(sp, -kDoubleSize));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::InsertDoubleHigh(DoubleRegister dst, Register src,
-@@ -2237,12 +2310,10 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(dst, MemOperand(sp));
--  stw(src, MemOperand(sp, Register::kExponentOffset));
-+  stfd(dst, MemOperand(sp, -kDoubleSize));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovDoubleLowToInt(Register dst, DoubleRegister src) {
-@@ -2253,11 +2324,9 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(src, MemOperand(sp));
-+  stfd(src, MemOperand(sp, -kDoubleSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lwz(dst, MemOperand(sp, Register::kMantissaOffset));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- }
- 
- void TurboAssembler::MovDoubleHighToInt(Register dst, DoubleRegister src) {
-@@ -2269,11 +2338,9 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(src, MemOperand(sp));
-+  stfd(src, MemOperand(sp, -kDoubleSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lwz(dst, MemOperand(sp, Register::kExponentOffset));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lwz(dst, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
- }
- 
- void TurboAssembler::MovDoubleToInt64(
-@@ -2288,32 +2355,26 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(src, MemOperand(sp));
-+  stfd(src, MemOperand(sp, -kDoubleSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
- #if V8_TARGET_ARCH_PPC64
--  ld(dst, MemOperand(sp, 0));
-+  ld(dst, MemOperand(sp, -kDoubleSize));
- #else
--  lwz(dst_hi, MemOperand(sp, Register::kExponentOffset));
--  lwz(dst, MemOperand(sp, Register::kMantissaOffset));
-+  lwz(dst_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
--  addi(sp, sp, Operand(kDoubleSize));
- }
- 
- void TurboAssembler::MovIntToFloat(DoubleRegister dst, Register src) {
--  subi(sp, sp, Operand(kFloatSize));
--  stw(src, MemOperand(sp, 0));
-+  stw(src, MemOperand(sp, -kFloatSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfs(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kFloatSize));
-+  lfs(dst, MemOperand(sp, -kFloatSize));
- }
- 
- void TurboAssembler::MovFloatToInt(Register dst, DoubleRegister src) {
--  subi(sp, sp, Operand(kFloatSize));
--  stfs(src, MemOperand(sp, 0));
-+  stfs(src, MemOperand(sp, -kFloatSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lwz(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kFloatSize));
-+  lwz(dst, MemOperand(sp, -kFloatSize));
- }
- 
- void TurboAssembler::Add(Register dst, Register src, intptr_t value,
---- a/deps/v8/src/codegen/ppc/cpu-ppc.cc	2022-02-15 21:11:46.291387457 -0800
-+++ b/deps/v8/src/codegen/ppc/cpu-ppc.cc	2022-02-17 20:38:08.816098185 -0800
-@@ -8,14 +8,12 @@
- 
- #include "src/codegen/cpu-features.h"
- 
--#define INSTR_AND_DATA_CACHE_COHERENCY LWSYNC
--
- namespace v8 {
- namespace internal {
- 
- void CpuFeatures::FlushICache(void* buffer, size_t size) {
- #if !defined(USE_SIMULATOR)
--  if (CpuFeatures::IsSupported(INSTR_AND_DATA_CACHE_COHERENCY)) {
-+  if (CpuFeatures::IsSupported(ICACHE_SNOOP)) {
-     __asm__ __volatile__(
-         "sync \n"
-         "icbi 0, %0  \n"
-@@ -26,25 +24,33 @@
-     return;
-   }
- 
--  const int kCacheLineSize = CpuFeatures::icache_line_size();
--  intptr_t mask = kCacheLineSize - 1;
-+  const int kInstrCacheLineSize = CpuFeatures::icache_line_size();
-+  const int kDataCacheLineSize = CpuFeatures::dcache_line_size();
-+  intptr_t ic_mask = kInstrCacheLineSize - 1;
-+  intptr_t dc_mask = kDataCacheLineSize - 1;
-   byte* start =
--      reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~mask);
-+      reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~dc_mask);
-   byte* end = static_cast<byte*>(buffer) + size;
--  for (byte* pointer = start; pointer < end; pointer += kCacheLineSize) {
--    __asm__(
-+  for (byte* pointer = start; pointer < end; pointer += kDataCacheLineSize) {
-+    __asm__ __volatile__(
-         "dcbf 0, %0  \n"
--        "sync        \n"
--        "icbi 0, %0  \n"
--        "isync       \n"
-         : /* no output */
-         : "r"(pointer));
-   }
-+  __asm__ __volatile__("sync");
- 
-+  start =
-+      reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~ic_mask);
-+  for (byte* pointer = start; pointer < end; pointer += kInstrCacheLineSize) {
-+    __asm__ __volatile__(
-+        "icbi 0, %0  \n"
-+        : /* no output */
-+        : "r"(pointer));
-+  }
-+  __asm__ __volatile__("isync");
- #endif  // !USE_SIMULATOR
- }
- }  // namespace internal
- }  // namespace v8
- 
--#undef INSTR_AND_DATA_CACHE_COHERENCY
- #endif  // V8_TARGET_ARCH_PPC
---- a/deps/v8/src/codegen/ppc/assembler-ppc.cc	2022-02-15 21:11:46.295387559 -0800
-+++ b/deps/v8/src/codegen/ppc/assembler-ppc.cc	2022-02-18 00:11:07.887257174 -0800
-@@ -57,58 +57,62 @@
- void CpuFeatures::ProbeImpl(bool cross_compile) {
-   supported_ |= CpuFeaturesImpliedByCompiler();
-   icache_line_size_ = 128;
-+  dcache_line_size_ = 128;
- 
-   // Only use statically determined features for cross compile (snapshot).
-   if (cross_compile) return;
- 
--// Detect whether frim instruction is supported (POWER5+)
--// For now we will just check for processors we know do not
--// support it
- #ifndef USE_SIMULATOR
-   // Probe for additional features at runtime.
-   base::CPU cpu;
--  if (cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << MODULO);
--  }
-+  switch (cpu.part()) {
-+    case base::CPU::PPC_POWER10:
-+    case base::CPU::PPC_POWER9:
-+      supported_ |= (1u << MODULO);
-+      // fallthrough
-+
-+    case base::CPU::PPC_POWER8:
- #if V8_TARGET_ARCH_PPC64
--  if (cpu.part() == base::CPU::PPC_POWER8 || 
--      cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << FPR_GPR_MOV);
--  }
-+      supported_ |= (1u << FPR_GPR_MOV);
- #endif
--  if (cpu.part() == base::CPU::PPC_POWER6 ||
--      cpu.part() == base::CPU::PPC_POWER7 ||
--      cpu.part() == base::CPU::PPC_POWER8 || 
--      cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << LWSYNC);
-+      // fallthrough
-+
-+    case base::CPU::PPC_POWER7:
-+      supported_ |= (1u << PPC_7_PLUS);
-+      supported_ |= (1u << POP_COUNT);
-+      // fallthrough
-+
-+    case base::CPU::PPC_POWER6:
-+    case base::CPU::PPC_POWER5:
-+    case base::CPU::PPC_PA6T:
-+      supported_ |= (1u << FP_ROUND_TO_INT);
-+      break;
-+
-+    // Special cases below. Otherwise, assume no special features.
-+    // NXP e5500/e6500 have popcnt but not much else since ISA v2.01.
-+    case base::CPU::PPC_E5500:
-+    case base::CPU::PPC_E6500:
-+      supported_ |= (1u << POP_COUNT);
-+      break;
-   }
--  if (cpu.part() == base::CPU::PPC_POWER7 ||
--      cpu.part() == base::CPU::PPC_POWER8 || 
--      cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << ISELECT);
--    supported_ |= (1u << VSX);
-+  if (cpu.has_isel()) {
-+    supported_ |= (1u << ISELECT);      // ISA v2.03, plus some NXP CPUs
-   }
--#if V8_OS_LINUX
--  if (!(cpu.part() == base::CPU::PPC_G5 || cpu.part() == base::CPU::PPC_G4)) {
--    // Assume support
--    supported_ |= (1u << FPU);
-+  if (cpu.has_icache_snoop()) {
-+    supported_ |= (1u << ICACHE_SNOOP); // ISA v2.02; has its own hwcap flag
-   }
-   if (cpu.icache_line_size() != base::CPU::UNKNOWN_CACHE_LINE_SIZE) {
-     icache_line_size_ = cpu.icache_line_size();
-   }
--#elif V8_OS_AIX
--  // Assume support FP support and default cache line size
--  supported_ |= (1u << FPU);
--#endif
-+  if (cpu.dcache_line_size() != base::CPU::UNKNOWN_CACHE_LINE_SIZE) {
-+    dcache_line_size_ = cpu.dcache_line_size();
-+  }
- #else  // Simulator
--  supported_ |= (1u << FPU);
--  supported_ |= (1u << LWSYNC);
-+  supported_ |= (1u << FP_ROUND_TO_INT);
-+  supported_ |= (1u << ICACHE_SNOOP);
-   supported_ |= (1u << ISELECT);
--  supported_ |= (1u << VSX);
-+  supported_ |= (1u << POP_COUNT);
-+  supported_ |= (1u << PPC_7_PLUS);
-   supported_ |= (1u << MODULO);
- #if V8_TARGET_ARCH_PPC64
-   supported_ |= (1u << FPR_GPR_MOV);
-@@ -129,7 +133,13 @@
- }
- 
- void CpuFeatures::PrintFeatures() {
--  printf("FPU=%d\n", CpuFeatures::IsSupported(FPU));
-+  printf("FP_ROUND_TO_INT=%d\n", CpuFeatures::IsSupported(FP_ROUND_TO_INT));
-+  printf("ICACHE_SNOOP=%d\n", CpuFeatures::IsSupported(ICACHE_SNOOP));
-+  printf("ISELECT=%d\n", CpuFeatures::IsSupported(ISELECT));
-+  printf("POP_COUNT=%d\n", CpuFeatures::IsSupported(POP_COUNT));
-+  printf("PPC_7_PLUS=%d\n", CpuFeatures::IsSupported(PPC_7_PLUS));
-+  printf("FPR_GPR_MOV=%d\n", CpuFeatures::IsSupported(FPR_GPR_MOV));
-+  printf("MODULO=%d\n", CpuFeatures::IsSupported(MODULO));
- }
- 
- Register ToRegister(int num) {
---- a/deps/v8/src/codegen/cpu-features.h	2022-02-15 21:11:46.295387559 -0800
-+++ b/deps/v8/src/codegen/cpu-features.h	2022-02-17 21:10:09.853266061 -0800
-@@ -13,6 +13,7 @@
- 
- // CPU feature flags.
- enum CpuFeature {
-+#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64
-   // x86
-   SSE4_2,
-   SSE4_1,
-@@ -26,11 +27,15 @@
-   LZCNT,
-   POPCNT,
-   ATOM,
-+
-+#elif V8_TARGET_ARCH_ARM
-   // ARM
-   // - Standard configurations. The baseline is ARMv6+VFPv2.
-   ARMv7,        // ARMv7-A + VFPv3-D32 + NEON
-   ARMv7_SUDIV,  // ARMv7-A + VFPv4-D32 + NEON + SUDIV
-   ARMv8,        // ARMv8-A (+ all of the above)
-+
-+#elif V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64
-   // MIPS, MIPS64
-   FPU,
-   FP64FPU,
-@@ -38,12 +43,18 @@
-   MIPSr2,
-   MIPSr6,
-   MIPS_SIMD,  // MSA instructions
-+
-+#elif V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64
-   // PPC
--  FPR_GPR_MOV,
--  LWSYNC,
--  ISELECT,
--  VSX,
--  MODULO,
-+  FP_ROUND_TO_INT,  // ISA v2.02 (POWER5)
-+  ICACHE_SNOOP,     // ISA v2.02 (POWER5)
-+  ISELECT,          // ISA v2.03 (POWER5+ and some NXP cores)
-+  PPC_7_PLUS,       // ISA v2.06 (POWER7)
-+  POP_COUNT,        // ISA v2.06 (POWER7 and NXP e5500/e6500)
-+  FPR_GPR_MOV,      // ISA v2.07 (POWER8)
-+  MODULO,           // ISA v3.0  (POWER9)
-+
-+#elif V8_TARGET_ARCH_S390X
-   // S390
-   DISTINCT_OPS,
-   GENERAL_INSTR_EXT,
-@@ -51,14 +62,17 @@
-   VECTOR_FACILITY,
-   VECTOR_ENHANCE_FACILITY_1,
-   MISC_INSTR_EXT2,
-+#endif
- 
-   NUMBER_OF_CPU_FEATURES,
- 
-+#if V8_TARGET_ARCH_ARM
-   // ARM feature aliases (based on the standard configurations above).
-   VFPv3 = ARMv7,
-   NEON = ARMv7,
-   VFP32DREGS = ARMv7,
-   SUDIV = ARMv7_SUDIV
-+#endif
- };
- 
- // CpuFeatures keeps track of which features are supported by the target CPU.
---- a/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc	2022-02-15 21:11:46.299387660 -0800
-+++ b/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc	2022-02-15 21:11:49.123459271 -0800
-@@ -2393,16 +2393,26 @@
- // static
- MachineOperatorBuilder::Flags
- InstructionSelector::SupportedMachineOperatorFlags() {
--  return MachineOperatorBuilder::kFloat32RoundDown |
--         MachineOperatorBuilder::kFloat64RoundDown |
--         MachineOperatorBuilder::kFloat32RoundUp |
--         MachineOperatorBuilder::kFloat64RoundUp |
--         MachineOperatorBuilder::kFloat32RoundTruncate |
--         MachineOperatorBuilder::kFloat64RoundTruncate |
--         MachineOperatorBuilder::kFloat64RoundTiesAway |
--         MachineOperatorBuilder::kWord32Popcnt |
--         MachineOperatorBuilder::kWord64Popcnt;
-+  MachineOperatorBuilder::Flags flags = MachineOperatorBuilder::Flag::kNoFlags;
-+  // FP rounding to integer instructions require Power ISA v2.02 or later.
-+  if (CpuFeatures::IsSupported(FP_ROUND_TO_INT)) {
-+    flags |= MachineOperatorBuilder::kFloat32RoundDown |
-+             MachineOperatorBuilder::kFloat64RoundDown |
-+             MachineOperatorBuilder::kFloat32RoundUp |
-+             MachineOperatorBuilder::kFloat64RoundUp |
-+             MachineOperatorBuilder::kFloat32RoundTruncate |
-+             MachineOperatorBuilder::kFloat64RoundTruncate |
-+             MachineOperatorBuilder::kFloat64RoundTiesAway;
-+  }
-+  // Population count requires Power ISA v2.06, or NXP e5500/e6500.
-+  if (CpuFeatures::IsSupported(POP_COUNT)) {
-+    flags |= MachineOperatorBuilder::kWord32Popcnt;
-+#if V8_TARGET_ARCH_PPC64
-+    flags |= MachineOperatorBuilder::kWord64Popcnt;
-+#endif
-+  }
-   // We omit kWord32ShiftIsSafe as s[rl]w use 0x3F as a mask rather than 0x1F.
-+  return flags;
- }
- 
- // static
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index ddfceb2f2179..000000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
-   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
deleted file mode 100644
index 01e95f15b477..000000000000
--- a/srcpkgs/nodejs-lts/patches/shared-uv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/deps/uvwasi/uvwasi.gyp
-+++ b/deps/uvwasi/uvwasi.gyp
-@@ -18,9 +18,6 @@
-         'src/wasi_rights.c',
-         'src/wasi_serdes.c',
-       ],
--      'dependencies': [
--        '../uv/uv.gyp:libuv',
--      ],
-       'direct_dependent_settings': {
-         'include_dirs': ['include']
-       },
-@@ -31,6 +28,12 @@
-             '_POSIX_C_SOURCE=200112',
-           ],
-         }],
-+        [ 'node_shared_libuv=="false"', {
-+          'dependencies': [ '../uv/uv.gyp:libuv' ],
-+        }],
-+        [ 'node_shared_libuv=="true"', {
-+          'libraries': [ '-luv' ],
-+        }]
-       ],
-     }
-   ]
diff --git a/srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch b/srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch
deleted file mode 100644
index 952892caed38..000000000000
--- a/srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 558ab896cbdd90259950c631ba29a1c66bf4c2d3
-Author: q66 <daniel@octaforge.org>
-Date:   Mon Feb 28 23:53:22 2022 +0100
-
-    add some hwcap bits fallbacks
-
-diff --git a/deps/v8/src/base/cpu.cc b/deps/v8/src/base/cpu.cc
-index a1b21d2..8e52802 100644
---- a/deps/v8/src/base/cpu.cc
-+++ b/deps/v8/src/base/cpu.cc
-@@ -768,6 +768,13 @@ CPU::CPU()
- 
- #elif V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64
- 
-+#ifndef PPC_FEATURE2_HAS_ISEL
-+#define PPC_FEATURE2_HAS_ISEL 0x08000000
-+#endif
-+#ifndef PPC_FEATURE2_ARCH_3_1
-+#define PPC_FEATURE2_ARCH_3_1 0x00040000
-+#endif
-+
- #ifndef USE_SIMULATOR
- #if V8_OS_LINUX
-   // Read processor info from getauxval() (needs at least glibc 2.18 or musl).
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
deleted file mode 100644
index d88dca8e6ee5..000000000000
--- a/srcpkgs/nodejs-lts/template
+++ /dev/null
@@ -1,104 +0,0 @@
-# Template file for 'nodejs-lts'
-pkgname=nodejs-lts
-version=12.22.10
-revision=3
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=1eeec68b530da4aced730e2af9e07a1ced8148337708f37fc8b4eddc3b6dc9e9
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser and llhttp"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts-10"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc64*) ;;
-	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
-esac
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --cross-compiling"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-post_configure() {
-	# Fix linking against llhttp
-	sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-10-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 537f8229dab9..000000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K12[\d.]+(?=\/)'
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index a53792a6544f..d4e821e86bcd 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=16.19.0
-revision=2
+revision=3
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
  $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
@@ -27,7 +27,7 @@ desc_option_cares="Enable shared c-ares"
 build_options_default="ssl libuv icu nghttp2 cares"
 
 replaces="iojs>=0"
-conflicts="nodejs-lts nodejs-lts-10"
+conflicts="nodejs-lts-10"
 provides="nodejs-runtime-0_1"
 
 # https://build.voidlinux.org/builders/i686_builder/builds/27325/steps/shell_3/logs/stdio
@@ -100,8 +100,20 @@ do_install() {
 
 nodejs-devel_package() {
 	short_desc+=" (development files)"
-	conflicts="nodejs-lts-devel nodejs-lts-10-devel"
+	conflicts="nodejs-lts-10-devel"
 	pkg_install() {
 		vmove usr/include
 	}
 }
+
+nodejs-lts_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" LTS"
+	build_style=meta
+}
+
+nodejs-lts-devel_package() {
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=" LTS (development files)"
+	build_style=meta
+}

From 4c7445dcdda2b4d83a3b471d65d0cf6ce86cb35f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 6 Dec 2022 16:11:24 +0100
Subject: [PATCH 0203/1853] llhttp: remove nodejs-lts comment

nodejs-lts is now merged to nodejs
---
 srcpkgs/llhttp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 7c367836045b..b2fbc9dd7932 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
 # Template file for 'llhttp'
 
-# When this package is updated, nodejs and nodejs-lts may need to be updated
+# When this package is updated, nodejs may need to be updated
 # or at least a revbump in the same pull request since they work in-sync.
 
 pkgname=llhttp

From d918b9bfe90959dca0583f71107ea69962ea86ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 22 Dec 2022 10:43:50 +0100
Subject: [PATCH 0204/1853] nodejs: update to 18.16.0.

---
 ...s-v8-src-trap-handler-trap-handler.h.patch | 31 ------------
 srcpkgs/nodejs/patches/cross-aarch64.patch    | 48 ++++++++++++-------
 srcpkgs/nodejs/template                       |  8 ++--
 3 files changed, 35 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch

diff --git a/srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch b/srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch
deleted file mode 100644
index 56529af97223..000000000000
--- a/srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/nxhack/openwrt-node-packages/blob/master/node/patches/v16.x/999-deps-v8-src-trap-handler-trap-handler.h.patch
-
---- a/deps/v8/src/trap-handler/trap-handler.h
-+++ b/deps/v8/src/trap-handler/trap-handler.h
-@@ -17,19 +17,16 @@ namespace v8 {
- namespace internal {
- namespace trap_handler {
- 
--// X64 on Linux, Windows, MacOS, FreeBSD.
--#if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 &&                        \
--    ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_MACOSX || \
--     V8_OS_FREEBSD)
-+#if V8_TARGET_ARCH_X64 && V8_OS_LINUX && !V8_OS_ANDROID
- #define V8_TRAP_HANDLER_SUPPORTED true
--// Arm64 (non-simulator) on Mac.
--#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX
-+#elif V8_TARGET_ARCH_X64 && V8_OS_WIN
- #define V8_TRAP_HANDLER_SUPPORTED true
--// Arm64 simulator on x64 on Linux or Mac.
--#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && (V8_OS_LINUX || V8_OS_MACOSX)
--#define V8_TRAP_HANDLER_VIA_SIMULATOR
-+#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
-+#define V8_TRAP_HANDLER_SUPPORTED true
-+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
-+#define V8_TRAP_HANDLER_SUPPORTED true
-+#elif V8_HOST_ARCH_ARM64 && V8_TARGET_ARCH_ARM64 && V8_OS_MACOSX
- #define V8_TRAP_HANDLER_SUPPORTED true
--// Everything else is unsupported.
- #else
- #define V8_TRAP_HANDLER_SUPPORTED false
- #endif
diff --git a/srcpkgs/nodejs/patches/cross-aarch64.patch b/srcpkgs/nodejs/patches/cross-aarch64.patch
index 3b96c87f2fdb..fa05cb15813e 100644
--- a/srcpkgs/nodejs/patches/cross-aarch64.patch
+++ b/srcpkgs/nodejs/patches/cross-aarch64.patch
@@ -1,29 +1,43 @@
-From 4ac90c41065d338c4305cf6dc39e3084b21a7f79 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 20 Nov 2022 19:22:03 +0100
-Subject: [PATCH] Revert "build: enable pointer authentication for branch
- protection on arm64"
+From 6bdf9dc3ec7dbff00acef081f4e3dd3e061fd744 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Tue, 6 Dec 2022 11:27:49 +0100
+Subject: [PATCH] build: fix arm64 cross-compilation
 
-This reverts commit 938212f3e74a74d0b436941aa24e71425ff666c5.
+Commit 938212f added -msign-return-address=all to _all_ cflags but that
+is wrong when cross-compiling, it should only be added to the target's
+cflags.
+
+Fixes: https://github.com/nodejs/node/issues/42888
 ---
- configure.py | 4 ----
- 1 file changed, 4 deletions(-)
+ configure.py | 2 --
+ node.gyp     | 3 +++
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/configure.py b/configure.py
-index d3192ca04c..2d049eb938 100755
+index 40e0395e..9de3148f 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -1241,10 +1241,6 @@ def configure_node(o):
+@@ -1294,9 +1294,7 @@ def configure_node(o):
  
    o['variables']['want_separate_host_toolset'] = int(cross_compiling)
  
 -  # Enable branch protection for arm64
--  if target_arch == 'arm64':
+   if target_arch == 'arm64':
 -    o['cflags']+=['-msign-return-address=all']
--
+     o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
+ 
    if options.node_snapshot_main is not None:
-     if options.shared:
-       # This should be possible to fix, but we will need to refactor the
--- 
-2.38.1
-
+diff --git a/node.gyp b/node.gyp
+index cf52281b..5218d941 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -112,6 +112,9 @@
+     },
+ 
+     'conditions': [
++      ['target_arch=="arm64"', {
++          'cflags': ['-msign-return-address=all'],  # Pointer authentication.
++      }],
+       ['OS in "aix os400"', {
+         'ldflags': [
+           '-Wl,-bnoerrmsg',
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index d4e821e86bcd..14f17fd3167f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=16.19.0
-revision=3
+version=18.16.0
+revision=1
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
  $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.gz"
-checksum=8b8a2939fa5f654ff61cae29b12118c24109273458ecbe6162ad8a8858309e0d
+checksum=6a4f5c5d76e5c50cef673099e56f19bc3266ae363f56ca0ab77dd2f3c5088c6d
 python_version=3
 
 build_options="ssl libuv icu nghttp2 cares"
@@ -41,7 +41,7 @@ fi
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	ppc*) broken="Node 16.x does not support 32-bit ppc" ;;
+	ppc*) broken="Node 18.x does not support 32-bit ppc" ;;
 esac
 
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

From 5b40d7d95ce9a7d85d9810dfb32cd7342056c8d1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Tue, 16 May 2023 10:59:54 +0400
Subject: [PATCH 0205/1853] go: update to 1.20.4.

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index df491a31e18d..18ee1751f2f9 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.3
+version=1.20.4
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=e447b498cde50215c4f7619e5124b0fc4e25fb5d16ea47271c47f278e7aa763a
+checksum=9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git

From 4ebe2b4e0631bce0e9588b2537634d380c8944f8 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Thu, 13 Apr 2023 21:06:27 +0200
Subject: [PATCH 0206/1853] evince: update to 44.1

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 81d808d5b9b9..a3b6471a6612 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,12 +1,11 @@
 # Template file for 'evince'
 pkgname=evince
-version=44.0
-revision=2
+version=44.1
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
- -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled
- -Dnautilus=false"
+ -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled"
 hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen)
  glib-devel itstool pkg-config perl-XML-Parser appstream-glib desktop-file-utils"
 # XXX missing packages for DVI backend.
@@ -21,7 +20,7 @@ homepage="https://wiki.gnome.org/Apps/Evince"
 #changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/evince/${version%.*}/evince-${version}.tar.xz"
-checksum=339ee9e005dd7823a13fe21c71c2ec6d2c4cb74548026e4741eee7b2703e09da
+checksum=15afd3bb15ffb38fecab34c23350950ad270ab03a85b94e333d9dd7ee6a74314
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 145dede42300734d78b92495f5001cd082610ed6 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 22 May 2023 05:32:53 +0300
Subject: [PATCH 0207/1853] Tuba: update to 0.3.2

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

diff --git a/srcpkgs/Tuba/template b/srcpkgs/Tuba/template
index fc2974bde2e0..18cf6d24e3b2 100644
--- a/srcpkgs/Tuba/template
+++ b/srcpkgs/Tuba/template
@@ -1,14 +1,17 @@
 # Template file for 'Tuba'
 pkgname=Tuba
-version=0.2.0
+version=0.3.2
 revision=1
 build_style=meson
 configure_args="-Ddistro=true"
 hostmakedepends="pkg-config gettext desktop-file-utils vala glib-devel"
-makedepends="libadwaita-devel libgee-devel libsecret-devel gtksourceview5-devel"
+makedepends="libadwaita-devel libgee-devel libsecret-devel gtksourceview5-devel
+ libwebp-devel"
+depends="webp-pixbuf-loader"
+checkdepends="appstream-glib"
 short_desc="Browse the fediverse"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://tuba.geopjr.dev/"
 distfiles="https://github.com/GeopJr/Tuba/archive/refs/tags/v${version}.tar.gz"
-checksum=c698206bbbd06a1ce5a6e8cc9e6590411dc1cce1dde87fb0e34d8e35432ee2b1
+checksum=1458b343f069efca00b0b5da49b9eb4b529e49de3d701da06d9529828be19cf9

From 9b63356baeb1596264727d8ccd6409281a6e3eb0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:13:18 +0200
Subject: [PATCH 0208/1853] scite: update to 5.3.6.

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

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 1b6ad2444b13..e11787636604 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.3.5
+version=5.3.6
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=a6527831ef8d658697bca30638149884f9d0afb3f748c86f5d27ed8b0bd1aa6e
+checksum=a30d1fb2572fbcfc543baa2f58ee968643f67431390af1330769c8ed2879e3ca
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 821fdc7df9543e0dfacf3e9d4cdddec2ff9507e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:14:08 +0200
Subject: [PATCH 0209/1853] xscope: update to 1.4.4.

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

diff --git a/srcpkgs/xscope/template b/srcpkgs/xscope/template
index 62f3c85a0848..425ac554a66a 100644
--- a/srcpkgs/xscope/template
+++ b/srcpkgs/xscope/template
@@ -1,6 +1,6 @@
 # Template file for 'xscope'
 pkgname=xscope
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X Window Protocol Viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
-checksum=50604759481ac9f747d75b3fd1ad1bab846656d5aa2b3cee5d0e4cb814273985
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=820d6708fce16e449a3cb8e62c2a0f49551e589d6595633deab82643e6a90c83
 
 post_install() {
 	vlicense COPYING

From 5882aaaf47ed03039b9cfc5c368c3514b0037e92 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:15:05 +0200
Subject: [PATCH 0210/1853] xwd: update to 1.0.9.

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

diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..8cb4a9665c6a 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,6 +1,6 @@
 # Template file for 'xwd'
 pkgname=xwd
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Dump an image of an X window"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f
 
 post_install() {
 	vlicense COPYING

From e11e9c108732bed39a0450ebd7cc99d223cd56f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:15:50 +0200
Subject: [PATCH 0211/1853] ugrep: update to 3.12.0.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index ec41b9347bd7..eb60f284250b 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.11.2
+version=3.12.0
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a314cc6fe149eef9bc0f0d69c6b331d9d4491a100677c1b3fbb2159806cca2dd
+checksum=f69330b74a2d2e46c878c19da3453e97d92ae960d0e1a92a853481cb889fca3e
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 7fc5ed23f35c3c707822a310d6c3ac0bada5631b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 4 Jun 2023 18:34:52 +0200
Subject: [PATCH 0212/1853] python3-zstandard: update to 0.21.0.

Closes: https://github.com/void-linux/void-packages/issues/44257
---
 srcpkgs/python3-zstandard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index 3296feb90d65..514c067a62bc 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zstandard'
 pkgname=python3-zstandard
-version=0.19.0
+version=0.21.0
 revision=1
 build_style=python3-module
 make_build_args="--system-zstd"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/indygreg/python-zstandard"
 changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
 distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=8106c216bcaed7b70e6515b407adbfd21dd84c9855c9771530e0a3561b130454
+checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
 
 pre_check() {
 	# The skipped test ignored due to failure, see:

From 4f63ded1f44e827a92ae33210559f29dec0bb15b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 4 Jun 2023 14:41:29 -0500
Subject: [PATCH 0213/1853] delta: update to 0.16.5.

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

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index ab06413387f0..7904e323b89f 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.16.4
+version=0.16.5
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
-checksum=66380e92d422881fae6526aee14bedf8124ea17903bcf6d22633e658bd509190
+checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
 
 pre_build() {
 	export RUSTONIG_SYSTEM_LIBONIG=1

From 743bd074d9a8452edaa38fd703d2616173991be7 Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Wed, 24 May 2023 22:34:20 +0200
Subject: [PATCH 0214/1853] rustypaste: update to 0.10.0.

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

diff --git a/srcpkgs/rustypaste/template b/srcpkgs/rustypaste/template
index 52eae3caaf96..f04fb2e37d6a 100644
--- a/srcpkgs/rustypaste/template
+++ b/srcpkgs/rustypaste/template
@@ -1,6 +1,6 @@
 # Template file for 'rustypaste'
 pkgname=rustypaste
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=cargo
 make_check_args="-- --test-threads 1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste/archive/refs/tags/v${version}.tar.gz"
-checksum=16197a881ae0f1fd32d90956b656d82429a1bb111c918837487eef943a14fd76
+checksum=54e4235716ccece450b51ffbd7a42a21b730650d3b481901e95d91477819806b
 conf_files="/etc/rustypaste/config.toml"
 
 system_accounts="_rustypaste"

From d381947f038acdbd782902e0a01c7d859d37f2e1 Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Wed, 31 May 2023 09:56:55 +0200
Subject: [PATCH 0215/1853] rustypaste-cli: update to 0.4.0.

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

diff --git a/srcpkgs/rustypaste-cli/template b/srcpkgs/rustypaste-cli/template
index 1b1f53295fbd..663a222a059f 100644
--- a/srcpkgs/rustypaste-cli/template
+++ b/srcpkgs/rustypaste-cli/template
@@ -1,6 +1,6 @@
-# Template file for 'rustypaste-cli' 
+# Template file for 'rustypaste-cli'
 pkgname=rustypaste-cli
-version=0.3.0
+version=0.4.0
 revision=1
 build_style=cargo
 short_desc="CLI tool for rustypaste"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste-cli"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste-cli/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=691fd3ddcf2c7c9c17728a304bd4299a35812940902b8b31059902abb49b037e
+checksum=c534d047202dcae17255a816882ac6358f82735270843f0b7ae525cc15fc2e91
 
 post_install() {
 	vlicense LICENSE

From 7998277296dee3a30355ecd6c1feff9765ccf8f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:25 -0400
Subject: [PATCH 0216/1853] chezmoi: update to 2.34.0.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index b7dca806e5f2..0204f59e0984 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.33.6
+version=2.34.0
 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=49f624ff55e1fb7165e9bca98aead8d6c49c6ff73926973c6ba6347f0ee17eba
+checksum=66a65bb283ba8259d0ca0205b3c3457da220c55d486da10b42f31fe5e478f5e8
 
 pre_build() {
 	local _date

From b99273bbf3567204ae3a2f8d7b6fd64e52bebaf9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:30 -0400
Subject: [PATCH 0217/1853] noto-fonts-ttf: update to 23.6.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 8763c4cc9440..554f1c2ceac1 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.5.1
+version=23.6.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=393e20547ea09d7c47053e86bcd4c16d753283244a96c09a7dcd79eea27aa3fa
+checksum=4a52070a67ce1f9c74eb74645bfa769d5df43bf1268123e733a5ac56cb36c476
 font_dirs="/usr/share/fonts/noto"
 
 do_install() {

From 5635a1f4d068b485206ba14ce8302a2021152dd5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:32 -0400
Subject: [PATCH 0218/1853] pyright: update to 1.1.311.

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

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index 42e65a683994..1ccc8edff5c9 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.309
+version=1.1.311
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=6af39e64928459992a4789bb3994b0a8144617fd32221c201c6157f3ccb76613
+checksum=33c2aa5d47d05d24fa741c068d7e87cdc17aa4d7c72b2e255dc38aa4b5c54752
 
 do_configure() {
 	cd "$wrksrc"

From fb9a0b89e30c8a2da20ec1d029f5187b79b11677 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:33 -0400
Subject: [PATCH 0219/1853] python3-pytest-xdist: update to 3.3.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 3128717d293a..b327702316a3 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.1
+version=3.3.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=1849bd98d8b242b948e472db7478e090bf3361912a8fed87992ed94085f54727
+checksum=d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93
 # tests only work in tox
 make_check=no
 

From 9a3c680fc853ed103990f4ea48e15e87e33a0951 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:34 -0400
Subject: [PATCH 0220/1853] soju: update to 0.6.2.

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

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 70c4d46bedcb..6d7c82e58ccf 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,6 +1,6 @@
 # Template file for 'soju'
 pkgname=soju
-version=0.6.1
+version=0.6.2
 revision=1
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
@@ -14,7 +14,7 @@ license="AGPL-3.0-or-later"
 homepage="https://soju.im"
 changelog="https://git.sr.ht/~emersion/soju/refs"
 distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=336ec8bb2482ec811261bb6c19bd71613fa20e65bb98aedfbceb16969bb7038b
+checksum=b8a8f5af08670497d233137086e273a26c388f5e313c9e9e613ef6caaa3e928a
 conf_files="/etc/soju/config"
 system_accounts="_soju"
 make_dirs="/var/db/soju 0750 _soju _soju

From 2b0a7e961177e20fa2b138086eb7c00f586dfec8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:35 -0400
Subject: [PATCH 0221/1853] webhook: update to 2.8.1.

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

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 602c73878774..8dd10051f2fa 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
-version=2.8.0
-revision=2
+version=2.8.1
+revision=1
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
@@ -9,7 +9,7 @@ maintainer="Abigail G <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/adnanh/webhook"
 distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz"
-checksum=c521558083f96bcefef16575a6f3f98ac79c0160fd0073be5e76d6645e068398
+checksum=a1e3eb2231e5631ebb374b76a79c3bac9cbdc7010974395e2d5e4e2e62ffd187
 conf_files="/etc/webhook/hooks.json /etc/sv/webhook/conf"
 system_accounts="_webhook"
 system_groups="_webhook"

From a0e8ce91fe51052d5af3cd11d93ae97ff08e430d Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sun, 4 Jun 2023 13:47:04 -0500
Subject: [PATCH 0222/1853] mat2: install man page

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

diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template
index 64fc4b5f2169..c06ed1f67211 100644
--- a/srcpkgs/mat2/template
+++ b/srcpkgs/mat2/template
@@ -1,7 +1,7 @@
 # Template file for 'mat2'
 pkgname=mat2
 version=0.13.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="bubblewrap python3-cairo python3-gobject python3-mutagen poppler-glib
@@ -14,3 +14,7 @@ changelog="https://0xacab.org/jvoisin/mat2/-/raw/master/CHANGELOG.md"
 distfiles="https://0xacab.org/jvoisin/mat2/-/archive/${version}/mat2-${version}.tar.gz"
 checksum=e1bb0161fa1c2f2adb1b933761f9569534309e90209568f96aca5fc8a74f511a
 make_check=no  # cannot bwrap in chroot
+
+post_install() {
+	vman doc/mat2.1
+}

From 54d8200bef11f972b76aaa0ce0d9cc8f90e0034a Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 4 Jun 2023 15:57:03 -0400
Subject: [PATCH 0223/1853] ircdog: update to 0.5.0.

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

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index af6253c17a7a..4eac96514502 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,15 +1,16 @@
 # Template file for 'ircdog'
 pkgname=ircdog
-version=0.4.0
-revision=2
+version=0.5.0
+revision=1
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"
 maintainer="0x5c <dev@0x5c.io>"
 license="ISC"
 homepage="https://github.com/ergochat/ircdog"
+changelog="https://raw.githubusercontent.com/ergochat/ircdog/master/CHANGELOG.md"
 distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
-checksum=7078dad0844a7f7578a95a410ed88f1aafe34384ba7090f14a6021eb7029068b
+checksum=d999c8e25eca99e7464e97bb61bc213d66fbef3e925a099f90d4be8c6f021d24
 
 post_install() {
 	vlicense LICENSE

From da105e6532e507700006b1d92c3c5bf690365876 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 13 Feb 2023 10:24:30 +0100
Subject: [PATCH 0224/1853] New package: muon-0.2.0

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

diff --git a/srcpkgs/muon/template b/srcpkgs/muon/template
new file mode 100644
index 000000000000..310187b9aac5
--- /dev/null
+++ b/srcpkgs/muon/template
@@ -0,0 +1,23 @@
+# Template file for 'muon'
+pkgname=muon
+version=0.1.0
+revision=1
+build_style=meson
+build_helper=qemu
+configure_args="
+ -Dlibcurl=enabled
+ -Dlibarchive=enabled
+ -Dlibpkgconf=enabled
+ -Dsamurai=disabled
+ -Dbestline=enabled"
+hostmakedepends="pkg-config samurai cmake"
+makedepends="pkgconf-devel libcurl-devel libarchive-devel"
+depends="samurai"
+checkdepends="git"
+short_desc="Meson implementation in C"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only, Apache-2.0"
+homepage="https://muon.build"
+changelog="https://git.sr.ht/~lattis/muon/refs/$version"
+distfiles="https://git.sr.ht/~lattis/muon/archive/$version.tar.gz"
+checksum="9d3825c2d562f8f8ad96d1f02167e89c4e84973decf205d127efd9293d7da35b"

From 2b7b5fd1afc9117c41a38d362abe31d1d50769f3 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:36:49 +0200
Subject: [PATCH 0225/1853] yoshimi: update to 2.3.0.

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

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 89b38332df69..0b72467a8d57 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=2.2.3
+version=2.3.0
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=9e4f4b8834bb6ebaa5f408fb275c66a680cfd7b5b8716c4b3a6dea06b2ac1ed0
+checksum=167c3f300a3513407f5ed61b1104a79552bfc574f4a6dbf5bb713f2456a834f9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From a21d7472146a702791a91b59d784f293d9550f38 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:38:58 +0200
Subject: [PATCH 0226/1853] terragrunt: update to 0.46.1.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index cc4ee5d45d03..fe7569f377f3 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.45.16
+version=0.46.1
 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=11c2fadf60545ec495a031ddc72e985af83aa5171f952ef0da451f37f5160435
+checksum=f3b99f6de74ce6d2af87a01cb0ca6ff8d6357e506fbc69252f821820d3c5c0bf
 
 post_install() {
 	vlicense LICENSE.txt

From 762338e51293420cf2d8764f10125972a30ace15 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:40:12 +0200
Subject: [PATCH 0227/1853] packer: update to 1.9.1.

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

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index c24377bf3a03..b9e862e13f30 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.8.7
+version=1.9.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=0b3a45a3ecb0b5e993a0a39ee4599d69b58c1419cebddbfc45c61eb15389ba98
+checksum=1f3ae38fe9313a072547d1ce5674d74438ad5d59b042a87428534ac39bfd47b7
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 75b68c3844653334a81b60b0dcf2e033906d5445 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:41:28 +0200
Subject: [PATCH 0228/1853] moby: update to 24.0.2.

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

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 83f23916624d..2878c75a8936 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,7 +1,7 @@
 # Template file for 'moby'
 # should be kept in sync with docker-cli
 pkgname=moby
-version=23.0.6
+version=24.0.2
 revision=1
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
@@ -18,7 +18,7 @@ homepage="https://www.docker.com"
 changelog="https://github.com/moby/moby/releases"
 distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
  https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-checksum="3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e
+checksum="f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0
  5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b"
 system_groups="docker"
 

From 5e1a87e2e4bd8c6daff23dc8a00d657df83aef2b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:42:06 +0200
Subject: [PATCH 0229/1853] docker-cli: update to 24.0.2.

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

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index ae4587fa99c7..47f6cc65b10d 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 # should be kept in sync with moby
 pkgname=docker-cli
-version=24.0.1
+version=24.0.2
 revision=1
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=f5916273959fb2df56424bb2c26d8b6feb9a148dd15eb400aedd5d3753e06959
+checksum=632357aa58d7f5e16ce87dbd73641c5f65c25b6501e3917ac4f0ce553a01e0bc
 system_groups="docker"
 
 pre_build() {

From 67e283e55207950e6d1b5e79829ae880f31cc8c4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:42:55 +0200
Subject: [PATCH 0230/1853] hugo: update to 0.112.7.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d9f4819d8c27..d80e676fd44d 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.112.3
+version=0.112.7
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=24720523cd4feb4a746fb1462c4ad0b1ecdd4c3fbe08469d4498ca0647b9e28f
+checksum=d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa
 
 post_install() {
 	vdoc README.md

From 48b593cc887d67e7b4220da067a5c32017a5043e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 0231/1853] occt: update to 7.7.1.

---
 common/shlibs                                 | 118 +++++++++---------
 .../occt/patches/cmake-build-type-none.patch  |  13 --
 srcpkgs/occt/patches/fix-install-dir.patch    |  26 +---
 srcpkgs/occt/patches/musl-fenv.patch          |  14 +--
 srcpkgs/occt/patches/musl-mallinfo.patch      |  26 ++--
 srcpkgs/occt/template                         |  16 ++-
 6 files changed, 101 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index 16eefd439b2b..042a1d23492e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
 libcapnp_c.so.0 c-capnproto-0.3_1
-libTKBin.so.7 occt-7.2.0p1_1
-libTKDraw.so.7 occt-7.2.0p1_1
-libTKSTEP209.so.7 occt-7.2.0p1_1
-libTKOpenGl.so.7 occt-7.2.0p1_1
-libTKBinTObj.so.7 occt-7.2.0p1_1
-libTKSTL.so.7 occt-7.2.0p1_1
-libTKViewerTest.so.7 occt-7.2.0p1_1
-libTKCAF.so.7 occt-7.2.0p1_1
-libTKService.so.7 occt-7.2.0p1_1
-libTKV3d.so.7 occt-7.2.0p1_1
-libTKXCAF.so.7 occt-7.2.0p1_1
-libTKMesh.so.7 occt-7.2.0p1_1
-libTKSTEP.so.7 occt-7.2.0p1_1
-libTKMath.so.7 occt-7.2.0p1_1
-libTKLCAF.so.7 occt-7.2.0p1_1
-libTKShHealing.so.7 occt-7.2.0p1_1
-libTKGeomAlgo.so.7 occt-7.2.0p1_1
-libTKTObjDRAW.so.7 occt-7.2.0p1_1
-libTKTObj.so.7 occt-7.2.0p1_1
-libTKStd.so.7 occt-7.2.0p1_1
-libTKSTEPBase.so.7 occt-7.2.0p1_1
-libTKIGES.so.7 occt-7.2.0p1_1
-libTKGeomBase.so.7 occt-7.2.0p1_1
-libTKFillet.so.7 occt-7.2.0p1_1
-libTKFeat.so.7 occt-7.2.0p1_1
-libTKG2d.so.7 occt-7.2.0p1_1
-libTKXSBase.so.7 occt-7.2.0p1_1
-libTKDCAF.so.7 occt-7.2.0p1_1
-libTKXml.so.7 occt-7.2.0p1_1
-libTKTopTest.so.7 occt-7.2.0p1_1
-libTKG3d.so.7 occt-7.2.0p1_1
-libTKBRep.so.7 occt-7.2.0p1_1
-libTKVRML.so.7 occt-7.2.0p1_1
-libTKCDF.so.7 occt-7.2.0p1_1
-libTKXSDRAW.so.7 occt-7.2.0p1_1
-libTKXMesh.so.7 occt-7.2.0p1_1
-libTKernel.so.7 occt-7.2.0p1_1
-libTKTopAlgo.so.7 occt-7.2.0p1_1
-libTKHLR.so.7 occt-7.2.0p1_1
-libTKBinXCAF.so.7 occt-7.2.0p1_1
-libTKVCAF.so.7 occt-7.2.0p1_1
-libTKBinL.so.7 occt-7.2.0p1_1
-libTKXmlXCAF.so.7 occt-7.2.0p1_1
-libTKXDEIGES.so.7 occt-7.2.0p1_1
-libTKBO.so.7 occt-7.2.0p1_1
-libTKStdL.so.7 occt-7.2.0p1_1
-libTKXDEDRAW.so.7 occt-7.2.0p1_1
-libTKXmlTObj.so.7 occt-7.2.0p1_1
-libTKPrim.so.7 occt-7.2.0p1_1
-libTKMeshVS.so.7 occt-7.2.0p1_1
-libTKSTEPAttr.so.7 occt-7.2.0p1_1
-libTKBool.so.7 occt-7.2.0p1_1
-libTKOffset.so.7 occt-7.2.0p1_1
-libTKXDESTEP.so.7 occt-7.2.0p1_1
-libTKQADraw.so.7 occt-7.2.0p1_1
-libTKXmlL.so.7 occt-7.2.0p1_1
-libTKRWMesh.so.7 occt-7.4.0_1
+libTKernel.so.7.7 occt-7.7.1_1
+libTKXmlXCAF.so.7.7 occt-7.7.1_1
+libTKXmlTObj.so.7.7 occt-7.7.1_1
+libTKXmlL.so.7.7 occt-7.7.1_1
+libTKXml.so.7.7 occt-7.7.1_1
+libTKXSDRAW.so.7.7 occt-7.7.1_1
+libTKXSBase.so.7.7 occt-7.7.1_1
+libTKXMesh.so.7.7 occt-7.7.1_1
+libTKXDESTEP.so.7.7 occt-7.7.1_1
+libTKXDEIGES.so.7.7 occt-7.7.1_1
+libTKXDEDRAW.so.7.7 occt-7.7.1_1
+libTKXDECascade.so.7.7 occt-7.7.1_1
+libTKXDE.so.7.7 occt-7.7.1_1
+libTKXCAF.so.7.7 occt-7.7.1_1
+libTKViewerTest.so.7.7 occt-7.7.1_1
+libTKVRML.so.7.7 occt-7.7.1_1
+libTKVCAF.so.7.7 occt-7.7.1_1
+libTKV3d.so.7.7 occt-7.7.1_1
+libTKTopTest.so.7.7 occt-7.7.1_1
+libTKTopAlgo.so.7.7 occt-7.7.1_1
+libTKTObjDRAW.so.7.7 occt-7.7.1_1
+libTKTObj.so.7.7 occt-7.7.1_1
+libTKStdL.so.7.7 occt-7.7.1_1
+libTKStd.so.7.7 occt-7.7.1_1
+libTKShHealing.so.7.7 occt-7.7.1_1
+libTKService.so.7.7 occt-7.7.1_1
+libTKSTL.so.7.7 occt-7.7.1_1
+libTKSTEPBase.so.7.7 occt-7.7.1_1
+libTKSTEPAttr.so.7.7 occt-7.7.1_1
+libTKSTEP209.so.7.7 occt-7.7.1_1
+libTKSTEP.so.7.7 occt-7.7.1_1
+libTKRWMesh.so.7.7 occt-7.7.1_1
+libTKQADraw.so.7.7 occt-7.7.1_1
+libTKPrim.so.7.7 occt-7.7.1_1
+libTKOpenGlTest.so.7.7 occt-7.7.1_1
+libTKOpenGl.so.7.7 occt-7.7.1_1
+libTKOffset.so.7.7 occt-7.7.1_1
+libTKMeshVS.so.7.7 occt-7.7.1_1
+libTKMesh.so.7.7 occt-7.7.1_1
+libTKMath.so.7.7 occt-7.7.1_1
+libTKLCAF.so.7.7 occt-7.7.1_1
+libTKIGES.so.7.7 occt-7.7.1_1
+libTKHLR.so.7.7 occt-7.7.1_1
+libTKGeomBase.so.7.7 occt-7.7.1_1
+libTKGeomAlgo.so.7.7 occt-7.7.1_1
+libTKG3d.so.7.7 occt-7.7.1_1
+libTKG2d.so.7.7 occt-7.7.1_1
+libTKFillet.so.7.7 occt-7.7.1_1
+libTKFeat.so.7.7 occt-7.7.1_1
+libTKExpress.so.7.7 occt-7.7.1_1
+libTKDraw.so.7.7 occt-7.7.1_1
+libTKDCAF.so.7.7 occt-7.7.1_1
+libTKCDF.so.7.7 occt-7.7.1_1
+libTKCAF.so.7.7 occt-7.7.1_1
+libTKBool.so.7.7 occt-7.7.1_1
+libTKBinXCAF.so.7.7 occt-7.7.1_1
+libTKBinTObj.so.7.7 occt-7.7.1_1
+libTKBinL.so.7.7 occt-7.7.1_1
+libTKBin.so.7.7 occt-7.7.1_1
+libTKBRep.so.7.7 occt-7.7.1_1
+libTKBO.so.7.7 occt-7.7.1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
- 
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
- 
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
- 
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch
index 68b3ee4ef4fe..931587bef990 100644
--- a/srcpkgs/occt/patches/fix-install-dir.patch
+++ b/srcpkgs/occt/patches/fix-install-dir.patch
@@ -1,26 +1,12 @@
-# fix cmake install dir references
-# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
-
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
+--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake	2023-05-31 20:05:47.619869450 +0200
++++ occt-7.7.1/adm/cmake/occt_macros.cmake	2023-05-31 20:07:25.611036417 +0200
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
  
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
 +  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
-<Paste>
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -5,18 +5,18 @@ is probably wrong, but I don't have a replacement for the
 non-posix functions fegetexcept(3) and feenableexcept(3).
 """
 
---- a/src/OSD/OSD_signal.cxx
-+++ b/src/OSD/OSD_signal.cxx
-@@ -703,7 +703,7 @@
+--- a/src/OSD/OSD_signal.cxx.orig	2022-07-22 10:53:38.000000000 +0200
++++ b/src/OSD/OSD_signal.cxx	2022-10-06 09:19:02.286414340 +0200
+@@ -761,7 +761,7 @@ typedef void (* SIG_PFV) (int);
  
  #include <signal.h>
  
--#if !defined(__ANDROID__) && !defined(__QNX__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) &&  defined(__GLIBC__)
    #include <sys/signal.h>
  #endif
  
-@@ -914,7 +914,7 @@
+@@ -977,7 +977,7 @@ static void SegvHandler(const int theSig
  //=======================================================================
  void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
  {
@@ -25,7 +25,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
    feclearexcept (FE_ALL_EXCEPT);
    if (theFloatingSignal)
    {
-@@ -947,7 +947,7 @@
+@@ -1010,7 +1010,7 @@ void OSD::SetFloatingSignal (Standard_Bo
  //=======================================================================
  Standard_Boolean OSD::ToCatchFloatingSignals()
  {
diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
index 4e5825bf1cb0..1ce5b16b793f 100644
--- a/srcpkgs/occt/patches/musl-mallinfo.patch
+++ b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -1,17 +1,21 @@
 In musl libc there is no struct mallinfo and no function mallinf()
 
---- a/src/OSD/OSD_MemInfo.cxx
-+++ b/src/OSD/OSD_MemInfo.cxx
-@@ -147,8 +147,12 @@
-   }
-   aFile.close();
+--- a/src/OSD/OSD_MemInfo.cxx.orig	2022-10-06 09:21:55.466236104 +0200
++++ b/src/OSD/OSD_MemInfo.cxx	2022-10-06 09:25:34.105323581 +0200
+@@ -188,12 +188,16 @@ void OSD_MemInfo::Update()
+     #endif
+   #endif
  
 +  #if defined(__GLIBC__)
-   struct mallinfo aMI = mallinfo();
-   myCounters[MemHeapUsage] = aMI.uordblks;
-+  #else /* XXX not yet coded */
-+  myCounters[MemHeapUsage] = 0;
+   #ifdef HAS_MALLINFO2
+     const struct mallinfo2 aMI = mallinfo2();
+   #else
+     const struct mallinfo aMI = mallinfo();
+   #endif
+     myCounters[MemHeapUsage] = aMI.uordblks;
++  #else
++    myCounters[MemHeapUsage] = 0;
 +  #endif
+   }
  
- #elif (defined(__APPLE__))
-   struct task_basic_info aTaskInfo;
+   if (!IsActive (MemVirtual)
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 5f9ef2d060e4..296a52de5a1b 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,8 +1,7 @@
 # Template file for 'occt'
 pkgname=occt
-reverts=7.5.0_1
-version=7.4.0p1
-revision=5
+version=7.7.1
+revision=1
 _gittag="V${version//./_}"
 build_style=cmake
 # XXX: re-enable -DUSE_TBB=ON if possible when updating
@@ -17,8 +16,17 @@ homepage="https://www.opencascade.com"
 # distfile: use git instead of official tarball, which requires registration
 # see https://www.opencascade.com/content/packaging-again-debian
 distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
+checksum=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
 conflicts="oce>=0"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+fi
+
+pre_build() {
+	cp build/OpenCASCADECompileDefinitionsAndFlags-release.cmake \
+		build/OpenCASCADECompileDefinitionsAndFlags-none.cmake
+}
 
 post_install() {
 	rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt

From 17c0c405e7037ff9ad2ae5f4fd03e702bf9595c8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Jun 2023 11:48:53 +0200
Subject: [PATCH 0232/1853] freecad: rebuild for occt-7.7.1_1

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

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e301f32d3540..a4a3f5f76b29 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=4
+revision=5
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From b1d29e961d2b4e4ffdaefce190271d5f2d21fc9b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 0233/1853] gmsh: rebuild for occt-7.7.1_1

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

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index ca44c92cf8e1..c3727d90e4c9 100644
--- a/srcpkgs/gmsh/template
+++ b/srcpkgs/gmsh/template
@@ -1,7 +1,7 @@
 # Template file for 'gmsh'
 pkgname=gmsh
 version=4.8.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON
  -DENABLE_HXT=$(vopt_if hxt ON OFF)

From 5dd99faa187727d6b33fb28a92c6c502d1256efa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 0234/1853] horizon: rebuilt for occt-7.7.0_1

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

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From f2374232a132090ffe0e770860bc472479b061af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 0235/1853] kicad: rebuilt for occt-7.7.1_1

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

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 17e6745b109c..1c34c498afbd 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=7.0.1
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON

From eca13c946fac29f4b49eee5f6315d698abbd5ce6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:53 +0200
Subject: [PATCH 0236/1853] python3-occ: update to 7.7.0.

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

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 6e9967154c5c..1fd02e0b26a0 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
-version=7.4.1
-revision=4
+version=7.7.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
@@ -13,4 +13,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="http://pythonocc.org"
 distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz"
-checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667
+checksum=9b27003b87799badfae04f8cacd03b8faa1309600c9de8021434d7511e718f82

From f611068aedcc0cac20eb93f7d5188efcbbbed646 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 0237/1853] PrusaSlicer: update to 2.5.2.

---
 .../PrusaSlicer/patches/cereal-is-header-only.patch   |  2 +-
 .../PrusaSlicer/patches/cmake-relax-dependency.patch  | 11 +++++++++++
 srcpkgs/PrusaSlicer/template                          |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..24897e503efb 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,9 +20,9 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r)
+
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
 ===================================================================
 --- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..b0f1448779a0
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig	2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt	2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+ 
+ generate_export_header(OCCTWrapper)
+ 
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index e645926e76f7..47ec80940155 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=5
+version=2.5.2
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,13 +11,13 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel libopenexr-devel wxWidgets-gtk3-devel occt-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
 
 post_extract() {
 	# Mark tests that fail on certain targets

From 27cac929560f5bdd5614523d442e624994e0567e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:52:59 +0300
Subject: [PATCH 0238/1853] qt6-multimedia: don't move qmldir to -devel subpkg

This breaks "import QtMultimedia" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-multimedia/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
index c622b7c9e8fc..a6832fdd69bf 100644
--- a/srcpkgs/qt6-multimedia/template
+++ b/srcpkgs/qt6-multimedia/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-multimedia'
 pkgname=qt6-multimedia
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_FEATURE_gstreamer=ON"
 hostmakedepends="perl qt6-declarative-host-tools pkg-config qt6-shadertools"
@@ -43,7 +43,6 @@ qt6-multimedia-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.prl"

From 300c46f61308e6d997d0352331800599eb27ac87 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:54:42 +0300
Subject: [PATCH 0239/1853] qt6-remoteobjects: don't move qmldir to -devel
 subpkg

This breaks "import QtRemoteObjects" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-remoteobjects/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
index b37d82bed03d..8cdd45e4ea8a 100644
--- a/srcpkgs/qt6-remoteobjects/template
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-remoteobjects'
 pkgname=qt6-remoteobjects
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools pkg-config"
 makedepends="qt6-declarative-devel"
@@ -39,7 +39,6 @@ qt6-remoteobjects-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 	}

From 52b3a48a9cd107bd080aa14581f7be62ca773707 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:55:27 +0300
Subject: [PATCH 0240/1853] qt6-sensors: don't move qmldir to -devel subpkg

This breaks "import QtSensors" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-sensors/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
index 5e6a1e2a7776..8f6d6ece628d 100644
--- a/srcpkgs/qt6-sensors/template
+++ b/srcpkgs/qt6-sensors/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-sensors'
 pkgname=qt6-sensors
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools pkg-config"
 makedepends="qt6-declarative-devel qt6-svg-devel"
@@ -27,7 +27,6 @@ qt6-sensors-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtSensors/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 	}

From 815c0d5970d86b4b7def00e1e5783b1ca772d164 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:56:01 +0300
Subject: [PATCH 0241/1853] qt6-webchannel: don't move qmldir to -devel subpkg

This breaks "import QtWebChannel" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-webchannel/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
index 9c3def385a7b..30484a12b4f1 100644
--- a/srcpkgs/qt6-webchannel/template
+++ b/srcpkgs/qt6-webchannel/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-webchannel'
 pkgname=qt6-webchannel
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl qt6-base qt6-declarative-host-tools"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
@@ -31,7 +31,6 @@ qt6-webchannel-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 		vmove usr/lib/qt6/modules

From 4c0766176e9cdd2a4ad334020e5e1783f1d98899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 5 Jun 2023 23:39:27 +0700
Subject: [PATCH 0242/1853] freecad: fix build for occt 7.7

---
 srcpkgs/freecad/patches/001-include.patch     | 112 ++++++++++++++++++
 .../patches/153-limits.h-for-musl.patch       |   4 +-
 .../154-revert-gui-tmp-redirect-stderr.patch  |   5 -
 ...d63c8c9b1280978be841d04e68a0a55cceb9.patch |   6 +-
 4 files changed, 116 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/freecad/patches/001-include.patch

diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/patches/001-include.patch
new file mode 100644
index 000000000000..28b5af54999b
--- /dev/null
+++ b/srcpkgs/freecad/patches/001-include.patch
@@ -0,0 +1,112 @@
+From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
+From: Uwe <donovaly@users.noreply.github.com>
+Date: Sun, 3 Jul 2022 22:51:16 +0200
+Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
+
+- also sort includes
+---
+ src/Mod/Part/App/OCCError.h             | 36 +++----------------------
+ src/Mod/Part/App/OffsetCurvePyImp.cpp   | 12 ++++-----
+ src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
+ 3 files changed, 12 insertions(+), 46 deletions(-)
+
+--- a/src/Mod/Part/App/OCCError.h
++++ b/src/Mod/Part/App/OCCError.h
+@@ -23,36 +23,8 @@
+ #ifndef _OCCError_h_
+ #define _OCCError_h_
+ 
+-# include <Standard_Version.hxx>
+ # include <Standard_Failure.hxx>
+-# include <Standard_AbortiveTransaction.hxx>
+-# include <Standard_ConstructionError.hxx>
+-# if OCC_VERSION_HEX >= 0x060500
+-# include <Standard_DefineException.hxx>
+-# endif
+-# include <Standard_DimensionError.hxx>
+-# include <Standard_DimensionMismatch.hxx>
+-# include <Standard_DivideByZero.hxx>
+-# include <Standard_DomainError.hxx>
+-# include <Standard_ImmutableObject.hxx>
+-# include <Standard_LicenseError.hxx>
+-# include <Standard_LicenseNotFound.hxx>
+-# include <Standard_MultiplyDefined.hxx>
+-# include <Standard_NegativeValue.hxx>
+-# include <Standard_NoMoreObject.hxx>
+-# include <Standard_NoSuchObject.hxx>
+-# include <Standard_NotImplemented.hxx>
+-# include <Standard_NullObject.hxx>
+-# include <Standard_NullValue.hxx>
+-# include <Standard_NumericError.hxx>
+-# include <Standard_OutOfMemory.hxx>
+-# include <Standard_OutOfRange.hxx>
+-# include <Standard_Overflow.hxx>
+-# include <Standard_ProgramError.hxx>
+-# include <Standard_RangeError.hxx>
+-# include <Standard_TooManyUsers.hxx>
+-# include <Standard_TypeMismatch.hxx>
+-# include <Standard_Underflow.hxx>
++# include <Standard_Version.hxx>
+ 
+ #include <Mod/Part/PartGlobal.h>
+ #include <Base/Console.h>
+@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
+ 
+ #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
+ #endif  // _OCCError_h_
+-
+--- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
++++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
+@@ -20,20 +20,20 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
+-
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <Geom_OffsetCurve.hxx>
+ #endif
+ 
+-#include "OCCError.h"
+-#include "Geometry.h"
++#include <Base/GeometryPyCXX.h>
++#include <Base/Vector3D.h>
++#include <Base/VectorPy.h>
++
+ #include "OffsetCurvePy.h"
+ #include "OffsetCurvePy.cpp"
++#include "Geometry.h"
++#include "OCCError.h"
+ 
+-#include <Base/GeometryPyCXX.h>
+-#include <Base/VectorPy.h>
+-#include <Base/Vector3D.h>
+ 
+ using namespace Part;
+ 
+--- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
++++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
+@@ -20,20 +20,16 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
+-
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <Geom_OffsetSurface.hxx>
+ # include <memory>
+ #endif
+ 
+-#include <Base/VectorPy.h>
+-#include <Base/Vector3D.h>
+-
+ #include "OCCError.h"
+-#include "Geometry.h"
+-#include <Mod/Part/App/OffsetSurfacePy.h>
+-#include <Mod/Part/App/OffsetSurfacePy.cpp>
++#include "OffsetSurfacePy.h"
++#include "OffsetSurfacePy.cpp"
++
+ 
+ using namespace Part;
+ 
diff --git a/srcpkgs/freecad/patches/153-limits.h-for-musl.patch b/srcpkgs/freecad/patches/153-limits.h-for-musl.patch
index 59b0ff178ef8..4c1b369680b8 100644
--- a/srcpkgs/freecad/patches/153-limits.h-for-musl.patch
+++ b/srcpkgs/freecad/patches/153-limits.h-for-musl.patch
@@ -1,6 +1,6 @@
---- a/src/FCConfig.h.ORIG
+--- a/src/FCConfig.h
 +++ b/src/FCConfig.h
-@@ -321,4 +321,10 @@
+@@ -321,4 +321,10 @@ typedef unsigned __int64    uint64_t;
  //#	define _PreComp_                  // use precompiled header
  #endif
  
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
index 287179a23c3c..d6a9adabdec8 100644
--- a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
+++ b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
@@ -12,8 +12,6 @@ Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
  src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
  1 file changed, 27 deletions(-)
 
-diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-index 7f0ddd75d..455ece0b3 100644
 --- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
 +++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
 @@ -21,42 +21,17 @@
@@ -68,6 +66,3 @@ index 7f0ddd75d..455ece0b3 100644
      Q_UNUSED(window)
      if (spnav_open() == -1) {
          Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
--- 
-2.37.1
-
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
index 44b8d977def0..d4acf370ca0a 100644
--- a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
@@ -8,11 +8,9 @@ Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
  src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/Mod/Draft/draftguitools/gui_snapper.py b/src/Mod/Draft/draftguitools/gui_snapper.py
-index de27eaa53482..ef9ba5284d3c 100644
 --- a/src/Mod/Draft/draftguitools/gui_snapper.py
 +++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1438,7 +1438,7 @@ def accept():
+@@ -1426,7 +1426,7 @@ class Snapper:
              Gui.Snapper.off()
              self.ui.offUi()
              if callback:
@@ -21,7 +19,7 @@ index de27eaa53482..ef9ba5284d3c 100644
                      obj = None
                      if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
                          obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1457,7 +1457,7 @@ def cancel():
+@@ -1445,7 +1445,7 @@ class Snapper:
              Gui.Snapper.off()
              self.ui.offUi()
              if callback:

From 891f81299bca8347b2c55a734963fa797a699a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 3 Jun 2023 15:50:15 -0300
Subject: [PATCH 0243/1853] python3-ipython: update to 8.14.0.

 - switch to pep517 build style
 - update depends and checkdepends
 - break unnecessary checkdepends cycle with ipython_ipykernel
 - fix a race (https://github.com/ipython/ipython/issues/12164)

Closes: #44268 [via git-merge-pr]
---
 .../python3-ipython/patches/fix-race.patch    | 28 +++++++++++++++++++
 srcpkgs/python3-ipython/template              | 17 +++++------
 2 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-ipython/patches/fix-race.patch

diff --git a/srcpkgs/python3-ipython/patches/fix-race.patch b/srcpkgs/python3-ipython/patches/fix-race.patch
new file mode 100644
index 000000000000..a6fdf5726815
--- /dev/null
+++ b/srcpkgs/python3-ipython/patches/fix-race.patch
@@ -0,0 +1,28 @@
+See: https://github.com/ipython/ipython/issues/12164
+
+diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
+index 59b5c2389..e83da39c6 100644
+--- a/IPython/utils/_process_posix.py
++++ b/IPython/utils/_process_posix.py
+@@ -136,6 +136,7 @@ def system(self, cmd):
+         # record how far we've printed, so that next time we only print *new*
+         # content from the buffer.
+         out_size = 0
++        child = None
+         try:
+             # Since we're not really searching the buffer for text patterns, we
+             # can set pexpect's search window to be tiny and it won't matter.
+@@ -158,6 +159,13 @@ def system(self, cmd):
+                 # Update the pointer to what we've already printed
+                 out_size = len(child.before)
+         except KeyboardInterrupt:
++
++            if child is None:
++                # the interrupt was received before pexpect.spawn()
++                # was done... recover as best as possible.
++                import signal
++                return -signal.SIGINT
++
+             # We need to send ^C to the process.  The ascii code for '^C' is 3
+             # (the character is known as ETX for 'End of Text', see
+             # curses.ascii.ETX).
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 14b1cc291123..910d51f0fb88 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,24 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.13.2
+version=8.14.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-jedi python3-decorator python3-pickleshare
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-jedi python3-decorator python3-pickleshare
  python3-traitlets python3-prompt_toolkit python3-Pygments python3-backcall
  python3-matplotlib-inline python3-pexpect python3-stack_data"
-checkdepends="python3-pytest $depends python3-matplotlib python3-Pillow
- python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+checkdepends="$depends python3-pytest-asyncio python3-testpath python3-curio
+ python3-jupyter_nbformat python3-matplotlib python3-numpy python3-pandas
+ python3-trio"
 short_desc="Enhanced interactive Python3 shell"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 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=7dff3fad32b97f6488e02f87b970f309d082f758d7b7fc252e3b19ee0e432dbb
+checksum=1d197b907b6ba441b692c48cf2a3a2de280dc0ac91a3405b39349a50272ca0a1
 conflicts="python-ipython<=5.8.0_2"
+make_check_pre="env PYTHONPATH=."
 
 post_install() {
 	# remove iptest

From b3b9c40fceee28d639191b92157a5c27e2b8d09b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 5 Jun 2023 13:40:15 -0400
Subject: [PATCH 0244/1853] python3-occ: remove obsolete patch

---
 srcpkgs/python3-occ/patches/python3.10.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/python3-occ/patches/python3.10.patch

diff --git a/srcpkgs/python3-occ/patches/python3.10.patch b/srcpkgs/python3-occ/patches/python3.10.patch
deleted file mode 100644
index e192608fd3b3..000000000000
--- a/srcpkgs/python3-occ/patches/python3.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Display/SimpleGui.py b/src/Display/SimpleGui.py
-index 42705a82..6a274c16 100644
---- a/src/Display/SimpleGui.py
-+++ b/src/Display/SimpleGui.py
-@@ -161,8 +161,8 @@ def init_display(backend_str: Optional[str]=None,
-             def centerOnScreen(self) -> None:
-                 '''Centers the window on the screen.'''
-                 resolution = QtWidgets.QApplication.desktop().screenGeometry()
--                x = (resolution.width() - self.frameSize().width()) / 2
--                y = (resolution.height() - self.frameSize().height()) / 2
-+                x = (resolution.width() - self.frameSize().width()) // 2
-+                y = (resolution.height() - self.frameSize().height()) // 2
-                 self.move(x, y)
- 
-             def add_menu(self, menu_name: str) -> None:

From a3b1db21163c09e5ef0068441b0feb450484e6b1 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Jun 2023 19:45:19 +0200
Subject: [PATCH 0245/1853] passt: update to 2023.06.03.429e1a7.

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

diff --git a/srcpkgs/passt/template b/srcpkgs/passt/template
index 3ab469513be4..aa1679b2467d 100644
--- a/srcpkgs/passt/template
+++ b/srcpkgs/passt/template
@@ -1,6 +1,6 @@
 # Template file for 'passt'
 pkgname=passt
-version=2023.05.09.96f8d55
+version=2023.06.03.429e1a7
 revision=1
 # upstream uses YYYY_MM_DD.COMMIT
 _version=${version/./_}
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2, BSD-3-Clause"
 homepage="https://passt.top"
 distfiles="https://passt.top/passt/snapshot/passt-${_version}.tar.xz"
-checksum=5f81185e8c94ff7eae925e2f0eae7f16cdd891e68f70b6e35e0a67fb4c41457d
+checksum=4bd17ce7bd1d6dda033e346a40c5dc60d39cc08a6e3341fef79888299c84c3b6
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 4c24123f1cb3860138b25a2f3657325b42f75d81 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Jun 2023 19:48:56 +0200
Subject: [PATCH 0246/1853] obs: update to 29.1.2.

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

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 7ee29ff3eac6..7b69c630d30d 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=29.1.1
+version=29.1.2
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 build_style=cmake
@@ -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=9a37148449d715b3c7cc3e622c291aba9fa45bd354a39453b3e922eb558cf21e
+checksum=215f1fa5772c5dd9f3d6e35b0cb573912b00320149666a77864f9d305525504b
 
 pre_configure() {
 	# it's not enough to use -DENABLE_BROWSER ...

From cf332cbef28f64783e78fb6c691b1c013fd6f54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Jun 2023 00:13:45 +0700
Subject: [PATCH 0247/1853] python3-occ: patch for occt 7.7.1

---
 srcpkgs/python3-occ/patches/occt-7.7.1.patch | 2561 ++++++++++++++++++
 srcpkgs/python3-occ/template                 |    2 +-
 2 files changed, 2562 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-occ/patches/occt-7.7.1.patch

diff --git a/srcpkgs/python3-occ/patches/occt-7.7.1.patch b/srcpkgs/python3-occ/patches/occt-7.7.1.patch
new file mode 100644
index 000000000000..70861a77853b
--- /dev/null
+++ b/srcpkgs/python3-occ/patches/occt-7.7.1.patch
@@ -0,0 +1,2561 @@
+From 6ba4509edb333494d35a40c01192ab5e236acdda Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Mon, 3 Apr 2023 14:01:20 +0200
+Subject: [PATCH 1/4] update swig files to occt-771
+
+---
+ src/SWIG_files/common/EnumTemplates.i      |   1 -
+ src/SWIG_files/headers/AIS_module.hxx      |   2 +
+ src/SWIG_files/headers/BRepFill_module.hxx |   1 +
+ src/SWIG_files/wrapper/AIS.i               | 127 ++++++++----
+ src/SWIG_files/wrapper/AIS.pyi             |  12 +-
+ src/SWIG_files/wrapper/BRepAlgo.i          |  26 +++
+ src/SWIG_files/wrapper/BRepAlgo.pyi        |   2 +
+ src/SWIG_files/wrapper/BRepBlend.i         |  44 +++--
+ src/SWIG_files/wrapper/BRepBlend.pyi       |  14 +-
+ src/SWIG_files/wrapper/BRepExtrema.i       | 218 +++++----------------
+ src/SWIG_files/wrapper/BRepExtrema.pyi     |  23 +--
+ src/SWIG_files/wrapper/BRepFill.i          |  48 +++++
+ src/SWIG_files/wrapper/BRepFill.pyi        |  19 ++
+ src/SWIG_files/wrapper/BRepOffset.i        |   3 +
+ src/SWIG_files/wrapper/BRepOffset.pyi      |   2 +
+ src/SWIG_files/wrapper/BRepOffsetAPI.i     |  11 ++
+ src/SWIG_files/wrapper/BRepOffsetAPI.pyi   |   1 +
+ src/SWIG_files/wrapper/BSplCLib.i          |  23 +++
+ src/SWIG_files/wrapper/BSplCLib.pyi        |   3 +
+ src/SWIG_files/wrapper/ChFiDS.i            |  14 ++
+ src/SWIG_files/wrapper/ChFiDS.pyi          |   3 +
+ src/SWIG_files/wrapper/GeomInt.i           |  23 +++
+ src/SWIG_files/wrapper/GeomInt.pyi         |   5 +
+ src/SWIG_files/wrapper/STEPCAFControl.i    | 140 ++++++-------
+ src/SWIG_files/wrapper/STEPCAFControl.pyi  |  32 +--
+ src/SWIG_files/wrapper/STEPConstruct.i     |  26 +++
+ src/SWIG_files/wrapper/STEPConstruct.pyi   |   2 +
+ src/SWIG_files/wrapper/ShapeUpgrade.i      |   1 +
+ src/SWIG_files/wrapper/StdPrs.i            |  12 +-
+ src/SWIG_files/wrapper/StdPrs.pyi          |   4 +-
+ src/SWIG_files/wrapper/StepToGeom.i        |  16 --
+ src/SWIG_files/wrapper/XCAFDoc.i           |  78 +++++---
+ src/SWIG_files/wrapper/XCAFDoc.pyi         |  56 ++++--
+ src/SWIG_files/wrapper/XCAFPrs.i           |  10 +-
+ 34 files changed, 592 insertions(+), 410 deletions(-)
+
+diff --git a/src/SWIG_files/common/EnumTemplates.i b/src/SWIG_files/common/EnumTemplates.i
+index b66537d8..69af927f 100644
+--- a/src/SWIG_files/common/EnumTemplates.i
++++ b/src/SWIG_files/common/EnumTemplates.i
+@@ -15,7 +15,6 @@ ENUM_OUTPUT_TYPEMAPS(BRepOffset_Status);
+ ENUM_OUTPUT_TYPEMAPS(Graphic3d_DisplayPriority);
+ ENUM_OUTPUT_TYPEMAPS(Graphic3d_NameOfMaterial);
+ ENUM_OUTPUT_TYPEMAPS(GeomAbs_Shape);
+-ENUM_OUTPUT_TYPEMAPS(ProxPnt_Status);
+ ENUM_OUTPUT_TYPEMAPS(Aspect_TypeOfLine);
+ ENUM_OUTPUT_TYPEMAPS(PrsDim_KindOfSurface);
+ ENUM_OUTPUT_TYPEMAPS(DsgPrs_ArrowSide);
+diff --git a/src/SWIG_files/headers/AIS_module.hxx b/src/SWIG_files/headers/AIS_module.hxx
+index ee7050ea..97fb3b69 100644
+--- a/src/SWIG_files/headers/AIS_module.hxx
++++ b/src/SWIG_files/headers/AIS_module.hxx
+@@ -22,12 +22,14 @@ along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
+ #include<AIS.hxx>
+ #include<AIS_AngleDimension.hxx>
+ #include<AIS_Animation.hxx>
++#include<AIS_AnimationAxisRotation.hxx>
+ #include<AIS_AnimationCamera.hxx>
+ #include<AIS_AnimationObject.hxx>
+ #include<AIS_AnimationTimer.hxx>
+ #include<AIS_AttributeFilter.hxx>
+ #include<AIS_Axis.hxx>
+ #include<AIS_BadEdgeFilter.hxx>
++#include<AIS_BaseAnimationObject.hxx>
+ #include<AIS_C0RegularityFilter.hxx>
+ #include<AIS_CameraFrustum.hxx>
+ #include<AIS_Chamf2dDimension.hxx>
+diff --git a/src/SWIG_files/headers/BRepFill_module.hxx b/src/SWIG_files/headers/BRepFill_module.hxx
+index 73975e24..ef638100 100644
+--- a/src/SWIG_files/headers/BRepFill_module.hxx
++++ b/src/SWIG_files/headers/BRepFill_module.hxx
+@@ -67,6 +67,7 @@ along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
+ #include<BRepFill_SequenceOfSection.hxx>
+ #include<BRepFill_ShapeLaw.hxx>
+ #include<BRepFill_Sweep.hxx>
++#include<BRepFill_ThruSectionErrorStatus.hxx>
+ #include<BRepFill_TransitionStyle.hxx>
+ #include<BRepFill_TrimEdgeTool.hxx>
+ #include<BRepFill_TrimShellCorner.hxx>
+diff --git a/src/SWIG_files/wrapper/AIS.i b/src/SWIG_files/wrapper/AIS.i
+index bf1f6b10..8f58d69a 100644
+--- a/src/SWIG_files/wrapper/AIS.i
++++ b/src/SWIG_files/wrapper/AIS.i
+@@ -577,8 +577,8 @@ AIS_TOPL_YZPlane = AIS_TypeOfPlane.AIS_TOPL_YZPlane
+ %wrap_handle(AIS_TrihedronOwner)
+ %wrap_handle(AIS_TypeFilter)
+ %wrap_handle(AIS_AnimationCamera)
+-%wrap_handle(AIS_AnimationObject)
+ %wrap_handle(AIS_Axis)
++%wrap_handle(AIS_BaseAnimationObject)
+ %wrap_handle(AIS_Circle)
+ %wrap_handle(AIS_ColorScale)
+ %wrap_handle(AIS_ConnectedInteractive)
+@@ -595,6 +595,8 @@ AIS_TOPL_YZPlane = AIS_TypeOfPlane.AIS_TOPL_YZPlane
+ %wrap_handle(AIS_TextLabel)
+ %wrap_handle(AIS_Triangulation)
+ %wrap_handle(AIS_Trihedron)
++%wrap_handle(AIS_AnimationAxisRotation)
++%wrap_handle(AIS_AnimationObject)
+ %wrap_handle(AIS_ColoredShape)
+ %wrap_handle(AIS_TexturedShape)
+ /* end handles declaration */
+@@ -8532,41 +8534,6 @@ opencascade::handle<V3d_View>
+ 	}
+ };
+ 
+-/****************************
+-* class AIS_AnimationObject *
+-****************************/
+-class AIS_AnimationObject : public AIS_Animation {
+-	public:
+-		/****************** AIS_AnimationObject ******************/
+-		/**** md5 signature: c16e60828b420c37f86bd653dd4d9c04 ****/
+-		%feature("compactdefaultargs") AIS_AnimationObject;
+-		%feature("autodoc", "Constructor with initialization. note that start/end transformations specify exactly local transformation of the object, not the transformation to be applied to existing local transformation. @param theanimationname animation identifier @param thecontext interactive context where object have been displayed @param theobject object to apply local transformation @param thetrsfstart local transformation at the start of animation (e.g. theobject->localtransformation()) @param thetrsfend local transformation at the end of animation.
+-
+-Parameters
+-----------
+-theAnimationName: TCollection_AsciiString
+-theContext: AIS_InteractiveContext
+-theObject: AIS_InteractiveObject
+-theTrsfStart: gp_Trsf
+-theTrsfEnd: gp_Trsf
+-
+-Returns
+--------
+-None
+-") AIS_AnimationObject;
+-		 AIS_AnimationObject(const TCollection_AsciiString & theAnimationName, const opencascade::handle<AIS_InteractiveContext> & theContext, const opencascade::handle<AIS_InteractiveObject> & theObject, const gp_Trsf & theTrsfStart, const gp_Trsf & theTrsfEnd);
+-
+-};
+-
+-
+-%make_alias(AIS_AnimationObject)
+-
+-%extend AIS_AnimationObject {
+-	%pythoncode {
+-	__repr__ = _dumps_object
+-	}
+-};
+-
+ /*****************
+ * class AIS_Axis *
+ *****************/
+@@ -8855,6 +8822,23 @@ None
+ 	}
+ };
+ 
++/********************************
++* class AIS_BaseAnimationObject *
++********************************/
++%nodefaultctor AIS_BaseAnimationObject;
++class AIS_BaseAnimationObject : public AIS_Animation {
++	public:
++};
++
++
++%make_alias(AIS_BaseAnimationObject)
++
++%extend AIS_BaseAnimationObject {
++	%pythoncode {
++	__repr__ = _dumps_object
++	}
++};
++
+ /**************************
+ * class AIS_CameraFrustum *
+ **************************/
+@@ -16143,6 +16127,77 @@ Standard_ShortReal
+ 	}
+ };
+ 
++/**********************************
++* class AIS_AnimationAxisRotation *
++**********************************/
++class AIS_AnimationAxisRotation : public AIS_BaseAnimationObject {
++	public:
++		/****************** AIS_AnimationAxisRotation ******************/
++		/**** md5 signature: 819427e2c422233cc067da4633992952 ****/
++		%feature("compactdefaultargs") AIS_AnimationAxisRotation;
++		%feature("autodoc", "Constructor with initialization. @param[in] theanimationname animation identifier @param[in] thecontext interactive context where object have been displayed @param[in] theobject object to apply rotation @param[in] theaxis rotation axis @param[in] theanglestart rotation angle at the start of animation @param[in] theangleend rotation angle at the end of animation.
++
++Parameters
++----------
++theAnimationName: str
++theContext: AIS_InteractiveContext
++theObject: AIS_InteractiveObject
++theAxis: gp_Ax1
++theAngleStart: float
++theAngleEnd: float
++
++Returns
++-------
++None
++") AIS_AnimationAxisRotation;
++		 AIS_AnimationAxisRotation(TCollection_AsciiString theAnimationName, const opencascade::handle<AIS_InteractiveContext> & theContext, const opencascade::handle<AIS_InteractiveObject> & theObject, const gp_Ax1 & theAxis, const Standard_Real theAngleStart, const Standard_Real theAngleEnd);
++
++};
++
++
++%make_alias(AIS_AnimationAxisRotation)
++
++%extend AIS_AnimationAxisRotation {
++	%pythoncode {
++	__repr__ = _dumps_object
++	}
++};
++
++/****************************
++* class AIS_AnimationObject *
++****************************/
++class AIS_AnimationObject : public AIS_BaseAnimationObject {
++	public:
++		/****************** AIS_AnimationObject ******************/
++		/**** md5 signature: c16e60828b420c37f86bd653dd4d9c04 ****/
++		%feature("compactdefaultargs") AIS_AnimationObject;
++		%feature("autodoc", "Constructor with initialization. note that start/end transformations specify exactly local transformation of the object, not the transformation to be applied to existing local transformation. @param[in] theanimationname animation identifier @param[in] thecontext interactive context where object have been displayed @param[in] theobject object to apply local transformation @param[in] thetrsfstart local transformation at the start of animation (e.g. theobject->localtransformation()) @param[in] thetrsfend local transformation at the end of animation.
++
++Parameters
++----------
++theAnimationName: str
++theContext: AIS_InteractiveContext
++theObject: AIS_InteractiveObject
++theTrsfStart: gp_Trsf
++theTrsfEnd: gp_Trsf
++
++Returns
++-------
++None
++") AIS_AnimationObject;
++		 AIS_AnimationObject(TCollection_AsciiString theAnimationName, const opencascade::handle<AIS_InteractiveContext> & theContext, const opencascade::handle<AIS_InteractiveObject> & theObject, const gp_Trsf & theTrsfStart, const gp_Trsf & theTrsfEnd);
++
++};
++
++
++%make_alias(AIS_AnimationObject)
++
++%extend AIS_AnimationObject {
++	%pythoncode {
++	__repr__ = _dumps_object
++	}
++};
++
+ /*************************
+ * class AIS_ColoredShape *
+ *************************/
+diff --git a/src/SWIG_files/wrapper/AIS.pyi b/src/SWIG_files/wrapper/AIS.pyi
+index a75ef4ba..da4a3977 100644
+--- a/src/SWIG_files/wrapper/AIS.pyi
++++ b/src/SWIG_files/wrapper/AIS.pyi
+@@ -1021,9 +1021,6 @@ class AIS_AnimationCamera(AIS_Animation):
+     def SetView(self, theView: V3d_View) -> None: ...
+     def View(self) -> V3d_View: ...
+ 
+-class AIS_AnimationObject(AIS_Animation):
+-    def __init__(self, theAnimationName: TCollection_AsciiString, theContext: AIS_InteractiveContext, theObject: AIS_InteractiveObject, theTrsfStart: gp_Trsf, theTrsfEnd: gp_Trsf) -> None: ...
+-
+ class AIS_Axis(AIS_InteractiveObject):
+     @overload
+     def __init__(self, aComponent: Geom_Line) -> None: ...
+@@ -1050,6 +1047,9 @@ class AIS_Axis(AIS_InteractiveObject):
+     def UnsetColor(self) -> None: ...
+     def UnsetWidth(self) -> None: ...
+ 
++class AIS_BaseAnimationObject(AIS_Animation):
++    pass
++
+ class AIS_CameraFrustum(AIS_InteractiveObject):
+     def __init__(self) -> None: ...
+     def AcceptDisplayMode(self, theMode: int) -> bool: ...
+@@ -1652,6 +1652,12 @@ class AIS_XRTrackedDevice(AIS_InteractiveObject):
+     def SetUnitFactor(self, theFactor: float) -> None: ...
+     def UnitFactor(self) -> float: ...
+ 
++class AIS_AnimationAxisRotation(AIS_BaseAnimationObject):
++    def __init__(self, theAnimationName: str, theContext: AIS_InteractiveContext, theObject: AIS_InteractiveObject, theAxis: gp_Ax1, theAngleStart: float, theAngleEnd: float) -> None: ...
++
++class AIS_AnimationObject(AIS_BaseAnimationObject):
++    def __init__(self, theAnimationName: str, theContext: AIS_InteractiveContext, theObject: AIS_InteractiveObject, theTrsfStart: gp_Trsf, theTrsfEnd: gp_Trsf) -> None: ...
++
+ class AIS_ColoredShape(AIS_Shape):
+     @overload
+     def __init__(self, theShape: TopoDS_Shape) -> None: ...
+diff --git a/src/SWIG_files/wrapper/BRepAlgo.i b/src/SWIG_files/wrapper/BRepAlgo.i
+index 3860648e..bd9e2f38 100644
+--- a/src/SWIG_files/wrapper/BRepAlgo.i
++++ b/src/SWIG_files/wrapper/BRepAlgo.i
+@@ -921,6 +921,17 @@ None
+ ") CutEdge;
+ 		void CutEdge(const TopoDS_Edge & E, const TopTools_ListOfShape & VonE, TopTools_ListOfShape & NE);
+ 
++		/****************** GetTolConf ******************/
++		/**** md5 signature: 7e9f7b87eb3b20edee9e3a86157928cd ****/
++		%feature("compactdefaultargs") GetTolConf;
++		%feature("autodoc", "Get maximal tolerance used for comparing distaces between vertices. .
++
++Returns
++-------
++float
++") GetTolConf;
++		Standard_Real GetTolConf();
++
+ 		/****************** GetVerticesForSubstitute ******************/
+ 		/**** md5 signature: 3b0ea732ecf076dde3f931f0997c07aa ****/
+ 		%feature("compactdefaultargs") GetVerticesForSubstitute;
+@@ -1014,6 +1025,21 @@ None
+ ") SetImageVV;
+ 		void SetImageVV(const BRepAlgo_Image & theImageVV);
+ 
++		/****************** SetTolConf ******************/
++		/**** md5 signature: 1c312d5c00a3d856c91eb31857ae32c6 ****/
++		%feature("compactdefaultargs") SetTolConf;
++		%feature("autodoc", "Set maximal tolerance used for comparing distaces between vertices. .
++
++Parameters
++----------
++theTolConf: float
++
++Returns
++-------
++None
++") SetTolConf;
++		void SetTolConf(const Standard_Real theTolConf);
++
+ 		/****************** UpdateVEmap ******************/
+ 		/**** md5 signature: 491681c63af221fbd7247e01d389bbc0 ****/
+ 		%feature("compactdefaultargs") UpdateVEmap;
+diff --git a/src/SWIG_files/wrapper/BRepAlgo.pyi b/src/SWIG_files/wrapper/BRepAlgo.pyi
+index 5ee7ab94..20ecddc9 100644
+--- a/src/SWIG_files/wrapper/BRepAlgo.pyi
++++ b/src/SWIG_files/wrapper/BRepAlgo.pyi
+@@ -86,6 +86,7 @@ class BRepAlgo_Loop:
+     def AddConstEdges(self, LE: TopTools_ListOfShape) -> None: ...
+     def AddEdge(self, E: TopoDS_Edge, LV: TopTools_ListOfShape) -> None: ...
+     def CutEdge(self, E: TopoDS_Edge, VonE: TopTools_ListOfShape, NE: TopTools_ListOfShape) -> None: ...
++    def GetTolConf(self) -> float: ...
+     def GetVerticesForSubstitute(self, VerVerMap: TopTools_DataMapOfShapeShape) -> None: ...
+     def Init(self, F: TopoDS_Face) -> None: ...
+     def NewEdges(self, E: TopoDS_Edge) -> TopTools_ListOfShape: ...
+@@ -93,6 +94,7 @@ class BRepAlgo_Loop:
+     def NewWires(self) -> TopTools_ListOfShape: ...
+     def Perform(self) -> None: ...
+     def SetImageVV(self, theImageVV: BRepAlgo_Image) -> None: ...
++    def SetTolConf(self, theTolConf: float) -> None: ...
+     def UpdateVEmap(self, theVEmap: TopTools_IndexedDataMapOfShapeListOfShape) -> None: ...
+     def VerticesForSubstitute(self, VerVerMap: TopTools_DataMapOfShapeShape) -> None: ...
+     def WiresToFaces(self) -> None: ...
+diff --git a/src/SWIG_files/wrapper/BRepBlend.i b/src/SWIG_files/wrapper/BRepBlend.i
+index 509a2525..b8131099 100644
+--- a/src/SWIG_files/wrapper/BRepBlend.i
++++ b/src/SWIG_files/wrapper/BRepBlend.i
+@@ -3508,7 +3508,7 @@ opencascade::handle<BRepBlend_Line>
+ 		const opencascade::handle<BRepBlend_Line> & Line();
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: e410fc1bc97982de557150e942b13c80 ****/
++		/**** md5 signature: 5c6445d58f45808f7c3defd1db894a35 ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -3522,9 +3522,9 @@ FinvP2: Blend_CurvPointFuncInv
+ Pdep: float
+ Pmax: float
+ MaxStep: float
++Tol3d: float
+ TolGuide: float
+ Soldep: math_Vector
+-Tolesp: float
+ Fleche: float
+ Appro: bool,optional
+ 	default value is Standard_False
+@@ -3533,10 +3533,10 @@ Returns
+ -------
+ None
+ ") Perform;
+-		void Perform(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
++		void Perform(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: 78e8905aafd910d0fa3a7b23c096467b ****/
++		/**** md5 signature: 452fb9b79df54fb801f2f70d066f611b ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -3550,7 +3550,7 @@ FinvP2: Blend_CurvPointFuncInv
+ Pdep: float
+ Pmax: float
+ Soldep: math_Vector
+-Tolesp: float
++Tol3d: float
+ TolGuide: float
+ RecRst1: bool
+ RecP1: bool
+@@ -3562,7 +3562,7 @@ Returns
+ -------
+ Psol: float
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real &OutValue, math_Vector & ParSol);
++		Standard_Boolean PerformFirstSection(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real &OutValue, math_Vector & ParSol);
+ 
+ };
+ 
+@@ -5559,7 +5559,7 @@ opencascade::handle<BRepBlend_Line>
+ 		const opencascade::handle<BRepBlend_Line> & Line();
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: 3ebeca31e507208cd42bab74df3ed6e3 ****/
++		/**** md5 signature: 86cf3650fa597d7655c244c1866126f2 ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5572,9 +5572,10 @@ FinvC: Blend_SurfCurvFuncInv
+ Pdep: float
+ Pmax: float
+ MaxStep: float
++Tol3d: float
++Tol2d: float
+ TolGuide: float
+ Soldep: math_Vector
+-Tolesp: float
+ Fleche: float
+ Appro: bool,optional
+ 	default value is Standard_False
+@@ -5583,10 +5584,10 @@ Returns
+ -------
+ None
+ ") Perform;
+-		void Perform(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
++		void Perform(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: 691664aa4fe132192d2ccf25ba05720a ****/
++		/**** md5 signature: 429fbdc03f84a4a14fbebef94ad27ee5 ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5599,7 +5600,8 @@ FinvC: Blend_SurfCurvFuncInv
+ Pdep: float
+ Pmax: float
+ Soldep: math_Vector
+-Tolesp: float
++Tol3d: float
++Tol2d: float
+ TolGuide: float
+ RecRst: bool
+ RecP: bool
+@@ -5610,7 +5612,7 @@ Returns
+ -------
+ Psol: float
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real &OutValue, math_Vector & ParSol);
++		Standard_Boolean PerformFirstSection(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real &OutValue, math_Vector & ParSol);
+ 
+ };
+ 
+@@ -5795,7 +5797,7 @@ opencascade::handle<BRepBlend_Line>
+ 		const opencascade::handle<BRepBlend_Line> & Line();
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: ef3b3700f467db4ea875b65f539d9955 ****/
++		/**** md5 signature: 6d94e3dcc7c71857d2c24ced3358703f ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5806,9 +5808,9 @@ FInv: Blend_FuncInv
+ Pdep: float
+ Pmax: float
+ MaxStep: float
++Tol3d: float
+ TolGuide: float
+ Soldep: math_Vector
+-Tolesp: float
+ Fleche: float
+ Appro: bool,optional
+ 	default value is Standard_False
+@@ -5817,10 +5819,10 @@ Returns
+ -------
+ None
+ ") Perform;
+-		void Perform(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
++		void Perform(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: a2bca51a10d7f020b86504fe9860626e ****/
++		/**** md5 signature: 92db8d0914da0712dd54b302697b3aa3 ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5829,7 +5831,7 @@ Parameters
+ F: Blend_Function
+ Pdep: float
+ ParDep: math_Vector
+-Tolesp: float
++Tol3d: float
+ TolGuide: float
+ Pos1: TopAbs_State
+ Pos2: TopAbs_State
+@@ -5838,10 +5840,10 @@ Returns
+ -------
+ bool
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_Function & F, const Standard_Real Pdep, math_Vector & ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, TopAbs_State & Pos1, TopAbs_State & Pos2);
++		Standard_Boolean PerformFirstSection(Blend_Function & F, const Standard_Real Pdep, math_Vector & ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, TopAbs_State & Pos1, TopAbs_State & Pos2);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: 39c72a7c59d31a28e720252eee26feee ****/
++		/**** md5 signature: 7464aaa5cedcb060541546a3a1ff5540 ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5852,7 +5854,7 @@ FInv: Blend_FuncInv
+ Pdep: float
+ Pmax: float
+ ParDep: math_Vector
+-Tolesp: float
++Tol3d: float
+ TolGuide: float
+ RecOnS1: bool
+ RecOnS2: bool
+@@ -5862,7 +5864,7 @@ Returns
+ -------
+ Psol: float
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real &OutValue, math_Vector & ParSol);
++		Standard_Boolean PerformFirstSection(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real &OutValue, math_Vector & ParSol);
+ 
+ 		/****************** SetDomainsToRecadre ******************/
+ 		/**** md5 signature: 10664ebffbd6ed784502d7d4acfa5a93 ****/
+diff --git a/src/SWIG_files/wrapper/BRepBlend.pyi b/src/SWIG_files/wrapper/BRepBlend.pyi
+index 03deabc7..cbe9c845 100644
+--- a/src/SWIG_files/wrapper/BRepBlend.pyi
++++ b/src/SWIG_files/wrapper/BRepBlend.pyi
+@@ -346,8 +346,8 @@ class BRepBlend_RstRstLineBuilder:
+     def Decroch2Start(self) -> bool: ...
+     def IsDone(self) -> bool: ...
+     def Line(self) -> BRepBlend_Line: ...
+-    def Perform(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, MaxStep: float, TolGuide: float, Soldep: math_Vector, Tolesp: float, Fleche: float, Appro: Optional[bool] = False) -> None: ...
+-    def PerformFirstSection(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tolesp: float, TolGuide: float, RecRst1: bool, RecP1: bool, RecRst2: bool, RecP2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
++    def Perform(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, MaxStep: float, Tol3d: float, TolGuide: float, Soldep: math_Vector, Fleche: float, Appro: Optional[bool] = False) -> None: ...
++    def PerformFirstSection(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tol3d: float, TolGuide: float, RecRst1: bool, RecP1: bool, RecRst2: bool, RecP2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
+ 
+ class BRepBlend_SurfCurvConstRadInv(Blend_SurfCurvFuncInv):
+     def __init__(self, S: Adaptor3d_Surface, C: Adaptor3d_Curve, Cg: Adaptor3d_Curve) -> None: ...
+@@ -519,8 +519,8 @@ class BRepBlend_SurfRstLineBuilder:
+     def DecrochStart(self) -> bool: ...
+     def IsDone(self) -> bool: ...
+     def Line(self) -> BRepBlend_Line: ...
+-    def Perform(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, MaxStep: float, TolGuide: float, Soldep: math_Vector, Tolesp: float, Fleche: float, Appro: Optional[bool] = False) -> None: ...
+-    def PerformFirstSection(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tolesp: float, TolGuide: float, RecRst: bool, RecP: bool, RecS: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
++    def Perform(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, MaxStep: float, Tol3d: float, Tol2d: float, TolGuide: float, Soldep: math_Vector, Fleche: float, Appro: Optional[bool] = False) -> None: ...
++    def PerformFirstSection(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tol3d: float, Tol2d: float, TolGuide: float, RecRst: bool, RecP: bool, RecS: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
+ 
+ class BRepBlend_Walking:
+     def __init__(self, Surf1: Adaptor3d_Surface, Surf2: Adaptor3d_Surface, Domain1: Adaptor3d_TopolTool, Domain2: Adaptor3d_TopolTool, HGuide: ChFiDS_ElSpine) -> None: ...
+@@ -536,11 +536,11 @@ class BRepBlend_Walking:
+     def Continu(self, F: Blend_Function, FInv: Blend_FuncInv, P: float, OnS1: bool) -> bool: ...
+     def IsDone(self) -> bool: ...
+     def Line(self) -> BRepBlend_Line: ...
+-    def Perform(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, MaxStep: float, TolGuide: float, Soldep: math_Vector, Tolesp: float, Fleche: float, Appro: Optional[bool] = False) -> None: ...
++    def Perform(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, MaxStep: float, Tol3d: float, TolGuide: float, Soldep: math_Vector, Fleche: float, Appro: Optional[bool] = False) -> None: ...
+     @overload
+-    def PerformFirstSection(self, F: Blend_Function, Pdep: float, ParDep: math_Vector, Tolesp: float, TolGuide: float, Pos1: TopAbs_State, Pos2: TopAbs_State) -> bool: ...
++    def PerformFirstSection(self, F: Blend_Function, Pdep: float, ParDep: math_Vector, Tol3d: float, TolGuide: float, Pos1: TopAbs_State, Pos2: TopAbs_State) -> bool: ...
+     @overload
+-    def PerformFirstSection(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, ParDep: math_Vector, Tolesp: float, TolGuide: float, RecOnS1: bool, RecOnS2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
++    def PerformFirstSection(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, ParDep: math_Vector, Tol3d: float, TolGuide: float, RecOnS1: bool, RecOnS2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
+     def SetDomainsToRecadre(self, RecDomain1: Adaptor3d_TopolTool, RecDomain2: Adaptor3d_TopolTool) -> None: ...
+     def TwistOnS1(self) -> bool: ...
+     def TwistOnS2(self) -> bool: ...
+diff --git a/src/SWIG_files/wrapper/BRepExtrema.i b/src/SWIG_files/wrapper/BRepExtrema.i
+index bc15b17e..18a48b42 100644
+--- a/src/SWIG_files/wrapper/BRepExtrema.i
++++ b/src/SWIG_files/wrapper/BRepExtrema.i
+@@ -48,6 +48,7 @@ https://www.opencascade.com/doc/occt-7.6.0/refman/html/package_brepextrema.html"
+ #include<gp_module.hxx>
+ #include<Bnd_module.hxx>
+ #include<BVH_module.hxx>
++#include<Poly_module.hxx>
+ #include<GeomAdaptor_module.hxx>
+ #include<Geom_module.hxx>
+ #include<Geom2d_module.hxx>
+@@ -55,6 +56,7 @@ https://www.opencascade.com/doc/occt-7.6.0/refman/html/package_brepextrema.html"
+ #include<Adaptor2d_module.hxx>
+ #include<TopLoc_module.hxx>
+ #include<Message_module.hxx>
++#include<TShort_module.hxx>
+ #include<TColgp_module.hxx>
+ #include<TColStd_module.hxx>
+ #include<TCollection_module.hxx>
+@@ -68,6 +70,7 @@ https://www.opencascade.com/doc/occt-7.6.0/refman/html/package_brepextrema.html"
+ %import gp.i
+ %import Bnd.i
+ %import BVH.i
++%import Poly.i
+ 
+ %pythoncode {
+ from enum import IntEnum
+@@ -1645,7 +1648,7 @@ None
+ 		 BRepExtrema_ProximityDistTool();
+ 
+ 		/****************** BRepExtrema_ProximityDistTool ******************/
+-		/**** md5 signature: b9731e05e5136c7110e50a313b036c02 ****/
++		/**** md5 signature: b080844c8fa666dae8c0e8db8d27e87e ****/
+ 		%feature("compactdefaultargs") BRepExtrema_ProximityDistTool;
+ 		%feature("autodoc", "Creates new tool for the given element sets.
+ 
+@@ -1653,6 +1656,8 @@ Parameters
+ ----------
+ theSet1: BRepExtrema_TriangleSet
+ theNbSamples1: int
++theAddVertices1: BVH_Array3d
++theAddStatus1: NCollection_Vector<ProxPnt_Status>
+ theSet2: BRepExtrema_TriangleSet
+ theShapeList1: BRepExtrema_ShapeList
+ theShapeList2: BRepExtrema_ShapeList
+@@ -1661,7 +1666,7 @@ Returns
+ -------
+ None
+ ") BRepExtrema_ProximityDistTool;
+-		 BRepExtrema_ProximityDistTool(const opencascade::handle<BRepExtrema_TriangleSet> & theSet1, const Standard_Integer theNbSamples1, const opencascade::handle<BRepExtrema_TriangleSet> & theSet2, const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
++		 BRepExtrema_ProximityDistTool(const opencascade::handle<BRepExtrema_TriangleSet> & theSet1, const Standard_Integer theNbSamples1, const BVH_Array3d & theAddVertices1, const NCollection_Vector<ProxPnt_Status> & theAddStatus1, const opencascade::handle<BRepExtrema_TriangleSet> & theSet2, const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
+ 
+ 		/****************** Accept ******************/
+ 		/**** md5 signature: 47868288da8d60ae3574004f3eef6f3b ****/
+@@ -1679,6 +1684,40 @@ bool
+ ") Accept;
+ 		virtual Standard_Boolean Accept(const Standard_Integer theSgmIdx, const Standard_Real &);
+ 
++		/****************** IsEdgeOnBorder ******************/
++		/**** md5 signature: 7f2df1d45fe4dd10cb81da19c83428fd ****/
++		%feature("compactdefaultargs") IsEdgeOnBorder;
++		%feature("autodoc", "Returns true if the edge is on the boarder.
++
++Parameters
++----------
++theTrgIdx: int
++theFirstEdgeNodeIdx: int
++theSecondEdgeNodeIdx: int
++theTr: Handle ( Poly_Triangulation )
++
++Returns
++-------
++bool
++") IsEdgeOnBorder;
++		static Standard_Boolean IsEdgeOnBorder(const Standard_Integer theTrgIdx, const Standard_Integer theFirstEdgeNodeIdx, const Standard_Integer theSecondEdgeNodeIdx, const Handle ( Poly_Triangulation ) & theTr);
++
++		/****************** IsNodeOnBorder ******************/
++		/**** md5 signature: 6a6c9031bf497d7acf6e95de1f2784f6 ****/
++		%feature("compactdefaultargs") IsNodeOnBorder;
++		%feature("autodoc", "Returns true if the node is on the boarder.
++
++Parameters
++----------
++theNodeIdx: int
++theTr: Handle ( Poly_Triangulation )
++
++Returns
++-------
++bool
++") IsNodeOnBorder;
++		static Standard_Boolean IsNodeOnBorder(const Standard_Integer theNodeIdx, const Handle ( Poly_Triangulation ) & theTr);
++
+ 		/****************** LoadShapeLists ******************/
+ 		/**** md5 signature: 2ec9bfacd5c06102fdebe80e35402ca0 ****/
+ 		%feature("compactdefaultargs") LoadShapeLists;
+@@ -1787,178 +1826,10 @@ theMetric: float
+ %extend BRepExtrema_ProximityDistTool {
+ 	%pythoncode {
+ 	__repr__ = _dumps_object
+-	}
+-};
+-
+-/***************************************
+-* class BRepExtrema_ProximityValueTool *
+-***************************************/
+-class BRepExtrema_ProximityValueTool {
+-	public:
+-typedef typename BRepExtrema_ProximityDistTool ::ProxPnt_Status ProxPnt_Status;
+-		/****************** BRepExtrema_ProximityValueTool ******************/
+-		/**** md5 signature: f01190ce189b90d5b9278fbee66731a1 ****/
+-		%feature("compactdefaultargs") BRepExtrema_ProximityValueTool;
+-		%feature("autodoc", "Creates new unitialized proximity tool.
+-
+-Returns
+--------
+-None
+-") BRepExtrema_ProximityValueTool;
+-		 BRepExtrema_ProximityValueTool();
+-
+-		/****************** BRepExtrema_ProximityValueTool ******************/
+-		/**** md5 signature: 457895b0f954d4aa93c3b2011e47f0e1 ****/
+-		%feature("compactdefaultargs") BRepExtrema_ProximityValueTool;
+-		%feature("autodoc", "Creates new proximity tool for the given element sets.
+-
+-Parameters
+-----------
+-theSet1: BRepExtrema_TriangleSet
+-theSet2: BRepExtrema_TriangleSet
+-theShapeList1: BRepExtrema_ShapeList
+-theShapeList2: BRepExtrema_ShapeList
+-
+-Returns
+--------
+-None
+-") BRepExtrema_ProximityValueTool;
+-		 BRepExtrema_ProximityValueTool(const opencascade::handle<BRepExtrema_TriangleSet> & theSet1, const opencascade::handle<BRepExtrema_TriangleSet> & theSet2, const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
+-
+-		/****************** Distance ******************/
+-		/**** md5 signature: d47317206a0fb34e540004324dbfafd8 ****/
+-		%feature("compactdefaultargs") Distance;
+-		%feature("autodoc", "Returns the computed distance.
+-
+-Returns
+--------
+-float
+-") Distance;
+-		Standard_Real Distance();
+-
+-		/****************** IsDone ******************/
+-		/**** md5 signature: e385477ab1bec806154173d4a550fd68 ****/
+-		%feature("compactdefaultargs") IsDone;
+-		%feature("autodoc", "Is proximity test completed?.
+-
+-Returns
+--------
+-bool
+-") IsDone;
+-		Standard_Boolean IsDone();
+-
+-		/****************** LoadShapeLists ******************/
+-		/**** md5 signature: 2ec9bfacd5c06102fdebe80e35402ca0 ****/
+-		%feature("compactdefaultargs") LoadShapeLists;
+-		%feature("autodoc", "Loads the given list of subshapes into the proximity tool.
+-
+-Parameters
+-----------
+-theShapeList1: BRepExtrema_ShapeList
+-theShapeList2: BRepExtrema_ShapeList
+-
+-Returns
+--------
+-None
+-") LoadShapeLists;
+-		void LoadShapeLists(const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
+-
+-		/****************** LoadTriangleSets ******************/
+-		/**** md5 signature: 3a94a7860b973acbc6838bfe75b5b812 ****/
+-		%feature("compactdefaultargs") LoadTriangleSets;
+-		%feature("autodoc", "Loads the given element sets into the proximity tool.
+-
+-Parameters
+-----------
+-theSet1: Handle ( BRepExtrema_TriangleSet )
+-theSet2: Handle ( BRepExtrema_TriangleSet )
+-
+-Returns
+--------
+-None
+-") LoadTriangleSets;
+-		void LoadTriangleSets(const Handle ( BRepExtrema_TriangleSet ) & theSet1, const Handle ( BRepExtrema_TriangleSet ) & theSet2);
+-
+-		/****************** MarkDirty ******************/
+-		/**** md5 signature: bd3f3e7de1b3b6a0c1da3082319fae2e ****/
+-		%feature("compactdefaultargs") MarkDirty;
+-		%feature("autodoc", "Marks test results as outdated.
+-
+-Returns
+--------
+-None
+-") MarkDirty;
+-		void MarkDirty();
+-
+-		/****************** Perform ******************/
+-		/**** md5 signature: c2c8700606b770cff797eb33824bf0aa ****/
+-		%feature("compactdefaultargs") Perform;
+-		%feature("autodoc", "Performs the computation of the proximity value.
+-
+-Parameters
+-----------
+-
+-Returns
+--------
+-theTolerance: float
+-") Perform;
+-		void Perform(Standard_Real &OutValue);
+-
+-		/****************** ProximityPoints ******************/
+-		/**** md5 signature: 4ddc607867ad4f349b192d8bb4196f92 ****/
+-		%feature("compactdefaultargs") ProximityPoints;
+-		%feature("autodoc", "Returns points on triangles sets, which provide the proximity distance.
+-
+-Parameters
+-----------
+-thePoint1: gp_Pnt
+-thePoint2: gp_Pnt
+ 
+-Returns
+--------
+-None
+-") ProximityPoints;
+-		void ProximityPoints(gp_Pnt & thePoint1, gp_Pnt & thePoint2);
+-
+-		/****************** ProximityPointsStatus ******************/
+-		/**** md5 signature: cbb67aeda5a68bd79cbb58089638d3f8 ****/
+-		%feature("compactdefaultargs") ProximityPointsStatus;
+-		%feature("autodoc", "Returns status of points on triangles sets, which provide the proximity distance.
+-
+-Parameters
+-----------
+-
+-Returns
+--------
+-thePointStatus1: ProxPnt_Status
+-thePointStatus2: ProxPnt_Status
+-") ProximityPointsStatus;
+-		void ProximityPointsStatus(ProxPnt_Status &OutValue, ProxPnt_Status &OutValue);
+-
+-		/****************** SetNbSamplePoints ******************/
+-		/**** md5 signature: 200898431f5ab55f6d0477df1f50c3b9 ****/
+-		%feature("compactdefaultargs") SetNbSamplePoints;
+-		%feature("autodoc", "Sets number of sample points used for proximity calculation for each shape. if number is less or equal zero, all triangulation nodes are used.
+-
+-Parameters
+-----------
+-theSamples1: int,optional
+-	default value is 0
+-theSamples2: int,optional
+-	default value is 0
+-
+-Returns
+--------
+-None
+-") SetNbSamplePoints;
+-		void SetNbSamplePoints(const Standard_Integer theSamples1 = 0, const Standard_Integer theSamples2 = 0);
+-
+-};
+-
+-
+-%extend BRepExtrema_ProximityValueTool {
+-	%pythoncode {
+-	__repr__ = _dumps_object
++	@methodnotwrapped
++	def LoadAdditionalPointsFirstSet(self):
++		pass
+ 	}
+ };
+ 
+@@ -1967,7 +1838,6 @@ None
+ ***********************************/
+ class BRepExtrema_ShapeProximity {
+ 	public:
+-typedef typename BRepExtrema_ProximityValueTool ::ProxPnt_Status ProxPnt_Status;
+ 		/****************** BRepExtrema_ShapeProximity ******************/
+ 		/**** md5 signature: 73b29b290349b3955b499c712de97888 ****/
+ 		%feature("compactdefaultargs") BRepExtrema_ShapeProximity;
+diff --git a/src/SWIG_files/wrapper/BRepExtrema.pyi b/src/SWIG_files/wrapper/BRepExtrema.pyi
+index 0738ed63..749fc5ef 100644
+--- a/src/SWIG_files/wrapper/BRepExtrema.pyi
++++ b/src/SWIG_files/wrapper/BRepExtrema.pyi
+@@ -9,6 +9,7 @@ from OCC.Core.Message import *
+ from OCC.Core.gp import *
+ from OCC.Core.Bnd import *
+ from OCC.Core.BVH import *
++from OCC.Core.Poly import *
+ 
+ #the following typedef cannot be wrapped as is
+ BRepExtrema_ShapeList = NewType('BRepExtrema_ShapeList', Any)
+@@ -163,8 +164,10 @@ class BRepExtrema_Poly:
+ class BRepExtrema_ProximityDistTool():
+     @overload
+     def __init__(self) -> None: ...
+-    @overload
+-    def __init__(self, theSet1: BRepExtrema_TriangleSet, theNbSamples1: int, theSet2: BRepExtrema_TriangleSet, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
++    @staticmethod
++    def IsEdgeOnBorder(theTrgIdx: int, theFirstEdgeNodeIdx: int, theSecondEdgeNodeIdx: int, theTr: Poly_Triangulation) -> bool: ...
++    @staticmethod
++    def IsNodeOnBorder(theNodeIdx: int, theTr: Poly_Triangulation) -> bool: ...
+     def LoadShapeLists(self, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
+     def LoadTriangleSets(self, theSet1: BRepExtrema_TriangleSet, theSet2: BRepExtrema_TriangleSet) -> None: ...
+     def Perform(self) -> None: ...
+@@ -172,20 +175,6 @@ class BRepExtrema_ProximityDistTool():
+     def ProximityPoints(self, thePoint1: BVH_Vec3d, thePoint2: BVH_Vec3d) -> None: ...
+     def RejectNode(self, theCornerMin: BVH_Vec3d, theCornerMax: BVH_Vec3d) -> Tuple[bool, float]: ...
+ 
+-class BRepExtrema_ProximityValueTool:
+-    @overload
+-    def __init__(self) -> None: ...
+-    @overload
+-    def __init__(self, theSet1: BRepExtrema_TriangleSet, theSet2: BRepExtrema_TriangleSet, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
+-    def Distance(self) -> float: ...
+-    def IsDone(self) -> bool: ...
+-    def LoadShapeLists(self, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
+-    def LoadTriangleSets(self, theSet1: BRepExtrema_TriangleSet, theSet2: BRepExtrema_TriangleSet) -> None: ...
+-    def MarkDirty(self) -> None: ...
+-    def Perform(self) -> float: ...
+-    def ProximityPoints(self, thePoint1: gp_Pnt, thePoint2: gp_Pnt) -> None: ...
+-    def SetNbSamplePoints(self, theSamples1: Optional[int] = 0, theSamples2: Optional[int] = 0) -> None: ...
+-
+ class BRepExtrema_ShapeProximity:
+     @overload
+     def __init__(self, theTolerance: Optional[float] = precision_Infinite()) -> None: ...
+@@ -271,3 +260,5 @@ class BRepExtrema_OverlapTool: ...
+ # hsequence classes
+ 
+ BRepExtrema_Poly_Distance = BRepExtrema_Poly.Distance
++BRepExtrema_ProximityDistTool_IsEdgeOnBorder = BRepExtrema_ProximityDistTool.IsEdgeOnBorder
++BRepExtrema_ProximityDistTool_IsNodeOnBorder = BRepExtrema_ProximityDistTool.IsNodeOnBorder
+diff --git a/src/SWIG_files/wrapper/BRepFill.i b/src/SWIG_files/wrapper/BRepFill.i
+index 1b12746f..0281ab54 100644
+--- a/src/SWIG_files/wrapper/BRepFill.i
++++ b/src/SWIG_files/wrapper/BRepFill.i
+@@ -105,6 +105,16 @@ from OCC.Core.Exception import *
+ };
+ 
+ /* public enums */
++enum BRepFill_ThruSectionErrorStatus {
++	BRepFill_ThruSectionErrorStatus_Done = 0,
++	BRepFill_ThruSectionErrorStatus_NotDone = 1,
++	BRepFill_ThruSectionErrorStatus_NotSameTopology = 2,
++	BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = 3,
++	BRepFill_ThruSectionErrorStatus_WrongUsage = 4,
++	BRepFill_ThruSectionErrorStatus_Null3DCurve = 5,
++	BRepFill_ThruSectionErrorStatus_Failed = 6,
++};
++
+ enum BRepFill_TypeOfContact {
+ 	BRepFill_NoContact = 0,
+ 	BRepFill_Contact = 1,
+@@ -122,6 +132,22 @@ enum BRepFill_TransitionStyle {
+ /* python proxy classes for enums */
+ %pythoncode {
+ 
++class BRepFill_ThruSectionErrorStatus(IntEnum):
++	BRepFill_ThruSectionErrorStatus_Done = 0
++	BRepFill_ThruSectionErrorStatus_NotDone = 1
++	BRepFill_ThruSectionErrorStatus_NotSameTopology = 2
++	BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = 3
++	BRepFill_ThruSectionErrorStatus_WrongUsage = 4
++	BRepFill_ThruSectionErrorStatus_Null3DCurve = 5
++	BRepFill_ThruSectionErrorStatus_Failed = 6
++BRepFill_ThruSectionErrorStatus_Done = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Done
++BRepFill_ThruSectionErrorStatus_NotDone = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotDone
++BRepFill_ThruSectionErrorStatus_NotSameTopology = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotSameTopology
++BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_ProfilesInconsistent
++BRepFill_ThruSectionErrorStatus_WrongUsage = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_WrongUsage
++BRepFill_ThruSectionErrorStatus_Null3DCurve = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Null3DCurve
++BRepFill_ThruSectionErrorStatus_Failed = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Failed
++
+ class BRepFill_TypeOfContact(IntEnum):
+ 	BRepFill_NoContact = 0
+ 	BRepFill_Contact = 1
+@@ -575,6 +601,17 @@ TopTools_ListOfShape
+ ") GeneratedShapes;
+ 		const TopTools_ListOfShape & GeneratedShapes(const TopoDS_Edge & SubSection);
+ 
++		/****************** GetStatus ******************/
++		/**** md5 signature: d01d66bd030c1232d59d2b7253fc3b10 ****/
++		%feature("compactdefaultargs") GetStatus;
++		%feature("autodoc", "No available documentation.
++
++Returns
++-------
++BRepFill_ThruSectionErrorStatus
++") GetStatus;
++		BRepFill_ThruSectionErrorStatus GetStatus();
++
+ 		/****************** Init ******************/
+ 		/**** md5 signature: 217046dd3125fb37abc6e15803e209f1 ****/
+ 		%feature("compactdefaultargs") Init;
+@@ -1816,6 +1853,17 @@ TopTools_ListOfShape
+ ") GeneratedShapes;
+ 		const TopTools_ListOfShape & GeneratedShapes(const TopoDS_Shape & SSection);
+ 
++		/****************** GetStatus ******************/
++		/**** md5 signature: d01d66bd030c1232d59d2b7253fc3b10 ****/
++		%feature("compactdefaultargs") GetStatus;
++		%feature("autodoc", "Returns status of the operation.
++
++Returns
++-------
++BRepFill_ThruSectionErrorStatus
++") GetStatus;
++		BRepFill_ThruSectionErrorStatus GetStatus();
++
+ 		/****************** IsMutableInput ******************/
+ 		/**** md5 signature: 2df16e5a957577cfce65832aa2d90512 ****/
+ 		%feature("compactdefaultargs") IsMutableInput;
+diff --git a/src/SWIG_files/wrapper/BRepFill.pyi b/src/SWIG_files/wrapper/BRepFill.pyi
+index b73b54f3..412b53b2 100644
+--- a/src/SWIG_files/wrapper/BRepFill.pyi
++++ b/src/SWIG_files/wrapper/BRepFill.pyi
+@@ -83,6 +83,23 @@ class BRepFill_SequenceOfSection:
+     def Value(self, theIndex: int) -> BRepFill_Section: ...
+     def SetValue(self, theIndex: int, theValue: BRepFill_Section) -> None: ...
+ 
++class BRepFill_ThruSectionErrorStatus(IntEnum):
++    BRepFill_ThruSectionErrorStatus_Done: int = ...
++    BRepFill_ThruSectionErrorStatus_NotDone: int = ...
++    BRepFill_ThruSectionErrorStatus_NotSameTopology: int = ...
++    BRepFill_ThruSectionErrorStatus_ProfilesInconsistent: int = ...
++    BRepFill_ThruSectionErrorStatus_WrongUsage: int = ...
++    BRepFill_ThruSectionErrorStatus_Null3DCurve: int = ...
++    BRepFill_ThruSectionErrorStatus_Failed: int = ...
++
++BRepFill_ThruSectionErrorStatus_Done = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Done
++BRepFill_ThruSectionErrorStatus_NotDone = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotDone
++BRepFill_ThruSectionErrorStatus_NotSameTopology = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotSameTopology
++BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_ProfilesInconsistent
++BRepFill_ThruSectionErrorStatus_WrongUsage = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_WrongUsage
++BRepFill_ThruSectionErrorStatus_Null3DCurve = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Null3DCurve
++BRepFill_ThruSectionErrorStatus_Failed = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Failed
++
+ class BRepFill_TypeOfContact(IntEnum):
+     BRepFill_NoContact: int = ...
+     BRepFill_Contact: int = ...
+@@ -139,6 +156,7 @@ class BRepFill_CompatibleWires:
+     def __init__(self, Sections: TopTools_SequenceOfShape) -> None: ...
+     def Generated(self) -> TopTools_DataMapOfShapeListOfShape: ...
+     def GeneratedShapes(self, SubSection: TopoDS_Edge) -> TopTools_ListOfShape: ...
++    def GetStatus(self) -> BRepFill_ThruSectionErrorStatus: ...
+     def Init(self, Sections: TopTools_SequenceOfShape) -> None: ...
+     def IsDegeneratedFirstSection(self) -> bool: ...
+     def IsDegeneratedLastSection(self) -> bool: ...
+@@ -255,6 +273,7 @@ class BRepFill_Generator:
+     def AddWire(self, Wire: TopoDS_Wire) -> None: ...
+     def Generated(self) -> TopTools_DataMapOfShapeListOfShape: ...
+     def GeneratedShapes(self, SSection: TopoDS_Shape) -> TopTools_ListOfShape: ...
++    def GetStatus(self) -> BRepFill_ThruSectionErrorStatus: ...
+     def IsMutableInput(self) -> bool: ...
+     def Perform(self) -> None: ...
+     def ResultShape(self, theShape: TopoDS_Shape) -> TopoDS_Shape: ...
+diff --git a/src/SWIG_files/wrapper/BRepOffset.i b/src/SWIG_files/wrapper/BRepOffset.i
+index d6800998..05add5f2 100644
+--- a/src/SWIG_files/wrapper/BRepOffset.i
++++ b/src/SWIG_files/wrapper/BRepOffset.i
+@@ -131,6 +131,7 @@ enum BRepOffset_Error {
+ 	BRepOffset_CannotFuseVertices = 7,
+ 	BRepOffset_CannotExtentEdge = 8,
+ 	BRepOffset_UserBreak = 9,
++	BRepOffset_MixedConnectivity = 10,
+ };
+ 
+ enum BRepOffsetSimple_Status {
+@@ -171,6 +172,7 @@ class BRepOffset_Error(IntEnum):
+ 	BRepOffset_CannotFuseVertices = 7
+ 	BRepOffset_CannotExtentEdge = 8
+ 	BRepOffset_UserBreak = 9
++	BRepOffset_MixedConnectivity = 10
+ BRepOffset_NoError = BRepOffset_Error.BRepOffset_NoError
+ BRepOffset_UnknownError = BRepOffset_Error.BRepOffset_UnknownError
+ BRepOffset_BadNormalsOnGeometry = BRepOffset_Error.BRepOffset_BadNormalsOnGeometry
+@@ -181,6 +183,7 @@ BRepOffset_CannotTrimEdges = BRepOffset_Error.BRepOffset_CannotTrimEdges
+ BRepOffset_CannotFuseVertices = BRepOffset_Error.BRepOffset_CannotFuseVertices
+ BRepOffset_CannotExtentEdge = BRepOffset_Error.BRepOffset_CannotExtentEdge
+ BRepOffset_UserBreak = BRepOffset_Error.BRepOffset_UserBreak
++BRepOffset_MixedConnectivity = BRepOffset_Error.BRepOffset_MixedConnectivity
+ 
+ class BRepOffsetSimple_Status(IntEnum):
+ 	BRepOffsetSimple_OK = 0
+diff --git a/src/SWIG_files/wrapper/BRepOffset.pyi b/src/SWIG_files/wrapper/BRepOffset.pyi
+index 89a5e3e1..fd6f7478 100644
+--- a/src/SWIG_files/wrapper/BRepOffset.pyi
++++ b/src/SWIG_files/wrapper/BRepOffset.pyi
+@@ -43,6 +43,7 @@ class BRepOffset_Error(IntEnum):
+     BRepOffset_CannotFuseVertices: int = ...
+     BRepOffset_CannotExtentEdge: int = ...
+     BRepOffset_UserBreak: int = ...
++    BRepOffset_MixedConnectivity: int = ...
+ 
+ BRepOffset_NoError = BRepOffset_Error.BRepOffset_NoError
+ BRepOffset_UnknownError = BRepOffset_Error.BRepOffset_UnknownError
+@@ -54,6 +55,7 @@ BRepOffset_CannotTrimEdges = BRepOffset_Error.BRepOffset_CannotTrimEdges
+ BRepOffset_CannotFuseVertices = BRepOffset_Error.BRepOffset_CannotFuseVertices
+ BRepOffset_CannotExtentEdge = BRepOffset_Error.BRepOffset_CannotExtentEdge
+ BRepOffset_UserBreak = BRepOffset_Error.BRepOffset_UserBreak
++BRepOffset_MixedConnectivity = BRepOffset_Error.BRepOffset_MixedConnectivity
+ 
+ class BRepOffsetSimple_Status(IntEnum):
+     BRepOffsetSimple_OK: int = ...
+diff --git a/src/SWIG_files/wrapper/BRepOffsetAPI.i b/src/SWIG_files/wrapper/BRepOffsetAPI.i
+index 1f9ad1dd..df26f708 100644
+--- a/src/SWIG_files/wrapper/BRepOffsetAPI.i
++++ b/src/SWIG_files/wrapper/BRepOffsetAPI.i
+@@ -2558,6 +2558,17 @@ TopoDS_Shape
+ ") GeneratedFace;
+ 		TopoDS_Shape GeneratedFace(const TopoDS_Shape & Edge);
+ 
++		/****************** GetStatus ******************/
++		/**** md5 signature: d01d66bd030c1232d59d2b7253fc3b10 ****/
++		%feature("compactdefaultargs") GetStatus;
++		%feature("autodoc", "Returns the status of thrusection operation.
++
++Returns
++-------
++BRepFill_ThruSectionErrorStatus
++") GetStatus;
++		BRepFill_ThruSectionErrorStatus GetStatus();
++
+ 		/****************** Init ******************/
+ 		/**** md5 signature: 82b061dc05f66b08422610d2d7504487 ****/
+ 		%feature("compactdefaultargs") Init;
+diff --git a/src/SWIG_files/wrapper/BRepOffsetAPI.pyi b/src/SWIG_files/wrapper/BRepOffsetAPI.pyi
+index 042de45f..815ee7e1 100644
+--- a/src/SWIG_files/wrapper/BRepOffsetAPI.pyi
++++ b/src/SWIG_files/wrapper/BRepOffsetAPI.pyi
+@@ -260,6 +260,7 @@ class BRepOffsetAPI_ThruSections(BRepBuilderAPI_MakeShape):
+     def FirstShape(self) -> TopoDS_Shape: ...
+     def Generated(self, S: TopoDS_Shape) -> TopTools_ListOfShape: ...
+     def GeneratedFace(self, Edge: TopoDS_Shape) -> TopoDS_Shape: ...
++    def GetStatus(self) -> BRepFill_ThruSectionErrorStatus: ...
+     def Init(self, isSolid: Optional[bool] = False, ruled: Optional[bool] = False, pres3d: Optional[float] = 1.0e-06) -> None: ...
+     def IsMutableInput(self) -> bool: ...
+     def LastShape(self) -> TopoDS_Shape: ...
+diff --git a/src/SWIG_files/wrapper/BSplCLib.i b/src/SWIG_files/wrapper/BSplCLib.i
+index f0b6635f..80aa4d80 100644
+--- a/src/SWIG_files/wrapper/BSplCLib.i
++++ b/src/SWIG_files/wrapper/BSplCLib.i
+@@ -2001,6 +2001,29 @@ InversionProblem: int
+ ") Interpolate;
+ 		static void Interpolate(const Standard_Integer Degree, const TColStd_Array1OfReal & FlatKnots, const TColStd_Array1OfReal & Parameters, const TColStd_Array1OfInteger & ContactOrderArray, const Standard_Integer ArrayDimension, Standard_Real &OutValue, Standard_Real &OutValue, Standard_Integer &OutValue);
+ 
++		/****************** Intervals ******************/
++		/**** md5 signature: 6005dd7b642eb153ae7f9293cf41ffb5 ****/
++		%feature("compactdefaultargs") Intervals;
++		%feature("autodoc", "Splits the given range to bspline intervals of given continuity @param[in] theknots the knots of bspline @param[in] themults the knots' multiplicities @param[in] thedegree the degree of bspline @param[in] isperiodic the periodicity of bspline @param[in] thecontinuity the target interval's continuity @param[in] thefirst the begin of the target range @param[in] thelast the end of the target range @param[in] thetolerance the tolerance @param[in,out] theintervals the array to store intervals if isn't nullptr returns the number of intervals.
++
++Parameters
++----------
++theKnots: TColStd_Array1OfReal
++theMults: TColStd_Array1OfInteger
++theDegree: int
++isPeriodic: bool
++theContinuity: int
++theFirst: float
++theLast: float
++theTolerance: float
++theIntervals: TColStd_Array1OfReal *
++
++Returns
++-------
++int
++") Intervals;
++		static Standard_Integer Intervals(const TColStd_Array1OfReal & theKnots, const TColStd_Array1OfInteger & theMults, Standard_Integer theDegree, Standard_Boolean isPeriodic, Standard_Integer theContinuity, Standard_Real theFirst, Standard_Real theLast, Standard_Real theTolerance, TColStd_Array1OfReal * theIntervals);
++
+ 		/****************** IsRational ******************/
+ 		/**** md5 signature: 5ee1bb4d64e0a78acc3cb994f1afcefa ****/
+ 		%feature("compactdefaultargs") IsRational;
+diff --git a/src/SWIG_files/wrapper/BSplCLib.pyi b/src/SWIG_files/wrapper/BSplCLib.pyi
+index b8ac4682..671f76a0 100644
+--- a/src/SWIG_files/wrapper/BSplCLib.pyi
++++ b/src/SWIG_files/wrapper/BSplCLib.pyi
+@@ -278,6 +278,8 @@ class bsplclib:
+     @staticmethod
+     def Interpolate(Degree: int, FlatKnots: TColStd_Array1OfReal, Parameters: TColStd_Array1OfReal, ContactOrderArray: TColStd_Array1OfInteger, ArrayDimension: int) -> Tuple[float, float, int]: ...
+     @staticmethod
++    def Intervals(theKnots: TColStd_Array1OfReal, theMults: TColStd_Array1OfInteger, theDegree: int, isPeriodic: bool, theContinuity: int, theFirst: float, theLast: float, theTolerance: float, theIntervals: TColStd_Array1OfReal) -> int: ...
++    @staticmethod
+     def IsRational(Weights: TColStd_Array1OfReal, I1: int, I2: int, Epsilon: Optional[float] = 0.0) -> bool: ...
+     @staticmethod
+     def KnotAnalysis(Degree: int, Periodic: bool, CKnots: TColStd_Array1OfReal, CMults: TColStd_Array1OfInteger, KnotForm: GeomAbs_BSplKnotDistribution) -> int: ...
+@@ -566,6 +568,7 @@ bsplclib_Interpolate = bsplclib.Interpolate
+ bsplclib_Interpolate = bsplclib.Interpolate
+ bsplclib_Interpolate = bsplclib.Interpolate
+ bsplclib_Interpolate = bsplclib.Interpolate
++bsplclib_Intervals = bsplclib.Intervals
+ bsplclib_IsRational = bsplclib.IsRational
+ bsplclib_KnotAnalysis = bsplclib.KnotAnalysis
+ bsplclib_KnotForm = bsplclib.KnotForm
+diff --git a/src/SWIG_files/wrapper/ChFiDS.i b/src/SWIG_files/wrapper/ChFiDS.i
+index d60e552a..b8096939 100644
+--- a/src/SWIG_files/wrapper/ChFiDS.i
++++ b/src/SWIG_files/wrapper/ChFiDS.i
+@@ -121,6 +121,7 @@ enum ChFiDS_TypeOfConcavity {
+ 	ChFiDS_Tangential = 2,
+ 	ChFiDS_FreeBound = 3,
+ 	ChFiDS_Other = 4,
++	ChFiDS_Mixed = 5,
+ };
+ 
+ /* end public enums declaration */
+@@ -178,11 +179,13 @@ class ChFiDS_TypeOfConcavity(IntEnum):
+ 	ChFiDS_Tangential = 2
+ 	ChFiDS_FreeBound = 3
+ 	ChFiDS_Other = 4
++	ChFiDS_Mixed = 5
+ ChFiDS_Concave = ChFiDS_TypeOfConcavity.ChFiDS_Concave
+ ChFiDS_Convex = ChFiDS_TypeOfConcavity.ChFiDS_Convex
+ ChFiDS_Tangential = ChFiDS_TypeOfConcavity.ChFiDS_Tangential
+ ChFiDS_FreeBound = ChFiDS_TypeOfConcavity.ChFiDS_FreeBound
+ ChFiDS_Other = ChFiDS_TypeOfConcavity.ChFiDS_Other
++ChFiDS_Mixed = ChFiDS_TypeOfConcavity.ChFiDS_Mixed
+ };
+ /* end python proxy for enums */
+ 
+@@ -2029,6 +2032,17 @@ TopoDS_Vertex
+ ") FirstVertex;
+ 		TopoDS_Vertex FirstVertex();
+ 
++		/****************** GetTolesp ******************/
++		/**** md5 signature: 217c13748b3cb2bf2cc59e96cafe8207 ****/
++		%feature("compactdefaultargs") GetTolesp;
++		%feature("autodoc", "Return tolesp parameter.
++
++Returns
++-------
++float
++") GetTolesp;
++		Standard_Real GetTolesp();
++
+ 		/****************** GetType ******************/
+ 		/**** md5 signature: 6d4e6ae7972633971ba343e8afc91aa1 ****/
+ 		%feature("compactdefaultargs") GetType;
+diff --git a/src/SWIG_files/wrapper/ChFiDS.pyi b/src/SWIG_files/wrapper/ChFiDS.pyi
+index 6543ea1a..d1884594 100644
+--- a/src/SWIG_files/wrapper/ChFiDS.pyi
++++ b/src/SWIG_files/wrapper/ChFiDS.pyi
+@@ -192,12 +192,14 @@ class ChFiDS_TypeOfConcavity(IntEnum):
+     ChFiDS_Tangential: int = ...
+     ChFiDS_FreeBound: int = ...
+     ChFiDS_Other: int = ...
++    ChFiDS_Mixed: int = ...
+ 
+ ChFiDS_Concave = ChFiDS_TypeOfConcavity.ChFiDS_Concave
+ ChFiDS_Convex = ChFiDS_TypeOfConcavity.ChFiDS_Convex
+ ChFiDS_Tangential = ChFiDS_TypeOfConcavity.ChFiDS_Tangential
+ ChFiDS_FreeBound = ChFiDS_TypeOfConcavity.ChFiDS_FreeBound
+ ChFiDS_Other = ChFiDS_TypeOfConcavity.ChFiDS_Other
++ChFiDS_Mixed = ChFiDS_TypeOfConcavity.ChFiDS_Mixed
+ 
+ class ChFiDS_CircSection:
+     def __init__(self) -> None: ...
+@@ -351,6 +353,7 @@ class ChFiDS_Spine(Standard_Transient):
+     def FirstParameter(self, IndexSpine: int) -> float: ...
+     def FirstStatus(self) -> ChFiDS_State: ...
+     def FirstVertex(self) -> TopoDS_Vertex: ...
++    def GetTolesp(self) -> float: ...
+     def GetType(self) -> GeomAbs_CurveType: ...
+     def GetTypeOfConcavity(self) -> ChFiDS_TypeOfConcavity: ...
+     def HasFirstTgt(self) -> bool: ...
+diff --git a/src/SWIG_files/wrapper/GeomInt.i b/src/SWIG_files/wrapper/GeomInt.i
+index a01b7841..9d84060c 100644
+--- a/src/SWIG_files/wrapper/GeomInt.i
++++ b/src/SWIG_files/wrapper/GeomInt.i
+@@ -936,6 +936,29 @@ opencascade::handle<Geom_Curve>
+ ") Boundary;
+ 		const opencascade::handle<Geom_Curve> & Boundary(const Standard_Integer Index);
+ 
++		/****************** BuildPCurves ******************/
++		/**** md5 signature: 6965f43fd020f13216b45cd065743faa ****/
++		%feature("compactdefaultargs") BuildPCurves;
++		%feature("autodoc", "Creates 2d-curve on given surface from given 3d-curve.
++
++Parameters
++----------
++theFirst: float
++theLast: float
++theUmin: float
++theUmax: float
++theVmin: float
++theVmax: float
++theSurface: Geom_Surface
++theCurve: Geom_Curve
++theCurve2d: Geom2d_Curve
++
++Returns
++-------
++theTol: float
++") BuildPCurves;
++		static void BuildPCurves(const Standard_Real theFirst, const Standard_Real theLast, const Standard_Real theUmin, const Standard_Real theUmax, const Standard_Real theVmin, const Standard_Real theVmax, Standard_Real &OutValue, const opencascade::handle<Geom_Surface> & theSurface, const opencascade::handle<Geom_Curve> & theCurve, opencascade::handle<Geom2d_Curve> & theCurve2d);
++
+ 		/****************** BuildPCurves ******************/
+ 		/**** md5 signature: 2c2bdb53423075c70323712785098b12 ****/
+ 		%feature("compactdefaultargs") BuildPCurves;
+diff --git a/src/SWIG_files/wrapper/GeomInt.pyi b/src/SWIG_files/wrapper/GeomInt.pyi
+index eae46ba0..c6076fec 100644
+--- a/src/SWIG_files/wrapper/GeomInt.pyi
++++ b/src/SWIG_files/wrapper/GeomInt.pyi
+@@ -110,6 +110,10 @@ class GeomInt_IntSS:
+     @overload
+     def __init__(self, S1: Geom_Surface, S2: Geom_Surface, Tol: float, Approx: Optional[bool] = True, ApproxS1: Optional[bool] = False, ApproxS2: Optional[bool] = False) -> None: ...
+     def Boundary(self, Index: int) -> Geom_Curve: ...
++    @overload
++    @staticmethod
++    def BuildPCurves(theFirst: float, theLast: float, theUmin: float, theUmax: float, theVmin: float, theVmax: float, theSurface: Geom_Surface, theCurve: Geom_Curve, theCurve2d: Geom2d_Curve) -> float: ...
++    @overload
+     @staticmethod
+     def BuildPCurves(f: float, l: float, S: Geom_Surface, C: Geom_Curve, C2d: Geom2d_Curve) -> float: ...
+     def HasLineOnS1(self, Index: int) -> bool: ...
+@@ -525,6 +529,7 @@ class GeomInt_WLApprox: ...
+ 
+ geomint_AdjustPeriodic = geomint.AdjustPeriodic
+ GeomInt_IntSS_BuildPCurves = GeomInt_IntSS.BuildPCurves
++GeomInt_IntSS_BuildPCurves = GeomInt_IntSS.BuildPCurves
+ GeomInt_IntSS_MakeBSpline = GeomInt_IntSS.MakeBSpline
+ GeomInt_IntSS_MakeBSpline2d = GeomInt_IntSS.MakeBSpline2d
+ GeomInt_IntSS_TreatRLine = GeomInt_IntSS.TreatRLine
+diff --git a/src/SWIG_files/wrapper/STEPCAFControl.i b/src/SWIG_files/wrapper/STEPCAFControl.i
+index 3ddc1ba8..9372c840 100644
+--- a/src/SWIG_files/wrapper/STEPCAFControl.i
++++ b/src/SWIG_files/wrapper/STEPCAFControl.i
+@@ -1849,24 +1849,24 @@ None
+ 		 STEPCAFControl_Writer();
+ 
+ 		/****************** STEPCAFControl_Writer ******************/
+-		/**** md5 signature: 70a513d4d628947fa1e98ed8e35359d9 ****/
++		/**** md5 signature: dedf68dbebf4d519616966632e9764a8 ****/
+ 		%feature("compactdefaultargs") STEPCAFControl_Writer;
+ 		%feature("autodoc", "Creates a reader tool and attaches it to an already existing session clears the session if it was not yet set for step clears the internal data structures.
+ 
+ Parameters
+ ----------
+-WS: XSControl_WorkSession
+-scratch: bool,optional
++theWS: XSControl_WorkSession
++theScratch: bool,optional
+ 	default value is Standard_True
+ 
+ Returns
+ -------
+ None
+ ") STEPCAFControl_Writer;
+-		 STEPCAFControl_Writer(const opencascade::handle<XSControl_WorkSession> & WS, const Standard_Boolean scratch = Standard_True);
++		 STEPCAFControl_Writer(const opencascade::handle<XSControl_WorkSession> & theWS, const Standard_Boolean theScratch = Standard_True);
+ 
+ 		/****************** ChangeWriter ******************/
+-		/**** md5 signature: 9719ebc8336482d007d450c0e3b00713 ****/
++		/**** md5 signature: acee09144e4dec42ed602fde52975129 ****/
+ 		%feature("compactdefaultargs") ChangeWriter;
+ 		%feature("autodoc", "Returns basic reader for root file.
+ 
+@@ -1877,39 +1877,39 @@ STEPControl_Writer
+ 		STEPControl_Writer & ChangeWriter();
+ 
+ 		/****************** ExternFile ******************/
+-		/**** md5 signature: 4f90b7104efa0649e14f70ad09ab8e61 ****/
++		/**** md5 signature: 0769b22e71152aabd75dace01164fc2b ****/
+ 		%feature("compactdefaultargs") ExternFile;
+ 		%feature("autodoc", "Returns data on external file by its original label returns false if no external file with given name is read.
+ 
+ Parameters
+ ----------
+-L: TDF_Label
+-ef: STEPCAFControl_ExternFile
++theLabel: TDF_Label
++theExtFile: STEPCAFControl_ExternFile
+ 
+ Returns
+ -------
+ bool
+ ") ExternFile;
+-		Standard_Boolean ExternFile(const TDF_Label & L, opencascade::handle<STEPCAFControl_ExternFile> & ef);
++		Standard_Boolean ExternFile(const TDF_Label & theLabel, opencascade::handle<STEPCAFControl_ExternFile> & theExtFile);
+ 
+ 		/****************** ExternFile ******************/
+-		/**** md5 signature: ad0d6b0b3be01575d180dd24c55cd264 ****/
++		/**** md5 signature: f77e0b8157371b505bc136b8bd33443e ****/
+ 		%feature("compactdefaultargs") ExternFile;
+ 		%feature("autodoc", "Returns data on external file by its name returns false if no external file with given name is read.
+ 
+ Parameters
+ ----------
+-name: char *
+-ef: STEPCAFControl_ExternFile
++theName: str
++theExtFile: STEPCAFControl_ExternFile
+ 
+ Returns
+ -------
+ bool
+ ") ExternFile;
+-		Standard_Boolean ExternFile(const char * name, opencascade::handle<STEPCAFControl_ExternFile> & ef);
++		Standard_Boolean ExternFile(Standard_CString theName, opencascade::handle<STEPCAFControl_ExternFile> & theExtFile);
+ 
+ 		/****************** ExternFiles ******************/
+-		/**** md5 signature: 1154c88bc3253c7291077317c11363ab ****/
++		/**** md5 signature: 08a0b41df731275c7119f8910e47970c ****/
+ 		%feature("compactdefaultargs") ExternFiles;
+ 		%feature("autodoc", "Returns data on external files returns null handle if no external files are read.
+ 
+@@ -1920,7 +1920,7 @@ NCollection_DataMap<TCollection_AsciiString, opencascade::handle<STEPCAFControl_
+ 		const NCollection_DataMap<TCollection_AsciiString, opencascade::handle<STEPCAFControl_ExternFile>> & ExternFiles();
+ 
+ 		/****************** GetColorMode ******************/
+-		/**** md5 signature: 010da6a8a0e8a61fdb607fd6faba2b56 ****/
++		/**** md5 signature: cddb885e605f1794a5a6486023f65736 ****/
+ 		%feature("compactdefaultargs") GetColorMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1931,7 +1931,7 @@ bool
+ 		Standard_Boolean GetColorMode();
+ 
+ 		/****************** GetDimTolMode ******************/
+-		/**** md5 signature: 2eed8e0bb30a6f85d0c500a8d4b9e16c ****/
++		/**** md5 signature: 5f3c2fc2e581a2ea711f9607cd0a817a ****/
+ 		%feature("compactdefaultargs") GetDimTolMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1942,7 +1942,7 @@ bool
+ 		Standard_Boolean GetDimTolMode();
+ 
+ 		/****************** GetLayerMode ******************/
+-		/**** md5 signature: d677385c303e067613f92bc738509727 ****/
++		/**** md5 signature: b6b1458608d2429d13e63a07c0b392d8 ****/
+ 		%feature("compactdefaultargs") GetLayerMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1953,7 +1953,7 @@ bool
+ 		Standard_Boolean GetLayerMode();
+ 
+ 		/****************** GetMaterialMode ******************/
+-		/**** md5 signature: cda125e3ff8f835393b9894e3f229aea ****/
++		/**** md5 signature: 2057a4ef866086868ba91cb34e6ad09a ****/
+ 		%feature("compactdefaultargs") GetMaterialMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1964,7 +1964,7 @@ bool
+ 		Standard_Boolean GetMaterialMode();
+ 
+ 		/****************** GetNameMode ******************/
+-		/**** md5 signature: 2dd32a893d6f5f4666ac3752ace2d12f ****/
++		/**** md5 signature: 1097f532a68b4625a0108cddc8366238 ****/
+ 		%feature("compactdefaultargs") GetNameMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1975,7 +1975,7 @@ bool
+ 		Standard_Boolean GetNameMode();
+ 
+ 		/****************** GetPropsMode ******************/
+-		/**** md5 signature: 3b2f4c2b61084d1e067d83421e0ea81d ****/
++		/**** md5 signature: 99cee0ed60040ac88dbf6e950f82a10e ****/
+ 		%feature("compactdefaultargs") GetPropsMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1986,7 +1986,7 @@ bool
+ 		Standard_Boolean GetPropsMode();
+ 
+ 		/****************** GetSHUOMode ******************/
+-		/**** md5 signature: 74c5f048b04741ef5abfe259b5c453cd ****/
++		/**** md5 signature: 4e3a3a7f89647ad6b4f35f24a42234d6 ****/
+ 		%feature("compactdefaultargs") GetSHUOMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1997,31 +1997,31 @@ bool
+ 		Standard_Boolean GetSHUOMode();
+ 
+ 		/****************** Init ******************/
+-		/**** md5 signature: 13544ae418c98602c6eaed6faea8f526 ****/
++		/**** md5 signature: e7d3f870615865a6686f75c3aa077ff3 ****/
+ 		%feature("compactdefaultargs") Init;
+ 		%feature("autodoc", "Clears the internal data structures and attaches to a new session clears the session if it was not yet set for step.
+ 
+ Parameters
+ ----------
+-WS: XSControl_WorkSession
+-scratch: bool,optional
++theWS: XSControl_WorkSession
++theScratch: bool,optional
+ 	default value is Standard_True
+ 
+ Returns
+ -------
+ None
+ ") Init;
+-		void Init(const opencascade::handle<XSControl_WorkSession> & WS, const Standard_Boolean scratch = Standard_True);
++		void Init(const opencascade::handle<XSControl_WorkSession> & theWS, const Standard_Boolean theScratch = Standard_True);
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: 82a9ff51a493dfcaea368ecaef792fdb ****/
++		/**** md5 signature: 624f8c3670df66af47c4a9af2967eb2a ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+ Parameters
+ ----------
+-doc: TDocStd_Document
+-filename: TCollection_AsciiString
++theDoc: TDocStd_Document
++theFileName: str
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+ 
+@@ -2029,17 +2029,17 @@ Returns
+ -------
+ bool
+ ") Perform;
+-		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & doc, const TCollection_AsciiString & filename, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & theDoc, TCollection_AsciiString theFileName, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: 1ef00b1bd520cd3b05cc4f00e91c494d ****/
++		/**** md5 signature: 90b76d8d692f1926baa1d9dd3db9018b ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "Transfers a document and writes it to a step file returns true if translation is ok.
+ 
+ Parameters
+ ----------
+-doc: TDocStd_Document
+-filename: char *
++theDoc: TDocStd_Document
++theFileName: str
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+ 
+@@ -2047,124 +2047,124 @@ Returns
+ -------
+ bool
+ ") Perform;
+-		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & doc, const char * filename, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & theDoc, Standard_CString theFileName, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** SetColorMode ******************/
+-		/**** md5 signature: e8d41838c31a9460a1c83d84b1f572a1 ****/
++		/**** md5 signature: f341158b4cc5262e2e5cb7b941cc9031 ****/
+ 		%feature("compactdefaultargs") SetColorMode;
+ 		%feature("autodoc", "Set colormode for indicate write colors or not.
+ 
+ Parameters
+ ----------
+-colormode: bool
++theColorMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetColorMode;
+-		void SetColorMode(const Standard_Boolean colormode);
++		void SetColorMode(const Standard_Boolean theColorMode);
+ 
+ 		/****************** SetDimTolMode ******************/
+-		/**** md5 signature: 18d408609aea9a67d1d1e15d923773db ****/
++		/**** md5 signature: 08cd53498196841f3c3a5c0e281a464f ****/
+ 		%feature("compactdefaultargs") SetDimTolMode;
+ 		%feature("autodoc", "Set dimtolmode for indicate write d&gts or not.
+ 
+ Parameters
+ ----------
+-dimtolmode: bool
++theDimTolMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetDimTolMode;
+-		void SetDimTolMode(const Standard_Boolean dimtolmode);
++		void SetDimTolMode(const Standard_Boolean theDimTolMode);
+ 
+ 		/****************** SetLayerMode ******************/
+-		/**** md5 signature: 3ec21c8de4b114a83bb0b34cb3b98662 ****/
++		/**** md5 signature: d164352478699d01fe5d59c680c2a74d ****/
+ 		%feature("compactdefaultargs") SetLayerMode;
+ 		%feature("autodoc", "Set layermode for indicate write layers or not.
+ 
+ Parameters
+ ----------
+-layermode: bool
++theLayerMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetLayerMode;
+-		void SetLayerMode(const Standard_Boolean layermode);
++		void SetLayerMode(const Standard_Boolean theLayerMode);
+ 
+ 		/****************** SetMaterialMode ******************/
+-		/**** md5 signature: ef4abdfa06b076742a69b17150f91d88 ****/
++		/**** md5 signature: 932571d6d0df2e34fd2487f6025f4956 ****/
+ 		%feature("compactdefaultargs") SetMaterialMode;
+ 		%feature("autodoc", "Set dimtolmode for indicate write d&gts or not.
+ 
+ Parameters
+ ----------
+-matmode: bool
++theMaterialMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetMaterialMode;
+-		void SetMaterialMode(const Standard_Boolean matmode);
++		void SetMaterialMode(const Standard_Boolean theMaterialMode);
+ 
+ 		/****************** SetNameMode ******************/
+-		/**** md5 signature: 43ccb5d3fb024d8191f251ee74d0f6ba ****/
++		/**** md5 signature: a24984c6ce274882f02601c13cf73b9a ****/
+ 		%feature("compactdefaultargs") SetNameMode;
+ 		%feature("autodoc", "Set namemode for indicate write name or not.
+ 
+ Parameters
+ ----------
+-namemode: bool
++theNameMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetNameMode;
+-		void SetNameMode(const Standard_Boolean namemode);
++		void SetNameMode(const Standard_Boolean theNameMode);
+ 
+ 		/****************** SetPropsMode ******************/
+-		/**** md5 signature: 97f3b34eb7a1e38c6cf17d5c26f938a6 ****/
++		/**** md5 signature: fbb288fb7a76bf6b9cd3acd70d056a7f ****/
+ 		%feature("compactdefaultargs") SetPropsMode;
+ 		%feature("autodoc", "Propsmode for indicate write validation properties or not.
+ 
+ Parameters
+ ----------
+-propsmode: bool
++thePropsMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetPropsMode;
+-		void SetPropsMode(const Standard_Boolean propsmode);
++		void SetPropsMode(const Standard_Boolean thePropsMode);
+ 
+ 		/****************** SetSHUOMode ******************/
+-		/**** md5 signature: ad06ed8b923731ee7b75bf3d7074f299 ****/
++		/**** md5 signature: 39955bf97fe8d6a6d6b3b211a859f216 ****/
+ 		%feature("compactdefaultargs") SetSHUOMode;
+ 		%feature("autodoc", "Set shuo mode for indicate write shuo or not.
+ 
+ Parameters
+ ----------
+-shuomode: bool
++theSHUOMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetSHUOMode;
+-		void SetSHUOMode(const Standard_Boolean shuomode);
++		void SetSHUOMode(const Standard_Boolean theSHUOMode);
+ 
+ 		/****************** Transfer ******************/
+-		/**** md5 signature: 2616e7e1bc1f8548fb5e464651c0f720 ****/
++		/**** md5 signature: dd7ebbdc1c22d7845ad531885273adee ****/
+ 		%feature("compactdefaultargs") Transfer;
+ 		%feature("autodoc", "Transfers a document (or single label) to a step model the mode of translation of shape is asis if multi is not null pointer, it switches to multifile mode (with external refs), and string pointed by <multi> gives prefix for names of extern files (can be empty string) returns true if translation is ok.
+ 
+ Parameters
+ ----------
+-doc: TDocStd_Document
+-mode: STEPControl_StepModelType,optional
++theDoc: TDocStd_Document
++theMode: STEPControl_StepModelType,optional
+ 	default value is STEPControl_AsIs
+-multi: char *,optional
++theIsMulti: str,optional
+ 	default value is 0
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+@@ -2173,19 +2173,19 @@ Returns
+ -------
+ bool
+ ") Transfer;
+-		Standard_Boolean Transfer(const opencascade::handle<TDocStd_Document> & doc, const STEPControl_StepModelType mode = STEPControl_AsIs, const char * multi = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Transfer(const opencascade::handle<TDocStd_Document> & theDoc, const STEPControl_StepModelType theMode = STEPControl_AsIs, Standard_CString theIsMulti = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Transfer ******************/
+-		/**** md5 signature: 3230c3763f234bd8211762a290f20e3d ****/
++		/**** md5 signature: 40f710aeab310ab1eff9bbdbe733b162 ****/
+ 		%feature("compactdefaultargs") Transfer;
+ 		%feature("autodoc", "Method to transfer part of the document specified by label.
+ 
+ Parameters
+ ----------
+-L: TDF_Label
+-mode: STEPControl_StepModelType,optional
++theLabel: TDF_Label
++theMode: STEPControl_StepModelType,optional
+ 	default value is STEPControl_AsIs
+-multi: char *,optional
++theIsMulti: str,optional
+ 	default value is 0
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+@@ -2194,19 +2194,19 @@ Returns
+ -------
+ bool
+ ") Transfer;
+-		Standard_Boolean Transfer(const TDF_Label & L, const STEPControl_StepModelType mode = STEPControl_AsIs, const char * multi = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Transfer(const TDF_Label & theLabel, const STEPControl_StepModelType theMode = STEPControl_AsIs, Standard_CString theIsMulti = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Transfer ******************/
+-		/**** md5 signature: 7533cb05eb0d45c4c5142f45de14069a ****/
++		/**** md5 signature: 4e3f0900d966cc07a5e2191b2b4ba7a6 ****/
+ 		%feature("compactdefaultargs") Transfer;
+ 		%feature("autodoc", "Mehod to writing sequence of root assemblies or part of the file specified by use by one label .
+ 
+ Parameters
+ ----------
+-L: TDF_LabelSequence
+-mode: STEPControl_StepModelType,optional
++theLabelSeq: TDF_LabelSequence
++theMode: STEPControl_StepModelType,optional
+ 	default value is STEPControl_AsIs
+-multi: char *,optional
++theIsMulti: str,optional
+ 	default value is 0
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+@@ -2215,7 +2215,7 @@ Returns
+ -------
+ bool
+ ") Transfer;
+-		Standard_Boolean Transfer(const TDF_LabelSequence & L, const STEPControl_StepModelType mode = STEPControl_AsIs, const char * multi = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Transfer(const TDF_LabelSequence & theLabelSeq, const STEPControl_StepModelType theMode = STEPControl_AsIs, Standard_CString theIsMulti = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Write ******************/
+ 		/**** md5 signature: 14544d6ececf228a5871ef6afa0279ae ****/
+@@ -2248,7 +2248,7 @@ IFSelect_ReturnStatus
+ 		IFSelect_ReturnStatus WriteStream(std::ostream & theStream);
+ 
+ 		/****************** Writer ******************/
+-		/**** md5 signature: 70b6d632350a5ba6ff972c4b437432a0 ****/
++		/**** md5 signature: 056d4f3221d283b7d58d92ddd5c40dd7 ****/
+ 		%feature("compactdefaultargs") Writer;
+ 		%feature("autodoc", "Returns basic reader as const.
+ 
+diff --git a/src/SWIG_files/wrapper/STEPCAFControl.pyi b/src/SWIG_files/wrapper/STEPCAFControl.pyi
+index 896eedcf..9160ffa9 100644
+--- a/src/SWIG_files/wrapper/STEPCAFControl.pyi
++++ b/src/SWIG_files/wrapper/STEPCAFControl.pyi
+@@ -175,12 +175,12 @@ class STEPCAFControl_Writer:
+     @overload
+     def __init__(self) -> None: ...
+     @overload
+-    def __init__(self, WS: XSControl_WorkSession, scratch: Optional[bool] = True) -> None: ...
++    def __init__(self, theWS: XSControl_WorkSession, theScratch: Optional[bool] = True) -> None: ...
+     def ChangeWriter(self) -> STEPControl_Writer: ...
+     @overload
+-    def ExternFile(self, L: TDF_Label, ef: STEPCAFControl_ExternFile) -> bool: ...
++    def ExternFile(self, theLabel: TDF_Label, theExtFile: STEPCAFControl_ExternFile) -> bool: ...
+     @overload
+-    def ExternFile(self, name: str, ef: STEPCAFControl_ExternFile) -> bool: ...
++    def ExternFile(self, theName: str, theExtFile: STEPCAFControl_ExternFile) -> bool: ...
+     def ExternFiles(self) -> False: ...
+     def GetColorMode(self) -> bool: ...
+     def GetDimTolMode(self) -> bool: ...
+@@ -189,24 +189,24 @@ class STEPCAFControl_Writer:
+     def GetNameMode(self) -> bool: ...
+     def GetPropsMode(self) -> bool: ...
+     def GetSHUOMode(self) -> bool: ...
+-    def Init(self, WS: XSControl_WorkSession, scratch: Optional[bool] = True) -> None: ...
++    def Init(self, theWS: XSControl_WorkSession, theScratch: Optional[bool] = True) -> None: ...
+     @overload
+-    def Perform(self, doc: TDocStd_Document, filename: TCollection_AsciiString, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Perform(self, theDoc: TDocStd_Document, theFileName: str, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     @overload
+-    def Perform(self, doc: TDocStd_Document, filename: str, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+-    def SetColorMode(self, colormode: bool) -> None: ...
+-    def SetDimTolMode(self, dimtolmode: bool) -> None: ...
+-    def SetLayerMode(self, layermode: bool) -> None: ...
+-    def SetMaterialMode(self, matmode: bool) -> None: ...
+-    def SetNameMode(self, namemode: bool) -> None: ...
+-    def SetPropsMode(self, propsmode: bool) -> None: ...
+-    def SetSHUOMode(self, shuomode: bool) -> None: ...
++    def Perform(self, theDoc: TDocStd_Document, theFileName: str, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def SetColorMode(self, theColorMode: bool) -> None: ...
++    def SetDimTolMode(self, theDimTolMode: bool) -> None: ...
++    def SetLayerMode(self, theLayerMode: bool) -> None: ...
++    def SetMaterialMode(self, theMaterialMode: bool) -> None: ...
++    def SetNameMode(self, theNameMode: bool) -> None: ...
++    def SetPropsMode(self, thePropsMode: bool) -> None: ...
++    def SetSHUOMode(self, theSHUOMode: bool) -> None: ...
+     @overload
+-    def Transfer(self, doc: TDocStd_Document, mode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, multi: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Transfer(self, theDoc: TDocStd_Document, theMode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, theIsMulti: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     @overload
+-    def Transfer(self, L: TDF_Label, mode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, multi: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Transfer(self, theLabel: TDF_Label, theMode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, theIsMulti: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     @overload
+-    def Transfer(self, L: TDF_LabelSequence, mode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, multi: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Transfer(self, theLabelSeq: TDF_LabelSequence, theMode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, theIsMulti: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     def Write(self, theFileName: str) -> IFSelect_ReturnStatus: ...
+     def Writer(self) -> STEPControl_Writer: ...
+ 
+diff --git a/src/SWIG_files/wrapper/STEPConstruct.i b/src/SWIG_files/wrapper/STEPConstruct.i
+index f1221c33..d9eaffc8 100644
+--- a/src/SWIG_files/wrapper/STEPConstruct.i
++++ b/src/SWIG_files/wrapper/STEPConstruct.i
+@@ -2598,6 +2598,17 @@ opencascade::handle<StepVisual_PresentationStyleAssignment>
+ ") MakeColorPSA;
+ 		opencascade::handle<StepVisual_PresentationStyleAssignment> MakeColorPSA(const opencascade::handle<StepRepr_RepresentationItem> & item, const opencascade::handle<StepVisual_Colour> & SurfCol, const opencascade::handle<StepVisual_Colour> & CurveCol, const opencascade::handle<StepVisual_Colour> & RenderCol, const Standard_Real RenderTransp, const Standard_Boolean isForNAUO = Standard_False);
+ 
++		/****************** NbRootStyles ******************/
++		/**** md5 signature: 4bb6a5a6f49e5abb7085f5ef57337a5a ****/
++		%feature("compactdefaultargs") NbRootStyles;
++		%feature("autodoc", "Returns number of override styles.
++
++Returns
++-------
++int
++") NbRootStyles;
++		Standard_Integer NbRootStyles();
++
+ 		/****************** NbStyles ******************/
+ 		/**** md5 signature: 9f5fbd515247307ce70e63c6f585ddb7 ****/
+ 		%feature("compactdefaultargs") NbStyles;
+@@ -2609,6 +2620,21 @@ int
+ ") NbStyles;
+ 		Standard_Integer NbStyles();
+ 
++		/****************** RootStyle ******************/
++		/**** md5 signature: 97e67ad6592e4e36a6444e18652921fc ****/
++		%feature("compactdefaultargs") RootStyle;
++		%feature("autodoc", "Returns override style with given index.
++
++Parameters
++----------
++i: int
++
++Returns
++-------
++opencascade::handle<StepVisual_StyledItem>
++") RootStyle;
++		opencascade::handle<StepVisual_StyledItem> RootStyle(const Standard_Integer i);
++
+ 		/****************** Style ******************/
+ 		/**** md5 signature: e152f39ac13e328dca6d350a6f881da8 ****/
+ 		%feature("compactdefaultargs") Style;
+diff --git a/src/SWIG_files/wrapper/STEPConstruct.pyi b/src/SWIG_files/wrapper/STEPConstruct.pyi
+index ca04fc33..0f3aa64d 100644
+--- a/src/SWIG_files/wrapper/STEPConstruct.pyi
++++ b/src/SWIG_files/wrapper/STEPConstruct.pyi
+@@ -253,7 +253,9 @@ class STEPConstruct_Styles(STEPConstruct_Tool):
+     def LoadInvisStyles(self, InvSyles: TColStd_HSequenceOfTransient) -> bool: ...
+     def LoadStyles(self) -> bool: ...
+     def MakeColorPSA(self, item: StepRepr_RepresentationItem, SurfCol: StepVisual_Colour, CurveCol: StepVisual_Colour, RenderCol: StepVisual_Colour, RenderTransp: float, isForNAUO: Optional[bool] = False) -> StepVisual_PresentationStyleAssignment: ...
++    def NbRootStyles(self) -> int: ...
+     def NbStyles(self) -> int: ...
++    def RootStyle(self, i: int) -> StepVisual_StyledItem: ...
+     def Style(self, i: int) -> StepVisual_StyledItem: ...
+ 
+ class STEPConstruct_ValidationProps(STEPConstruct_Tool):
+diff --git a/src/SWIG_files/wrapper/ShapeUpgrade.i b/src/SWIG_files/wrapper/ShapeUpgrade.i
+index 1fd11ef9..b3c16c8c 100644
+--- a/src/SWIG_files/wrapper/ShapeUpgrade.i
++++ b/src/SWIG_files/wrapper/ShapeUpgrade.i
+@@ -1064,6 +1064,7 @@ None
+ class ShapeUpgrade_UnifySameDomain : public Standard_Transient {
+ 	public:
+ typedef NCollection_DataMap<TopoDS_Shape , opencascade ::handle<Geom_Plane>, TopTools_ShapeMapHasher> DataMapOfFacePlane;
++typedef NCollection_DataMap<TopoDS_Shape , TopTools_MapOfShape , TopTools_ShapeMapHasher> DataMapOfShapeMapOfShape;
+ 		/****************** ShapeUpgrade_UnifySameDomain ******************/
+ 		/**** md5 signature: 81e68dd91fd764ff95aa62b12dc88ed6 ****/
+ 		%feature("compactdefaultargs") ShapeUpgrade_UnifySameDomain;
+diff --git a/src/SWIG_files/wrapper/StdPrs.i b/src/SWIG_files/wrapper/StdPrs.i
+index 0d01b154..bcdbf6c2 100644
+--- a/src/SWIG_files/wrapper/StdPrs.i
++++ b/src/SWIG_files/wrapper/StdPrs.i
+@@ -1220,7 +1220,7 @@ int
+ class StdPrs_ShadedShape : public Prs3d_Root {
+ 	public:
+ 		/****************** Add ******************/
+-		/**** md5 signature: 4361c97ebfd2d178620c977d5eabb386 ****/
++		/**** md5 signature: eb25cffb7e72ca49100cdcc43a05ee8c ****/
+ 		%feature("compactdefaultargs") Add;
+ 		%feature("autodoc", "Shades <theshape>. @param thevolumetype defines the way how to interpret input shapes - as closed volumes (to activate back-face culling and capping plane algorithms), as open volumes (shells or solids with holes) or to perform autodetection (would split input shape into two groups).
+ 
+@@ -1231,15 +1231,17 @@ theShape: TopoDS_Shape
+ theDrawer: Prs3d_Drawer
+ theVolume: StdPrs_Volume,optional
+ 	default value is StdPrs_Volume_Autodetection
++theGroup: Graphic3d_Group,optional
++	default value is NULL
+ 
+ Returns
+ -------
+ None
+ ") Add;
+-		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection);
++		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection, const opencascade::handle<Graphic3d_Group> & theGroup = NULL);
+ 
+ 		/****************** Add ******************/
+-		/**** md5 signature: c21dc028b4eb82bb3707a6e95d6e5c3b ****/
++		/**** md5 signature: c2784d9b78f332340fcb1d6c9293a2a1 ****/
+ 		%feature("compactdefaultargs") Add;
+ 		%feature("autodoc", "Shades <theshape> with texture coordinates. @param thevolumetype defines the way how to interpret input shapes - as closed volumes (to activate back-face culling and capping plane algorithms), as open volumes (shells or solids with holes) or to perform autodetection (would split input shape into two groups).
+ 
+@@ -1254,12 +1256,14 @@ theUVRepeat: gp_Pnt2d
+ theUVScale: gp_Pnt2d
+ theVolume: StdPrs_Volume,optional
+ 	default value is StdPrs_Volume_Autodetection
++theGroup: Graphic3d_Group,optional
++	default value is NULL
+ 
+ Returns
+ -------
+ None
+ ") Add;
+-		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const Standard_Boolean theHasTexels, const gp_Pnt2d & theUVOrigin, const gp_Pnt2d & theUVRepeat, const gp_Pnt2d & theUVScale, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection);
++		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const Standard_Boolean theHasTexels, const gp_Pnt2d & theUVOrigin, const gp_Pnt2d & theUVRepeat, const gp_Pnt2d & theUVScale, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection, const opencascade::handle<Graphic3d_Group> & theGroup = NULL);
+ 
+ 		/****************** AddWireframeForFacesWithoutTriangles ******************/
+ 		/**** md5 signature: 2399101e036cd3b0540bfa37732d6fc1 ****/
+diff --git a/src/SWIG_files/wrapper/StdPrs.pyi b/src/SWIG_files/wrapper/StdPrs.pyi
+index 3a01af7b..4df76eb5 100644
+--- a/src/SWIG_files/wrapper/StdPrs.pyi
++++ b/src/SWIG_files/wrapper/StdPrs.pyi
+@@ -156,10 +156,10 @@ class StdPrs_PoleCurve(Prs3d_Root):
+ class StdPrs_ShadedShape(Prs3d_Root):
+     @overload
+     @staticmethod
+-    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection) -> None: ...
++    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection, theGroup: Optional[Graphic3d_Group] = None) -> None: ...
+     @overload
+     @staticmethod
+-    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theHasTexels: bool, theUVOrigin: gp_Pnt2d, theUVRepeat: gp_Pnt2d, theUVScale: gp_Pnt2d, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection) -> None: ...
++    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theHasTexels: bool, theUVOrigin: gp_Pnt2d, theUVRepeat: gp_Pnt2d, theUVScale: gp_Pnt2d, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection, theGroup: Optional[Graphic3d_Group] = None) -> None: ...
+     @staticmethod
+     def AddWireframeForFacesWithoutTriangles(thePrs: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer) -> None: ...
+     @staticmethod
+diff --git a/src/SWIG_files/wrapper/StepToGeom.i b/src/SWIG_files/wrapper/StepToGeom.i
+index a91cc710..f4ab236f 100644
+--- a/src/SWIG_files/wrapper/StepToGeom.i
++++ b/src/SWIG_files/wrapper/StepToGeom.i
+@@ -808,22 +808,6 @@ opencascade::handle<Geom2d_VectorWithMagnitude>
+ ") MakeVectorWithMagnitude2d;
+ 		static opencascade::handle<Geom2d_VectorWithMagnitude> MakeVectorWithMagnitude2d(const opencascade::handle<StepGeom_Vector> & SV);
+ 
+-		/****************** MakeYprRotation ******************/
+-		/**** md5 signature: de9dc847a92c9949d29654e63b9eb686 ****/
+-		%feature("compactdefaultargs") MakeYprRotation;
+-		%feature("autodoc", "No available documentation.
+-
+-Parameters
+-----------
+-SR: StepKinematics_SpatialRotation
+-theCntxt: StepRepr_GlobalUnitAssignedContext
+-
+-Returns
+--------
+-opencascade::handle<TColStd_HArray1OfReal>
+-") MakeYprRotation;
+-		static opencascade::handle<TColStd_HArray1OfReal> MakeYprRotation(const StepKinematics_SpatialRotation & SR, const opencascade::handle<StepRepr_GlobalUnitAssignedContext> & theCntxt);
+-
+ };
+ 
+ 
+diff --git a/src/SWIG_files/wrapper/XCAFDoc.i b/src/SWIG_files/wrapper/XCAFDoc.i
+index 791919dd..e5c716a9 100644
+--- a/src/SWIG_files/wrapper/XCAFDoc.i
++++ b/src/SWIG_files/wrapper/XCAFDoc.i
+@@ -2317,7 +2317,7 @@ TDF_Label
+ 		TDF_Label FindColor(const Quantity_ColorRGBA & col);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: be86e43f2f2ac06163dce467a9739527 ****/
++		/**** md5 signature: 7092ec33c89b067e1ceab0d67b5ed02d ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color defined by label lab returns false if the label is not in colortable or does not define a color.
+ 
+@@ -2330,10 +2330,10 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & lab, Quantity_Color & col);
++		static Standard_Boolean GetColor(const TDF_Label & lab, Quantity_Color & col);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: a7a6506d3132240934c87e97ec6b28ed ****/
++		/**** md5 signature: 7252a98dd463a84602d0b7516d6cfc04 ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color defined by label lab returns false if the label is not in colortable or does not define a color.
+ 
+@@ -2346,7 +2346,7 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & lab, Quantity_ColorRGBA & col);
++		static Standard_Boolean GetColor(const TDF_Label & lab, Quantity_ColorRGBA & col);
+ 
+ 		/****************** GetColor ******************/
+ 		/**** md5 signature: 869ec12dba73e125e4d66d2a85d2d496 ****/
+@@ -2366,7 +2366,7 @@ bool
+ 		static Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, TDF_Label & colorL);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: 5801253cfaf9cc63278aa2d80d15b2c3 ****/
++		/**** md5 signature: 9f42bc515522bf5857381b8ed56f5af6 ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color assigned to <l> as <type> returns false if no such color is assigned.
+ 
+@@ -2380,10 +2380,10 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_Color & color);
++		static Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_Color & color);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: f56e146c8c1c603ab9bcf2d6c801e3b4 ****/
++		/**** md5 signature: 175af0eadf13dd6e8e7059280dcebe1e ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color assigned to <l> as <type> returns false if no such color is assigned.
+ 
+@@ -2397,7 +2397,7 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_ColorRGBA & color);
++		static Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_ColorRGBA & color);
+ 
+ 		/****************** GetColor ******************/
+ 		/**** md5 signature: 6e439ce30113cabaadf18ee4ce1d0971 ****/
+@@ -2599,7 +2599,7 @@ bool
+ 		Standard_Boolean IsSet(const TopoDS_Shape & S, const XCAFDoc_ColorType type);
+ 
+ 		/****************** IsVisible ******************/
+-		/**** md5 signature: e84f73aaf1ac293dea741c71b9f10a4b ****/
++		/**** md5 signature: bcc14ce19df050eb884b5911b48c4b59 ****/
+ 		%feature("compactdefaultargs") IsVisible;
+ 		%feature("autodoc", "Return true if object on this label is visible, false if invisible.
+ 
+@@ -2611,7 +2611,7 @@ Returns
+ -------
+ bool
+ ") IsVisible;
+-		Standard_Boolean IsVisible(const TDF_Label & L);
++		static Standard_Boolean IsVisible(const TDF_Label & L);
+ 
+ 		/****************** RemoveColor ******************/
+ 		/**** md5 signature: 3e1749f5696dd21fe53c3eb3d8e77952 ****/
+@@ -3477,7 +3477,7 @@ None
+ 		void GetDatumLabels(TDF_LabelSequence & Labels);
+ 
+ 		/****************** GetDatumOfTolerLabels ******************/
+-		/**** md5 signature: ed65059da2973245ec5c0f5e0dfd7526 ****/
++		/**** md5 signature: 581e63a0a9642866e1575d216f9b4d3d ****/
+ 		%feature("compactdefaultargs") GetDatumOfTolerLabels;
+ 		%feature("autodoc", "Returns all datum labels defined for thedimtoll label.
+ 
+@@ -3490,10 +3490,10 @@ Returns
+ -------
+ bool
+ ") GetDatumOfTolerLabels;
+-		Standard_Boolean GetDatumOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
++		static Standard_Boolean GetDatumOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
+ 
+ 		/****************** GetDatumWithObjectOfTolerLabels ******************/
+-		/**** md5 signature: da94437dec84c797c8bab6e76d5e373f ****/
++		/**** md5 signature: d5f3a53d01bb6038ce1c82b7e4989ce4 ****/
+ 		%feature("compactdefaultargs") GetDatumWithObjectOfTolerLabels;
+ 		%feature("autodoc", "Returns all datum labels with xcafdimtolobjects_datumobject defined for label thedimtoll.
+ 
+@@ -3506,7 +3506,7 @@ Returns
+ -------
+ bool
+ ") GetDatumWithObjectOfTolerLabels;
+-		Standard_Boolean GetDatumWithObjectOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
++		static Standard_Boolean GetDatumWithObjectOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
+ 
+ 		/****************** GetDimTol ******************/
+ 		/**** md5 signature: 5f2928d077835acfc683c0b7e312ac72 ****/
+@@ -3646,7 +3646,7 @@ bool
+ 		Standard_Boolean GetRefGeomToleranceLabels(const TDF_Label & theShapeL, TDF_LabelSequence & theDimTols);
+ 
+ 		/****************** GetRefShapeLabel ******************/
+-		/**** md5 signature: e25d6989472f0a0e102c1daa5f739a29 ****/
++		/**** md5 signature: b09dac51ded70edf3dd23cc545931b1a ****/
+ 		%feature("compactdefaultargs") GetRefShapeLabel;
+ 		%feature("autodoc", "Gets all shape labels referred by thel label of the gd&t table. returns false if there are no shape labels added to the sequences.
+ 
+@@ -3660,7 +3660,7 @@ Returns
+ -------
+ bool
+ ") GetRefShapeLabel;
+-		Standard_Boolean GetRefShapeLabel(const TDF_Label & theL, TDF_LabelSequence & theShapeLFirst, TDF_LabelSequence & theShapeLSecond);
++		static Standard_Boolean GetRefShapeLabel(const TDF_Label & theL, TDF_LabelSequence & theShapeLFirst, TDF_LabelSequence & theShapeLSecond);
+ 
+ 		/****************** GetTolerOfDatumLabels ******************/
+ 		/**** md5 signature: b4d4047d58bcf3d1d31d5586d788da7e ****/
+@@ -5490,20 +5490,20 @@ opencascade::handle<TColStd_HSequenceOfExtendedString>
+ 		opencascade::handle<TColStd_HSequenceOfExtendedString> GetLayers(const TopoDS_Shape & Sh);
+ 
+ 		/****************** GetShapesOfLayer ******************/
+-		/**** md5 signature: 8b01d3b5f0a0832996031f609b876e7c ****/
++		/**** md5 signature: 2bcd2de1711ebf8ae0d1ddf5d01dce52 ****/
+ 		%feature("compactdefaultargs") GetShapesOfLayer;
+ 		%feature("autodoc", "Return sequanese of shape labels that assigned with layers to <shlabels>.
+ 
+ Parameters
+ ----------
+-layerL: TDF_Label
+-ShLabels: TDF_LabelSequence
++theLayerL: TDF_Label
++theShLabels: TDF_LabelSequence
+ 
+ Returns
+ -------
+ None
+ ") GetShapesOfLayer;
+-		void GetShapesOfLayer(const TDF_Label & layerL, TDF_LabelSequence & ShLabels);
++		static void GetShapesOfLayer(const TDF_Label & theLayerL, TDF_LabelSequence & theShLabels);
+ 
+ 		/****************** ID ******************/
+ 		/**** md5 signature: 4697ce8a095fa6dcef0217708d19718f ****/
+@@ -6456,7 +6456,7 @@ Standard_GUID
+ 		static const Standard_GUID & GetID();
+ 
+ 		/****************** GetMaterial ******************/
+-		/**** md5 signature: 806c54e68af730f31f3353b2ba682bd0 ****/
++		/**** md5 signature: cf930e538eb371f96b92c4f439c49612 ****/
+ 		%feature("compactdefaultargs") GetMaterial;
+ 		%feature("autodoc", "Returns material assigned to <matl> returns false if no such material is assigned.
+ 
+@@ -6472,7 +6472,7 @@ Returns
+ -------
+ aDensity: float
+ ") GetMaterial;
+-		Standard_Boolean GetMaterial(const TDF_Label & MatL, opencascade::handle<TCollection_HAsciiString> & aName, opencascade::handle<TCollection_HAsciiString> & aDescription, Standard_Real &OutValue, opencascade::handle<TCollection_HAsciiString> & aDensName, opencascade::handle<TCollection_HAsciiString> & aDensValType);
++		static Standard_Boolean GetMaterial(const TDF_Label & MatL, opencascade::handle<TCollection_HAsciiString> &OutValue, opencascade::handle<TCollection_HAsciiString> &OutValue, Standard_Real &OutValue, opencascade::handle<TCollection_HAsciiString> &OutValue, opencascade::handle<TCollection_HAsciiString> &OutValue);
+ 
+ 		/****************** GetMaterialLabels ******************/
+ 		/**** md5 signature: cd3883adc849957e7e10d763ad936071 ****/
+@@ -8152,6 +8152,32 @@ opencascade::handle<TDataStd_NamedData>
+ ") GetNamedProperties;
+ 		opencascade::handle<TDataStd_NamedData> GetNamedProperties(const TopoDS_Shape & theShape, const Standard_Boolean theToCreate = Standard_False);
+ 
++		/****************** GetOneShape ******************/
++		/**** md5 signature: 3215690f7fd49b341401d78832c630e0 ****/
++		%feature("compactdefaultargs") GetOneShape;
++		%feature("autodoc", "Gets shape from a sequence of shape's labels @param[in] thelabels a sequence of labels to get shapes from returns original shape in case of one label and a compound of shapes in case of more.
++
++Parameters
++----------
++theLabels: TDF_LabelSequence
++
++Returns
++-------
++TopoDS_Shape
++") GetOneShape;
++		static TopoDS_Shape GetOneShape(const TDF_LabelSequence & theLabels);
++
++		/****************** GetOneShape ******************/
++		/**** md5 signature: 5c1df85e1e2a72b0b93fde509f26a709 ****/
++		%feature("compactdefaultargs") GetOneShape;
++		%feature("autodoc", "Gets shape from a sequence of all top-level shapes which are free returns original shape in case of one label and a compound of shapes in case of more.
++
++Returns
++-------
++TopoDS_Shape
++") GetOneShape;
++		TopoDS_Shape GetOneShape();
++
+ 		/****************** GetReferredShape ******************/
+ 		/**** md5 signature: 63acc4d5460c835c166b1fc0b2913030 ****/
+ 		%feature("compactdefaultargs") GetReferredShape;
+@@ -9844,7 +9870,7 @@ Standard_GUID
+ 		static const Standard_GUID & GetID();
+ 
+ 		/****************** GetMaterial ******************/
+-		/**** md5 signature: 83194336f7abcf51085de62960d38361 ****/
++		/**** md5 signature: 694e93123423187642f68fe8d4e64f2a ****/
+ 		%feature("compactdefaultargs") GetMaterial;
+ 		%feature("autodoc", "Returns material defined by specified label, or null if the label is not in material table.
+ 
+@@ -9856,7 +9882,7 @@ Returns
+ -------
+ opencascade::handle<XCAFDoc_VisMaterial>
+ ") GetMaterial;
+-		opencascade::handle<XCAFDoc_VisMaterial> GetMaterial(const TDF_Label & theMatLabel);
++		static opencascade::handle<XCAFDoc_VisMaterial> GetMaterial(const TDF_Label & theMatLabel);
+ 
+ 		/****************** GetMaterials ******************/
+ 		/**** md5 signature: a96d68af36051bd063fefc1e10aabb79 ****/
+@@ -9890,7 +9916,7 @@ bool
+ 		static Standard_Boolean GetShapeMaterial(const TDF_Label & theShapeLabel, TDF_Label & theMaterialLabel);
+ 
+ 		/****************** GetShapeMaterial ******************/
+-		/**** md5 signature: 86335bfdea98c720bcf3af0fe4fb0fe0 ****/
++		/**** md5 signature: 04847c1ad68cdd465933ffa2a713f244 ****/
+ 		%feature("compactdefaultargs") GetShapeMaterial;
+ 		%feature("autodoc", "Returns material assigned to the shape label.
+ 
+@@ -9902,7 +9928,7 @@ Returns
+ -------
+ opencascade::handle<XCAFDoc_VisMaterial>
+ ") GetShapeMaterial;
+-		opencascade::handle<XCAFDoc_VisMaterial> GetShapeMaterial(const TDF_Label & theShapeLabel);
++		static opencascade::handle<XCAFDoc_VisMaterial> GetShapeMaterial(const TDF_Label & theShapeLabel);
+ 
+ 		/****************** GetShapeMaterial ******************/
+ 		/**** md5 signature: b4d2560c50c52f8b49c713aa67731929 ****/
+diff --git a/src/SWIG_files/wrapper/XCAFDoc.pyi b/src/SWIG_files/wrapper/XCAFDoc.pyi
+index b3036a2f..9fed3910 100644
+--- a/src/SWIG_files/wrapper/XCAFDoc.pyi
++++ b/src/SWIG_files/wrapper/XCAFDoc.pyi
+@@ -299,16 +299,20 @@ class XCAFDoc_ColorTool(TDataStd_GenericEmpty):
+     @overload
+     def FindColor(self, col: Quantity_ColorRGBA) -> TDF_Label: ...
+     @overload
+-    def GetColor(self, lab: TDF_Label, col: Quantity_Color) -> bool: ...
++    @staticmethod
++    def GetColor(lab: TDF_Label, col: Quantity_Color) -> bool: ...
+     @overload
+-    def GetColor(self, lab: TDF_Label, col: Quantity_ColorRGBA) -> bool: ...
++    @staticmethod
++    def GetColor(lab: TDF_Label, col: Quantity_ColorRGBA) -> bool: ...
+     @overload
+     @staticmethod
+     def GetColor(L: TDF_Label, type: XCAFDoc_ColorType, colorL: TDF_Label) -> bool: ...
+     @overload
+-    def GetColor(self, L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_Color) -> bool: ...
++    @staticmethod
++    def GetColor(L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_Color) -> bool: ...
+     @overload
+-    def GetColor(self, L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_ColorRGBA) -> bool: ...
++    @staticmethod
++    def GetColor(L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_ColorRGBA) -> bool: ...
+     @overload
+     def GetColor(self, S: TopoDS_Shape, type: XCAFDoc_ColorType, colorL: TDF_Label) -> bool: ...
+     @overload
+@@ -330,7 +334,8 @@ class XCAFDoc_ColorTool(TDataStd_GenericEmpty):
+     def IsSet(self, L: TDF_Label, type: XCAFDoc_ColorType) -> bool: ...
+     @overload
+     def IsSet(self, S: TopoDS_Shape, type: XCAFDoc_ColorType) -> bool: ...
+-    def IsVisible(self, L: TDF_Label) -> bool: ...
++    @staticmethod
++    def IsVisible(L: TDF_Label) -> bool: ...
+     def RemoveColor(self, lab: TDF_Label) -> None: ...
+     def ReverseChainsOfTreeNodes(self) -> bool: ...
+     @staticmethod
+@@ -418,9 +423,11 @@ class XCAFDoc_DimTolTool(TDataStd_GenericEmpty):
+     def FindDimTol(self, theKind: int, theVal: TColStd_HArray1OfReal, theName: TCollection_HAsciiString, theDescription: TCollection_HAsciiString) -> TDF_Label: ...
+     def GetDatum(self, theDatumL: TDF_Label, theName: TCollection_HAsciiString, theDescription: TCollection_HAsciiString, theIdentification: TCollection_HAsciiString) -> bool: ...
+     def GetDatumLabels(self, Labels: TDF_LabelSequence) -> None: ...
+-    def GetDatumOfTolerLabels(self, theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
+-    def GetDatumWithObjectOfTolerLabels(self, theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
+-    def GetDimTol(self, theDimTolL: TDF_Label, theVal: TColStd_HArray1OfReal, theName: TCollection_HAsciiString, theDescription: TCollection_HAsciiString) -> Tuple[bool, int]: ...
++    @staticmethod
++    def GetDatumOfTolerLabels(theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
++    @staticmethod
++    def GetDatumWithObjectOfTolerLabels(theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
++    def GetDimTol(self, theDimTolL: TDF_Label, theVal: TColStd_HArray1OfReal) -> Tuple[bool, int, str, str]: ...
+     def GetDimTolLabels(self, Labels: TDF_LabelSequence) -> None: ...
+     def GetDimensionLabels(self, theLabels: TDF_LabelSequence) -> None: ...
+     def GetGeomToleranceLabels(self, theLabels: TDF_LabelSequence) -> None: ...
+@@ -429,7 +436,8 @@ class XCAFDoc_DimTolTool(TDataStd_GenericEmpty):
+     def GetRefDatumLabel(self, theShapeL: TDF_Label, theDatum: TDF_LabelSequence) -> bool: ...
+     def GetRefDimensionLabels(self, theShapeL: TDF_Label, theDimensions: TDF_LabelSequence) -> bool: ...
+     def GetRefGeomToleranceLabels(self, theShapeL: TDF_Label, theDimTols: TDF_LabelSequence) -> bool: ...
+-    def GetRefShapeLabel(self, theL: TDF_Label, theShapeLFirst: TDF_LabelSequence, theShapeLSecond: TDF_LabelSequence) -> bool: ...
++    @staticmethod
++    def GetRefShapeLabel(theL: TDF_Label, theShapeLFirst: TDF_LabelSequence, theShapeLSecond: TDF_LabelSequence) -> bool: ...
+     def GetTolerOfDatumLabels(self, theDatumL: TDF_Label, theTols: TDF_LabelSequence) -> bool: ...
+     def ID(self) -> Standard_GUID: ...
+     def IsDatum(self, lab: TDF_Label) -> bool: ...
+@@ -629,7 +637,8 @@ class XCAFDoc_LayerTool(TDataStd_GenericEmpty):
+     def GetLayers(self, Sh: TopoDS_Shape, aLayerLS: TDF_LabelSequence) -> bool: ...
+     @overload
+     def GetLayers(self, Sh: TopoDS_Shape) -> TColStd_HSequenceOfExtendedString: ...
+-    def GetShapesOfLayer(self, layerL: TDF_Label, ShLabels: TDF_LabelSequence) -> None: ...
++    @staticmethod
++    def GetShapesOfLayer(theLayerL: TDF_Label, theShLabels: TDF_LabelSequence) -> None: ...
+     def ID(self) -> Standard_GUID: ...
+     def IsLayer(self, lab: TDF_Label) -> bool: ...
+     @overload
+@@ -731,7 +740,8 @@ class XCAFDoc_MaterialTool(TDataStd_GenericEmpty):
+     def GetDensityForShape(ShapeL: TDF_Label) -> float: ...
+     @staticmethod
+     def GetID() -> Standard_GUID: ...
+-    def GetMaterial(self, MatL: TDF_Label, aName: TCollection_HAsciiString, aDescription: TCollection_HAsciiString, aDensName: TCollection_HAsciiString, aDensValType: TCollection_HAsciiString) -> Tuple[bool, float]: ...
++    @staticmethod
++    def GetMaterial(MatL: TDF_Label) -> Tuple[bool, str, str, float, str, str]: ...
+     def GetMaterialLabels(self, Labels: TDF_LabelSequence) -> None: ...
+     def ID(self) -> Standard_GUID: ...
+     def IsMaterial(self, lab: TDF_Label) -> bool: ...
+@@ -899,6 +909,11 @@ class XCAFDoc_ShapeTool(TDataStd_GenericEmpty):
+     def GetNamedProperties(self, theLabel: TDF_Label, theToCreate: Optional[bool] = False) -> TDataStd_NamedData: ...
+     @overload
+     def GetNamedProperties(self, theShape: TopoDS_Shape, theToCreate: Optional[bool] = False) -> TDataStd_NamedData: ...
++    @overload
++    @staticmethod
++    def GetOneShape(theLabels: TDF_LabelSequence) -> TopoDS_Shape: ...
++    @overload
++    def GetOneShape(self) -> TopoDS_Shape: ...
+     @staticmethod
+     def GetReferredShape(L: TDF_Label, Label: TDF_Label) -> bool: ...
+     @staticmethod
+@@ -1058,13 +1073,15 @@ class XCAFDoc_VisMaterialTool(TDF_Attribute):
+     def BaseLabel(self) -> TDF_Label: ...
+     @staticmethod
+     def GetID() -> Standard_GUID: ...
+-    def GetMaterial(self, theMatLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
++    @staticmethod
++    def GetMaterial(theMatLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
+     def GetMaterials(self, Labels: TDF_LabelSequence) -> None: ...
+     @overload
+     @staticmethod
+     def GetShapeMaterial(theShapeLabel: TDF_Label, theMaterialLabel: TDF_Label) -> bool: ...
+     @overload
+-    def GetShapeMaterial(self, theShapeLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
++    @staticmethod
++    def GetShapeMaterial(theShapeLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
+     @overload
+     def GetShapeMaterial(self, theShape: TopoDS_Shape, theMaterialLabel: TDF_Label) -> bool: ...
+     @overload
+@@ -1209,7 +1226,12 @@ XCAFDoc_Color_Set = XCAFDoc_Color.Set
+ XCAFDoc_Color_Set = XCAFDoc_Color.Set
+ XCAFDoc_ColorTool_AutoNaming = XCAFDoc_ColorTool.AutoNaming
+ XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
+ XCAFDoc_ColorTool_GetID = XCAFDoc_ColorTool.GetID
++XCAFDoc_ColorTool_IsVisible = XCAFDoc_ColorTool.IsVisible
+ XCAFDoc_ColorTool_Set = XCAFDoc_ColorTool.Set
+ XCAFDoc_ColorTool_SetAutoNaming = XCAFDoc_ColorTool.SetAutoNaming
+ XCAFDoc_Datum_GetID = XCAFDoc_Datum.GetID
+@@ -1217,7 +1239,10 @@ XCAFDoc_Datum_Set = XCAFDoc_Datum.Set
+ XCAFDoc_Datum_Set = XCAFDoc_Datum.Set
+ XCAFDoc_DimTol_GetID = XCAFDoc_DimTol.GetID
+ XCAFDoc_DimTol_Set = XCAFDoc_DimTol.Set
++XCAFDoc_DimTolTool_GetDatumOfTolerLabels = XCAFDoc_DimTolTool.GetDatumOfTolerLabels
++XCAFDoc_DimTolTool_GetDatumWithObjectOfTolerLabels = XCAFDoc_DimTolTool.GetDatumWithObjectOfTolerLabels
+ XCAFDoc_DimTolTool_GetID = XCAFDoc_DimTolTool.GetID
++XCAFDoc_DimTolTool_GetRefShapeLabel = XCAFDoc_DimTolTool.GetRefShapeLabel
+ XCAFDoc_DimTolTool_Set = XCAFDoc_DimTolTool.Set
+ XCAFDoc_Dimension_GetID = XCAFDoc_Dimension.GetID
+ XCAFDoc_Dimension_Set = XCAFDoc_Dimension.Set
+@@ -1268,6 +1293,7 @@ XCAFDoc_GraphNode_GetDefaultGraphID = XCAFDoc_GraphNode.GetDefaultGraphID
+ XCAFDoc_GraphNode_Set = XCAFDoc_GraphNode.Set
+ XCAFDoc_GraphNode_Set = XCAFDoc_GraphNode.Set
+ XCAFDoc_LayerTool_GetID = XCAFDoc_LayerTool.GetID
++XCAFDoc_LayerTool_GetShapesOfLayer = XCAFDoc_LayerTool.GetShapesOfLayer
+ XCAFDoc_LayerTool_Set = XCAFDoc_LayerTool.Set
+ XCAFDoc_LengthUnit_GetID = XCAFDoc_LengthUnit.GetID
+ XCAFDoc_LengthUnit_Set = XCAFDoc_LengthUnit.Set
+@@ -1279,6 +1305,7 @@ XCAFDoc_Material_GetID = XCAFDoc_Material.GetID
+ XCAFDoc_Material_Set = XCAFDoc_Material.Set
+ XCAFDoc_MaterialTool_GetDensityForShape = XCAFDoc_MaterialTool.GetDensityForShape
+ XCAFDoc_MaterialTool_GetID = XCAFDoc_MaterialTool.GetID
++XCAFDoc_MaterialTool_GetMaterial = XCAFDoc_MaterialTool.GetMaterial
+ XCAFDoc_MaterialTool_Set = XCAFDoc_MaterialTool.Set
+ XCAFDoc_Note_Get = XCAFDoc_Note.Get
+ XCAFDoc_Note_IsMine = XCAFDoc_Note.IsMine
+@@ -1294,6 +1321,7 @@ XCAFDoc_ShapeTool_GetComponents = XCAFDoc_ShapeTool.GetComponents
+ XCAFDoc_ShapeTool_GetExternRefs = XCAFDoc_ShapeTool.GetExternRefs
+ XCAFDoc_ShapeTool_GetID = XCAFDoc_ShapeTool.GetID
+ XCAFDoc_ShapeTool_GetLocation = XCAFDoc_ShapeTool.GetLocation
++XCAFDoc_ShapeTool_GetOneShape = XCAFDoc_ShapeTool.GetOneShape
+ XCAFDoc_ShapeTool_GetReferredShape = XCAFDoc_ShapeTool.GetReferredShape
+ XCAFDoc_ShapeTool_GetSHUO = XCAFDoc_ShapeTool.GetSHUO
+ XCAFDoc_ShapeTool_GetSHUONextUsage = XCAFDoc_ShapeTool.GetSHUONextUsage
+@@ -1320,6 +1348,8 @@ XCAFDoc_ViewTool_GetID = XCAFDoc_ViewTool.GetID
+ XCAFDoc_ViewTool_Set = XCAFDoc_ViewTool.Set
+ XCAFDoc_VisMaterial_GetID = XCAFDoc_VisMaterial.GetID
+ XCAFDoc_VisMaterialTool_GetID = XCAFDoc_VisMaterialTool.GetID
++XCAFDoc_VisMaterialTool_GetMaterial = XCAFDoc_VisMaterialTool.GetMaterial
++XCAFDoc_VisMaterialTool_GetShapeMaterial = XCAFDoc_VisMaterialTool.GetShapeMaterial
+ XCAFDoc_VisMaterialTool_GetShapeMaterial = XCAFDoc_VisMaterialTool.GetShapeMaterial
+ XCAFDoc_VisMaterialTool_Set = XCAFDoc_VisMaterialTool.Set
+ XCAFDoc_Volume_Get = XCAFDoc_Volume.Get
+diff --git a/src/SWIG_files/wrapper/XCAFPrs.i b/src/SWIG_files/wrapper/XCAFPrs.i
+index 51f661e0..efa0d4b0 100644
+--- a/src/SWIG_files/wrapper/XCAFPrs.i
++++ b/src/SWIG_files/wrapper/XCAFPrs.i
+@@ -1019,7 +1019,7 @@ None
+ class XCAFPrs_Texture : public Graphic3d_Texture2D {
+ 	public:
+ 		/****************** XCAFPrs_Texture ******************/
+-		/**** md5 signature: f9dbe9d0fe880b67c047fad8716af896 ****/
++		/**** md5 signature: 000bd876aad38ca74535015d5e9463d7 ****/
+ 		%feature("compactdefaultargs") XCAFPrs_Texture;
+ 		%feature("autodoc", "Constructor.
+ 
+@@ -1032,7 +1032,7 @@ Returns
+ -------
+ None
+ ") XCAFPrs_Texture;
+-		 XCAFPrs_Texture(const Image_Texture & theImageSource, const Graphic3d_TextureUnit theUnit);
++		 XCAFPrs_Texture(const opencascade::handle<Image_Texture> & theImageSource, const Graphic3d_TextureUnit theUnit);
+ 
+ 		/****************** GetCompressedImage ******************/
+ 		/**** md5 signature: bad0c95151f5a884e9dbc72217977538 ****/
+@@ -1065,15 +1065,15 @@ opencascade::handle<Image_PixMap>
+ 		virtual opencascade::handle<Image_PixMap> GetImage(const opencascade::handle<Image_SupportedFormats> & theSupported);
+ 
+ 		/****************** GetImageSource ******************/
+-		/**** md5 signature: 1fa59174d8d0d408df072137f5b3fe0e ****/
++		/**** md5 signature: c24f99a1f3e5bf7521b240aa232d6d28 ****/
+ 		%feature("compactdefaultargs") GetImageSource;
+ 		%feature("autodoc", "Return image source.
+ 
+ Returns
+ -------
+-Image_Texture
++opencascade::handle<Image_Texture>
+ ") GetImageSource;
+-		const Image_Texture & GetImageSource();
++		const opencascade::handle<Image_Texture> & GetImageSource();
+ 
+ };
+ 
+
+From 44af64d633d315e52e3f18247ff8e26d0619effb Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Tue, 4 Apr 2023 03:57:57 +0200
+Subject: [PATCH 2/4] bump occt version to 7.7.1
+
+---
+ CMakeLists.txt          | 6 +++---
+ ci/conda/meta.yaml      | 6 +++---
+ src/PkgBase/__init__.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14a60d09..8cef86b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,8 +21,8 @@ project(PYTHONOCC)
+ 
+ # set pythonOCC version
+ set(PYTHONOCC_VERSION_MAJOR 7)
+-set(PYTHONOCC_VERSION_MINOR 6)
+-set(PYTHONOCC_VERSION_PATCH 3)
++set(PYTHONOCC_VERSION_MINOR 7)
++set(PYTHONOCC_VERSION_PATCH 1)
+ 
+ #  Empty for official releases, set to -dev, -rc1, etc for development releases
+ set(PYTHONOCC_VERSION_DEVEL )
+@@ -147,7 +147,7 @@ if(DEFINED OCE_INCLUDE_PATH)
+ # if OCE_INCLUDE_PATH is not passed at command line,
+ # find OCE automatically
+ else(OCE_INCLUDE_PATH)
+-  find_package(OpenCASCADE 7.7.0 REQUIRED)
++  find_package(OpenCASCADE 7.7.1 REQUIRED)
+   if(OpenCASCADE_FOUND)
+     message(STATUS "OpenCASCADE version found: " ${OpenCASCADE_MAJOR_VERSION} "." ${OpenCASCADE_MINOR_VERSION} "." ${OpenCASCADE_MAINTENANCE_VERSION})
+     message(STATUS "OpenCASCADE include directory: " ${OpenCASCADE_INCLUDE_DIR})
+diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
+index 33d91edc..8ca381de 100644
+--- a/ci/conda/meta.yaml
++++ b/ci/conda/meta.yaml
+@@ -1,4 +1,4 @@
+-{% set version = "7.7.0" %}
++{% set version = "7.7.1" %}
+ 
+ package:
+   name: pythonocc-core
+@@ -26,11 +26,11 @@ requirements:
+ 
+   host:
+     - python {{ python }}
+-    - occt ==7.7.0
++    - occt ==7.7.1
+     - numpy >=1.17
+ 
+   run:
+-    - occt ==7.7.0
++    - occt ==7.7.1
+     - six
+     - numpy >=1.17
+ 
+diff --git a/src/PkgBase/__init__.py b/src/PkgBase/__init__.py
+index 898fb48e..e90690b0 100644
+--- a/src/PkgBase/__init__.py
++++ b/src/PkgBase/__init__.py
+@@ -1,6 +1,6 @@
+ PYTHONOCC_VERSION_MAJOR = 7
+ PYTHONOCC_VERSION_MINOR = 7
+-PYTHONOCC_VERSION_PATCH = 0
++PYTHONOCC_VERSION_PATCH = 1
+ 
+ #  Empty for official releases, set to -dev, -rc1, etc for development releases
+ PYTHONOCC_VERSION_DEVEL = ''
+
+From 6ec7cc9095631de070573fc26164578f2e2c87bf Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Thu, 13 Apr 2023 16:40:05 +0200
+Subject: [PATCH 3/4] remove xvfb tests from conda build
+
+---
+ ci/conda/run_test.sh | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/ci/conda/run_test.sh b/ci/conda/run_test.sh
+index 8d0acf0a..6610b84e 100644
+--- a/ci/conda/run_test.sh
++++ b/ci/conda/run_test.sh
+@@ -2,10 +2,3 @@
+ cd ../work/test
+ python run_tests.py
+ mypy test_mypy_classic_occ_bottle.py
+-
+-if [ $(uname) == Linux ]; then
+-    # start xvfb
+-    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_pyqt5_unittest.py
+-    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_pyside2_unittest.py
+-    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_wx_unittest.py
+-fi
+
+From bcd7a2c2e0b12801416db9c0d73f2c01992e8ab5 Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Thu, 13 Apr 2023 17:08:51 +0200
+Subject: [PATCH 4/4] Fix DataEchange load colrs
+
+---
+ src/Extend/DataExchange.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/Extend/DataExchange.py b/src/Extend/DataExchange.py
+index 20f0c9b8..6545d83a 100644
+--- a/src/Extend/DataExchange.py
++++ b/src/Extend/DataExchange.py
+@@ -41,6 +41,7 @@ from OCC.Core.TDocStd import TDocStd_Document
+ from OCC.Core.XCAFDoc import (
+     XCAFDoc_DocumentTool_ShapeTool,
+     XCAFDoc_DocumentTool_ColorTool,
++    XCAFDoc_ColorTool,
+ )
+ from OCC.Core.STEPCAFControl import STEPCAFControl_Reader
+ from OCC.Core.TDF import TDF_LabelSequence, TDF_Label
+@@ -62,6 +63,7 @@ try:
+ except ImportError:
+     HAVE_SVGWRITE = False
+ 
++
+ ##########################
+ # Step import and export #
+ ##########################
+@@ -280,11 +282,10 @@ def read_step_file_with_names_colors(filename):
+ 
+             if not color_set:
+                 if (
+-                    color_tool.GetColor(lab, 0, c)
+-                    or color_tool.GetColor(lab, 1, c)
+-                    or color_tool.GetColor(lab, 2, c)
++                    XCAFDoc_ColorTool.GetColor(lab, 0, c)
++                    or XCAFDoc_ColorTool.GetColor(lab, 1, c)
++                    or XCAFDoc_ColorTool.GetColor(lab, 2, c)
+                 ):
+-
+                     color_tool.SetInstanceColor(shape, 0, c)
+                     color_tool.SetInstanceColor(shape, 1, c)
+                     color_tool.SetInstanceColor(shape, 2, c)
+@@ -330,9 +331,9 @@ def read_step_file_with_names_colors(filename):
+ 
+                 if not color_set:
+                     if (
+-                        color_tool.GetColor(lab_subs, 0, c)
+-                        or color_tool.GetColor(lab_subs, 1, c)
+-                        or color_tool.GetColor(lab_subs, 2, c)
++                        XCAFDoc_ColorTool.GetColor(lab_subs, 0, c)
++                        or XCAFDoc_ColorTool.GetColor(lab_subs, 1, c)
++                        or XCAFDoc_ColorTool.GetColor(lab_subs, 2, c)
+                     ):
+                         color_tool.SetInstanceColor(shape, 0, c)
+                         color_tool.SetInstanceColor(shape, 1, c)
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 1fd02e0b26a0..947435fe886e 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -6,7 +6,7 @@ archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
 hostmakedepends="python3 swig"
-makedepends="python3-devel occt-devel freetype-devel swig"
+makedepends="python3-devel occt-devel freetype-devel swig rapidjson"
 depends="python3 occt freetype"
 short_desc="Industrial strength 3D CAD Python3 package"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"

From 7407ea966eb1e233c1c1d28b5b5833fc2bd10e25 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 16 Feb 2023 19:39:39 +0530
Subject: [PATCH 0248/1853] python3-colorama: update to 0.4.6.

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

diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
index 36a3dda2081c..ec542c2b3b4a 100644
--- a/srcpkgs/python3-colorama/template
+++ b/srcpkgs/python3-colorama/template
@@ -1,18 +1,20 @@
 # Template file for 'python3-colorama'
 pkgname=python3-colorama
-version=0.4.5
-revision=2
-build_style=python3-module
-hostmakedepends="unzip python3-setuptools"
+version=0.4.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Cross-platform colored terminal text (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/tartley/colorama"
 changelog="https://github.com/tartley/colorama/raw/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
-checksum=e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4
+checksum=08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44
 
 post_install() {
 	vlicense LICENSE.txt
+	rm -r ${DESTDIR}/${py3_sitelib}/colorama/tests
 }

From 207e369dc5bc90a53eb4609abf772ef448ad9e0a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 00:43:08 +0530
Subject: [PATCH 0249/1853] common/build-style/python3-pep517.sh: extract
 wheels in hidden dirs

This prevents pytest from collecting tests multiple times when
they are bundled in the wheel itself alongside the source tree.

Closes: #43946 [via git-merge-pr]
---
 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 ffe52fccf3db..2d5ff7caf34e 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -19,7 +19,7 @@ do_check() {
 		testjobs="-n $XBPS_MAKEJOBS"
 	fi
 
-	local testdir="${wrksrc}/tmp/$(date +%s)"
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
 	python3 -m installer --destdir "${testdir}" \
 		${make_install_args} ${make_install_target:-dist/*.whl}
 

From 6be67280cf8403c3a3af965a616c14675393f7c4 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 5 Jun 2023 16:38:07 +0300
Subject: [PATCH 0250/1853] spotify: update to 1.2.11.

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

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 8eaa25125af7..4dc3395617cd 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.2.9
+version=1.2.11
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
-distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.743.g85d9593d_amd64.deb"
-checksum=44eebb4c1a80fae48b532f6dd915ec2990489d0b6b77bf4ee800abf9ee772c81
+distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.916.geb595a67_amd64.deb"
+checksum=472bf841451c219320f1ca038915f52bd4afdf7a1c979571d6ed541ca5e26d51
 repository=nonfree
 restricted=yes
 nostrip=yes

From cedba2c82ec719b0821d3211165ed6de45f9b644 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Mon, 5 Jun 2023 08:12:45 -0400
Subject: [PATCH 0251/1853] font-iosevka: update to 24.1.1.

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 55aba82b0fe2..c464f5a8d207 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=24.1.0
+version=24.1.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
 changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
 distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="52207eccbf8dc8cad208f55efb6ba692361ef6de12faa0716b36a2a123db5522
- 01cdb5c52ada9275e8a30878ef1b709283694a23b877e2f2519fe1940c6b2136"
+checksum="f452e564737131c4425c6784024d9b9fb83d24a4775ca7fb1f03e21a466137f5
+ e33e7785e34892506e60def6d6e2b38b2bb87edd9fdeaedc53913e6d0fb66ea0"
 
 font_dirs="/usr/share/fonts/TTF"
 

From cb20a44a0f41ce3762df7d2df7c8eb9cd5ed878e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 5 Jun 2023 11:56:36 +0200
Subject: [PATCH 0252/1853] linux6.3: update to 6.3.6

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

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 35b5178363f6..135f88fab13f 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.5
+version=6.3.6
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- bf66d350e6a4727b8ddbd3a14ddc9033c4b80ffb6d4688269917e1a1a5e4578a"
+ 0bceca759d8c1531197b369668a8aa800b3733fcbe87cc0ecf8f014389c16fd8"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1f8ce0ed1c1fb75e950ef8d88a174618fe2d312c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 5 Jun 2023 21:50:52 +0200
Subject: [PATCH 0253/1853] lazygit: update to 0.38.2.

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

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 77ca7aaf2703..aee7817a109b 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.38.1
+version=0.38.2
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ 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=144f55267df7d51be9ae1dc3313707a7f6bcdf0c42eb330667c1fd661dec01b8
+checksum=2e727db952022c0518443d18c9b8a97a882970b93c5ab198ff33bb8ed2166c2f
 
 post_install() {
 	vlicense LICENSE

From 6facc326a8390788d1eff0f15371b130ace7f403 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 1 Jun 2023 13:55:30 +0530
Subject: [PATCH 0254/1853] tree: update to 2.1.1.

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

diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index b74113a90c14..3f819f254a8c 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -1,15 +1,15 @@
 # Template file for 'tree'
 pkgname=tree
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=gnu-makefile
 short_desc="Recursive directory listing program"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-2.0-or-later"
 homepage="https://mama.indstate.edu/users/ice/tree"
 changelog="https://mama.indstate.edu/users/ice/tree/changes.html"
 distfiles="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${version}/unix-tree-${version}.tar.gz"
-checksum=e9f829a03996451bcf90fae4fdee4285bece6dc1a89de92a3f8e6cad29e03c71
+checksum=bcd2a0327ad40592a9c43e09a4d2ef834e6f17aa9a59012a5fb1007950b5eced
 
 do_install() {
 	make MANDIR=${DESTDIR}/usr/share/man DESTDIR=${DESTDIR}/usr/bin install

From 6b0efae720b1c5a07895b614eda2fb7da2e359bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Jun 2023 23:07:55 -0400
Subject: [PATCH 0255/1853] vivaldi: update to 6.0.2979.25.

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 2156fa12d550..12b5400171bf 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
 # Permission to redistribute is granted.
 # see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.0.2979.22
+version=6.0.2979.25
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ 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=b8dda705696e965c693993f63f3542c0a70d98ef579834b75a214e729d1d3aa8
+	checksum=9b737b76f3ad4676b71582d97643e301f19117828027c5e50e5a469d3a00c156
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=c7bc016ddec176eae758615e1c3e6461be6dd3fcc611741a5306c79cd03888c1
+	checksum=b918fd16b71943de7f2775ce9bf8ad4637e35a41a05f1a3aade1d5eb2667c012
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=948fed1e8f50a0f94e91985fb86e99b3557d9e0dfb55afa9dc6e840d8a071ba8
+	checksum=e0dfd628ca39962f3772687548d181a0fe5e3be823f8935368514983060b101a
 	;;
 *)
 	broken="No distfiles available for this target"

From 2903b2ea6b290064f31a573f8a9433dbad133ea0 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 28 May 2023 17:48:18 +0300
Subject: [PATCH 0256/1853] gc: Update to 8.2.4

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

diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index a62033103920..61935cc0b664 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -1,6 +1,6 @@
 # Template file for 'gc'
 pkgname=gc
-version=8.2.2
+version=8.2.4
 revision=1
 build_style=gnu-configure
 # libatomic_ops is replaced by C11 atomic
@@ -11,7 +11,7 @@ maintainer="Ivan Maidanski <ivmai@mail.ru>"
 license="MIT"
 homepage="https://www.hboehm.info/gc/"
 distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
-checksum=f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0
+checksum=3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/include/gc/

From 78d2d0ce4c689b9ddedf6f82cc83427b60401fd6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 00:55:54 +0200
Subject: [PATCH 0257/1853] firefox: update to 114.0.

---
 ...the-vendored-glean_parser-for-all-of.patch | 39 ----------
 .../firefox/patches/avoid-redefinition.patch  | 15 ----
 srcpkgs/firefox/patches/skia-sucks1.patch     | 77 -------------------
 srcpkgs/firefox/patches/skia-sucks2.patch     | 44 -----------
 srcpkgs/firefox/patches/skia-sucks3.patch     | 32 --------
 srcpkgs/firefox/template                      |  7 +-
 6 files changed, 4 insertions(+), 210 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
 delete mode 100644 srcpkgs/firefox/patches/avoid-redefinition.patch
 delete mode 100644 srcpkgs/firefox/patches/skia-sucks1.patch
 delete mode 100644 srcpkgs/firefox/patches/skia-sucks2.patch
 delete mode 100644 srcpkgs/firefox/patches/skia-sucks3.patch

diff --git a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
deleted file mode 100644
index 3a7118ec69ca..000000000000
--- a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ahochheiden <ahochheiden@mozilla.com>
-Date: Sat, 6 May 2023 21:07:09 +0000
-Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of
- `mach` r=firefox-build-system-reviewers,glandium
-
-Differential Revision: https://phabricator.services.mozilla.com/D177340
----
- python/sites/build.txt       | 1 -
- python/sites/mach.txt        | 1 +
- python/sites/python-test.txt | 1 -
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/python/sites/build.txt b/python/sites/build.txt
-index b43f7680d200..4e6f6c51d9ad 100644
---- a/python/sites/build.txt
-+++ b/python/sites/build.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pth:third_party/python/vsdownload
-diff --git a/python/sites/mach.txt b/python/sites/mach.txt
-index b9fafd0b9c59..a18691184312 100644
---- a/python/sites/mach.txt
-+++ b/python/sites/mach.txt
-@@ -78,6 +78,7 @@ vendored:third_party/python/esprima
- vendored:third_party/python/fluent.migrate
- vendored:third_party/python/fluent.syntax
- vendored:third_party/python/giturlparse
-+vendored:third_party/python/glean_parser
- vendored:third_party/python/gyp/pylib
- vendored:third_party/python/idna
- vendored:third_party/python/importlib_metadata
-diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt
-index 48cdcd2b8f48..74889365a22b 100644
---- a/python/sites/python-test.txt
-+++ b/python/sites/python-test.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pypi:pytest==7.0.1
diff --git a/srcpkgs/firefox/patches/avoid-redefinition.patch b/srcpkgs/firefox/patches/avoid-redefinition.patch
deleted file mode 100644
index 867d37c62a90..000000000000
--- a/srcpkgs/firefox/patches/avoid-redefinition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Rasmus Thomsen <oss@cogitri.dev>
-Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
-(linux/if.h), leading to redefinitions. We need to include net/if.h before
-linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
-Upstream: No
---- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:32.359751046 +0200
-+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
-@@ -31,6 +31,7 @@
- */
- 
- #if defined(LINUX)
-+#include <net/if.h>
- #include "addrs-netlink.h"
- #include <csi_platform.h>
- #include <assert.h>
diff --git a/srcpkgs/firefox/patches/skia-sucks1.patch b/srcpkgs/firefox/patches/skia-sucks1.patch
deleted file mode 100644
index cd9eecccf610..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
-https://bugzilla.mozilla.org/attachment.cgi?id=9028600
-
---- a/gfx/skia/skia/third_party/skcms/skcms.cc
-+++ b/gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -30,6 +30,8 @@
-         #include <avx512fintrin.h>
-         #include <avx512dqintrin.h>
-     #endif
-+#elif defined(__BIG_ENDIAN__)
-+    #define SKCMS_PORTABLE
- #endif
- 
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
- static uint16_t read_big_u16(const uint8_t* ptr) {
-     uint16_t be;
-     memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
--    return _byteswap_ushort(be);
-+#if defined(__BIG_ENDIAN__)
-+    return be;
- #else
-+    #if defined(_MSC_VER)
-+    return _byteswap_ushort(be);
-+    #else
-     return __builtin_bswap16(be);
-+    #endif
- #endif
- }
- 
- static uint32_t read_big_u32(const uint8_t* ptr) {
-     uint32_t be;
-     memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
--    return _byteswap_ulong(be);
-+#if defined(__BIG_ENDIAN__)
-+    return be;
- #else
-+    #if defined(_MSC_VER)
-+    return _byteswap_ulong(be);
-+    #else
-     return __builtin_bswap32(be);
-+    #endif
- #endif
- }
- 
---- a/gfx/2d/DrawTargetSkia.cpp
-+++ b/gfx/2d/DrawTargetSkia.cpp
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
-   return surfaceBounds.Intersect(bounds);
- }
- 
--static const int kARGBAlphaOffset =
--    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;
- 
- static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
-                              const int32_t aStride, SurfaceFormat aFormat) {
---- a/gfx/2d/Types.h
-+++ b/gfx/2d/Types.h
-@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
-   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
-   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
--  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
--  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
--#else
--#  error "bad endianness"
--#endif
- 
-   // The following values are OS and endian-independent synonyms.
-   //
diff --git a/srcpkgs/firefox/patches/skia-sucks2.patch b/srcpkgs/firefox/patches/skia-sucks2.patch
deleted file mode 100644
index 1a498f8711dd..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# Parent  aecb4600e5da17443b224c79eee178c1d8e155e3
-For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
-right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
-
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- a/gfx/skia/skia/include/private/SkNx.h	Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
-     AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
-     AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
- 
-+    // On Big endian the commented out variant doesn't work,
-+    // and honestly, I have no idea why it exists in the first place.
-+    // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+    // which gets a 64-bit integer, and FromBits returns 32-bit,
-+    // cutting off the wrong half again.
-+    // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+    // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+    AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
-     AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
-     AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
-     AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
- 
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
-             //   ~~~>
-             // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
-             // c = 0*aa + d(1-1*aa) =      d(1-aa)
-+
-+            // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+            return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
-             return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
-                  + d.approxMulDiv255(aa.inv());
-         };
-         while (h --> 0) {
diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch
deleted file mode 100644
index 4bf77e684405..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
-
-# HG changeset patch
-# Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
-                     On big endian this is broken and instead of fading out, the 
-                     tab gets white and the font transparent, leading to an unreadable
-                     tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
-          to byte-swap the correct buffer, but I could not find it.
-          So the next best thing is to deactivate the fading-effect. Now all tab-titles
-          are readable, albeit not as pretty to look at as they could be. 
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- a/gfx/2d/DrawTargetSkia.cpp	Tue Oct 22 12:27:22 2019 +0200
-+++ b/gfx/2d/DrawTargetSkia.cpp	Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
-       SkCanvas::kPreserveLCDText_SaveLayerFlag |
-           (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
- 
-+#if MOZ_BIG_ENDIAN()
-+  // Pushing a layer where an aMask is defined produces wrong output.
-+  // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+  // Therefore I deactivate those layers in the meantime.
-+  // The result is: Tab-titles that are longer than the available space should be faded out.
-+  //                The fading doesn't work, so we deactivate the fading-effect here.
-+  if (!aMask)
-+#endif
-   mCanvas->saveLayer(saveRec);
- 
-   SetPermitSubpixelAA(aOpaque);
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 85a14d933c65..3bf78b037413 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,16 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=113.0
+version=114.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
-distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627
+# distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz"
+distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"
+checksum=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6
 
 lib32disabled=yes
 

From bfa7d334aa8087d6c82554b980c69105c4f987ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 15:36:35 +0200
Subject: [PATCH 0258/1853] firefox-i18n: update to 114.0.

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

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9c721ea35982..7c94212c279a 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=113.0
+version=114.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d36df7a481a96ab6ac74ba4cc33e0ee72e91caa2bfe55b97a17d9794d2a3c4e8
- 21d502f5e1d25ee0ea4b3709afc7e9575f629cd15737e21aed19c1f148fd57d1
- ee8d0193cfd2ed426044352d957026e91f31d6c1de680080e6d27ae08cf70ec1
- dca830694cccbecd46e74950d14fa46c3f43614551fb7f75e3b537275a9d50fa
- 2b84cea51df01c5959d1b1012f3ac2e411b9da26b2264b18b59553a814f3ef8e
- 4fe334dce9241ad92b93e09c66124d42841a1e724e359cbb0c50e6000f2f9fc5
- 8b895a7879c8bb652ff56e390e0da4889a4774f30f1976f11b13afe8e7a72994
- 6a6a2cc943c146a98180ed5e862a2c279a08702f89d4074beec01a64f55b98a1
- 06144c4d43188e20d3325c2799a61b87808b587dc0136ac817d890a0cd91bf25
- 0f3d153bde7f1a6afb2a598fe98e95c41f5d14f78191db7b353220557e40e5d5
- a3ff7e5536d4ff85b06ca4f8ffacee45cf1ba73c0662593a14bac544139cc3f9
- 85be7ecde1bfeea1f1f477f2b808de51c74f01d2228966f31e60abe06279049e
- 156747a491aaf8744bd37a085a5b3959d1c00a4edac14ed859690cf980aae709
- bd31e4c6331cc249f114eb9ef7a454d99482fb05c0f0f0e8d4507948d7c113b5
- 0373f78a7bbe79d849c11bec495893c5e99f40c20d3b674acb9704126cd49741
- f6c3f8edc69a07692a8fba5ad37a04e46f246bb9e2f085da5a97caa024d19828
- ca9c9f07abd3feec4dc6cd375f3a2c8841ee19bd69585c6d70ad950c18879adc
- 3626081b50619d66cb88e14eaf71caa97a2b48d79f69cac3a5bb919633f87d04
- b0a4b03cb247c8f0c87c9dee819cc47ff6ced32cb3c89773233a08963975ea36
- 6ae2fdf3c67a676112befb69b0c66709f2acadfeb1d7696315e331cd61dc96bf
- 998bd6ee63d6388c0631524992d7c4d050f8f005d37b0c593e531bfaf6a4a2d1
- 3729bcd73ccc966f0d73f7e32aadb2bfbb9559466c69550602bedad2a78bf500
- 06acc903cfbb6b7f683ae738b733972e451ab6a14b28f7975c2884ae59701ec4
- b1938f51754971be1fa5fcccccdfcba6fa63a845746e47f666efd050042141c1
- 57400cd4597926629ab8f22e5f4722e0234f5727441906708786bbe6843fbf22
- fd42ffc5e14bd3526d8fea876a1e18df379e5f75c1f10368641dee1d6eebbb23
- cc351cb54675a908b20226b13354e189b6a3fc38a5c039116b1f2258af0f479f
- df0794bb5b2e78aec73ecdc779458e9a86f756b5e2f37acec6e227543dc1b3d0
- c750bac67017e0784cf58fb06e92e2bc52688a16a3773825a1a6e0df84ef233a
- a4a11e68fcd10aadd62b0cb10533ffd43a1c98a3e1db535e119cac0df5613f3a
- d489aeb8ca63f97778fa309d43529838349918414188dce598d29b20c59da533
- 438efaaae1867ab1b37fe23283c2bfe666d73288c76f482f339bcdf27a4eb7dd
- d52e1c96fa56d3bd8f152bb4b2e9c9a9e2edc2c4fad81869b1962b06ebb4c283
- 9f442e9e8c819791cb78fe655c53129b9a5d0b8090079ab74b45b7f7d1515a5b
- 8a17ed68d41be60e18ecbe2becff41912305e7fb86384b7d1fc89dd767fa21d5
- 891591bcde2190b87be25d5d57777608b8f8cea06d58c8a60d09d18809b42856
- 9e57d9348c392adfbb14debfc3aa474116007241109ca421a369ef5865cca480
- ea9bf771e9e792a2a1723093c3f3d522681f638c5dc30c0dae6dde0a68648961
- bf9e2e72dfcdb609064a0c0f503001f270257045b3f0b455470bccfbab0476b9
- 0f4f2eea09738aea94c0afec45f0bec34dbae9c4bd922634c82735d3a703f292
- bc228183f6e3c563ade71fd4c64784aa0c0a0e5e108ac04c055e9bcd9836bb86
- 95c0605bffcef0d327830fa14aea895d54b4c18cc38122e49ce115c9a7afb47f
- ee2753898e65d344ad7bc9642ec0a2e05a7880ebee03112c1190cd001c15b4b9
- 9a14eae682acd9044b4227adf33ec1d2e0e4ecad75791fecfd355871d27eb047
- 60db4ea466aa513ca24c4051f0c048bd09e6feb0935b7789cbe4331ad4888cdc
- 9f75ea79337d72287bf6738fb62f6f5abb0bd67e306c331ae1feb412ec160482
- 8a8e4d03059b5bd2ed73870e89f31b20b6ef4d644487d2e048eb422f59a3649b
- 26e0a1db066ec73688d607243f90c98b77806cd67bee504345f6de1e24915f4c
- 7c274bc5c13c6e0b7b2e6674f1e2af791b81eceb0bd722ef5a80e921a97bd903
- a34e84cd85b434885ba7b7b5824b293d8a8a9f23cceb23f79a802236eb6dde1e
- 9aaf343698c7666394b393154ffcf248d87d226fe577e5563afd2de602249c2f
- fef917c385f92ac3dc95aff1d2e9f78eb7afe9d74895c87a7051d770ac887987
- 11729bfef6adcea46e77b1c96dc2b40d3989ffa36ba65f3782f9453f5533b2ae
- 177164301e02565efb226aa525e5b5b2bfd7cd904f5456e15350284f31f3f223
- 45310e7db684e38f404fc4b805e39bbe7a5bae4028beab38311e6aaf2a31fe2b
- 5a25567e3c83bc7a57d16df9f5f669fb1b4e90f5bf1c483280cac6a00e86537c
- ce1295de439ca8476195ac7c4041608669705943c60e883f678a20f0cb7f58e6
- 075b9a3867ddee26ad61441939b4d431329b9605bb86125b29e719e81a0a2c68
- aabf6cef613b20f1fdecd91fcc347275a7c1bc0ef1d18e55e5a245bf6735818e
- 4afde707b110688d130a865969a5ebd78cc7876f74ac151624705fd9f3a8e275
- 3f11b5ea15424f75544378a913eff10f2f9802610541aa24dca72ee2503ef35d
- d0cb5f452064685162686ba49a7b4f5ec6998c726d415c72f178b2db4ef523e3
- 917fe99ea4ce119c418d52d071e6662c8cb9c6190939111142a1daabc4091fd0
- 8eafb1a687d8b8072c6caec83f9ca80d03699f0a182629c2087fe77c2f354fd2
- dcd54b26247e4563d675c612ca7c471fd2588fe9beda9c077695a2f5a673cdde
- 93e71b7dd69dec0d992829ecd7362369a8a2c6070900d93879693d4ea5a1ef32
- 5ba8d4c71ff5b915e20d9d5eab5f57d2daf971cf1b3f0b12dc2fd25755bf6303
- 6b6a82733fec2611d62fafc00dd3de8bc7f7018a8ea9c1f1f7f8d11b599e2a23
- a7cb00209f94b3cb18db773f6d7ab568c416c3604b2d109135b9521f89e2371c
- 0f14e9cee9d13549d418bde6fb20c2827297e673bea582ac1cf085b8d763861e
- 897f391a66e95dc41f52c480a162239f76bac3cf7209152e7e610a19facee29f
- 6a5fdeefc438825d60ad5f8ff14615de43c4a332f01c275e9c2a4a66dd5a4fdb
- e1ea24d2cfa6fc4b490ac81755920b9b8f6f481666d56a66be6fde2539b2080d
- fcf415b511a74d57b1cfa92a22eabd5e3bc30f42642c754e07c429b8caffc714
- 38021f594397a1078fb5be7d584a15dae70f9663681f6f33ef9d14f2a3b91d93
- 32d56004e40dc59240060f0eb84bb761a67f4545d73856775eac41c79c25fdec
- 0bac15f959317aab370995793e585b331b181536b5b40cfcf59100b81a086f38
- 54ec4111d38fd2c4ce4dbfbb86a4517466102d1fd871f6f4f73e4f8cf59a998e
- 353fb938fd4641fd65b10cf54d9f40f703cec74a3d5316126478903eec3f9435
- c43a49feff2ffe483599e286631a2f3bbad61fe90182b8d0acd5468115590971
- f9ebe4290302e434ac774cf21bd5397d438c9e6478b778bd2b2c2bd5f95c3399
- 19a21659c6fb216e5d594ca35f62453de7ceaf88408a52444b40f8dc23d64f17
- 1294a7fdf7e36a3abb2b89222e97d4aaa6dcc2b36bff5319843a64122c692160
- d9f184a76008b8d2be832086b1f53baea3eff988993fd683c5cb2bcd1d240f4f
- c38edc9bfb0ac02bf4972811f50baa3cb237c1e7d626237b8c7c08d520e1246d
- afce22b71757920587de3ff5a5c12fe3dd7b53daf9110ffde6c09c69545edd0e
- fb754a736658035849341f2d01d1f48bb06b09c7f1ee9e6749e0580c7c9cb903
- 30c5079f9c514b7b9e8bc44fd67bd44e4a5b42457c9c76a2ca606a8bf5d62bde
- abf2d8a5d2c8736ffbede3844101a3bd9ea977a0dbca091c2b87871e3bbe96c3
- 7fd38252dd62fe45a732dd322e920ab90533d533f947322db80c48773262a827
- 01db872a78484ee2ed53060810ab46927572d4af92c727b0e03e5337ad2a6fa5
- 944cd12f408e49e0fd4bb79205f9ce9ee007b64d923a3c1d83c1e0cc7f494621
- 6bf5b9d2f30ded74ebdf32933148fe7a478cffff9353379b72f0482ea0991f10
- 1da211f718c88aa8252be97c7a5703d54e9c65599a24121d80853174e9e7dd60
- f2fdd09021e69566d750e34404866235f0f395ead48b36db35738192de557ad0
- da39e10a5598ab69b756872efcaad594fe52dda0e533e7a0d56ad1cdc8859a43"
+checksum="c0f9a6c3d766c08f3676602696d8798b679ec1388cd5392a1b8668ffee145ffa
+ 26e309adb10d6ee133a5e1d47d969b04da06a9aaafb915080ab6d039bd7c9995
+ 5275570c342f09f90a735bb264810c7f4ae1fbc8e18d9a4944a95569682daf62
+ 4f6b16a79b454c72f8fdc0e4800e7a085c392a3204cf2173fb85853568820fe9
+ 34423da9b8cf41b280a3c6dc998da72004bc2ea0245dcb59af6cbe26a6683b68
+ e37ca54dbd3506ca177e812305c5ba870584131a16958b8c46c7f2159172982d
+ 0db3c23472f6b45d158b9de5220040821e89be207767910121040e9cba949f92
+ 38e9cccd6791e769fd9016c2e0a3d5aafb6a2090c1c60326f03907aac0991325
+ f3bec565c0c4c1bd7b659e4c4922d2d33ed5ebc1dd81e9d7b5a23c510da325a0
+ 045ff5e6a99bacdeb1421061fb01a1fc71a76e12c9205cdd1fc58391cd89a613
+ 7aa85724f5b31d31c3108700bf0d2efca74105c5e0df72c6a79b1913f5058152
+ 6a1fd174df2343abe8a74f219c32cbf457f3914c0dd3c96949d947dedafec8b1
+ 559b6c47830caaae13ea507cec2268e4469ee1b90504cdfa1252e5d6295d9a7c
+ ff96e801074a1343ea9a122d3078250a961eb7da29ecac542a0c84186a17f010
+ d0f973e086135861ce2e5e26e1e56bf9b21503d06fb732c8b918f426d55348f6
+ aee67eb0b05c7c06b23aca4af3e473ddc75c9570a3d866675bb30c0fa409f2c0
+ 20e9c7514e8e4a135c36cfd32177fbb000072e2fe3b7a38ea3e08ec2064d9633
+ 6adfd2d6f9667472b0665f0370c2eb582355ca370ea046028741b91c16aa76b2
+ c2a9d90d8a46a3f0070c031c48dcc09fcb33b8d571881578ae541984f0f98ff5
+ 797686f4f8ad9279e8b080ba39cf52f049235ff4ce6e61ca0fe65f9d479a2d45
+ 9ea3dc01ba7d9389d4514626f5cb1597063f7e68401ea13522a74ac777cde4cb
+ 3e02c13156f87af7a25e826f8f72487004c3b64675be73e53eaa55f45a4b0147
+ a2561641f64b428f34ec4d5215b97a6ae945df31b347c282e4f33a1fe82c5bc1
+ 93a4955b0952613b931c2574fa9c6ed251a08df32f46304b3ead002bbe701ec9
+ f1bab7c5b208ebb5ac87a5006a236fe09727be260bdd3b0f7b520a0ed91366d8
+ c7ff4fee557227e6dbf87a1bd12205217710e41028066b0da3ed46adc3df2944
+ 7f6f51cc45674f07f905107d2b6ea1770c39ccf1b8a5782e6bab964fcccc39a2
+ a28453e1d0727297918fb3a83bd68090598c5ddd0386e5cbd21b5ead68cd8d2e
+ 5b88a842efc8b8adccf314734e56ef5570e8823614f03b1023e7f3ba6ae904bf
+ 0f607d174af36790046d1ce2219dd341e557af524f22d8afa504538e047d9081
+ 85a57d3d4746f6e43c3f24ca9d7c2d873ba48166772c0a127485381b4017d9d2
+ ed68f1678df1cedc204c2ebc6363f5ccc82562f684f45455169ffce3a94860ab
+ da0e4e3abc51b101e84450ef84f77b3709ef21d7db3f401f4449fab69966ff62
+ b474686d3b54e00ef1c3606dc432c64a4f3b1f56321cc1b28cd0737e7e313ab8
+ c2c27f1b46fdf4288fd04ff8554443542ce6821cdb7c13e3ddc7bf51c4b62c0a
+ 342230adbb31f5e07b5a89ded0bd860fe76a1cb638953383de5c690fead75050
+ 48d5d27014991eebd2f3cd86ddce13807753fba0c67af32f4665db3685b45ee0
+ e9a5d2be6f3e69570abefcf58390ffecf911efcbb096601f6ea326797d9950e3
+ 0185575560595cd58b8526ba5450c395b0c513e360b523e57be37c3d0af05744
+ e5abcec84157c0085f99b2f4d0cce258d3dd496a8edb7fa208937da8fa7436a3
+ 4d3f1274da892de438c0d0e1003dd06509a7c21b60e7df3f91cbec463021a9db
+ 61356d776b6341a0802ad6974bfd133db0b93b5430eb55d21167049a8626b603
+ 8968f1a77e30680209df33cc6282797ef0e24164ca65141e232d8bc3fbff8123
+ cc4769a1372fe19d1d64afb2660d71eb012f518a731fe2a3b1fc4d38cab285f0
+ b3cfcc9e008fd1800d6688d5180e9fbcbb0336e16e444f81715ffca4d1ddc96f
+ 96592a74d16993e03fd202be691f2e3bc9ac6e2d9fa50a6de0670f46e71b203b
+ 1644d3bfd7e4c2b537a7a52b25b7f9cd808ddbaf86e026be91536c62252cd792
+ 63e53aee3ca63d086778c3b66d2e0530c23e901dc4e2a437e8bdba7bcb6ee720
+ 49e78397cd9d8ec6ce22f6503f89132009ecf028719f5b5ddd1164922184ffa5
+ 12ec633c84011216239334c2f08eaa7ec4e4fa4f9c4d9277d6275a84f6df467f
+ 825410ee4860f3466803725a7a604530b5641779f819f48e3fd47b5831a47659
+ cab3fdae9481f6b8d4f81b91377771022de050a5da63d970b0b35c9a4c8c82f1
+ aa56bd371cf1096c65e2c76073d25d69ecc8018be8487e14cac370bd9f5d45b1
+ 0a18c294ef2a89150acc6521898bed8276806ca607bbb87c6e01c30cc3f6f697
+ fc5e0b80bb4dda023a18d46f3f686981a13bfb364d6d29e4e46cf1f58381daf2
+ 6f15404bca77866c663e8ba1c727ff40007700ca0d36f0e5559e417e654d3b64
+ f0b77a56215baf8546b06a69e7211319af04e3baeb5c06a0fe0519787d949d8c
+ 0a8c4f3c3f541cf4be8ac72c5d8e9cc85852568ece273f4173c71eb637d406e7
+ 23a448de4027b9b2b7d3ad46d3a53411289a2d9b8fdfcbf2b9d9094d0269ff34
+ 3890f6fcc967db23914ee090edd31ca03622e359d7ca7fe5ebb92a203d63f17e
+ f14464fee583c0afe7022db7e6d5dd607782a5f04c9e0caef7dfab6ab135f609
+ 82baa25118153388a0ab7b9c2ec4d89ad52c1acd380141e0bb301bb698371563
+ 39da2bd341d58d4686b2609772d2e40c04183a4046ef4de5bf02821cd550d864
+ ca2e41b6c29c062f40cbf8b5ebb9badfde0457350169b6ae201f607f3dc25813
+ 752168e60f96d2b01275afc1ffcf7b8ad9f3383a05d6f99c76d7f8b2052189e9
+ 37cac85f7af9cb2edc726cb8336dead32ed2f10ab6e72547c799e0dae455148a
+ da58c2ba13252a42551629e66771e8254fdc4e80fff7e7fab40baeec8adc201c
+ 050b33dba495f812910ee3a53affd7eae61ce2456b148a33e1883e06c6beb73e
+ 16d619c02edb3179a30f7af5aea14d0c01266d46f0663b76fbcf71de29b27af8
+ 1eadb108e6271cd74ef0a3328dd277cb92765ff0b8d72d922a979d0ed9710944
+ ac5352956096a0eb869759cbbc0e04acc95a3be677b5ef56f2b237ae74567632
+ cc2035801a929b67b97d5185480757eb51fd8063e360a7bd0d2cecea6edda2e4
+ 62d73008f29ffc7078d1e2bddb36f360044f28a3bab820832b6ea82b07582048
+ 129981bf7628f49fba9522636211405b66fb14159f76c557b93d6d810c672cc2
+ ba6a082b4c41594d1fa671269357f7f814c169f0c62e343164ea86957cb0c748
+ 33de6d30b7a9337b299d083bf5ede792f785c17e4bf3a9c85dcecd7abb0ea4ef
+ b8d14e07fdbd034d4241de6a77c6bfed38b54726ec770ea25442a947fd9a821f
+ 86436adc98e9f449ca2dcdf076042987400d62f8acf9458abf7cd98c327751e8
+ ba69da64c6ab3d416759818e420259023a4d64434b27cb604d6491737e7e4a33
+ ff239bdcb54a03dad3210b9457231e56a38e306220ec981c1f29307d73620fa4
+ 3ebb85c2974c9d69f4e9c816f338da304a58469034997f83f0cd9056c4acb6d3
+ 5315ff187fe3fddfc39000a7164ff3b42938059978eb322ba222a43d2a1145d1
+ 0f768dd1b87e34b347e32d5f06691b68d7747654faf2586a673154d777a2765f
+ 802537e360788ec58d697c17cd0333e8fcfc92ce3161d19cedc2a4841825d0ca
+ 6722b217cd12f3a6502f14865fbf02bae8dceeb98f7a593840a88d57829cbbed
+ a0d85d09f3bda6a1416240a252ec4cfc916cf37b98c72185a6b97e3b7b50251d
+ 0a48ee5ae79e98d8b07adfef4eaacf93b19011ec3a667bfca3fc0098e348ab8c
+ 4b559d090fe138fabc031b27b1cf5a0d67c0a036f646fa4430fe8c4c9f6b0e37
+ 3c9b56539542ace8a6481400800367a07e980ebaad213caba3e5fe2da15bef9b
+ 0b27ce7aa8ff4b09d5f42c1525d89505d2b159c7d9051b3e1dcb60ed67a0be5c
+ b9fcbc9063278b77c652ed738913c1d9506306796af41c42fbe5ff2bae721fe1
+ 625c2e19caa24046e624383501a395bdbbbf39594e742cc40e31d85cdc3eadce
+ 5b397388706d49d413b745ca17f0776f8db6c81b3b6001d0490b3f1163d50ff3
+ 03bb0e45f2038e8dd5d57ad131c163ddcd135cbf1b42371670bef4fa2fdf8da3
+ 8b11f723ba5a973cf3639fa03e860e29f7427c8d8e68d278d5770ec83a6fb903
+ 6ded563d8f5ae096ed6f3c58dd19277333dae81fda96832a50a5040ef79ca35b"

From 0e2b892efb13dee02decbcc971fa6ec4e4809b21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:06:35 -0400
Subject: [PATCH 0259/1853] New package: python3-lazy_loader-0.2

---
 srcpkgs/python3-lazy_loader/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-lazy_loader/template

diff --git a/srcpkgs/python3-lazy_loader/template b/srcpkgs/python3-lazy_loader/template
new file mode 100644
index 000000000000..492c98124834
--- /dev/null
+++ b/srcpkgs/python3-lazy_loader/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-lazy_loader'
+pkgname=python3-lazy_loader
+version=0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="Populate Python namespace without incurring immediate import costs"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/scientific-python/lazy_loader"
+changelog="https://raw.githubusercontent.com/scientific-python/lazy_loader/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/l/lazy_loader/lazy_loader-${version}.tar.gz"
+checksum=0edc7a5175c400acb108f283749951fefdadedeb00adcec6e88b974a9254f18a
+
+post_install() {
+	vlicense LICENSE.md
+}

From a41ca937b2bbc28476f4c82aecaa7f5895c96096 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:06:36 -0400
Subject: [PATCH 0260/1853] New package: python3-pyproject-metadata-0.7.1

---
 srcpkgs/python3-pyproject-metadata/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pyproject-metadata/template

diff --git a/srcpkgs/python3-pyproject-metadata/template b/srcpkgs/python3-pyproject-metadata/template
new file mode 100644
index 000000000000..fcf5c5d22593
--- /dev/null
+++ b/srcpkgs/python3-pyproject-metadata/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproject-metadata'
+pkgname=python3-pyproject-metadata
+version=0.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core python3-wheel"
+depends="python3-packaging"
+short_desc="PEP 621 metadata parsing"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://pep621.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/FFY00/python-pyproject-metadata/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyproject-metadata/pyproject-metadata-${version}.tar.gz"
+checksum=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67
+make_check=no # tarball includes no tests
+
+post_install() {
+	vlicense LICENSE
+}

From f810686900e1a4a9b424df3b29472f99981c5c1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:48:57 -0400
Subject: [PATCH 0261/1853] New package: python3-meson-python-0.13.1

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

diff --git a/srcpkgs/python3-meson-python/template b/srcpkgs/python3-meson-python/template
new file mode 100644
index 000000000000..57f3b808c83e
--- /dev/null
+++ b/srcpkgs/python3-meson-python/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-meson-python'
+pkgname=python3-meson-python
+version=0.13.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="meson python3-pyproject-metadata"
+depends="meson python3-pyproject-metadata patchelf"
+short_desc="Meson PEP 517 Python build backend"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://meson-python.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/mesonbuild/meson-python/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/m/meson_python/meson_python-${version}.tar.gz"
+checksum=63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618
+# tests require custom-built executables, need reconciliation with xbps-src env
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 4720168046ff237342cd320646f887a54a5c3a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:09:26 -0400
Subject: [PATCH 0262/1853] python3-scikit-image: update to 0.21.0.

---
 .../patches/meson-cross.patch                 | 93 +++++++++++++++++++
 .../patches/numpy-version.patch               | 14 +++
 srcpkgs/python3-scikit-image/template         | 59 +++++++++---
 3 files changed, 151 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/python3-scikit-image/patches/meson-cross.patch
 create mode 100644 srcpkgs/python3-scikit-image/patches/numpy-version.patch

diff --git a/srcpkgs/python3-scikit-image/patches/meson-cross.patch b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
new file mode 100644
index 000000000000..8807a612f665
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
@@ -0,0 +1,93 @@
+From 8789a3365282a4f5604e090a10c960e710d240b9 Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh@sideband.org>
+Date: Tue, 6 Jun 2023 10:05:25 -0400
+Subject: [PATCH] meson: allow proper selection of NumPy, Pythran in cross
+ builds
+
+---
+ skimage/meson.build | 62 +++++++++++++++++++++++++++------------------
+ 1 file changed, 38 insertions(+), 24 deletions(-)
+
+diff --git a/skimage/meson.build b/skimage/meson.build
+index 28c831312..c168389d7 100644
+--- a/skimage/meson.build
++++ b/skimage/meson.build
+@@ -29,37 +29,51 @@ if is_windows
+   endif
+ endif
+ 
+-# NumPy include directory - needed in all submodules
+-incdir_numpy = run_command(py3,
+-  [
+-    '-c',
+-    'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
+-  ],
+-  check: true
+-).stdout().strip()
++# Both NumPy and Pythran require header files that may differ between the build
++# system and the host system in a cross-compilation environment. To accommodate
++# these cases, we can query user-defined properties that can be specified in
++# the 'properties' section of a Meson cross file:
++#
++#   [properties]
++#   numpy-include-dir = '/path/to/numpy/includes'
++#   pythran-include-dir = '/path/to/pythran/includes'
++#
++# In the absence of explicitly configured paths, just run the build Python and
++# try to query the Python packages for their paths directly.
++
++# NumPy include directory
++incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
++if incdir_numpy == 'not-given'
++  # If not specified, try to query NumPy from the build python
++  incdir_numpy = run_command(py3,
++    [
++      '-c',
++      'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
++    ],
++    check: true
++  ).stdout().strip()
++endif
+ 
+ inc_np = include_directories(incdir_numpy)
+ 
+ cc = meson.get_compiler('c')
+ 
+-# Pythran include directory and build flags
+-use_pythran = run_command(py3,
+-  [
+-    '-c',
+-    'import os; print(os.environ.get("SCIPY_USE_PYTHRAN", 1))'
+-  ],
+-  check: true
+-).stdout().strip() == '1'
+-
+-incdir_pythran = run_command(py3,
+-  [
+-    '-c',
+-    'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
+-  ],
+-  check: true
+-).stdout().strip()
++# Pythran include directory
++incdir_pythran = meson.get_external_property('pythran-include-dir', 'not-given')
++if incdir_pythran == 'not-given'
++  # If not specified, try to query Pythran from the build python
++  incdir_pythran = run_command(py3,
++    [
++      '-c',
++      'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
++    ],
++    check: true
++  ).stdout().strip()
++endif
++
+ inc_pythran = include_directories(incdir_pythran)
+ 
++# Pythran build flags
+ cpp_args_pythran = [
+   '-DENABLE_PYTHON_MODULE',
+   '-D__PYTHRAN__=3',
+-- 
+2.41.0
+
diff --git a/srcpkgs/python3-scikit-image/patches/numpy-version.patch b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
new file mode 100644
index 000000000000..9d3a96588edd
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
@@ -0,0 +1,14 @@
+There doesn't seem to be a valid reason for this restriction, and it doesn't
+impede building anyway.
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -145,7 +145,7 @@
+     "numpy==1.21.1; python_version=='3.8' and platform_python_implementation != 'PyPy'",
+     "numpy==1.21.1; python_version=='3.9' and platform_python_implementation != 'PyPy'",
+     "numpy==1.21.6; python_version=='3.10' and platform_system != 'Windows' and platform_python_implementation != 'PyPy'",
+-    "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
++    "numpy>=1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
+     "numpy; python_version>='3.12'",
+     "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'",
+ ]
diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index c3b403fdef61..e800ed4f00f6 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,28 +1,57 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
-version=0.19.3
-revision=2
-_pkgname="${pkgname#python3-}"
-build_style=python3-module
-build_helper="numpy"
-hostmakedepends="python3-Cython python3-wheel python3-numpy
- python3-packaging python3-setuptools pythran"
-makedepends="python3-devel"
-depends="python3-scipy python3-numpy python3-imageio python3-matplotlib
- python3-networkx python3-tifffile python3-pywt python3-packaging"
+version=0.21.0
+revision=1
+build_style=meson
+build_helper="python3"
+hostmakedepends="python3-build python3-installer python3-meson-python
+ python3-wheel python3-setuptools python3-packaging python3-Cython pythran
+ python3-lazy_loader python3-numpy pkg-config"
+makedepends="python3-devel python3-numpy pythran"
+depends="python3-numpy python3-scipy python3-networkx python3-Pillow
+ python3-imageio python3-tifffile python3-pywt python3-packaging
+ python3-lazy_loader"
 short_desc="Image processing in Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://scikit-image.org/"
-distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=4eb877c98d1395769daef5bc2ba8a7efd3f736c87086aecb3775a9174593398b
+distfiles="https://github.com/scikit-image/scikit-image/archive/v${version}.tar.gz"
+checksum=53a82a9dbd3ed608d2ad3876269a271a7e922b12e228388eac996b508aadd652
 # Tests require data files and unpackaged dependencies
 make_check=no
 
-pre_build() {
-	make_build_args+=" ${makejobs}"
+if [ "${CROSS_BUILD}" ]; then
+	configure_args="--cross-file=python.cross"
+fi
+
+pre_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		# Meson can't tolerate $CC with arguments as set by build helper
+		CC="${XBPS_CROSS_TRIPLET}-gcc"
+		# CXX needs to know where to find Python headers
+		CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+}
+
+post_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}"
+		cat > python.cross <<-EOF
+		[properties]
+		numpy-include-dir = '${_xpy}/numpy/core/include'
+		pythran-include-dir = '${_xpy}/pythran'
+		EOF
+	fi
+}
+
+do_build() {
+	# Use the build directory already configured by xbps-src for meson
+	python3 -m build --no-isolation --wheel \
+		-Cbuilddir="./build" -Ccompile-args="${makejobs}" .
 }
 
-post_install() {
+do_install() {
+	python3 -m installer --destdir "${DESTDIR}" \
+		--no-compile-bytecode dist/*.whl
 	vlicense LICENSE.txt
 }

From 18e3c78c76fcf21e606386359487ac23af54c202 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:12:58 -0400
Subject: [PATCH 0263/1853] python3-MarkupSafe: update to 2.1.3.

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

diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index e164956b0e2c..ce9f7dc13108 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MarkupSafe'
 pkgname=python3-MarkupSafe
-version=2.1.2
+version=2.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/markupsafe/"
 distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d
+checksum=af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad
 
 post_install() {
 	vlicense LICENSE.rst

From 56279c566f4518d78648326ab5f88d0ef3f1c254 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:14:59 -0400
Subject: [PATCH 0264/1853] python3-cryptography_vectors: update to 41.0.1.

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

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 8a900ad9d118..122780dbe152 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=41.0.0
+version=41.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=7c77787f6f1e3065aed0af9b0113d3736f2d0a80e0ed1ddbd296cf5ac638df00
+checksum=23b08c39777ec7b2774a11f945d1746301b1e88ecff2e5326d7f50ea0f42d580
 
 post_install() {
 	vlicense LICENSE

From aed81f9ff4fb6c3f070115dc7803e80a0b98e2c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:16:54 -0400
Subject: [PATCH 0265/1853] python3-cryptography: update to 41.0.1.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index f5a45e5277a5..ed5d26a87413 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=41.0.0
+version=41.0.1
 revision=1
 build_style=python3-module
 build_helper="rust"
@@ -17,7 +17,7 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78
+checksum=d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From c68436bdbe3d333094e1f28a5a394d463fcffb8c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:17:42 -0400
Subject: [PATCH 0266/1853] python3-imageio: update to 2.31.0.

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

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index ad3e419c67fd..859954e3973c 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.30.0
+version=2.31.0
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=15e8ae8a63575040253a772cb476b7ce4e4d762200fb6086e08802784c7d394b
+checksum=2833a9e648a7d95d3dbbe74d3488283de59722463c67fa4d0481185f7de29ed6
 
 post_install() {
 	vlicense LICENSE

From 2d1277388ffb05c067037c03c6fac3054e4c1c54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:30:28 -0400
Subject: [PATCH 0267/1853] python3-cvxopt: fix dist-info versioning

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

diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 92e33c022bae..7e85f1c5628b 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-cvxopt'
 pkgname=python3-cvxopt
 version=1.3.1
-revision=1
+revision=2
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel SuiteSparse-devel gsl-devel glpk-devel fftw-devel
  $(vopt_if openblas 'openblas-devel' 'lapack-devel')"
 depends="python3"

From 7c8ef2964e164e9d2150ddd92bbcd8666a68fe05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:23:31 +0200
Subject: [PATCH 0268/1853] xrdb: update to 1.2.2.

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

diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index e786702c8d80..bc72395160e7 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -1,6 +1,6 @@
 # Template file for 'xrdb'
 pkgname=xrdb
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-cpp=/usr/bin/cpp,/usr/bin/clang-cpp,/usr/bin/mcpp"
@@ -11,8 +11,8 @@ short_desc="X server resource database utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4
 
 post_install() {
 	vlicense COPYING

From bcaa3be73c09b508361bfd11247b06cdc43300ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Jun 2023 17:38:11 +0200
Subject: [PATCH 0269/1853] reptyr: update to 0.10.0.

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

diff --git a/srcpkgs/reptyr/template b/srcpkgs/reptyr/template
index b1cad3c1d477..5190ebf8b816 100644
--- a/srcpkgs/reptyr/template
+++ b/srcpkgs/reptyr/template
@@ -1,6 +1,6 @@
 # Template file for 'reptyr'
 pkgname=reptyr
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-makefile
 make_install_args="BASHCOMPDIR=/usr/share/bash-completion/completions"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/nelhage/reptyr"
 distfiles="https://github.com/nelhage/reptyr/archive/${pkgname}-${version}.tar.gz"
-checksum=b442fbb80a1003b1985974c6fc9eeb8124a43a9bf014ae6af8cde0ca5e587731
+checksum=c6ffbc34a511ac00d072219bda30699e51f2f4eb483cbae9e32e981d49e8b380
 
 post_install() {
 	vlicense COPYING LICENSE

From 2d9db361f1c3e76dd32cbf75d2426e24b376fa9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:06:49 +0200
Subject: [PATCH 0270/1853] xorgproto: update to 2023.1.

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

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 342be095872f..02905d7aabb0 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
-version=2022.2
+version=2023.1
 revision=1
 build_style=meson
 configure_args="-Dlegacy=true"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.xz"
-checksum=5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e
+checksum=6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13
 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
  dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
  printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0

From d6767366ec488a7cd7349f15d392b1080773fc8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:07:25 +0200
Subject: [PATCH 0271/1853] ugrep: update to 3.12.1.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index eb60f284250b..df9ae32837ff 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.12.0
+version=3.12.1
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=f69330b74a2d2e46c878c19da3453e97d92ae960d0e1a92a853481cb889fca3e
+checksum=a442ac9c0961746374d0627e6ec52d5c6250541640aeb9a698eb40382d0ec44c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 759b9580df8708890a1cf2211c6b7a7ebc10e6c7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 22:57:19 +0200
Subject: [PATCH 0272/1853] syncthing: update to 1.23.5.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 58a95827922d..1c704f3d6eed 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.23.4
+version=1.23.5
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=4b68cee85b63fbb197a4e5401b3983a2a2358e1098ff91755f47925a1ee17f58
+checksum=d87f02b3e970c0f08c59166851b40ee5c647efcb2d70b5f0410416987cd42294
 
 pre_build() {
 	GOARCH= go generate \

From b57ad4746ac1d2d2acd7c8b60d8ce1af38719a8a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:28:53 +0200
Subject: [PATCH 0273/1853] terragrunt: update to 0.46.2.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fe7569f377f3..fc654aa02f70 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.46.1
+version=0.46.2
 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=f3b99f6de74ce6d2af87a01cb0ca6ff8d6357e506fbc69252f821820d3c5c0bf
+checksum=0d8bb4e98276e68c76d770e662bb434fb5c89f8fc06c3c00e14e717417123ec5
 
 post_install() {
 	vlicense LICENSE.txt

From 5629c64d75cf3e6e3a2c0d4b524ef2f6680fb689 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:29:51 +0200
Subject: [PATCH 0274/1853] hugo: update to 0.113.0.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d80e676fd44d..d5c4cfeca19a 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.112.7
+version=0.113.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa
+checksum=0bea01f37d7d04e6262844ff3070b76e5fb9f5fe2330a1367bd1c35c77098161
 
 post_install() {
 	vdoc README.md

From 63262845c903e985f42a6b7f70dee7ad56cb03c7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:02 +0200
Subject: [PATCH 0275/1853] drumkv1: update to 0.9.31.

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

diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index dee163016be3..90373aa8ef95 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
 # Template file for 'drumkv1'
 pkgname=drumkv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://drumkv1.sourceforge.io/"
 changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=75b0c50705fe2a81d578e739700bbbabcdb359d153f76b9475016c8572d64ec1
+checksum=d42b09322a4135964afdd5246a8d6863d8aa20886b47ba8b58f345d23aa68033

From c875fe4dec3ad2c45c99ff5958e5d63347bcd691 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:05 +0200
Subject: [PATCH 0276/1853] padthv1: update to 0.9.31.

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

diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 33a217131082..2c4b5a50bff7 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'padthv1'
 pkgname=padthv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://padthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/padthv1/padthv1-${version}.tar.gz"
-checksum=704b94d41d5daca3dbd9eaca93b8228e8f6e447a8c86f1f695fd92f16e7e6add
+checksum=305f45be4c923bcfa671463b01ef212d8fde4ae37ea687581a8046187b9315c7

From eb6537c428ef526f0e8dd023dab64f99b8f02a2f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 0277/1853] samplv1: update to 0.9.31.

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

diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index d4d17baa57c3..0d299884926b 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
 # Template file for 'samplv1'
 pkgname=samplv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://samplv1.sourceforge.io/"
 changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/samplv1/samplv1-${version}.tar.gz"
-checksum=f32fcccfa0395757b66351816e841e2b5c0459ce9161aba36d23ff9db58955a5
+checksum=9d4eb430709e5ed53d28c8dd9c01f07fc042be569b72a248bd766d2256a50bcb

From 6cff128c63b8c008e4ab66eb72574e1f5ed01c5b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 0278/1853] synthv1: update to 0.9.31.

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

diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index 7d20b505baea..126cd0600682 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'synthv1'
 pkgname=synthv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://synthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/synthv1/synthv1-${version}.tar.gz"
-checksum=235cf1035f91a24743d01fcd1efa5274db94f2395734f33519ca672ac64af4d5
+checksum=9304a03adcfc51d4c83e6acdbbd4ef8e4418c996a1e23f8c5f9eabd62d8fce1b

From f44f95551eab7f8b0db7d484d9d0812809dc44c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:05:38 -0400
Subject: [PATCH 0279/1853] python3-meson-python: fix update-check

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

diff --git a/srcpkgs/python3-meson-python/update b/srcpkgs/python3-meson-python/update
new file mode 100644
index 000000000000..60b9eebd42f4
--- /dev/null
+++ b/srcpkgs/python3-meson-python/update
@@ -0,0 +1 @@
+pattern="meson_python-\K[0-9.]+(?=.tar)"

From 906c9a192f3b98fe67a8b8713892bda3adaf8c26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:09:23 -0400
Subject: [PATCH 0280/1853] cpp-utilities: update to 5.23.0.

---
 .../patches/fix-32bit-sendfile.patch          | 26 -------------------
 srcpkgs/cpp-utilities/template                |  4 +--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch

diff --git a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch b/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
deleted file mode 100644
index 0c8cc562f866..000000000000
--- a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 92757f253113515e96bb4ddbb4627b314ada6b58 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Thu, 6 Apr 2023 11:33:41 -0400
-Subject: [PATCH] Fix use of `sendfile()` on 32-bit systems
-
----
- io/copy.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/io/copy.h b/io/copy.h
-index 4abbe8d..0635a8e 100644
---- a/io/copy.h
-+++ b/io/copy.h
-@@ -155,7 +155,8 @@ void CopyHelper<bufferSize>::callbackCopy(NativeFileStream &input, NativeFileStr
-         output.flush();
-         const auto totalBytes = static_cast<std::streamoff>(count);
-         while (count) {
--            const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, std::min(count, bufferSize));
-+            const auto bytesToCopy = static_cast<std::size_t>(std::min(count, static_cast<std::uint64_t>(bufferSize)));
-+            const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, bytesToCopy);
-             if (bytesCopied < 0) {
-                 throw std::ios_base::failure(argsToString("sendfile64() failed: ", std::strerror(errno)));
-             }
--- 
-2.40.0
-
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d4d2d10eb9a8..4e164a09fac5 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.22.0
+version=5.23.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/cpp-utilities/archive/v${version}.tar.gz"
-checksum=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
+checksum=2a0564afb3c5c2f9119ef4ea434001d4ee67a88a99484c412253b3f9ae4147bc
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 1e12f44c310bf9df644d617fcf4b219fd7f8ef23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:10:23 -0400
Subject: [PATCH 0281/1853] qtutilities: update to 6.12.1.

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

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 027d35c37179..06cc1b888bd8 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.12.0
+version=6.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=d3b8bc68c82d195cfeb4aa8d599c020774322aea7faebf5243e139088d89a82c
+checksum=83a68a39a2edbd1ba3ec2e50b9b4c84ed5a54c30fb3cb1bc3088e8d0290989c2
 
 pre_check() {
 	ninja -C build tests

From 1a563143f4d473e7e65d6dce25a482fd4bd0567a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:15:08 -0400
Subject: [PATCH 0282/1853] tagparser: update to 12.0.0.

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

diff --git a/common/shlibs b/common/shlibs
index 042a1d23492e..e34e372b84f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3925,7 +3925,7 @@ libslirp.so.0 libslirp-4.2.0_1
 libqpdf.so.29 libqpdf-11.0.0_1
 libstk-4.6.1.so libstk-4.6.1_1
 libc++utilities.so.5 cpp-utilities-5.2.0_1
-libtagparser.so.11 tagparser-11.0.0_1
+libtagparser.so.12 tagparser-12.0.0_1
 libqtutilities.so.6 qtutilities-6.0.4_1
 libkdsoap.so.2 KDSoap-2.0.0_1
 libkdsoap-server.so.2 KDSoap-2.0.0_1
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index c0ce54c985f9..5577aaa67c0a 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=11.6.0
+version=12.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=298ff927e14860e97e5b75057ff50fe64e0e0521ca7253e8624be6db6ac77261
+checksum=94ded89093beb67d95816c4ba700cb50f64b4f4fdc7748ccfbb61946246b635e
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 9fd8863392f5af36cfa03b587d359df50c0e298b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:16:28 -0400
Subject: [PATCH 0283/1853] tageditor: update to 3.8.0.

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

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 8b18b4f825bb..26b4421b4396 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.7.9
+version=3.8.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz"
-checksum=987101e9a259db79b28b872c778e9818f12618ce5a12ab7558b6262c7621b217
+checksum=9ab25924be61b1ddd12510c2fa90a9fd9ebae1b634764e50415f47c1e0be28ab
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From c39c2ae36afba95fd875fe03a859d18377731efa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:58:26 +0200
Subject: [PATCH 0284/1853] knot: update to 3.2.7.

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

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 8a220c62d1d3..bfb53410c2e2 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,7 +1,7 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.2.6
-revision=2
+version=3.2.7
+revision=1
 build_style=gnu-configure
 configure_args="
  --disable-silent-rules
@@ -12,7 +12,8 @@ configure_args="
 conf_files="/etc/knot/knot.conf"
 hostmakedepends="automake pkg-config protobuf-c"
 makedepends="gnutls-devel lmdb-devel libedit-devel liburcu-devel
- protobuf-c-devel fstrm-devel libmaxminddb-devel"
+ protobuf-c-devel fstrm-devel libmaxminddb-devel libcap-ng-devel
+ nghttp2-devel"
 checkdepends="softhsm"
 short_desc="High-performance authoritative-only DNS server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -20,7 +21,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=ac124fb17dbc4ac5310a30a396245a6ba304b3c89abed0f8a47d727462c8da4d
+checksum=d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 1b184a4f65c6ddc6df9c61fe2710817eed8fad6a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 13:34:57 +0200
Subject: [PATCH 0285/1853] chromium: update to 114.0.5735.106.

---
 ...g-for-std-strlen-in-web_view_impl.cc.patch | 29 -------
 ...typename-s-that-are-required-in-C-17.patch | 45 +++++++++++
 ...karound_clang_bug-structured_binding.patch | 32 --------
 ...karound_clang_bug-structured_binding.patch | 81 +++++++++++++++++++
 .../patches/cursed^Uscoped_file.patch         | 18 -----
 srcpkgs/chromium/template                     | 20 ++---
 6 files changed, 133 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
 create mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
 delete mode 100644 srcpkgs/chromium/patches/cursed^Uscoped_file.patch

diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index 6648fab5719d..000000000000
--- a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
---
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
- 
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 000000000000..35b7152cbbdb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+     RemoteSavedCallbacks<T...>& saved_callbacks,
+     const RemoteId& remote_id,
+-    std::remove_reference<T>::type... result) {
++    typename std::remove_reference<T>::type... result) {
+   auto found_callbacks_map = saved_callbacks.find(remote_id);
+   if (found_callbacks_map == saved_callbacks.end())
+     return;  // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+   template <class... T>
+   void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+                          const RemoteId& remote_id,
+-                         std::remove_reference<T>::type... result);
++                         typename std::remove_reference<T>::type... result);
+ 
+   // Test support for client ID management.
+   static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
deleted file mode 100644
index c3e87c9f589a..000000000000
--- a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
-workaround llvm15 compiler bug
-diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me	2023-05-03 16:30:34.244612573 +0200
-+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc	2023-05-03 16:37:36.732278590 +0200
-@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
-                                 row_auto_repetitions);
- 
-   bool has_nested_subgrid = false;
--  auto& [grid_items, layout_data, subtree_size] =
--      sizing_tree->CreateSizingData();
-+
-+  auto& workaround_clang_bug = sizing_tree->CreateSizingData();
-+  auto& grid_items = workaround_clang_bug.grid_items;
-+  auto& layout_data = workaround_clang_bug.layout_data;
-+  auto& subtree_size = workaround_clang_bug.subtree_size;
- 
-   if (!must_ignore_children) {
-     // Construct grid items that are not subgridded.
-@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
-     NGGridSizingTree* sizing_tree) const {
-   DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
- 
--  auto& [grid_items, layout_data, subtree_size] =
--      sizing_tree->At(current_grid_index);
-+  auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
-+  auto& grid_items = workaround_clang_bug.grid_items;
-+  auto& layout_data = workaround_clang_bug.layout_data;
-+  auto& subtree_size = workaround_clang_bug.subtree_size;
- 
-   auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
-     InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..af8e737059c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding	2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc	2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+                               : BuildGridSizingTree(&oof_children);
+ 
+   LayoutUnit intrinsic_block_size;
+-  auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++  auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& tree_size = t_s;
+ 
+   if (IsBreakInside(BreakToken())) {
+     // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+                                 row_auto_repetitions);
+ 
+   bool has_nested_subgrid = false;
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_tree->CreateSizingData(opt_subgrid_data);
++  auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   if (!must_ignore_children) {
+     // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+   NGGridSizingTree sizing_tree;
+ 
+   if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+-    auto& [grid_items, layout_data, subtree_size] =
+-        sizing_tree.CreateSizingData();
++    auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++    auto& grid_items = g_i;
++    auto& layout_data = l_d;
++    auto& subtree_size = s_s;
+ 
+     const auto& node = Node();
+     grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+     const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+   DCHECK(sizing_subtree);
+ 
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_subtree.SubtreeRootData();
++  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+     InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+     bool* opt_needs_additional_pass) const {
+   DCHECK(sizing_subtree);
+ 
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_subtree.SubtreeRootData();
++  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   const bool is_for_columns = track_direction == kForColumns;
+   const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me	2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc	2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+   // Reject all outstanding promises.
+   DCHECK(thread_checker_.CalledOnValidThread());
+-  for (auto& [promise_id, promise] : promises_) {
++  for (auto& [p_i, p_e] : promises_) {
++    auto& promise_id = p_i;
++    auto& promise = p_e;
+     TRACE_EVENT_NESTABLE_ASYNC_END1(
+         "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+         "status", "cleared");
diff --git a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
deleted file mode 100644
index 2e5433f7abce..000000000000
--- a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/base/files/scoped_file_linux.cc.orig
-+++ b/base/files/scoped_file_linux.cc
-@@ -77,15 +77,3 @@
- }
- 
- }  // namespace base
--
--extern "C" {
--
--int __close(int);
--
--__attribute__((visibility("default"), noinline)) int close(int fd) {
--  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
--    CrashOnFdOwnershipViolation();
--  return __close(fd);
--}
--
--}  // extern "C"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index cafc2fe324c6..b4a39dfd3815 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,12 +1,11 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=113.0.5672.92
+version=114.0.5735.106
 revision=1
 archs="i686* x86_64* aarch64* armv7l*"
 hostmakedepends="
  $(vopt_if clang "clang lld llvm15")
- $(vopt_if js_optimize openjdk)
  bison git gperf hwids ninja nodejs perl pkg-config python3
  libatomic-devel libepoxy-devel libevent-devel libglib-devel"
 makedepends="
@@ -17,8 +16,8 @@ makedepends="
  libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
  libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
  libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
- pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel libffi-devel
+ pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
  $(vopt_if pipewire pipewire-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if sndio sndio-devel)"
@@ -28,15 +27,14 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
+checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
 
 lib32disabled=yes
 
-build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
+build_options="clang debug vaapi pulseaudio sndio pipewire"
 build_options_default="clang vaapi pulseaudio pipewire"
 desc_option_clang="Use clang to build"
 desc_option_debug="Build with debug symbols"
-desc_option_js_optimize="Optimize the JS used for Chromium's UI"
 desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
 
 if [ "$XBPS_LIBC" = musl ]; then
@@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
 	 libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
 	 libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
 	 $(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
-	 libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
-	 mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
+	 libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
+	 mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
 	 libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
 fi
 
@@ -158,7 +156,6 @@ do_configure() {
 		libxml
 		libxslt
 		opus
-		re2
 		snappy
 	"
 
@@ -219,9 +216,6 @@ do_configure() {
 		# deprecated
 		'use_gnome_keyring=false'
 
-		# https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
-		"enable_js_type_check=$(vopt_if js_optimize true false)"
-
 		"use_pulseaudio=$(vopt_if pulseaudio true false)"
 		"link_pulseaudio=$(vopt_if pulseaudio true false)"
 

From f3c3796aa3068ef75ce7b8873a654fe8116cf322 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 7 Jun 2023 20:18:21 +0200
Subject: [PATCH 0286/1853] linux5.4: update to 5.4.245.

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

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index e1e9d22352c9..a48fbde924c7 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.244
+version=5.4.245
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- c1055b17cae94cefd31aac8da0cd4099f607c38765c8b1e590a760c0370ab7cc"
+ 8e0a8911bccb734a55b319687ee7050259b1c9d64324ef04448d9bea7c8a02be"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From 5a5a9ad62f1022346ac93b53a3a18da1fe1ca136 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 16:42:41 -0400
Subject: [PATCH 0287/1853] mongo-c-driver: update to 1.23.5.

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

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 1e7a908c7fe7..1785e796bd79 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.23.4
+version=1.23.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=209406c91fcf7c63aa633179a0a6b1b36ba237fb77e0470fd81f7299a408e334
+checksum=260dc2207881ccbe7b79b1fa6b3ba84ab9be94eb93d4beefbbe8a6cb562947ed
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From abbd96dcaa01d71868ea6a6d3d1d6859473789e2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 16:45:47 -0400
Subject: [PATCH 0288/1853] python3-google-i18n-address: update to 3.0.0.

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

diff --git a/srcpkgs/python3-google-i18n-address/template b/srcpkgs/python3-google-i18n-address/template
index 1161c2bb4ca1..81c5425c20e2 100644
--- a/srcpkgs/python3-google-i18n-address/template
+++ b/srcpkgs/python3-google-i18n-address/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-google-i18n-address'
 pkgname=python3-google-i18n-address
-version=2.5.2
+version=3.0.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target="tests/"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-poetry-core hatchling"
 depends="python3-requests"
 checkdepends="python3-pytest-cov python3-pytest-cov $depends"
 short_desc="Address validation helpers for Google's i18n address database"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mirumee/google-i18n-address"
 distfiles="https://github.com/mirumee/google-i18n-address/archive/refs/tags/${version}.tar.gz"
-checksum=5ec8e92d71ffe4d889c439f7f55f698553b6d731cc5177276045a5bb436a6029
+checksum=387b4683936bbc19d1cf9a1dbf8f08610742f5ad3db72b681240b2e43a120c05

From be8f2ad426ee5ceca04f563ded6f809ea38f20a2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 16:47:28 -0400
Subject: [PATCH 0289/1853] xml2rfc: update to 3.17.3.

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

diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 1058373efeee..8d5be28f449a 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
 # Template file for 'xml2rfc'
 pkgname=xml2rfc
-version=3.17.2
+version=3.17.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ietf-tools.github.io/xml2rfc/"
 distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=168183289de769bf53adb80f02986f73bb4e6934fa73a85c89a82be7a2b6f01d
+checksum=535b7f701a5d87be8fb8ecdefcef486b11fa454bf0be236c6378c20ca57f28c5
 make_check=no # too many dependencies
 
 post_install() {

From 503d0d9b9c8485b40c9285fe5b3c54e37a3bd120 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 18:06:06 -0400
Subject: [PATCH 0290/1853] QMPlay2: update to 23.06.04.

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

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index ad73cbb01bae..17879a25093d 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=23.02.05
+version=23.06.04
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=b5347b6840e6f60496f7ca043d423ec52afc7a8b34274379a50c7e7bcd75414c
+checksum=9173b9b8ae26b9e97092239f40451172e9fe8d5d7ac1cbf0aa88ab8a73db7d1a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 1662ca771a879e3b473489d68d19c7ea722b9988 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 21:53:29 -0400
Subject: [PATCH 0291/1853] python3: update to 3.11.4.

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 04ef3591be55..ef07cb7d2f39 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,8 +3,8 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.11.3
-revision=2
+version=3.11.4
+revision=1
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6
  --enable-loadable-sqlite-extensions --with-computed-gotos
@@ -25,7 +25,7 @@ distfiles="
  https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz
  ${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz
 "
-checksum="8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
+checksum="2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
  ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
 skip_extraction="${_bluez}.tar.xz"
 

From 9cb508675413dd3a285a3d2a9cab259dbfc515f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 21:58:11 -0400
Subject: [PATCH 0292/1853] python3-tkinter: update to 3.11.4.

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

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index ec080a818e69..fc16bfdf9dce 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.11.3
+version=3.11.4
 revision=1
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6
@@ -28,7 +28,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
+checksum=2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From 3716482e42063f9e45037cc7eeb48448dcb29414 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 8 May 2023 20:24:34 +0300
Subject: [PATCH 0293/1853] coredns: update to 1.10.1.

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

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index 812ffae342f5..decf19f647e8 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,20 +1,22 @@
 # Template file for 'coredns'
 pkgname=coredns
-version=1.8.6
-revision=3
+version=1.10.1
+revision=1
 build_style=go
 go_import_path=github.com/coredns/coredns
-hostmakedepends="git make mmark"
+hostmakedepends="mmark"
 short_desc="CoreDNS is a DNS server that chains plugins"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"
 homepage="https://coredns.io"
+changelog="https://github.com/coredns/coredns/releases"
 distfiles="https://github.com/coredns/coredns/archive/v${version}.tar.gz"
-checksum=cbe3764afe2148b8047ea7e5cbba5108c298dee3a9a0391028e2980e35beaa2b
+checksum=f47186452e5f2925e2c71135669afd9e03b9b55831417d33d612ef2fa69924a7
 make_dirs="/etc/coredns 0750 root root"
 
-_git_commit=f59c03d09c3a3a12f571ad1087b979325f3dae30
-go_ldflags+="-X github.com/coredns/coredns/coremain.GitCommit=${_git_commit}"
+# Update this on each version bump.
+_git_commit=055b2c31a9cf28321734e5f71613ea080d216cd3
+go_ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${_git_commit}"
 
 post_build() {
 	make -f Makefile.doc MMARK="$(command -v mmark) -man" man/coredns.1 man/corefile.5 plugins

From 4c5aac7ad7850609f08eab8ea28316ebd2e54ec1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 8 Jun 2023 21:42:29 +0100
Subject: [PATCH 0294/1853] librepcb: add missing qt5-plugin-sqlite dependency.

Fixes #44294.
---
 srcpkgs/librepcb/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index 670b1bf77a18..d51ca101381c 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -1,11 +1,12 @@
 # Template file for 'librepcb'
 pkgname=librepcb
 version=0.1.5
-revision=1
+revision=2
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-svg-devel zlib-devel"
+depends="qt5-plugin-sqlite"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5f5fcdef08a447c04519c7365adc1b53a49e88aa Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Wed, 7 Jun 2023 11:22:34 +0200
Subject: [PATCH 0295/1853] element-desktop: update to 1.11.32.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 11ecbd72a16e..4c805a19f318 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.11.31
-revision=3
+version=1.11.32
+revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
 hostmakedepends="git yarn nodejs rust cargo python3 curl
@@ -17,8 +17,8 @@ homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
 distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
-checksum="5152bcdab011deb7e5d7c713edd268bf4266dedde87ff735ad146e9eb12e205b
- 6597d59f12a0f878fa363d6253a506583f686284d81a50baceb2965a4e0cce18"
+checksum="be4cc53354741690361aa5c933828a6f16a9826546650f03202005d449afc1d2
+ 5aa9c183a8e23e0114d51339519be1a14081c76531a4828057fec1a7f171f2b2"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From c3fb9dbea5e40231bffec3f7c3b14884c2095d17 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 8 Jun 2023 00:23:53 +0530
Subject: [PATCH 0296/1853] osv-scanner: update to 1.3.4.

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

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index 9ef331e35c51..ff02f965d680 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,6 +1,6 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=go
 go_import_path="github.com/google/osv-scanner"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://google.github.io/osv-scanner/"
 changelog="https://raw.githubusercontent.com/google/osv-scanner/main/CHANGELOG.md"
 distfiles="https://github.com/google/osv-scanner/archive/refs/tags/v${version}.tar.gz"
-checksum=cc058ea2a51435c0289ca026219439f643e8ef984fe60e87628cdfe519973d46
+checksum=19229149eca937a4da60ca29416fe1ea6997655fd10e273b833082ef5977a3de
 
 do_check() {
 	go test ./...

From 04c790a91b235b1291eaa444d50df7ab1c13a993 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 8 Jun 2023 13:45:31 +0200
Subject: [PATCH 0297/1853] qtractor: update to 0.9.34

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

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index ce3471a68476..ea744367cef3 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,9 +1,9 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.33
+version=0.9.34
 revision=1
 _clap_tag=1.1.8
-_vst3sdk_tag=3.7.7_build_19
+_vst3sdk_tag=3.7.8_build_34
 create_wrksrc=yes
 build_wrksrc="qtractor"
 build_style=cmake
@@ -24,12 +24,12 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta
  https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz"
-checksum="25c526941d4c90a00df1ce0f61fba478278b707b94c25640b0d392e2ef76028d
+checksum="6f10c6bfe2328068ecdd60f4e49463bd82aaa5c19d118dc43df6a0a051287deb
  6f281ef55c4cf6129cf5b1746f373a4ba3e4078c1f406202d2e34ddeae86e37a
- 3dd04a170659cfdfc4bdf5fc83e91577b66d1a72042b74b35bc225393511c938
- 3eee23a453b76ba5d6c609891f4557d6b4d8988d0c2a157171b4fc817ecb8d17
- b092b521a278fe385a7e0b206c5dd9e0198a3e49e9db0083c14c182a1c04556c
- 5bcae9462cc86100f41ae9a3ed62bd0be0b40b9bda246ed11d5caa168d39452f"
+ a27e6acc86f2761e554e2f2f8256b248345b145de02771e2f6c6fe6b24c187d8
+ bd4e24f143d739d5e9e69398ed07c9961eb561cefad69486eb3453fb31bca58b
+ 7509e85caf02d6567384adb84ee7b05bdea5283f52cb232e504ac44091aeb42d
+ 0392a24cc3665365d3a1f448e8f1c79d5375645acf88be73598cae673afcc1fc"
 
 post_extract() {
 	cd $wrksrc

From 0666c545852d8f5ecea6e2091fc6d745ea9d0751 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 8 Jun 2023 09:18:54 -0400
Subject: [PATCH 0298/1853] texlab: update to 5.7.0

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

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 4281e3813302..b1b9b7988e02 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
 # Template file for 'texlab'
 pkgname=texlab
-version=5.6.0
+version=5.7.0
 revision=1
 build_style=cargo
 make_install_args="--path crates/texlab"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
 changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
 distfiles="https://github.com/latex-lsp/texlab/archive/refs/tags/v${version}.tar.gz"
-checksum=16d7bf4c4e3a25cf1a9cd2ccfea2315c7c03cd3705de50f179133a25b1f0ae30
+checksum=0af42d00da72114704a234f26ca4ec603e067ecdd03a1f0b7002445bfc906f4b
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="smartstring fails to compile"

From d08784639d334f83762c484a56225ee207c9ac26 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 8 Jun 2023 15:44:43 +0200
Subject: [PATCH 0299/1853] golangci-lint: update to 1.53.2.

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

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 767f29fbb95e..7b2aa25aa7a9 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,7 +1,7 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.51.2
-revision=2
+version=1.53.2
+revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=7e5bc05ad3739cec5a8b4e947a02d540c657a06039175c8822e1000f6bf606bd
+checksum=fc3e94b5574cdbe0faf37c8cbc1764c4ed07852a9e9dc146216ee69a20b3f97c
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From e06503e4a494d60d05f30cc64cb8872f9cad8dbf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 6 Jun 2023 13:42:57 +0200
Subject: [PATCH 0300/1853] Clipboard: update to 0.8.0

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

diff --git a/srcpkgs/Clipboard/template b/srcpkgs/Clipboard/template
index 7d5f0477cd3e..bcb06d1b87f4 100644
--- a/srcpkgs/Clipboard/template
+++ b/srcpkgs/Clipboard/template
@@ -1,6 +1,6 @@
 # Template file for 'Clipboard'
 pkgname=Clipboard
-version=0.7.1
+version=0.8.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Slackadays/Clipboard"
 changelog="https://github.com/Slackadays/Clipboard/releases"
 distfiles="https://github.com/Slackadays/Clipboard/archive/refs/tags/${version}.tar.gz"
-checksum=ade73db60fdbdff8c68a4dc97f854aae502304e8294d57a7b32f6b01d48f8eef
+checksum=d3fa16ee7fab364f9755d2a5991aaf06f7b6d703df7994486e7c424bfe1d97d2
 
 if [ "${XBPS_TARGET_NO_ATOMIC8}" ]; then
 	makedepends+=" libatomic-devel"

From a13dba41b897282c81c5dc9d249a0e477aa173f8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 6 Jun 2023 13:56:00 +0100
Subject: [PATCH 0301/1853] elfutils: update to 0.189.

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

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index eda621c1511d..810b4f41ab3d 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,10 +1,10 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.187
+version=0.189
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config m4"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
@@ -13,8 +13,9 @@ short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
+changelog="https://sourceware.org/git/?p=elfutils.git;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://sourceware.org/pub/elfutils/${version}/${pkgname}-${version}.tar.bz2"
-checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
+checksum=39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 CFLAGS="-Wno-error=deprecated-declarations" # curl 7.55+
@@ -55,8 +56,8 @@ debuginfod_package() {
 	short_desc+=" - debuginfod programs"
 	pkg_install() {
 		vmove "usr/bin/debuginfod*"
-		vmove "usr/share/man/man1/debuginfod-find.1"
-		vmove "usr/share/man/man8/debuginfod.8"
+		vmove usr/share/man/man1/debuginfod-find.1
+		vmove usr/share/man/man8/debuginfod.8
 	}
 }
 

From b804184eb31d78a7020b2eda58f3583c2c2a0ace Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 6 Jun 2023 13:24:32 -0400
Subject: [PATCH 0302/1853] starship: update to 1.15.0

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

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 132254c4d5e0..92b620107a6e 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,6 +1,6 @@
 # Template file for 'starship'
 pkgname=starship
-version=1.14.2
+version=1.15.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://starship.rs"
 changelog="https://raw.githubusercontent.com/starship/starship/master/CHANGELOG.md"
 distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz"
-checksum=6c9bee757955644453deab3564a10c0696606bb1c197ad631ff6ebbf8892b7a7
+checksum=e525476cf93d3a06332abf9e02415d4789fac6f28e4b7d98db7d83da08231828
 
 do_check() {
 	mkdir -p fake-home

From 6c1f48729fa3eb874c73276151108168911bc85d Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Tue, 6 Jun 2023 20:24:30 -0500
Subject: [PATCH 0303/1853] Signal-Desktop: update to 6.20.1.

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index fec02583a29a..7eca75b4f1f5 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,38 +1,34 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.20.0
+version=6.20.1
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
 # https://git.alpinelinux.org/aports/tree/testing/signal-desktop
 # ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
 archs="x86_64"
-hostmakedepends="git git-lfs nodeenv python3 tar"
+hostmakedepends="git git-lfs nodejs python3 tar"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
 maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=fc92011c51da6792215eb92d48afc17f1967caeade1307daaa13884244d7a3b0
+checksum=3c664dbb5c1670554859fa55fd765ac35632f573fd5b7bea63876cdf41b6b7d6
 nostrip_files="signal-desktop"
 
 post_extract() {
 	# git-lfs hook needs to be installed for one of the dependencies
 	git lfs install
 
-	# use nodeenv since we have that in the repos already
-	nodeenv --node='18.14.0' signal-node
-	. ./signal-node/bin/activate
+	vsed 's/"node": "/&>=/' -i package.json
 
 	npm install -g yarn
-
 	# Dependencies have to be installed before applying patch
 	yarn install --ignore-engines --frozen-lockfile
 }
 
 do_build() {
-	. ./signal-node/bin/activate
 	yarn generate
 	yarn build-release
 }

From d0a62aa3ec87ce8a4b77b403d1d909c2973fceff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 8 Jun 2023 02:18:17 -0700
Subject: [PATCH 0304/1853] power-profiles-daemon: update to 0.13.

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

diff --git a/srcpkgs/power-profiles-daemon/template b/srcpkgs/power-profiles-daemon/template
index 30ffad79543c..b42312b54c27 100644
--- a/srcpkgs/power-profiles-daemon/template
+++ b/srcpkgs/power-profiles-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'power-profiles-daemon'
 pkgname=power-profiles-daemon
-version=0.12
-revision=2
+version=0.13
+revision=1
 build_style=meson
 configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/"
 hostmakedepends="pkg-config glib-devel"
@@ -12,8 +12,9 @@ short_desc="Makes power profiles handling available over D-Bus"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/power-profiles-daemon"
+changelog="https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/raw/main/NEWS"
 distfiles="https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/${version}/power-profiles-daemon-${version}.tar.gz"
-checksum=4c01dc51cd734403af868cff2d13923c83076c477d7f02c601f3a5127dd82a18
+checksum=74aac43eb43ebe5a3255a00eb48d781a5acfba32e96ab85737e22205e045e581
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"

From 18844c5d6195c00d90f269ed4a7d18b6772e8bf7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 6 Jun 2023 07:29:46 +0200
Subject: [PATCH 0305/1853] fselect: fix for rust 1.70

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

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 436f6f97023d..9a9fe4371235 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,7 +1,7 @@
 # Template file for 'fselect'
 pkgname=fselect
 version=0.8.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libzstd-devel"
@@ -23,6 +23,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	XBPS_CROSS_RUSTFLAGS+=" -latomic"
 fi
 
+post_patch() {
+	cargo update --package mp4parse@0.12.0 --precise 0.12.1
+}
+
 post_install() {
 	vlicense LICENSE-MIT
 	vman docs/fselect.1

From 67a52d09ad6e261a659347192f36ff6e119f8f73 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 5 Jun 2023 21:54:15 -0400
Subject: [PATCH 0306/1853] nerd-fonts: update to 3.0.2

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

diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template
index d4cbc69b5984..f4409116aa62 100644
--- a/srcpkgs/nerd-fonts/template
+++ b/srcpkgs/nerd-fonts/template
@@ -1,6 +1,6 @@
 # Template file for 'nerd-fonts'
 pkgname=nerd-fonts
-version=3.0.1
+version=3.0.2
 revision=1
 depends="nerd-fonts-ttf nerd-fonts-otf"
 short_desc="Iconic font aggregator, collection and patcher"
@@ -9,7 +9,7 @@ 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=c4b62dd2287ace2eeff2911186021a26fe8a9531edfaa5d4622eb794bb323d89
+checksum=3b18b305451b0b22cb6484197f8029efe54e5c459e8ed3adbb0fb1697c0c13a6
 
 do_install() {
 	vmkdir usr/share/fonts/NerdFonts/otf

From 94fefdd261e37a849edc47b9bc7635938d67863b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:57:49 +0100
Subject: [PATCH 0307/1853] bindfs: update to 1.17.3.

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

diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 4a8d39ed3472..1ae65af58a61 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bindfs'
 pkgname=bindfs
-version=1.17.2
+version=1.17.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,6 +11,6 @@ license="GPL-2.0-or-later"
 homepage="https://bindfs.org"
 changelog="https://bindfs.org/docs/ChangeLog.utf8.txt"
 distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=5f2c50a70b8d58c025b81fbf364fad432d154936630ce0023cc88baa8d5ca1d0
+checksum=c16876091572c23242c16e87c5be7e3512f443aae637328d8c011c071e9302eb
 #cannot mount
 make_check=no

From 418f69b9bc0ca290675e0362349646fe0f99ebb9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 5 Jun 2023 01:10:44 +0530
Subject: [PATCH 0308/1853] puzzles: update to 20230606.4227ac1.

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

diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 260344e0cc6c..831ef3f7b33e 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,6 +1,6 @@
 # Template file for 'puzzles'
 pkgname=puzzles
-version=20230505.63346a8
+version=20230606.4227ac1
 revision=1
 build_style=cmake
 configure_args="-DNAME_PREFIX=puzzles-"
@@ -10,8 +10,8 @@ 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=63346a8ceac9ac1061e59af2a99ab1a44c851392;sf=tgz>${pkgname}-${version#*.}.tgz"
-checksum=77a7a06fa21a987cbc1475bc689b0374633a3fdbe6f76a66832b448697de5d40
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=4227ac1fd5dc25c247e7526526079b85e1890766;sf=tgz>${pkgname}-${version#*.}.tgz"
+checksum=9613c6091e04eef3f47d596ac78ad465cf8656c5502e376059419bcbe87da5b1
 
 post_install() {
 	vlicense LICENCE LICENSE

From b8cfadbb3c50b62b6de93333d8c9832f9e5f8563 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 4 Jun 2023 16:41:16 +0900
Subject: [PATCH 0309/1853] keyd: update to 2.4.3.

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

diff --git a/srcpkgs/keyd/template b/srcpkgs/keyd/template
index ac149364173e..69618a8f3169 100644
--- a/srcpkgs/keyd/template
+++ b/srcpkgs/keyd/template
@@ -1,6 +1,6 @@
 # Template file for 'keyd'
 pkgname=keyd
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,11 +10,10 @@ license="MIT"
 homepage="https://github.com/rvaiya/keyd"
 changelog="https://raw.githubusercontent.com/rvaiya/keyd/master/docs/CHANGELOG.md"
 distfiles="https://github.com/rvaiya/keyd/archive/refs/tags/v${version}.tar.gz"
-checksum=877e1a39efaa062c996856d632d6aeedd409422be6c5bdb2064a9b707293c280
+checksum=d4075f673879f4950c1c0d43985797603200e993596a5d7fcec1597c2350c380
 system_groups="keyd"
 
 post_install() {
 	vsv keyd
 	vlicense LICENSE
-	vinstall keyd.quirks 644 usr/share/libinput 30-keyd.quirks
 }

From 2ed5e04350d0637cc210d9afa656ac19febb939b Mon Sep 17 00:00:00 2001
From: Mojamuto <carlosme@protonmail.ch>
Date: Sun, 4 Jun 2023 13:56:40 +0200
Subject: [PATCH 0310/1853] xfce4-battery-plugin: update to 1.1.5

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

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..3fe17fcdbbae 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
-version=1.1.4
+version=1.1.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
+checksum=752233bfb320ee1e26104a656cbb868299f562733063e2b9a18f0966585ce213

From f1e239d95ae19574efbbb4ea4b8533ae35defa22 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 4 Jun 2023 16:52:22 +0200
Subject: [PATCH 0311/1853] gopls: update to 0.12.2.

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

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 16491e5febc4..c786fc23aeb6 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,16 +1,16 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.11.0
-revision=2
+version=0.12.2
+revision=1
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls
 short_desc="Official language server for the Go language"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
-license="MIT"
+license="BSD-3-Clause"
 homepage="https://github.com/golang/tools/tree/master/gopls"
 distfiles="https://github.com/golang/tools/archive/refs/tags/gopls/v${version}.tar.gz"
-checksum=b5dd0040bcc75b4760eb543826b6503a163c835c90f50843e626a112ca083931
+checksum=f185a44f46fe39688493008d47debfe63ea7cd26464f522df292c62539b8ca8d
 
 post_install() {
 	vlicense ../LICENSE

From 020165766c325abe7a79a7a973992f87d2da31ed Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 4 Jun 2023 21:12:02 +0200
Subject: [PATCH 0312/1853] nmap: update to 7.94

---
 srcpkgs/nmap/patches/openssl.patch | 314 -----------------------------
 srcpkgs/nmap/template              |   9 +-
 2 files changed, 5 insertions(+), 318 deletions(-)
 delete mode 100644 srcpkgs/nmap/patches/openssl.patch

diff --git a/srcpkgs/nmap/patches/openssl.patch b/srcpkgs/nmap/patches/openssl.patch
deleted file mode 100644
index 0d6e80105153..000000000000
--- a/srcpkgs/nmap/patches/openssl.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From d6bea8dcdee36a3902cece14097993350306f1b6 Mon Sep 17 00:00:00 2001
-From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Tue, 6 Sep 2022 22:39:34 +0000
-Subject: [PATCH] Build based on OpenSSL version, not API level. Fixes #2516
-
----
- ncat/http_digest.c        |  2 +-
- ncat/ncat_connect.c       |  4 ++--
- ncat/ncat_ssl.c           |  6 +++---
- ncat/ncat_ssl.h           | 12 ------------
- ncat/test/test-wildcard.c |  4 ++--
- nse_openssl.cc            | 28 +++++++---------------------
- nse_ssl_cert.cc           | 24 ++++++------------------
- nsock/src/nsock_ssl.c     |  4 ++--
- nsock/src/nsock_ssl.h     | 15 +--------------
- 9 files changed, 24 insertions(+), 75 deletions(-)
-
-diff --git a/ncat/http_digest.c b/ncat/http_digest.c
-index b5f80a920a..e6ff99175c 100644
---- a/ncat/http_digest.c
-+++ b/ncat/http_digest.c
-@@ -133,7 +133,7 @@ int http_digest_init_secret(void)
-     return 0;
- }
- 
--#if OPENSSL_API_LEVEL < 10100
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define EVP_MD_CTX_new EVP_MD_CTX_create
- #define EVP_MD_CTX_free EVP_MD_CTX_destroy
- #endif
-diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
-index 0e4b50761c..3dd3291fc9 100644
---- a/ncat/ncat_connect.c
-+++ b/ncat/ncat_connect.c
-@@ -82,8 +82,8 @@
- #include <openssl/err.h>
- 
- /* Deprecated in OpenSSL 3.0 */
--#if OPENSSL_API_LEVEL >= 30000
--#define SSL_get_peer_certificate SSL_get1_peer_certificate
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# define SSL_get_peer_certificate SSL_get1_peer_certificate
- #endif
- #endif
- 
-diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c
-index 9226b48116..3818bfecc5 100644
---- a/ncat/ncat_ssl.c
-+++ b/ncat/ncat_ssl.c
-@@ -80,7 +80,7 @@
- #define FUNC_ASN1_STRING_data ASN1_STRING_data
- #endif
- 
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
-@@ -117,7 +117,7 @@ SSL_CTX *setup_ssl_listen(void)
-     OpenSSL_add_all_algorithms();
-     ERR_load_crypto_strings();
-     SSL_load_error_strings();
--#elif OPENSSL_API_LEVEL >= 30000
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-   if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
-   {
-     loguser("OpenSSL legacy provider failed to load.\n");
-@@ -477,7 +477,7 @@ static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
-     const char *commonName = "localhost";
-     char dNSName[128];
-     int rc;
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     int ret = 0;
-     RSA *rsa = NULL;
-     BIGNUM *bne = NULL;
-diff --git a/ncat/ncat_ssl.h b/ncat/ncat_ssl.h
-index fca0b17716..458736e271 100644
---- a/ncat/ncat_ssl.h
-+++ b/ncat/ncat_ssl.h
-@@ -67,18 +67,6 @@
- #include <openssl/ssl.h>
- #include <openssl/err.h>
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
- #define NCAT_CA_CERTS_FILE "ca-bundle.crt"
- 
- enum {
-diff --git a/ncat/test/test-wildcard.c b/ncat/test/test-wildcard.c
-index 428ece71c7..fe55e1997e 100644
---- a/ncat/test/test-wildcard.c
-+++ b/ncat/test/test-wildcard.c
-@@ -20,7 +20,7 @@ are rejected. The SSL transactions happen over OpenSSL BIO pairs.
- 
- #include "ncat_core.h"
- #include "ncat_ssl.h"
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
- #include <openssl/bn.h>
- #endif
- 
-@@ -294,7 +294,7 @@ static int set_dNSNames(X509 *cert, const struct lstr dNSNames[])
- static int gen_cert(X509 **cert, EVP_PKEY **key,
-     const struct lstr commonNames[], const struct lstr dNSNames[])
- {
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     int rc, ret=0;
-     RSA *rsa = NULL;
-     BIGNUM *bne = NULL;
-diff --git a/nse_openssl.cc b/nse_openssl.cc
-index 3ee5d73d3f..0f5b450e0c 100644
---- a/nse_openssl.cc
-+++ b/nse_openssl.cc
-@@ -20,6 +20,9 @@
- #define FUNC_EVP_CIPHER_CTX_init EVP_CIPHER_CTX_reset
- #define FUNC_EVP_CIPHER_CTX_cleanup EVP_CIPHER_CTX_reset
- #define PASS_EVP_CTX(ctx) (ctx)
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# include <openssl/provider.h>
-+#endif
- #else
- #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_init
- #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_cleanup
-@@ -37,23 +40,6 @@ extern NmapOps o;
- 
- #include "nse_openssl.h"
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--
--#if OPENSSL_API_LEVEL >= 30000
--#include <openssl/provider.h>
--#endif
--
- #define NSE_SSL_LUA_ERR(_L) \
-     luaL_error(_L, "OpenSSL error: %s", ERR_error_string(ERR_get_error(), NULL))
- 
-@@ -184,7 +170,7 @@ static int l_bignum_is_prime( lua_State *L ) /** bignum_is_prime( BIGNUM p ) */
-   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
-   BN_CTX * ctx = BN_CTX_new();
-   int is_prime =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
- #else
-     BN_check_prime( p->bn, ctx, NULL );
-@@ -199,7 +185,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
-   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
-   BN_CTX * ctx = BN_CTX_new();
-   int is_prime =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
- #else
-     BN_check_prime( p->bn, ctx, NULL );
-@@ -210,7 +196,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
-     BN_sub_word( n, (BN_ULONG)1 );
-     BN_div_word( n, (BN_ULONG)2 );
-     is_safe =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       BN_is_prime_ex( n, BN_prime_checks, ctx, NULL );
- #else
-       BN_check_prime( n, ctx, NULL );
-@@ -582,7 +568,7 @@ LUALIB_API int luaopen_openssl(lua_State *L) {
- #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-   OpenSSL_add_all_algorithms();
-   ERR_load_crypto_strings();
--#elif OPENSSL_API_LEVEL >= 30000
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-   if (NULL == OSSL_PROVIDER_load(NULL, "legacy") && o.debugging > 1)
-   {
-     // Legacy provider may not be available.
-diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
-index 5ae623a475..bc35019a1a 100644
---- a/nse_ssl_cert.cc
-+++ b/nse_ssl_cert.cc
-@@ -89,19 +89,7 @@
- #define X509_get0_notAfter X509_get_notAfter
- #endif
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/core_names.h>
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
-@@ -459,7 +447,7 @@ static const char *pkey_type_to_string(int type)
- }
- 
- int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-   char tmp[64] = {0};
-   size_t len = 0;
-   /* This structure (ecdhparams.curve_params) comes from tls.lua */
-@@ -634,7 +622,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-   else
- #endif
-   if (pkey_type == EVP_PKEY_RSA) {
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     RSA *rsa = EVP_PKEY_get1_RSA(pubkey);
-     if (rsa) {
- #endif
-@@ -643,7 +631,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       luaL_getmetatable( L, "BIGNUM" );
-       lua_setmetatable( L, -2 );
- #if HAVE_OPAQUE_STRUCTS
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       const BIGNUM *n = NULL, *e = NULL;
-       data->should_free = false;
-       RSA_get0_key(rsa, &n, &e, NULL);
-@@ -663,7 +651,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       luaL_getmetatable( L, "BIGNUM" );
-       lua_setmetatable( L, -2 );
- #if HAVE_OPAQUE_STRUCTS
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       data->should_free = false;
- #else
-       data->should_free = true;
-@@ -673,7 +661,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       data->bn = rsa->n;
- #endif
-       lua_setfield(L, -2, "modulus");
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       RSA_free(rsa);
-     }
- #endif
-diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c
-index 1ef7d521f0..23db5513ea 100644
---- a/nsock/src/nsock_ssl.c
-+++ b/nsock/src/nsock_ssl.c
-@@ -64,7 +64,7 @@
- #include "netutils.h"
- 
- #if HAVE_OPENSSL
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
- #endif
- 
-@@ -120,7 +120,7 @@ static SSL_CTX *ssl_init_helper(const SSL_METHOD *method) {
-     SSL_library_init();
- #else
-     OPENSSL_atexit(nsock_ssl_atexit);
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-     if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
-     {
-       nsock_log_error("OpenSSL legacy provider failed to load.\n");
-diff --git a/nsock/src/nsock_ssl.h b/nsock/src/nsock_ssl.h
-index bb99b1b5e1..1af473d629 100644
---- a/nsock/src/nsock_ssl.h
-+++ b/nsock/src/nsock_ssl.h
-@@ -69,20 +69,7 @@
- #include <openssl/err.h>
- #include <openssl/rand.h>
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
- #endif
-
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 8636e26d247d..761485cdba06 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -1,20 +1,21 @@
 # Template file for 'nmap'
 pkgname=nmap
-version=7.93
+version=7.94
 revision=1
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
-hostmakedepends="python"
+hostmakedepends="python3"
 makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <mail@piraty.dev>"
 license="custom:nmap"
 homepage="https://nmap.org"
+changelog="https://raw.githubusercontent.com/nmap/nmap/master/CHANGELOG"
 distfiles="https://nmap.org/dist/nmap-${version}.tar.bz2"
-checksum=55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651
+checksum=d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc
 repository=nonfree
-python_version=2
+python_version=3
 
 build_options="lua"
 build_options_default="lua"

From c78bb87813bef3cd9bf550659f2be42b310c8455 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 4 Jun 2023 21:51:48 +0200
Subject: [PATCH 0313/1853] lagrange: update to 1.16.3.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 569c997fb20a..e674d266750f 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.16.2
+version=1.16.3
 revision=1
 build_style=cmake
 configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=90e3c6cec54ecd0b0afce3952494c46bc6846850da622f66a6394b62b5866c86
+checksum=e82d00a616735d1c2a0a4a165ed63894f6563b9478971c76ef31033599eab0ce
 
 post_install() {
 	vlicense LICENSE.md

From 92380cd5bce5349b1cab9c5d2fd0fc69769a3fe8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 4 Jun 2023 22:04:41 +0200
Subject: [PATCH 0314/1853] vala-language-server: update to 0.48.7

---
 .../patches/glib-2.74-regex.patch             | 46 -------------------
 srcpkgs/vala-language-server/template         |  4 +-
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/vala-language-server/patches/glib-2.74-regex.patch

diff --git a/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch b/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch
deleted file mode 100644
index 53511585ca5b..000000000000
--- a/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b6193265d68b90755d57938c2ba1895841cf4b36 Mon Sep 17 00:00:00 2001
-From: Princeton Ferro <princetonferro@gmail.com>
-Date: Sat, 24 Sep 2022 18:07:27 -0400
-Subject: [PATCH] fix regex for links in comments (#268)
-
-Closes #263
----
- src/documentation/doccomment.vala       | 2 +-
- src/documentation/girdocumentation.vala | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/documentation/doccomment.vala b/src/documentation/doccomment.vala
-index 53bc2520..613cccaf 100644
---- a/src/documentation/doccomment.vala
-+++ b/src/documentation/doccomment.vala
-@@ -129,7 +129,7 @@ class Vls.DocComment {
-         body = /{{{(\w+)?(.*?)}}}/s.replace (body, body.length, 0, "```\\1\\2```");
-         
-         // images and links
--        body = /(\[\[|{{)([~:\/\\\w-.]+)(\|(.*?))?(\]\]|}})/
-+        body = /(\[\[|{{)([~:\/\\\w\-.]+)(\|(.*?))?(\]\]|}})/
-             .replace_eval (body, body.length, 0, 0, (match_info, result) => {
-                 string type = match_info.fetch (1) ?? "";
-                 string href = match_info.fetch (2) ?? "";
-diff --git a/src/documentation/girdocumentation.vala b/src/documentation/girdocumentation.vala
-index 93e0aaeb..36e8b7d7 100644
---- a/src/documentation/girdocumentation.vala
-+++ b/src/documentation/girdocumentation.vala
-@@ -356,7 +356,7 @@ class Vls.GirDocumentation {
-         if (gtkdoc_dir != null) {
-             // substitute image URLs
-             // substitute relative paths in GIR comments for absolute paths to GTK-Doc resources
--            comment_data = /!\[(.*?)\]\(([~:\/\\\w-.]+)\)/
-+            comment_data = /!\[(.*?)\]\(([~:\/\\\w\-.]+)\)/
-                 .replace_eval (comment_data, comment_data.length, 0, 0, (match_info, result) => {
-                     string link_label = match_info.fetch (1) ?? "";
-                     string link_href = match_info.fetch (2) ?? "";
-@@ -386,7 +386,7 @@ class Vls.GirDocumentation {
-             });
- 
-         // now, substitute references to sections
--        comment_data = /\[(.*?)\]\[([\w-\s]+)\]/
-+        comment_data = /\[(.*?)\]\[([\w\-\s]+)\]/
-             .replace_eval (comment_data, comment_data.length, 0, 0, (match_info, result) => {
-                 string link_label = match_info.fetch (1) ?? "";
-                 string section = match_info.fetch (2) ?? "";
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index aa5eeec286cb..2b79b3652de6 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.5
+version=0.48.7
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=c2ace01705c21ee79db281e61035dba00c4d9780e3227921ec7167ba49eb42b7
+checksum=6e848334accd27566843d56db15bedcf7529dc68e416d23d3b4e9fc522019c68

From 60a2ccdd666d4abe8ed9792014ce056141500ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 4 Jun 2023 22:07:41 +0200
Subject: [PATCH 0315/1853] arti: update to 1.1.5.

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

diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index 4ee222463631..d6be792e376c 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
 # Template file for 'arti'
 pkgname=arti
-version=1.1.4
+version=1.1.5
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0, MIT"
 homepage="https://gitlab.torproject.org/tpo/core/arti"
 changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
 distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=8e354b9014010d9dec3f209092cdff0c13d7ae9ed937f7326de8134079c7f011
+checksum=1ac43aa8ae742d516724bd1f7b412a5a979b5007b88f9eed2d8ab06e92bb28f4
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	case "$XBPS_TARGET_MACHINE" in

From 5b8c8a90ef80c3ce106452b8af8231c7c7005c63 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 5 Jun 2023 02:25:09 +0200
Subject: [PATCH 0316/1853] yad: update to 13.0

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

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 25b187b8d41f..7563d196ee60 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=12.3
+version=13.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=794442b03cc22c64020f44511eb97400bae2dcb82883185399f6c6be6219c009
+checksum=194198c4a58e20ceffd9a3206633c3726d962d7d4219edb77aeb748897403e34
 
 pre_configure() {
 	autoreconf -ivf

From 5e4f6df4919b403e658fc70f0ee8dd5302496da0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 4 Jun 2023 22:05:09 -0400
Subject: [PATCH 0317/1853] hyperfine: update to 1.17.0

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

diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template
index c21501c586a2..fa1bdf406d35 100644
--- a/srcpkgs/hyperfine/template
+++ b/srcpkgs/hyperfine/template
@@ -1,6 +1,6 @@
 # Template file for 'hyperfine'
 pkgname=hyperfine
-version=1.16.1
+version=1.17.0
 revision=1
 build_style=cargo
 short_desc="Command-line benchmarking tool"
@@ -9,7 +9,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/sharkdp/hyperfine"
 changelog="https://raw.githubusercontent.com/sharkdp/hyperfine/master/CHANGELOG.md"
 distfiles="https://github.com/sharkdp/hyperfine/archive/refs/tags/v${version}.tar.gz"
-checksum=ffb3298945cbe2c068ca1a074946d55b9add83c9df720eda2ed7f3d94d7e65d2
+checksum=3dcd86c12e96ab5808d5c9f3cec0fcc04192a87833ff009063c4a491d5487b58
 
 export SHELL_COMPLETIONS_DIR=${XBPS_BUILDDIR}/${pkgname}-${version}
 

From 02695ef183d3855fc1fce48226e33aa1e9394e80 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 5 Jun 2023 15:36:55 +0200
Subject: [PATCH 0318/1853] open-vm-tools: update to 12.2.0

---
 ...-test-for-feature-instead-of-platfor.patch | 28 ++++++++-----------
 srcpkgs/open-vm-tools/template                |  6 ++--
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
index f6c0c084d541..4dea9a6b4173 100644
--- a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
+++ b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
@@ -22,18 +22,11 @@ The features we test for are:
 
 This is needed for musl libc.
 
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- open-vm-tools/configure.ac               |  4 ++++
- open-vm-tools/lib/misc/idLinux.c         | 30 +++++++++++-------------
- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 11 +++++----
- 3 files changed, 24 insertions(+), 21 deletions(-)
-
 diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 9aa95abb..941195c1 100644
+index 5f9a193..a846dff 100644
 --- a/open-vm-tools/configure.ac
 +++ b/open-vm-tools/configure.ac
-@@ -879,6 +879,7 @@ AC_CHECK_FUNCS(
+@@ -1179,6 +1179,7 @@ AC_CHECK_FUNCS(
  
  AC_CHECK_FUNCS([ecvt])
  AC_CHECK_FUNCS([fcvt])
@@ -41,7 +34,7 @@ index 9aa95abb..941195c1 100644
  
  AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
  
-@@ -1088,9 +1089,12 @@ fi
+@@ -1388,9 +1389,12 @@ fi
  ###
  
  AC_CHECK_HEADERS([crypt.h])
@@ -55,7 +48,7 @@ index 9aa95abb..941195c1 100644
  AC_CHECK_HEADERS([sys/inttypes.h])
  AC_CHECK_HEADERS([sys/io.h])
 diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c
-index 1bb86f48..2116f2aa 100644
+index 3d7d1e3..0e12ac5 100644
 --- a/open-vm-tools/lib/misc/idLinux.c
 +++ b/open-vm-tools/lib/misc/idLinux.c
 @@ -27,12 +27,9 @@
@@ -72,7 +65,7 @@ index 1bb86f48..2116f2aa 100644
  #ifdef __APPLE__
  #include <sys/socket.h>
  #include <TargetConditionals.h>
-@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid)  // IN:
+@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid)  // IN:
  static Bool
  IdIsSetUGid(void)
  {
@@ -106,10 +99,11 @@ index 1bb86f48..2116f2aa 100644
 +#elif HAVE___SECURE_GETENV
     static const char envName[] = "VMW_SETUGID_TEST";
  
-    if (setenv(envName, "1", TRUE) == -1) {
-       return TRUE; /* Conservative */
+    /*
+@@ -1062,7 +1058,9 @@ IdIsSetUGid(void)
+       return secure_getenv(envName) == NULL;
     }
-    return __secure_getenv(envName) == NULL;
+    return TRUE;
 -#endif
 +#else
 +   /* Android does not have a secure_getenv, so be conservative. */
@@ -118,7 +112,7 @@ index 1bb86f48..2116f2aa 100644
  }
  #endif
 diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
-index 3363f3ac..b343196b 100644
+index de57a4a..7a132ee 100644
 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
 +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
 @@ -35,9 +35,13 @@
@@ -136,7 +130,7 @@ index 3363f3ac..b343196b 100644
  # include <net/if.h>
  #endif
  #ifndef NO_DNET
-@@ -494,10 +498,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
+@@ -499,10 +503,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
   *
   ******************************************************************************
   */
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 6e4e19bfdd5e..67ee6db8275d 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=12.1.5
+version=12.2.0
 revision=1
 archs="x86_64* i686* aarch64*"
 build_wrksrc="open-vm-tools"
@@ -17,8 +17,8 @@ maintainer="Piraty <mail@piraty.dev>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/ReleaseNotes.md"
-distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=678d08b46fba15f2b4c39245b5bc4deec30284d6f13ee279c233bc3d3627ec8a
+distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz"
+checksum=5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
 
 build_options="pam x11"
 build_options_default="pam x11"

From 5a007a3941e64fdf0b6bab3df089fef6b9691660 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 4 Jun 2023 13:46:04 +0530
Subject: [PATCH 0319/1853] himalaya: update to 0.8.0.

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

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index 4bafe8d2f2c5..a115d4e5562c 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,19 +1,34 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.7.3
+version=0.8.0
 revision=1
 build_style=cargo
+build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel"
+makedepends="sqlite-devel libzstd-devel"
 short_desc="CLI email client"
 maintainer="Gadzhi Kharkharov <me@kkga.me>"
 license="MIT"
 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=5bfadca9d6141834c3a97d53a43bdd317e59ee4f893bcc00e6fcbf9fc0f5b55a
+checksum=c9bf62c802b05d3c98e105513042eafbbcbed4c5ed61aec7addae185accc5b40
 
 post_install() {
 	vlicense LICENSE
 	vdoc README.md
+
+	local himalaya="${DESTDIR}/usr/bin/himalaya"
+	vtargetrun ${himalaya} man .
+	for page in himalaya*.1; do
+		vman ${page}
+	done
+
+	for shell in bash fish zsh; do
+		vtargetrun ${himalaya} completion ${shell} > himalaya.${shell}
+		vcompletion himalaya.${shell} ${shell}
+	done
+
+	vsconf config.sample.toml config.toml
+	vinstall assets/himalaya.desktop 644 usr/share/applications
 }

From 68db9cf99778faca06cf09059f9b9fb9314b3bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:43:28 +0100
Subject: [PATCH 0320/1853] ImageMagick: update to 7.1.1.11.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cc78d87b0326..dbfcc264cae7 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.1.10
+# Revbump php*-imagick with ImageMagick updates.
+version=7.1.1.11
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -19,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=5008d827a78b56d436f532e6b6f7b6d4a69aa59342ce3dae00383f4686718c89
+checksum=98bb2783da7d5b06e7543529bd07b50d034fba611ff15e8817a0f4f73957d934
 
 subpackages="libmagick libmagick-devel"
 

From 29d9b8be60996364e04d42f59da677f7d392e8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:48:23 +0100
Subject: [PATCH 0321/1853] php8.0-imagick: revbump for ImageMagick 7.1.1.11.

---
 srcpkgs/php8.0-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
index fe31cb060f30..ae1823ab75d2 100644
--- a/srcpkgs/php8.0-imagick/template
+++ b/srcpkgs/php8.0-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0-imagick'
 pkgname=php8.0-imagick
 version=3.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.0"

From 88acdafe9e631b86aab065f2367c707d28e8d5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:48:23 +0100
Subject: [PATCH 0322/1853] php8.1-imagick: revbump for ImageMagick 7.1.1.11.

---
 srcpkgs/php8.1-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index 9c949a40d8c6..dbf7cae1d74a 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1-imagick'
 pkgname=php8.1-imagick
 version=3.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.1"

From b930111aa92b8bb7732bc2ecf5da5e6c8a7343ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:48:23 +0100
Subject: [PATCH 0323/1853] php8.2-imagick: revbump for ImageMagick 7.1.1.11.

---
 srcpkgs/php8.2-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2-imagick/template b/srcpkgs/php8.2-imagick/template
index 59d405b7ee0e..09b11989c52a 100644
--- a/srcpkgs/php8.2-imagick/template
+++ b/srcpkgs/php8.2-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2-imagick'
 pkgname=php8.2-imagick
 version=3.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.2"

From 1b233409205aba40b8de7633f554f83f7b3e7d47 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 6 Jun 2023 16:47:01 +0200
Subject: [PATCH 0324/1853] dbeaver: update to 23.1.0.

---
 srcpkgs/dbeaver/files/dbeaver.desktop | 3 +--
 srcpkgs/dbeaver/template              | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dbeaver/files/dbeaver.desktop b/srcpkgs/dbeaver/files/dbeaver.desktop
index 1eb3eba5b99d..ecb376d39cbb 100644
--- a/srcpkgs/dbeaver/files/dbeaver.desktop
+++ b/srcpkgs/dbeaver/files/dbeaver.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
 Name=DBeaver
 Comment=SQL Integrated Development Environment
-Icon=dbeaver
+Icon=/usr/lib/dbeaver/icon.xpm
 Exec=dbeaver
 Terminal=false
 Type=Application
 Categories=Development
-
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d207598988d8..de239d96902c 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=23.0.5
+version=23.1.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://dbeaver.io"
 changelog="https://dbeaver.io/news/"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=55261bcdf16635347a42f8f8059df4368c88da79bbf4e458f0f648a8ab03e7e1
+checksum=85df98086b9984c4379382077f90bee60231fd04e1ccde120e9422e29a462218
 nopie=true
 
 do_build() {

From 3b126f47f28872699b047b68c38d70b9bae72ce3 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 1 Jun 2023 13:46:26 +0200
Subject: [PATCH 0325/1853] dooble: update to 2023.05.31.

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

diff --git a/srcpkgs/dooble/template b/srcpkgs/dooble/template
index ac1d6dcb0f17..002507fbdcef 100644
--- a/srcpkgs/dooble/template
+++ b/srcpkgs/dooble/template
@@ -1,6 +1,6 @@
 # Template file for 'dooble'
 pkgname=dooble
-version=2023.04.20
+version=2023.05.31
 revision=1
 build_style=qmake
 configure_args="dooble.pro"
@@ -12,7 +12,7 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://textbrowser.github.io/dooble/"
 distfiles="https://github.com/textbrowser/dooble/archive/refs/tags/${version}.tar.gz"
-checksum=5425a5ad6753c08df061a8b78fa4aba035a915327d7b967eab3f0a6479eb869c
+checksum=ca2ad5dde9b695acb0b3553ce351fb6f155e9fb412dcb870adba8e12051a09e5
 
 do_install() {
 	vbin Dooble dooble

From e7dd1b3e0f4655a26b7aa249336ba92282ae9e53 Mon Sep 17 00:00:00 2001
From: JailBird <jailbird@fdf.net>
Date: Fri, 2 Jun 2023 15:51:03 -0500
Subject: [PATCH 0326/1853] dnsdist: update to 1.8.0

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

diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index 0e2138b9d7bc..9b3991a2d546 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsdist'
 pkgname=dnsdist
-version=1.7.2
-revision=3
+version=1.8.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
  --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
@@ -19,7 +19,7 @@ license="GPL-2.0-only"
 homepage="https://dnsdist.org/"
 changelog="https://dnsdist.org/changelog.html"
 distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=524bd2bb05aa2e05982a971ae8510f2812303ab4486a3861b62212d06b1127cd
+checksum=1c0d375c25453d349b88e03ff589aa2603ca8692fc98364c068ead372804704f
 
 system_accounts="_dnsdist"
 
@@ -33,6 +33,6 @@ pre_configure() {
 }
 
 post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vinstall dnsdist.conf-dist 644 etc/dnsdist dnsdist.conf
 	vsv dnsdist
 }

From 324af758b13bd9f35218c3feb87f779426ce3b15 Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Fri, 2 Jun 2023 22:29:57 -0400
Subject: [PATCH 0327/1853] ntfs2btrfs: update to 20230501

---
 ...Use-GNUInstallDirs-to-determine-sbin.patch | 23 -------------------
 srcpkgs/ntfs2btrfs/template                   |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch

diff --git a/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch b/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
deleted file mode 100644
index 4f3412240f52..000000000000
--- a/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f97247434ecda2cd2c451da5c73c3af98dfaea35 Mon Sep 17 00:00:00 2001
-From: Mark Harmstone <mark@harmstone.com>
-Date: Thu, 7 Oct 2021 17:59:35 +0100
-Subject: [PATCH] CMakeLists.txt: use GNUInstallDirs to determine sbin location
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cfaa571..17ded78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,5 +89,5 @@ else()
-     target_compile_options(ntfs2btrfs PRIVATE -Wall -Wextra -Wno-address-of-packed-member -Wconversion -Wno-unknown-pragmas -Werror=pointer-arith)
- endif()
- 
--install(TARGETS ntfs2btrfs DESTINATION sbin)
-+install(TARGETS ntfs2btrfs DESTINATION ${CMAKE_INSTALL_SBINDIR})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ntfs2btrfs.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
--- 
-2.33.0
-
diff --git a/srcpkgs/ntfs2btrfs/template b/srcpkgs/ntfs2btrfs/template
index c87a81de187d..d8a5903a4e98 100644
--- a/srcpkgs/ntfs2btrfs/template
+++ b/srcpkgs/ntfs2btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'ntfs2btrfs'
 pkgname=ntfs2btrfs
-version=20210923
+version=20230501
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_SBINDIR=bin"
@@ -11,4 +11,4 @@ maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-only"
 homepage="https://github.com/maharmstone/ntfs2btrfs"
 distfiles="https://github.com/maharmstone/ntfs2btrfs/archive/${version}.tar.gz"
-checksum=e07cc1cad634d59e58111bf993683f02a7504913fac1ef8dd33fd06ebf9140c1
+checksum=15924a22e9d80e4ca28bf5524708dd8f69d840df1e781a659ce953fee7d90730

From 542c90f58165394dc2dbfed3083f25db65b254bc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 3 Jun 2023 18:11:15 +0100
Subject: [PATCH 0328/1853] dav1d: update to 1.2.1.

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

diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index 93a5a75f8238..ff2b78b4333b 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -1,6 +1,6 @@
 # Template file for 'dav1d'
 pkgname=dav1d
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=meson
 configure_args="-Denable_asm=true -Denable_tools=true -Dfuzzing_engine=none
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 changelog="https://code.videolan.org/videolan/dav1d/raw/master/NEWS"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive/${version}/dav1d-${version}.tar.bz2"
-checksum=05cedc43127e00a86c68b8a49a5f68e2dc22b9baa10b1e12a5e3bc5b37876a6b
+checksum=a4003623cdc0109dec3aac8435520aa3fb12c4d69454fa227f2658cdb6dab5fa
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Denable_tests=true"

From c71fcb2eb8e2e033abe206dc66a80354ad5fe3b1 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Tue, 30 May 2023 08:57:22 +0200
Subject: [PATCH 0329/1853] cpuid: update to 20230505.

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

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 0fd421467072..849aec8d173d 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20230406
+version=20230505
 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=f4045de535f30e34e8c012b054ce66f40ac399144d6e3c3896bd80c0deeef1b0
+checksum=55d30400cd6bab9acf3597edfc9a527a258e3a7b5c40ccc9b8b32b10d3e29b30
 
 conflicts="msr-tools"

From 2642c0e4a85ef0e637819bce46e68ee12a6314bc Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 3 Jun 2023 20:20:17 +0200
Subject: [PATCH 0330/1853] pgmetrics: update to 1.15.0.

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

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index ed30907d502b..de82b6132519 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,7 +1,7 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
-version=1.14.1
-revision=2
+version=1.15.0
+revision=1
 build_style=go
 go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://pgmetrics.io"
 distfiles="https://github.com/rapidloop/pgmetrics/archive/refs/tags/v${version}.tar.gz"
-checksum=cb93d65215e47fd7d15b9fe236dee53f29d72870d57e9262a37487dd516e8dda
+checksum=2975c4c5fbc8ebffeeb4afa0fd783bef60b3034c8d882d7e6d630ed5af803018
 
 post_install() {
 	vdoc README.md

From c6c17fd8e09195624c5b8411333a1ea51735752d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 3 Jun 2023 20:43:28 -0400
Subject: [PATCH 0331/1853] just: update to 1.14.0

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

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index f9861bccb69f..8f93ff95355e 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.13.0
+version=1.14.0
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz"
-checksum=ead24ef982253fa4bdd0af27b0867f74c8d9528817be8dd8b14b182369a432c7
+checksum=021d4dee59ddfd86ab87b9c9423b9a8126932c844da9765a35eb1ccb8f6cf4ce
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From cc31ad9815c8b21ac44bfe41d63dd0178f9a77dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 30 May 2023 20:11:12 +0200
Subject: [PATCH 0332/1853] libssh2: update to 1.11.0

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

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index 456e4cc4547b..4b999a7fc1ee 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,16 +1,16 @@
 # Template file for 'libssh2'
 pkgname=libssh2
-version=1.10.0
+version=1.11.0
 revision=1
-build_style=gnu-configure
-configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
+build_style=cmake
+configure_args="-DENABLE_ZLIB_COMPRESSION=ON -DRUN_DOCKER_TESTS=OFF"
 makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.libssh2.org/"
 distfiles="http://www.libssh2.org/download/${pkgname}-${version}.tar.gz"
-checksum=2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51
+checksum=3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
 
 post_install() {
 	vlicense COPYING LICENSE
@@ -21,9 +21,11 @@ libssh2-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/doc
+		vmove usr/share/man
 	}
 }

From ad25019983e9eda899acf02d318a3697b1f78007 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 29 May 2023 11:22:11 +0530
Subject: [PATCH 0333/1853] font-spleen: update to 2.0.0.

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

diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template
index 33eda7716544..d84121bb2803 100644
--- a/srcpkgs/font-spleen/template
+++ b/srcpkgs/font-spleen/template
@@ -1,6 +1,6 @@
 # Template file for 'font-spleen'
 pkgname=font-spleen
-version=1.9.3
+version=2.0.0
 revision=1
 build_style=gnu-makefile
 make_cmd=bmake
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/fcambus/spleen"
 changelog="https://raw.githubusercontent.com/fcambus/spleen/master/ChangeLog"
 distfiles="https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"
-checksum=b7ad1edb02a5ddad117ca94f026eb8450b51504d2e81bc3a03875e12d4e76b25
+checksum=778778b35dd48701b803db247a6ac8759154ce5fc3abd5cc0b6db98a44ba5a0c
 font_dirs="/usr/share/fonts/X11/spleen"
 
 do_configure() {

From ba6e4f52bb8a52e52a59255e094ab245c4a18a29 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 May 2023 14:48:45 -0400
Subject: [PATCH 0334/1853] azote: update to 1.12.0

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

diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 8d4ab840fe91..319a5f5b3ad8 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,6 +1,6 @@
 # Template file for 'azote'
 pkgname=azote
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Piotr Miller <nwg.piotr@gmail.com>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/azote"
 distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/v${version}.tar.gz"
-checksum=82cacfabecd0ad2265495d07cce80cb9d01c2191104250adce67012bddd79fd1
+checksum=f36962755f266ab3adf21fe997ad0df7ff4c372b6d9e7437d6c815e75ad479dc
 make_check=no # no tests provided
 
 post_install() {

From 140f532ff1c746dec2b971599bdeaab487d94a88 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 16 May 2023 15:52:27 -0700
Subject: [PATCH 0335/1853] root: update to 6.28.04

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

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 0cbe92f79ecd..13a46d1a759e 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,6 +1,6 @@
 # Template file for 'root'
 pkgname=root
-version=6.28.02
+version=6.28.04
 revision=1
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
@@ -27,7 +27,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://root.cern"
 distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
-checksum=6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa
+checksum=70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965
 build_options="fortran"
 build_options_default="fortran"
 python_version=3

From 714721cd19d9c5e8377d3375d98dfbb88042e7f4 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Tue, 7 Mar 2023 13:22:56 -0300
Subject: [PATCH 0336/1853] nextcloud-client: update to 3.8.2, adopt

Also:
- Remove patch to disable update check, use BUILD_UPDATER=NO flag
  instead [1]

[1] https://github.com/nextcloud/desktop/pull/1847
---
 ...heck-for-updates-disabled-as-default.patch | 24 -------------------
 srcpkgs/nextcloud-client/template             |  8 +++----
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch

diff --git a/srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch b/srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch
deleted file mode 100644
index dec501c628f2..000000000000
--- a/srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Set check for updates option as false by default
-
---- a/src/gui/generalsettings.ui
-+++ b/src/gui/generalsettings.ui
-@@ -114,7 +114,7 @@
-            <string>&amp;Automatically check for Updates</string>
-           </property>
-           <property name="checked">
--           <bool>true</bool>
-+           <bool>false</bool>
-           </property>
-          </widget>
-         </item>
---- a/src/libsync/configfile.cpp
-+++ b/src/libsync/configfile.cpp
-@@ -631,7 +631,7 @@ bool ConfigFile::autoUpdateCheck(const QString &connection) const
-     if (connection.isEmpty())
-         con = defaultConnection();
- 
--    QVariant fallback = getValue(QLatin1String(autoUpdateCheckC), con, true);
-+    QVariant fallback = getValue(QLatin1String(autoUpdateCheckC), con, false);
-     fallback = getValue(QLatin1String(autoUpdateCheckC), QString(), fallback);
- 
-     QVariant value = getPolicySetting(QLatin1String(autoUpdateCheckC), fallback);
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 27502262b8fa..8d667180293f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,9 +1,9 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.8.1
+version=3.8.2
 revision=1
 build_style=cmake
-configure_args="-Wno-dev"
+configure_args="-DBUILD_UPDATER=NO -Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
@@ -14,12 +14,12 @@ depends="qt5-graphicaleffects"
 checkdepends="cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
 short_desc="NextCloud Desktop client"
-maintainer="yopito <pierre.bourgin@free.fr>"
+maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
 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=f919a09c261039ddb8fcb6c10f10b1c6a8a31f64bf9b8b14ff46b5d02e428afc
+checksum=6186aaa70b82b06b4531cff2e55e0dd38a0d817de7ef039a81293d82cb05e8c0
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 

From e48635a4f44f6cad50ca9c910770e90c6453ea8b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 10:43:50 +0200
Subject: [PATCH 0337/1853] hyperrogue: update to 12.1q

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

diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index 9cd93f66f554..ac59d59696b7 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,6 +1,6 @@
 # Template file for 'hyperrogue'
 pkgname=hyperrogue
-version=12.1o
+version=12.1q
 revision=1
 build_style=gnu-makefile
 makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, CC-BY-SA-4.0, CC-BY-SA-3.0, CC-BY-3.0, Public Domain"
 homepage="https://www.roguetemple.com/z/hyper/"
 changelog="https://raw.githubusercontent.com/zenorogue/hyperrogue/master/changelog.txt"
 distfiles="https://github.com/zenorogue/hyperrogue/archive/refs/tags/v${version}.tar.gz"
-checksum=cd351935d79be5c2e952a48cfad165635573d4aec0f695f8d6b563fb9938c4e9
+checksum=65689881423762cadf6d6b2e22a1ade62a3f6911fdf6d268d84111e1e0f3b6f0
 nocross="Generates code from build output that must run on host"
 
 # SDL_gfx-devel headers require that SDL.h be under the header search paths,

From ea34f674a2d383bb8d5fa80428bfd7dcd3be3d45 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 May 2023 10:15:20 -0400
Subject: [PATCH 0338/1853] fragments: update to 2.1.1

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

diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index 135e4905b99f..7de6c8b6b2b2 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,7 +1,7 @@
 # Template file for 'fragments'
 pkgname=fragments
-version=2.1
-revision=2
+version=2.1.1
+revision=1
 build_style=meson
 build_helper="rust"
 hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
@@ -14,7 +14,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Fragments"
 distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
+checksum=5d573b99565d730101d41541731efe70df5bd72bab27de9f3da17b847e3684a8
 
 post_patch() {
 	if [ "$CROSS_BUILD" ]; then

From 21e8c7b1f3856537f80ac8515a3105063195c574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 31 May 2023 19:40:31 +0200
Subject: [PATCH 0339/1853] tml: update to 0.6.1.

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

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index e7b794000e57..55da9c4b2b73 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
-version=0.6.0
-revision=3
+version=0.6.1
+revision=1
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/liamg/tml"
 distfiles="https://github.com/liamg/tml/archive/v${version}.tar.gz"
-checksum=80c5113447ee0f4aea0339184e6f393b135c62c985c788baf7e0fa4b9f7c2c48
+checksum=f9ee764c08481deca00a292ecec19c0987b68254cfc1a0f7f8b63528bfafee67
 
 post_install() {
 	vlicense LICENSE

From 196442710dd61401dabf3ce8b058b63d78e1b97b Mon Sep 17 00:00:00 2001
From: Jason Elswick <jason@jasondavid.tv>
Date: Wed, 31 May 2023 16:17:18 -0500
Subject: [PATCH 0340/1853] python3-dnsrecon: update to 1.1.4

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

diff --git a/srcpkgs/python3-dnsrecon/template b/srcpkgs/python3-dnsrecon/template
index 32979df704f7..ed46e10d17cd 100644
--- a/srcpkgs/python3-dnsrecon/template
+++ b/srcpkgs/python3-dnsrecon/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-dnsrecon'
 pkgname=python3-dnsrecon
-version=1.1.3
-revision=2
+version=1.1.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-netaddr python3-dnspython python3-lxml python3-flake8 python3-setuptools"
 checkdepends="${depends} python3-pytest"
 short_desc="DNS enumeration script"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Jason Elswick <jason@jasondavid.tv>"
 license="GPL-2.0-only"
 homepage="https://github.com/darkoperator/dnsrecon"
 distfiles="https://github.com/darkoperator/dnsrecon/archive/refs/tags/${version}.tar.gz"
-checksum=076aa0745ab956b278f535f17fd002bd8be838e00fd18a639c30e9cd37ec9eb0
+checksum=ef3a7969b2cf25d1a65a62043a8dbede73103920e2c17c72e8c1aa7c1cc467b2

From 5a7399de6d0a218d2c3edc08e9d253143b783e00 Mon Sep 17 00:00:00 2001
From: Imran Khan <imran@khan.ovh>
Date: Thu, 1 Jun 2023 21:11:13 +0600
Subject: [PATCH 0341/1853] pgbouncer: update to 1.19.1.

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

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index fb60ee74f89e..f681521fcd3a 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,22 +1,22 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.17.0
+version=1.19.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"
-checkdepends="which postgresql14 postgresql14-client"
+checkdepends="python3-pytest-xdist python3-pytest-asyncio python3-filelock python3-psycopg postgresql15 postgresql15-client"
 short_desc="Lightweight connection pooler for PostgreSQL"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="ISC"
 homepage="https://pgbouncer.github.io/"
 changelog="https://raw.githubusercontent.com/pgbouncer/pgbouncer/master/NEWS.md"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=657309b7bc5c7a85cbf70a9a441b535f7824123081eabb7ba86d00349a256e23
+checksum=58c3eff9bb72c18133b28e1f034fd59356ea76281c65e127432ca101c208a394
 make_check=ci-skip # Postgres server can't be run as root
 
 pre_check() {
-	. /etc/profile.d/postgresql14.sh
+	. /etc/profile.d/postgresql15.sh
 }
 
 post_install() {

From 17da0732ec641686481a30bf642823764371aed0 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Thu, 1 Jun 2023 13:44:02 -0400
Subject: [PATCH 0342/1853] mako: update to 1.8.0

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

diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template
index aad55bad6e21..2780bb58a057 100644
--- a/srcpkgs/mako/template
+++ b/srcpkgs/mako/template
@@ -1,6 +1,6 @@
 # Template file for 'mako'
 pkgname=mako
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=meson
 configure_args="-Dicons=enabled -Dman-pages=enabled -Dzsh-completions=true
@@ -13,7 +13,7 @@ maintainer="Emerson Ferreira <me@skrps.me>"
 license="MIT"
 homepage="https://wayland.emersion.fr/mako/"
 distfiles="https://github.com/emersion/mako/archive/v${version}.tar.gz"
-checksum=4312ff6bc61708115b43b967a42813374de7a2022f10c84e20127606416c3c12
+checksum=f149f3dd2a083504a50307554c0a729ac56888c8ebb0704a78b7261be26166de
 
 post_install() {
 	vlicense LICENSE

From f013c9a306822fedf7a32d6ebbefa7e7a0e2c8d3 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Thu, 8 Jun 2023 18:50:59 -0500
Subject: [PATCH 0343/1853] Signal-Desktop: update to 6.20.2.

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 7eca75b4f1f5..88a862a26a14 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.20.1
+version=6.20.2
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=3c664dbb5c1670554859fa55fd765ac35632f573fd5b7bea63876cdf41b6b7d6
+checksum=8cca38e0ce70bec39a9d3f4c1d51bfec95a1455187c5ec1001ce98ec55f9c3e5
 nostrip_files="signal-desktop"
 
 post_extract() {

From c85fc5a14b58c1ea7ef0d40a12af22b6df33cee0 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:58:25 +0200
Subject: [PATCH 0344/1853] alfred: update to 2023.1.

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

diff --git a/srcpkgs/alfred/template b/srcpkgs/alfred/template
index 6ad228a0008b..111904c8daf4 100644
--- a/srcpkgs/alfred/template
+++ b/srcpkgs/alfred/template
@@ -1,6 +1,6 @@
 # Template file for 'alfred'
 pkgname=alfred
-version=2021.1
+version=2023.1
 revision=1
 build_style=gnu-makefile
 make_build_args="CONFIG_ALFRED_GPSD=n"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://www.open-mesh.org/projects/alfred/wiki"
 distfiles="https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${version}.tar.gz"
-checksum=94e2cf4dad885f9059fc8b8694a71eca51c9e184683bb99a79e3de8cb7485e88
+checksum=438048248f373757d3a8bde7cbc6db6685f4d0105d130da2f5a54f29090c6974
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libnl3"
 

From 53d36e8d65ea2c00ac0ed053ca4eef49801e7172 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:06:12 +0200
Subject: [PATCH 0345/1853] gopass: update to 1.15.5.

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

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 320ff8ca0e14..66b113ae5a7b 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.15.2
-revision=2
+version=1.15.5
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.gopass.pw/"
 changelog="https://raw.githubusercontent.com/gopasspw/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz"
-checksum=c4eb5b8c28b0cb339581e1ef9f19612f6d523d7fa8a24554365ee72dc331d8d9
+checksum=d37e23081abd53c6441a28f1faecc5bbdc760e921ea26fb092745a695e79f60f
 
 post_install() {
 	vlicense LICENSE

From 575351e61b46ccd8c791e7a1a3b4bff896934106 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:38:24 +0200
Subject: [PATCH 0346/1853] iperf3: update to 3.13.

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

diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 6ca59cb0ae4c..a8e54cccc2be 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf3'
 pkgname=iperf3
-version=3.11
+version=3.13
 revision=1
 build_style=gnu-configure
 make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS="
@@ -10,7 +10,7 @@ license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md"
 distfiles="https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"
-checksum=de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f
+checksum=bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865
 
 post_install() {
 	vlicense LICENSE

From e95be0604416f3014718997c365ab7566316a6bb Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 29 May 2023 22:03:09 +0100
Subject: [PATCH 0347/1853] enchant2: update to 2.5.0.

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

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 1f028cba007b..c3d41d86fda6 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.3.3
-revision=2
+version=2.5.0
+revision=1
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
 # might be a bug in their build system that only this directory and/or file aren't
@@ -12,7 +12,7 @@ make_build_args="pkgdatadir=/usr/share/enchant-2"
 make_install_args="$make_build_args"
 # tests need --enable-relocatable
 configure_args="--enable-relocatable"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config groff"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
  libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
@@ -22,7 +22,7 @@ license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 changelog="https://raw.githubusercontent.com/AbiWord/enchant/master/NEWS"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=3da12103f11cf49c3cf2fd2ce3017575c5321a489e5b9bfa81dd91ec413f3891
+checksum=149e224cdd2ca825d874639578b6246e07f37d5b8f3970658a377a1ef46f2e15
 make_check=no # tests broken
 
 enchant2-devel_package() {

From eca981e8fa4888c375e405db3e24b99d8efaa01f Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Mon, 29 May 2023 18:31:51 -0400
Subject: [PATCH 0348/1853] Waybar: update to 0.9.18

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

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 4a6d1d595037..3da1c780f280 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.17
+version=0.9.18
 revision=1
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
@@ -28,7 +28,7 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz"
-checksum="da6f448be343a593ee092486fb4744502aa1e6ad85f4eccc3670d0b84a2a4266"
+checksum=44927f71834196276cfcbf5607339f59b511edf0ecc496c09d4f5f115108df3e
 
 build_options="libnl pulseaudio dbusmenugtk mpd sndio pipewire"
 build_options_default="libnl pulseaudio dbusmenugtk mpd sndio pipewire"

From a6cb00d437912e61647a3bae768dfb11baa6a7c2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 30 May 2023 11:28:32 +0200
Subject: [PATCH 0349/1853] intellij-idea-community-edition: update to 2023.1.2

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

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index c681412597c5..63390bf45691 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2023.1
+version=2023.1.2
 revision=1
 archs="x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"
-checksum=e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa
+checksum=f222f0282bebe2e8c3fef6a27b160c760c118e45a0cdb7c9053d645a8e00844a
 repository=nonfree
 nopie=yes
 python_version=3

From 43cce44220b5892bafeaa164e5f4ba01ec0cfe13 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 30 May 2023 11:34:12 +0200
Subject: [PATCH 0350/1853] pnpm: update to 8.6.0

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

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index a6551bc553a0..5e3f10c0aa8b 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=7.30.5
+version=8.6.0
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=c8d730294f671574458704cd56e81dc0eb8d345a444e4c7a728d8d2cdc4f5045
+checksum=1e9c17c34c2eebaba02e78b619e296db08d302c296e58c2f51b0cd4e3e5bcda2
 python_version=3
 
 do_install() {

From b6f4f9f2d057314a81b5261d81026c09e2a558bb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 May 2023 10:28:13 -0400
Subject: [PATCH 0351/1853] mdBook: update to 0.4.30

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

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 0f14fdda92c3..cfcdbc4cb545 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.29
+version=0.4.30
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz"
-checksum=13e2ff0b9193aa257e6629554bc7dcdb83ee9654235dcd351b254aecd7d7b04f
+checksum=9df217a6a4c22d4b0fef0d13e04b1a9ae896a0c1084af36b93d032c9fa2c4148
 
 post_install() {
 	vlicense LICENSE

From 775edc04857dd7d88a2864e9938ea79e1a4fe67e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 18:48:26 -0300
Subject: [PATCH 0352/1853] python3-coverage: update to 7.2.7.

---
 .../patches/no-versioned-coverage.patch       | 16 --------
 srcpkgs/python3-coverage/template             | 41 ++++++++++++++-----
 2 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python3-coverage/patches/no-versioned-coverage.patch

diff --git a/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
deleted file mode 100644
index fefbfc0af761..000000000000
--- a/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -86,12 +86,9 @@ setup_args = dict(
-     },
- 
-     entry_points={
--        # Install a script as "coverage", and as "coverage[23]", and as
--        # "coverage-2.7" (or whatever).
-+        # Install a script as "coverage"
-         'console_scripts': [
-             'coverage = coverage.cmdline:main',
--            'coverage%d = coverage.cmdline:main' % sys.version_info[:1],
--            'coverage-%d.%d = coverage.cmdline:main' % sys.version_info[:2],
-         ],
-     },
- 
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
index 223f93ac4447..514705a375cd 100644
--- a/srcpkgs/python3-coverage/template
+++ b/srcpkgs/python3-coverage/template
@@ -1,17 +1,36 @@
 # Template file for 'python3-coverage'
 pkgname=python3-coverage
-version=5.0.3
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=7.2.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 makedepends="python3-devel"
-depends="python3-setuptools"
-checkdepends="python3-pytest-xdist python3-flaky python3-unittest-mixins"
-short_desc="Code coverage testing for Python3"
+checkdepends="$depends python3-pytest-xdist python3-flaky python3-hypothesis"
+short_desc="Code coverage tool for Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
+homepage="https://github.com/nedbat/coveragepy"
+changelog="https://raw.githubusercontent.com/nedbat/coveragepy/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-# coverage executable needs to run for many tests
-make_check=no
+checksum=924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59
+
+pre_check() {
+	# required setup, see tox.ini
+	python igor.py zip_mods
+}
+
+do_check() {
+	# Running via PYTHONPATH breaks a few tests so we use a venv
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
+	python3 -m venv --system-site-packages --without-pip "${testdir}"
+
+	local testpy="${testdir}/bin/python3"
+	"${testpy}" -m installer dist/*.whl
+	PATH="${testdir}/bin:${PATH}" "${testpy}" -m pytest -n ${XBPS_MAKEJOBS}
+}
+
+post_install() {
+	# remove versioned scripts (keep only /usr/bin/coverage)
+	rm ${DESTDIR}/usr/bin/coverage3
+	rm ${DESTDIR}/usr/bin/coverage-${py3_ver}
+}

From b603663e5081dac7e555912512a51bee9f9d0568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 23:53:02 -0300
Subject: [PATCH 0353/1853] python3-flaky: update to 3.7.0.

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

diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template
index 8f80d84d295b..5d1bbe305358 100644
--- a/srcpkgs/python3-flaky/template
+++ b/srcpkgs/python3-flaky/template
@@ -1,13 +1,15 @@
 # Template file for 'python3-flaky'
 pkgname=python3-flaky
-version=3.6.1
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=3.7.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
-short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python3)"
+short_desc="Plugin for nose or pytest that automatically reruns flaky tests"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/box/flaky"
+changelog="https://raw.githubusercontent.com/box/flaky/master/HISTORY.rst"
 distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
-checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698
+checksum=3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d
+make_check=no  # Tests are broken

From 3a8a29204fa7d849bdc133de1f436ce0ffe3c70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 5 Jun 2023 01:58:55 -0300
Subject: [PATCH 0354/1853] python3-hypothesis: update to 6.76.0.

---
 srcpkgs/python3-hypothesis/template | 47 +++++++++++++++--------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 30def188b53f..67321c20e2d2 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,32 +1,35 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.75.0
+version=6.76.0
 revision=1
 build_wrksrc=hypothesis-python
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+# disable tests requiring unpackaged dependencies or installed entrypoints
+make_check_args="
+ --ignore=tests/codemods/test_codemods.py
+ --ignore=tests/codemods/test_codemod_cli.py
+ --ignore=tests/dpcontracts/test_contracts.py
+ --ignore=tests/lark/test_grammar.py
+ --ignore=tests/patching/test_patching.py
+ --ignore=tests/redis/test_redis_exampledatabase.py
+ -k not(test_registered_from_entrypoint)
+"
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-attrs python3-sortedcontainers"
-checkdepends="python3-pytest-xdist black python3-typing_extensions
- python3-pytz python3-numpy python3-pexpect python3-dateutil $depends"
-short_desc="Python3 library for property based testing"
+checkdepends="python3-pytest-xdist black python3-typing_extensions python3-pytz
+ python3-numpy python3-pexpect python3-dateutil python3-pandas $depends"
+short_desc="Python library for property-based testing"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MPL-2.0"
 homepage="https://hypothesis.works/"
-changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
+changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=b5aae201b1758beb00c6d8eea3d860a461fe9f628c14d01f7a90a978b23e9178
+checksum=4564bbd860413af105dcdee6d5a9f8a1d08274f940266dfd2b45492d61f8b847
 
-do_check() {
-	# Manually run the tests that tox considers part of the "full" suite,
-	# less any related to packages not provided by Void.
-	#
-	# The tests in ghostwriter/test_ghostwriter_cli require a "hypothesis"
-	# entrypoint script, which does not exist until install time.
-	#
-	# The test_subTest_no_self function tries to run a separate
-	# interpreter, which will not see the local PYTHONPATH here.
-	PYTHONPATH=src python3 -m pytest -n $XBPS_MAKEJOBS \
-		-k 'not test_settings_alone and not test_subTest_no_self' \
-		--ignore=tests/ghostwriter/test_ghostwriter_cli.py \
-		tests/{cover,datetime,typing_extensions,ghostwriter}
-}
+if [ "$XBPS_CHECK_PKGS" != full ]; then
+	# Skip "full" tests unless explicitly requested"
+	make_check_target="
+	 tests/cover tests/pytest tests/datetime
+	 tests/typing_extensions tests/ghostwriter
+	"
+fi

From 8902a7940d9c38dce9b3c7f8aad23c150473f452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 23:36:00 -0300
Subject: [PATCH 0355/1853] python3-mock: update to 5.0.2.

---
 srcpkgs/python3-mock/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python3-mock/template b/srcpkgs/python3-mock/template
index b237c4789a27..314da43a1740 100644
--- a/srcpkgs/python3-mock/template
+++ b/srcpkgs/python3-mock/template
@@ -1,23 +1,18 @@
 # Template file for 'python3-mock'
 pkgname=python3-mock
-version=4.0.3
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=5.0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 checkdepends="python3-pytest"
-short_desc="Python3 mock library"
+short_desc="Python mock library"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://mock.readthedocs.org/en/latest/"
-changelog="https://mock.readthedocs.io/en/latest/changelog.html"
+changelog="https://raw.githubusercontent.com/testing-cabal/mock/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc
-
-do_check() {
-	# The skipped test checks internal Python unittest behavior and fails
-	python3 -m pytest -k "not test_bool_not_called"
-}
+checksum=06f18d7d65b44428202b145a9a36e99c2ee00d1eb992df0caf881d4664377891
 
 post_install() {
 	vlicense LICENSE.txt

From 52d5ace41ef7cb289f75fb626c3ea1be74e2183a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 19:06:45 -0300
Subject: [PATCH 0356/1853] New package: python3-process-tests-2.1.2

---
 srcpkgs/python3-process-tests/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-process-tests/template

diff --git a/srcpkgs/python3-process-tests/template b/srcpkgs/python3-process-tests/template
new file mode 100644
index 000000000000..3f129be9880b
--- /dev/null
+++ b/srcpkgs/python3-process-tests/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-process-tests'
+pkgname=python3-process-tests
+version=2.1.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Tools for testing processes"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/ionelmc/python-process-tests"
+changelog="https://raw.githubusercontent.com/ionelmc/python-process-tests/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/process-tests/process-tests-${version}.tar.gz"
+checksum=a3747ad947bdfc93e5c986bdb17a6d718f3f26e8577a0807a00962f29e26deba
+make_check=no  # no tests available
+
+post_install() {
+	vlicense LICENSE
+}

From 4e6d24162776163723d0126e52f924a39531d612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 17:08:42 -0300
Subject: [PATCH 0357/1853] python3-pytest-asyncio: update to 0.21.0.

---
 srcpkgs/python3-pytest-asyncio/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 4e747d5c5b41..ec0fdcb061f3 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,22 +1,23 @@
 # Template file for 'python3-pytest-asyncio'
 pkgname=python3-pytest-asyncio
-version=0.20.3
+version=0.21.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-pytest"
-checkdepends="$depends python3-hypothesis"
-short_desc="Pytest support for asyncio"
+checkdepends="$depends python3-flaky python3-hypothesis python3-pytest-trio"
+short_desc="Pytest plugin for asyncio"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pytest-dev/pytest-asyncio"
+changelog="https://raw.githubusercontent.com/pytest-dev/pytest-asyncio/master/docs/source/reference/changelog.rst"
 distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36
+checksum=2b38a496aef56f56b0e87557ec313e11e1ab9276fc3863f6a7be0f1d0e415e1b
 
-do_check() {
-	local skiptests="test_auto_mode_cmdline or \
-		test_strict_mode_ignores_trio_fixtures or \
-		test_unused_port_fixture or test_unused_port_factory_fixture"
-
-	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k "not (${skiptests})"
-}
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+	# these tests fail on CI (bind to a tcp address)
+	make_check_args="
+	 --deselect=tests/test_simple.py::test_unused_port_fixture
+	 --deselect=tests/test_simple.py::test_unused_port_factory_fixture
+	 "
+fi

From 771fc86cfc573dfb457ed818aae347eae5de195d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 20:58:14 -0300
Subject: [PATCH 0358/1853] New package: python3-pytest-console-scripts-1.4.1

---
 .../python3-pytest-console-scripts/template   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-console-scripts/template

diff --git a/srcpkgs/python3-pytest-console-scripts/template b/srcpkgs/python3-pytest-console-scripts/template
new file mode 100644
index 000000000000..2c6281267898
--- /dev/null
+++ b/srcpkgs/python3-pytest-console-scripts/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-console-scripts'
+pkgname=python3-pytest-console-scripts
+version=1.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-pytest"
+checkdepends="$depends"
+short_desc="Pytest plugin for testing console scripts"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/kvas-it/pytest-console-scripts"
+changelog="https://raw.githubusercontent.com/kvas-it/pytest-console-scripts/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/p/pytest-console-scripts/pytest-console-scripts-${version}.tar.gz"
+checksum=5a826ed84cc0afa202eb9e44381d7d762f7bdda8e0c23f9f79a7f1f44cf4a895
+
+post_install() {
+	vlicense LICENSE
+}

From f9bc8667785a2965a99e8186207e953a73796cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 22:46:04 -0300
Subject: [PATCH 0359/1853] python3-pytest-cov: update to 4.1.0.

---
 srcpkgs/python3-pytest-cov/template | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index 47dc36d44017..edc00f201af7 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,20 +1,32 @@
 # Template file for 'python3-pytest-cov'
 pkgname=python3-pytest-cov
-version=3.0.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=4.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-pytest python3-coverage"
-checkdepends="$depends python3-toml python3-py python3-pluggy python3-packaging
- python3-more-itertools python3-attrs python3-six python3-parsing"
+checkdepends="$depends python3-fields python3-process-tests
+ python3-pytest-xdist python3-virtualenv"
 short_desc="Pytest plugin for measuring coverage"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://pytest-cov.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470
-make_check=no # requires unpackaged xdist, fields, process_tests
+checksum=3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6
+
+do_check() {
+	# Running via PYTHONPATH breaks a few tests so we use a venv
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
+	python3 -m venv --system-site-packages --without-pip "${testdir}"
+
+	local testpy="${testdir}/bin/python3"
+	"${testpy}" -m installer dist/*.whl
+	# coverage needs to be installed inside venv
+	# see: https://github.com/pytest-dev/pytest-cov/issues/517
+	ln -s /${py3_sitelib}/coverage ${testdir}${py3_sitelib#usr}
+	PATH="${testdir}/bin:${PATH}" "${testpy}" -m pytest -n ${XBPS_MAKEJOBS}
+}
 
 post_install() {
 	vlicense LICENSE

From 23095e0bbf6876bd0175231b4e51690dfba384f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 20:40:38 -0300
Subject: [PATCH 0360/1853] python3-pytest-mock: update to 3.10.0.

---
 srcpkgs/python3-pytest-mock/template | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 602337199a41..abb1557f6655 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,28 +1,18 @@
 # Template file for 'python3-pytest-mock'
 pkgname=python3-pytest-mock
-version=3.9.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=3.10.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-pytest"
-checkdepends="$depends"
-short_desc="Thin-wrapper around mock for easier use with py.test (Python3)"
+checkdepends="python3-pytest-asyncio python3-mock"
+short_desc="Pytest plugin for mock"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pytest-mock/"
 changelog="https://raw.githubusercontent.com/pytest-dev/pytest-mock/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=c899a0dcc8a5f22930acd020b500abd5f956911f326864a3b979e4866e14da82
-
-# pytest-mock requires pytest-mock to be installed so it'll always fail during
-# packaging
-make_check=no
-
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires=/d' \
-		-e "s|use_scm_version=.*|version='${version}',|"
-}
+checksum=fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f
 
 post_install() {
 	vlicense LICENSE

From a14e1f28c8c4fc5ba473000d72445539e1326892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 5 Jun 2023 02:54:48 -0300
Subject: [PATCH 0361/1853] New package: python3-pytest-trio-0.8.0

---
 srcpkgs/python3-pytest-trio/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-trio/template

diff --git a/srcpkgs/python3-pytest-trio/template b/srcpkgs/python3-pytest-trio/template
new file mode 100644
index 000000000000..4009a6de72c4
--- /dev/null
+++ b/srcpkgs/python3-pytest-trio/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pytest-trio'
+pkgname=python3-pytest-trio
+version=0.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-outcome python3-pytest"
+checkdepends="$depends python3-hypothesis"
+short_desc="Pytest plugin for trio"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT, Apache-2.0"
+homepage="https://github.com/python-trio/pytest-trio"
+changelog="https://raw.githubusercontent.com/python-trio/pytest-trio/master/docs/source/history.rst"
+distfiles="${PYPI_SITE}/p/pytest-trio/pytest-trio-${version}.tar.gz"
+checksum=8363db6336a79e6c53375a2123a41ddbeccc4aa93f93788651641789a56fb52e
+make_check_pre="env PYTHONPATH=."
+
+post_patch() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no
+	# longer supported in pytest
+	mv pytest_trio/_tests/conftest.py .
+}
+
+post_install() {
+	vlicense LICENSE
+}

From caa4b8d0d757b3d80749643e6655ecbb7b67005f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 21:01:36 -0300
Subject: [PATCH 0362/1853] python3-pytest-xdist: enable tests.

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

diff --git a/srcpkgs/python3-pytest-xdist/template b/srcpkgs/python3-pytest-xdist/template
index b327702316a3..91a4f148cf5c 100644
--- a/srcpkgs/python3-pytest-xdist/template
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -3,8 +3,9 @@ pkgname=python3-pytest-xdist
 version=3.3.1
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-pytest python3-execnet"
+checkdepends="$depends python3-filelock python3-pexpect python3-psutil"
 short_desc="Pytest plugin for distributed testing & loop-on-failures testing modes"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
@@ -12,8 +13,6 @@ 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=d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93
-# tests only work in tox
-make_check=no
 
 post_install() {
 	vlicense LICENSE

From 2399065610f9fb8ab9049f0e99dd6649f3dd2b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 13:16:19 -0300
Subject: [PATCH 0363/1853] python3-testpath: update to 0.6.0.

Closes: #44272 [via git-merge-pr]
---
 srcpkgs/python3-testpath/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-testpath/template b/srcpkgs/python3-testpath/template
index a439b95a62b0..ef041edb6a91 100644
--- a/srcpkgs/python3-testpath/template
+++ b/srcpkgs/python3-testpath/template
@@ -1,20 +1,23 @@
 # Template file for 'python3-testpath'
 pkgname=python3-testpath
-version=0.4.4
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
-short_desc="Test utilities for code working with files and commands (Python3)"
+checkdepends="python3-pytest"
+short_desc="Test utilities for Python code working with files and commands"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/testpath"
+changelog="https://raw.githubusercontent.com/jupyter/testpath/master/doc/history.rst"
 distfiles="${PYPI_SITE}/t/testpath/testpath-${version}.tar.gz"
-checksum=60e0a3261c149755f4399a1fff7d37523179a70fdc3abdf78de9fc2604aeec7e
+checksum=2f1b97e6442c02681ebe01bd84f531028a7caea1af3825000f52345c30285e0f
 
 pre_build() {
 	rm -f testpath/cli-*.exe
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 92012b4bdc917c3ccca833781ed500592315e078 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 30 May 2023 11:05:07 -0500
Subject: [PATCH 0364/1853] perl-Alien-Build: update to 2.80.

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

diff --git a/srcpkgs/perl-Alien-Build/template b/srcpkgs/perl-Alien-Build/template
index e3b41551c3bc..dfdc366425be 100644
--- a/srcpkgs/perl-Alien-Build/template
+++ b/srcpkgs/perl-Alien-Build/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Alien-Build'
 pkgname=perl-Alien-Build
-version=2.50
+version=2.80
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-PkgConfig perl-File-Which"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/Alien::Build"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-${version}.tar.gz"
-checksum=4ed2e175ba2d46d77fc8bb3b726a583cd3b28dc5c2885c375cfa2bf2a7c17347
+checksum=d9edc936b06705bb5cb5ee5a2ea8bcf6111a3e8815914f177e15e3c0fed301f3

From 8f5f225553a54267cd7d0a8b349ade575e14c0c3 Mon Sep 17 00:00:00 2001
From: Rei Eventide <rei@eventide.space>
Date: Sat, 27 May 2023 09:25:43 +0000
Subject: [PATCH 0365/1853] retroarch: update to 1.15.0

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 240d3df9db00..28016aa0129e 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.14.0
+version=1.15.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -24,7 +24,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=aa4d579bfceb43450725171f594f69877f007a8892cb46678f8b62935c4de635
+checksum=3d3da8c1613820ce4b9360df794d36fd0f7ff902ae164936145a1d4f9e1014db
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From 53dd5963a4597a93505fb76a135d0429563d96fc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 30 May 2023 14:38:43 +0200
Subject: [PATCH 0366/1853] helix: switch from launcher script to symlink

---
 srcpkgs/helix/files/hx | 2 --
 srcpkgs/helix/template | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/helix/files/hx

diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
deleted file mode 100644
index a43e49fadc5b..000000000000
--- a/srcpkgs/helix/files/hx
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index f920843b9ce4..ee11896d0803 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=23.05
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 short_desc="Post-modern modal text editor"
@@ -30,7 +30,7 @@ post_install() {
 	vinstall contrib/helix.png 644 usr/share/icons/hicolor/128x128/apps
 
 	vmkdir usr/lib/helix
-	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
 	vcopy runtime usr/lib/helix
-	vbin ${FILESDIR}/hx
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	ln -s /usr/lib/helix/hx ${DESTDIR}/usr/bin/
 }

From d047c667bf176dc42ed4736fa97dbd3c8eeeeaa6 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 26 May 2023 18:34:16 +0200
Subject: [PATCH 0367/1853] xonsh: update to 0.14.0

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

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 83df2334ceb5..94561f0ccfe3 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,6 +1,6 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.13.4
+version=0.14.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=2386351e2dc29120466b937f8b25cb0e86ffb2c629c1d0df71175d712cdea478
+checksum=a83f9540f5652ec84b1f0d38aa6f17443a288a71791223421495e6bcd2f8625a
 register_shell="/bin/xonsh"
 # FIXME: fails with multiple AttributeErrors
 make_check=extended

From 67cf7f73df0fd8f2b1d980eaac4ab0057eb8fa64 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Fri, 26 May 2023 09:46:23 -0700
Subject: [PATCH 0368/1853] aws-vault: update to 7.2.0.

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

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index 77575438c1d4..c0abaae96558 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,16 +1,16 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
-version=6.3.1
-revision=3
+version=7.2.0
+revision=1
 build_style=go
-go_import_path=github.com/99designs/aws-vault/v6
+go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"
 short_desc="Vault for securely storing and accessing AWS credentials"
 maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/99designs/aws-vault"
 distfiles="https://github.com/99designs/aws-vault/archive/v${version}.tar.gz"
-checksum=433df90b7ed1cf1ec08aa75a4f1f993edfe5fa3fecfff5519574613ab0ab4630
+checksum=3f2f1d0ec06eb0873f9b96b59dc70f9fcc832dc97b927af3dbab6cdc87477b0e
 
 post_install() {
 	vlicense LICENSE

From 3b06f26a2dbba6d67374b2b82652f2724aac5a94 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 15:56:22 +0530
Subject: [PATCH 0369/1853] Marker: update to 2023.05.02.

MathJax is now optional dep, Katex is used by default.
---
 srcpkgs/Marker/patches/elf_files_in_lib.patch | 19 -----------
 srcpkgs/Marker/patches/system-mathjax.patch   | 12 -------
 srcpkgs/Marker/template                       | 32 +++++++++++++------
 3 files changed, 23 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/Marker/patches/elf_files_in_lib.patch
 delete mode 100644 srcpkgs/Marker/patches/system-mathjax.patch

diff --git a/srcpkgs/Marker/patches/elf_files_in_lib.patch b/srcpkgs/Marker/patches/elf_files_in_lib.patch
deleted file mode 100644
index 63d2cc5f6969..000000000000
--- a/srcpkgs/Marker/patches/elf_files_in_lib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN Marker/meson.build Marker1/meson.build
---- Marker/meson.build	2019-11-06 14:44:46.000000000 +0200
-+++ Marker1/meson.build	2019-12-06 22:39:56.434367811 +0200
-@@ -5,13 +5,14 @@
-
- PREFIX = get_option('prefix')
- DATA_DIR = join_paths(PREFIX, 'share')
-+LIBS_DIR = join_paths(PREFIX, 'lib')
- APP_DIR = join_paths(DATA_DIR, 'com.github.fabiocolacio.marker')
- ICONS_DIR = join_paths(APP_DIR, 'icons')
- STYLES_DIR = join_paths(APP_DIR, 'styles')
- COMMON_DIR = join_paths(APP_DIR, 'common')
- SCRIPTS_DIR = join_paths(APP_DIR, 'scripts')
- HIGHLIGHT_STYLES_DIR = join_paths(join_paths(SCRIPTS_DIR, 'highlight'),'styles')
--WEB_EXTENSIONS_DIRECTORY = join_paths(APP_DIR, 'extensions')
-+WEB_EXTENSIONS_DIRECTORY = join_paths(LIBS_DIR, 'Marker.extensions')
- APPDATA_DIR = join_paths(DATA_DIR, 'metainfo')
- LOCALE_DIR = join_paths(PREFIX, get_option('localedir'))
-
diff --git a/srcpkgs/Marker/patches/system-mathjax.patch b/srcpkgs/Marker/patches/system-mathjax.patch
deleted file mode 100644
index 1ef9fde3693d..000000000000
--- a/srcpkgs/Marker/patches/system-mathjax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/marker-markdown.c
-+++ b/src/marker-markdown.c
-@@ -87,8 +87,7 @@ char* html_header(MarkerMathJSMode    ma
-       } else
-       {
-         mathjs_css = g_strdup(" ");
--        mathjs_script = g_strdup_printf("<script src=\"file://%smathjax/MathJax.js?config=TeX-AMS_HTML\"></script>",
--                                        SCRIPTS_DIR);
-+        mathjs_script = g_strdup("<script src=\"file:///usr/share/mathjax/MathJax.js?config=TeX-AMS_HTML\"></script>");
-         mathjs_auto = g_strdup(" ");
-       }
-       break;
diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index 1bc21fc39379..0bcf2f8f9f44 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -1,22 +1,36 @@
 # Template file for 'Marker'
 pkgname=Marker
-version=2020.04.04
-revision=3
+version=2023.05.02
+revision=1
+_scidown_commit=a7b7f063de4f272ef0ec12d00b98470888e8cb32
+_charter_commit=a25dee1214ea9ba5882325066555cb813efbb489
+_tinyexpr_commit=9476568b69de4c384903f1d5f255907b92592f45
+build_wrksrc="Marker-${version}"
 build_style=meson
 hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
- webkit2gtk-devel"
-depends="iso-codes mathjax2"
+ libwebkit2gtk41-devel"
+depends="iso-codes"
 short_desc="Gtk3 markdown editor"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later, ISC"
+license="GPL-3.0-or-later, ISC, Zlib"
 homepage="https://fabiocolacio.github.io/Marker/"
-distfiles="https://github.com/fabiocolacio/Marker/releases/download/${version}/marker.zip"
-checksum=ca493e7e94f171c15f7ffc9f697ce265d3b4fdb20fae157601d091d89dd6fb40
+distfiles="https://github.com/fabiocolacio/Marker/archive/refs/tags/${version}.tar.gz
+ https://github.com/Mandarancio/scidown/archive/${_scidown_commit}.tar.gz
+ https://github.com/Mandarancio/charter/archive/${_charter_commit}.tar.gz
+ https://github.com/codeplea/tinyexpr/archive/${_tinyexpr_commit}.tar.gz"
+checksum="097a6e3811f0c4c14c574b8aafee27ee62232ae3ad3084e18a35c2dc8a1e93dd
+ 31e63658e2e79b5c5b0497d568e548f177fc89cb1dd9b6d78aba7685f0506ff0
+ 60237a813383b44891e57049ba1f86cc5b89c28eee620b6ee90582a0c7ba6f8a
+ 1c0c9496d9e9b693ae364860f0b66c403b87337db1b5a78275a0c78a07495286"
 
 post_extract() {
-	# don't include bundled mathjax
-	rm -rf data/scripts/mathjax
+	rmdir "${build_wrksrc}/src/scidown"
+	mv "scidown-${_scidown_commit}" "${build_wrksrc}/src/scidown"
+	rmdir "${build_wrksrc}/src/scidown/src/charter"
+	mv "charter-${_charter_commit}" "${build_wrksrc}/src/scidown/src/charter"
+	rmdir "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr"
+	mv "tinyexpr-${_tinyexpr_commit}" "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr"
 }
 
 post_install() {

From 53f5ff706e88f0b111e8fa3a2fa694510620abcb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 11:40:06 +0530
Subject: [PATCH 0370/1853] gping: update to 1.12.0.

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

diff --git a/srcpkgs/gping/template b/srcpkgs/gping/template
index 27c92c18b985..4993e855f42d 100644
--- a/srcpkgs/gping/template
+++ b/srcpkgs/gping/template
@@ -1,6 +1,6 @@
 # Template file for 'gping'
 pkgname=gping
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=cargo
 make_install_args="--path gping"
@@ -10,7 +10,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://crates.io/crates/gping"
 distfiles="https://github.com/orf/gping/archive/refs/tags/gping-v${version}.tar.gz"
-checksum=df32aa9d435fa724c1fefe00e32d3f53c7e8d29c11d63031b97c9cd82c0afc26
+checksum=63b5a60d1389e44c5baef07cec41d148b454798683baf220bb260d450a4906b8
 
 post_install() {
 	vlicense LICENSE

From 52f0811bb4ffef95dbc788e51abfaf844f7cec6b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 26 May 2023 21:25:06 +0100
Subject: [PATCH 0371/1853] tdb: update to 1.4.8.

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

diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index 23bea72ec8e0..5df924f26a67 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -1,6 +1,6 @@
 # Template file for 'tdb'
 pkgname=tdb
-version=1.4.7
+version=1.4.8
 revision=1
 build_style=waf3
 build_helper="qemu"
@@ -15,11 +15,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tdb.samba.org/"
 distfiles="https://download.samba.org/pub/tdb/tdb-${version}.tar.gz"
-checksum=a4fb168def533f31ff2c07f7d9844bb3131e6799f094ebe77d0380adc987c20e
+checksum=8434c9c857d13ce3fa8466f75601f25c3693676b36919f159e0ad6121baf5ce8
 
 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
 export PYTHONHASHSEED=1
 
+do_check() {
+	${configure_script} test ${makejobs}
+}
+
 tdb-devel_package() {
 	depends="libtdb-${version}_${revision}"
 	short_desc+=" - development files"

From 7f4274a91b93ec05983855c26c5d835274d02e0c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 26 May 2023 22:42:01 +0100
Subject: [PATCH 0372/1853] sqlite: update to 3.42.0.

---
 .../sqlite/patches/3.41-perf-regression.patch | 19 -------------------
 srcpkgs/sqlite/template                       |  6 +++---
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/sqlite/patches/3.41-perf-regression.patch

diff --git a/srcpkgs/sqlite/patches/3.41-perf-regression.patch b/srcpkgs/sqlite/patches/3.41-perf-regression.patch
deleted file mode 100644
index d3e3e20a4c92..000000000000
--- a/srcpkgs/sqlite/patches/3.41-perf-regression.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch-Source: https://sqlite.org/src/info/aa6bd6dff751223e
-https://sqlite.org/forum/forumpost/3a180ba0d4
-
-Can be removed in 3.42.x
-
-diff --git a/sqlite3.c b/sqlite3.c
-index 947a154..bf9ce16 100644
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -143420,9 +143420,6 @@ static int pushDownWhereTerms(
-       if( pSel->pWin ) return 0;    /* restriction (6b) */
- #endif
-     }
--    if( compoundHasDifferentAffinities(pSubq) ){
--      return 0;  /* restriction (9) */
--    }
-     if( notUnionAll ){
-       /* If any of the compound arms are connected using UNION, INTERSECT,
-       ** or EXCEPT, then we must ensure that none of the columns use a
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 14d03054c9e3..e6eb425185fd 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,7 +1,7 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.41.2
-revision=2
+version=3.42.0
+revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 build_style=gnu-configure
 configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5"
@@ -12,7 +12,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/changes.html"
 distfiles="https://sqlite.org/2023/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=e98c100dd1da4e30fa460761dab7c0b91a50b785e167f8c57acc46514fae9499
+checksum=7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From bae80fe6dd2f1c495515df92c46e32c0b1f75540 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 5 Apr 2023 19:46:13 +0100
Subject: [PATCH 0373/1853] xfsprogs: update to 6.3.0.

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

diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 2e55f5e0b458..a57d12193edc 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-editline=yes --enable-lib64=no --libdir=/usr/lib
@@ -13,7 +13,11 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=d67dcba5a28e0904b60886b6e5f752bc7c9c3a5c7096153855b5adca9db86c51
+checksum=ec987c9f0bcb2db2991bffb80d353150b389c3a2b79b6830411f7042adf6990c
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" liburcu-devel"
+fi
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \

From 9501ff92d0127292e61b43514daedccc793e3c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 28 May 2023 16:03:25 +0100
Subject: [PATCH 0374/1853] btrfs-progs: update to 6.3.1.

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

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 0aa9eb6a3be6..4ba0fb11a9b9 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=6.2.2
+version=6.3.1
 revision=1
 build_style=gnu-configure
 make_check_target=test
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"
-checksum=e4888db8637d92e667448386992d0856b954cf2515b98d39b667da43c482d693
+checksum=9ad98394c7936c3650445a134103a0db6ad3bf6f163917dfff49ff77614b3f14
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no

From f5367d94cfe9965c2122bdb6a851b0c250bae216 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 28 May 2023 18:44:08 +0100
Subject: [PATCH 0375/1853] python3-docutils: update to 0.20.1.

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

diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
index 60f911f1bdf6..de11fe3d00fc 100644
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
-version=0.19
+version=0.20.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 # docutils/writers/odf_odt/pygmentsformatter.py
 depends="python3-Pygments"
-checkdepends="${depends}"
+checkdepends="${depends} python3-pytest"
 short_desc="Python3 documentation utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
+homepage="https://docutils.sourceforge.io"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6
+checksum=f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py
@@ -28,11 +28,6 @@ alternatives="
  docutils:rst2xml:/usr/bin/rst2xml.py
  docutils:rstpep2html:/usr/bin/rstpep2html.py"
 
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
 post_install() {
 	vlicense COPYING.txt COPYING
 }

From fe6982b9794d4d78beddc34df714b12b2aab3ac0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH 0376/1853] rust-sccache: update to 0.5.3.

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

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..f16c5ebf6041 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.4.2
+version=0.5.3
 revision=1
 build_style=cargo
 # 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 changelog="https://github.com/mozilla/sccache/releases"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 549ea0261ae5ccb919cd12376a8e8d50a836f2f7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 01:16:00 +0530
Subject: [PATCH 0377/1853] vale: update to 2.27.0.

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

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 115fcdb1b9b7..83730b8aaeb2 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.26.0
+version=2.27.0
 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=a54e5cce0b29e395a22a2476e42c52b2f2a9105caa9520ddf7b7cbf58fb3087b
+checksum=65de0683d653767da8ef9f58fe3bf5978263978db4b98ee9609d7b90f2c4f4dc
 
 post_install() {
 	vlicense LICENSE

From 17cb942f815dae98dfb9d846cae3996a15e2f579 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 25 May 2023 22:16:15 +0200
Subject: [PATCH 0378/1853] translate-shell: update to 0.9.7.1

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

diff --git a/srcpkgs/translate-shell/template b/srcpkgs/translate-shell/template
index 2975a3706dbd..7aa9dbbb1729 100644
--- a/srcpkgs/translate-shell/template
+++ b/srcpkgs/translate-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'translate-shell'
 pkgname=translate-shell
-version=0.9.7
+version=0.9.7.1
 revision=1
 build_style=gnu-makefile
 make_build_args="$(vopt_if zsh TARGET=zsh)"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Unlicense"
 homepage="https://www.soimort.org/translate-shell"
 distfiles="https://github.com/soimort/translate-shell/archive/v${version}.tar.gz"
-checksum=fe328bff9670a925f6dd6f80629ed92b078edd9a4c3f8414fbb3d921365c59a7
+checksum=f949f379779b9e746bccb20fcd180d041fb90da95816615575b49886032bcefa
 
 build_options="zsh"
 desc_option_zsh="Use zsh compatible wrapper"

From 1fe06a45213a82363fb39ce1ed4d5cda8360b3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 May 2023 00:14:46 +0200
Subject: [PATCH 0379/1853] tectonic: update to 0.13.1.

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

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 30a37226eb1e..59f2209266a9 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.12.0
-revision=2
+version=0.13.1
+revision=1
 build_style=cargo
 configure_args="--features=external-harfbuzz"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=96a53ab5ba29d2bf263f19b6f07450471118bf2067c610b362a1492d0b9b989f
+checksum=bc16c2d7c85b646f5d168371a6cf1f2c219d8fcdcc919addcc9d74ce0cfbd442
 
 post_install() {
 	vlicense LICENSE

From ba985e9e74411df3297d09c9124ad7548b6ff61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 7 May 2023 12:27:26 +0200
Subject: [PATCH 0380/1853] kopia: update to 0.13.0.

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

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index a30dd1d241b0..1f0b8a016118 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
-version=0.12.1
-revision=2
+version=0.13.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=c42d4c7c7d0e3e0c80cfee1e42b7567264d97e36d18d2d5e7b675cd7e2fdb5a6
+checksum=017fe4375207ce2ed73433b072249882735de1a8a5aedebec2ca1c6fee9e5a9b
 
 post_install() {
 	for shell in bash zsh; do

From 015c256dbc08f59078521ed14c611483227856cf Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 15:16:32 +0100
Subject: [PATCH 0381/1853] wavpack: update to 5.6.0.

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

diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index b82b264a5065..d9b0f68f014b 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -1,20 +1,21 @@
 # Template file for 'wavpack'
 pkgname=wavpack
-version=5.4.0
+version=5.6.0
 revision=1
 build_style=gnu-configure
+configure_args="--enable-static"
 short_desc="Hybrid lossless audio compression"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.wavpack.com/"
-distfiles="http://www.wavpack.com/${pkgname}-${version}.tar.bz2"
-checksum=0716a6dcf9a72d61005e1b09bbbd61aaf49837cb4e4a351992a6daed16cac034
+homepage="https://www.wavpack.com/"
+changelog="https://raw.githubusercontent.com/dbry/WavPack/master/NEWS"
+distfiles="https://www.wavpack.com/wavpack-${version}.tar.bz2"
+checksum=8cbfa15927d29bcf953db35c0cfca7424344ff43ebe4083daf161577fb839cc1
+
+case "$XBPS_TARGET_MACHINE" in
+	armv5*) configure_args+=" --disable-asm";;
+esac
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		armv5*) configure_args+=" --disable-asm";;
-	esac
-}
 post_install() {
 	vlicense COPYING LICENSE
 }
@@ -25,6 +26,7 @@ libwavpack_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
 wavpack-devel_package() {
 	depends="libwavpack>=${version}_${revision}"
 	short_desc+=" - development files"

From 9f3dd7d91e64e14cbe2fb8741e56df4717a0d294 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 May 2023 17:18:15 +0300
Subject: [PATCH 0382/1853] setzer: update to 55

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

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index 035e71b8f05d..1a50dd02d31b 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,13 +1,15 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.4.8
-revision=2
+version=55
+revision=1
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pexpect"
+depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pexpect
+ libwebkit2gtk41 libhandy1"
+checkdepends="desktop-file-utils AppStream"
 short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
 maintainer="Bleznudd <bleznudd@pm.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cvfosammmm/setzer"
 distfiles="https://github.com/cvfosammmm/setzer/archive/v${version}.tar.gz"
-checksum=4e347f538a5bf9d0be73de3b91fa79d3601c94ba1faf74f191f1904ec67fa2cf
+checksum=e0096886627159e61925b1d623c7f419193c4577b1f32acd8f6ea94a89ed0513

From 4af51e912b8817bb1d50dce3172e1c845b589cb0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 May 2023 19:27:24 +0200
Subject: [PATCH 0383/1853] cargo-update: update to 13.0.4

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

diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 860dfe924247..086d3660bfaa 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
-version=13.0.3
+version=13.0.4
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
@@ -11,12 +11,7 @@ license="MIT"
 homepage="https://github.com/nabijaczleweli/cargo-update"
 changelog="https://github.com/nabijaczleweli/cargo-update/releases"
 distfiles="https://github.com/nabijaczleweli/cargo-update/archive/refs/tags/v${version}.tar.gz"
-checksum=36643823e3dc5e7905ca6515ee5672799cbeb347ba9cb029ffc35265bd901fcb
-
-# on i686, unexpected index dir hashes are generated
-if [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
-	make_check_args="-- --skip ops::assert_index_path"
-fi
+checksum=cc07255dc6b7b61d7c54955ea33486b447f629564d9f3ebb88d421ab5bcdcdf6
 
 post_patch() {
 	# Upstream does not ship a lockfile and is very vocal about that being

From 3da62a0ded6f2b16601904fe462e6467a0ecf1ae Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 18 May 2023 11:08:47 +0530
Subject: [PATCH 0384/1853] pre-commit: update to 3.3.2.

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

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 6b93d5cab7f3..53c3d6716f24 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pre-commit.com/"
 changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=733f78c9a056cdd169baa6cd4272d51ecfda95346ef8a89bf93712706021b907
+checksum=66e37bec2d882de1f17f88075047ef8962581f83c234ac08da21a0c58953d1f0
 make_check=no # unpackaged: pytest-env re-assert
 
 post_install() {

From fa78f0abd442bb99103d87e3ecd3269b6122f626 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 May 2023 17:11:07 -0400
Subject: [PATCH 0385/1853] mdbook-toc: update to 0.12.0

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

diff --git a/srcpkgs/mdbook-toc/template b/srcpkgs/mdbook-toc/template
index a4a7d7911b8b..e7db8b9ec1a2 100644
--- a/srcpkgs/mdbook-toc/template
+++ b/srcpkgs/mdbook-toc/template
@@ -1,6 +1,6 @@
 # Template file for 'mdbook-toc'
 pkgname=mdbook-toc
-version=0.11.2
+version=0.12.0
 revision=1
 build_style=cargo
 short_desc="Preprocessor for mdbook to add inline TOC support"
@@ -8,8 +8,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/badboy/mdbook-toc"
 changelog="https://raw.githubusercontent.com/badboy/mdbook-toc/main/CHANGELOG.md"
-distfiles="https://github.com/badboy/mdbook-toc/archive/${version}.tar.gz"
-checksum=39a1cbf3d50d19c0a304c41408439b6f3a053bcfedb1958af00cf20b8daa8cc7
+distfiles="https://github.com/badboy/mdbook-toc/archive/refs/tags/${version}.tar.gz"
+checksum=cd7f0a929a23657370feb620d2159ccf728164a3a69f8c1c4d34200a4c4476d2
 
 post_install() {
 	vlicense LICENSE

From 5ffab44acc60bb3d7d5fdf565699d9b02096aa9c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 24 May 2023 17:37:56 +0100
Subject: [PATCH 0386/1853] wpebackend-fdo: update to 1.14.2.

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

diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template
index 3286f2431d31..d2f197cf276b 100644
--- a/srcpkgs/wpebackend-fdo/template
+++ b/srcpkgs/wpebackend-fdo/template
@@ -1,6 +1,6 @@
 # Template file for 'wpebackend-fdo'
 pkgname=wpebackend-fdo
-version=1.12.1
+version=1.14.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -9,8 +9,8 @@ short_desc="FreeDesktop.org backend for WPE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://wpewebkit.org"
-distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz"
-checksum=45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629
+distfiles="https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"
+checksum=93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38
 
 post_install() {
 	vlicense COPYING

From 7994b913b2189c75ae1f919288ae6cca1d6fdcfa Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 19 May 2023 23:00:46 +0200
Subject: [PATCH 0387/1853] ncdu: add update file

---
 srcpkgs/ncdu/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/ncdu/update

diff --git a/srcpkgs/ncdu/update b/srcpkgs/ncdu/update
new file mode 100644
index 000000000000..4bb77c330916
--- /dev/null
+++ b/srcpkgs/ncdu/update
@@ -0,0 +1,2 @@
+site="https://dev.yorhel.nl/ncdu/changes"
+pattern='<strong>\K[\d.]+(?=</strong>)'

From 8bad4cfdd1d52e673d7a4c642f0e6b01084da8b3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 19 May 2023 23:01:41 +0200
Subject: [PATCH 0388/1853] ncdu2: add update file

---
 srcpkgs/ncdu2/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/ncdu2/update

diff --git a/srcpkgs/ncdu2/update b/srcpkgs/ncdu2/update
new file mode 100644
index 000000000000..2d8983e5d62f
--- /dev/null
+++ b/srcpkgs/ncdu2/update
@@ -0,0 +1,2 @@
+site="https://dev.yorhel.nl/ncdu/changes2"
+pattern='<strong>\K[\d.]+(?=</strong>)'

From 3f344a9798d70ae706f88e80204675b748ed5f1f Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 21 May 2023 14:41:06 +0200
Subject: [PATCH 0389/1853] python3-ansible-lint: update to 6.16.2

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

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index f99a3c167dd6..a842f6193637 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=6.14.3
+version=6.16.2
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -17,7 +17,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/ansible/ansible-lint"
 distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=73ec59929b6214f6d2ce5858c22c64e3a1daba7b8cdc1271833bb6d3c7155449
+checksum=93ad8a04adcda6025d4ff218a10694120fe70cb91da8ac9f85c5dc82b32456e4
 # cba anymore, the list of failing tests changes with every update
 make_check="no"
 

From 23600f127c43bea7cb9dc72f0d5fb55a4ca82b63 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 21 May 2023 15:03:34 +0200
Subject: [PATCH 0390/1853] python3-ansible-compat: update to 4.1.0

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

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index 4f24371ccc7e..7f3de3717f45 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
-version=3.0.1
+version=4.1.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/ansible/ansible-compat"
 distfiles="${PYPI_SITE}/a/ansible-compat/ansible-compat-${version}.tar.gz"
-checksum=d7dc5e4b7fade9b7375c568a24475b7be81024cac2a20caef3260ef0b51287b4
+checksum=bcc6b3cf4bb102e1b1b36a8639fee7ad18ddb1d99fb055d208c8a0f650a51621
 
 post_patch() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"

From eeeb1c06c45e24a5183e57e27a3d83e482e6f081 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 19 May 2023 09:06:48 -0400
Subject: [PATCH 0391/1853] ntfy: update to 2.5.0.

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

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index d4cd86aa7a50..54a11d3e5da6 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,6 +1,6 @@
 # Template file for 'ntfy'
 pkgname=ntfy
-version=2.4.0
+version=2.5.0
 revision=1
 build_style=go
 go_import_path="heckel.io/ntfy"
@@ -13,7 +13,7 @@ license="Apache-2.0,GPL-2.0-only"
 homepage="https://ntfy.sh"
 changelog="https://raw.githubusercontent.com/binwiederhier/ntfy/main/docs/releases.md"
 distfiles="https://github.com/binwiederhier/ntfy/archive/refs/tags/v${version}.tar.gz"
-checksum=798e186a76b30d8e3ed2e3839e1389f136882ac6293753cb32e3bc96e9cf9b90
+checksum=16128c38c5ef8397463a44c953f77b14643caf8c044ddc1cc84377b3127ffc9f
 system_accounts="_ntfy"
 make_dirs="/var/lib/ntfy 0700 _ntfy _ntfy"
 _ntfy_homedir="/var/lib/ntfy"

From 15c8a28c40fd0d4ceb51f9c8dab48fcfa7873a91 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 14:04:13 +0100
Subject: [PATCH 0392/1853] python-zope.interface: update to 5.5.2.

---
 srcpkgs/python-zope.interface/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 6a35a71e2bb8..35f87781a1d8 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,7 +1,7 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
-version=5.4.0
-revision=3
+version=5.5.2
+revision=1
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel"
@@ -12,7 +12,7 @@ license="ZPL-2.1"
 homepage="https://github.com/zopefoundation/zope.interface"
 changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e
+checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
 # Tests can't find the package they test
 make_check=no
 

From c562030a5ce0595f071911c16657a11b81a61421 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Fri, 19 May 2023 23:34:06 -0500
Subject: [PATCH 0393/1853] rpi-imager: update to 1.7.5.

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

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 223eb357a3a4..0b69c027c140 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.7.4
+version=1.7.5
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Adam Gausmann <adam@gaussian.dev>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
 distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=c605a4770da5dbae67fa775bad226311529450fd6ef1fdec708f9f384d1aff34
+checksum=876c4e22483cb28bba975ad000589963e4e952e541f5a985fa68e44490e235a0
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From 15904f5853a66becd528f5431f818f795683c48a Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Mon, 15 May 2023 12:49:19 -0500
Subject: [PATCH 0394/1853] OpenJK, gamemode: orphan; senpai: swap

* Swap senpai's maintainer to Emil Miler
---
 srcpkgs/OpenJK/template   | 2 +-
 srcpkgs/gamemode/template | 2 +-
 srcpkgs/senpai/template   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
index 69b4bde71121..e21aa5b7e2cd 100644
--- a/srcpkgs/OpenJK/template
+++ b/srcpkgs/OpenJK/template
@@ -9,7 +9,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DBuildJK2SPEngine=on
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
 short_desc="Open Source Implementation of Jedi Knight II and III Engine"
-maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/JACoders/OpenJK"
 distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
index c70be770dee5..dd699a75dbd0 100644
--- a/srcpkgs/gamemode/template
+++ b/srcpkgs/gamemode/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="inih-devel dbus-devel elogind-devel"
 depends="lib${pkgname}>=${version}_${revision}"
 short_desc="Optimise Linux system performance on demand"
-maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/FeralInteractive/gamemode"
 changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/master/CHANGELOG.md"
diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 15b2a518314a..0546d041f163 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -7,7 +7,7 @@ go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"
 hostmakedepends="scdoc"
 short_desc="IRC client that works best with bouncers"
-maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+maintainer="Emil Miler <em@0x45.cz>"
 license="ISC"
 homepage="https://git.sr.ht/~taiite/senpai"
 distfiles="https://git.sr.ht/~taiite/senpai/archive/v${version}.tar.gz"

From 33987367db2d2c12397a20be9cbba57cbe949af8 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH 0395/1853] zoxide: update to 0.9.1

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

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
 
 post_install() {
 	vlicense LICENSE

From ed67210c88aa57947a52e5e707082064c3a62472 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 15 Apr 2023 22:32:55 +0200
Subject: [PATCH 0396/1853] calibre: update to 6.17.0

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 052b1b4a5a4c..0bed9e49972e 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=6.13.0
-revision=3
+version=6.17.0
+revision=1
 build_wrksrc=calibre
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -26,7 +26,7 @@ depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
  python3-pyqt6-network python3-pyqt6-dbus python3-pyqt6-opengl-widgets
  python3-pyqt6-widgets python3-pyqt6-gui python3-pyqt6-declarative
  python3-pyqt6-printsupport python3-pyqt6-webchannel python3-pyqt6-svg
- python3-pyqt6-webengine"
+ python3-pyqt6-webengine python3-fonttools"
 checkdepends="${depends} libjpeg-turbo-tools jxrlib"
 short_desc="Ebook management application"
 maintainer="skmpz <dem.procopiou@gmail.com>"
@@ -36,7 +36,7 @@ changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog
 _lover=7.4.3.2
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz
  https://download.documentfoundation.org/libreoffice/src/${_lover%.*}/libreoffice-dictionaries-${_lover}.tar.xz"
-checksum="eb40f34b7106e3f36d37e0b65dacb5cec863665c68fb2350592dbc1ec133aea3
+checksum="1ca4abb8a5d850c1f5963e37080dd1a7795736538d5c4d4ff6014b687d7a368e
  3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389"
 python_version=3
 lib32disabled=yes

From d78cc3e96d8ec176695998ec4cae56cd8d18aef3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 15 Apr 2023 21:51:40 +0100
Subject: [PATCH 0397/1853] rav1e: update to 0.6.6.

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

diff --git a/srcpkgs/rav1e/template b/srcpkgs/rav1e/template
index e4589a60170e..e454757f8d78 100644
--- a/srcpkgs/rav1e/template
+++ b/srcpkgs/rav1e/template
@@ -1,21 +1,19 @@
 # Template file for 'rav1e'
 pkgname=rav1e
-version=0.6.3
+version=0.6.6
 revision=1
 build_style=cargo
-hostmakedepends="nasm cargo-c"
+hostmakedepends="cargo-c"
 short_desc="Fastest and safest AV1 encoder"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://crates.io/crates/rav1e"
 distfiles="https://static.crates.io/crates/rav1e/rav1e-${version}.crate"
-checksum=277898094f0d03c6a609e491324102daf5080e71c06b4b25e5acf8b89d26c945
+checksum=16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	# error: ran out of registers during register allocation
-	# LLVM ERROR: Cannot emit physreg copy instruction
-	make_check=no # Tests fail to compile
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*) hostmakedepends+=" nasm" ;;
+esac
 
 post_build() {
 	cargo auditable cbuild --release --target ${RUST_TARGET} \

From 8a976dbc072bc738f5496c52cd510f71d235f34b Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Mon, 17 Apr 2023 08:28:05 +0530
Subject: [PATCH 0398/1853] xdg-desktop-portal-wlr: update to 0.7.0.

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

diff --git a/srcpkgs/xdg-desktop-portal-wlr/template b/srcpkgs/xdg-desktop-portal-wlr/template
index 888b905842d3..dfcd7ff97da5 100644
--- a/srcpkgs/xdg-desktop-portal-wlr/template
+++ b/srcpkgs/xdg-desktop-portal-wlr/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-wlr'
 pkgname=xdg-desktop-portal-wlr
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc"
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://github.com/emersion/xdg-desktop-portal-wlr"
 distfiles="https://github.com/emersion/xdg-desktop-portal-wlr/archive/v${version}.tar.gz"
-checksum=20f145f00a40b41221aca73b1423f3ea4633980e1a2b1c4b25045d5eacd313e2
+checksum=78377c976645c07fe5a099c75976ac3477db4764899acfe43f0910803cadf450
 
 post_install() {
 	vlicense LICENSE

From 0090143469beb8dbf26b91031986cb6d0d3560c0 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0399/1853] bluedevil: update to 5.27.5

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

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index decb0ff31839..a48ce07318ae 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=101871f56da19ae667d61ec32addc446eb94f81ce0c541cf0367de96c3c896a3
+checksum=61535ae665a5bc1e17c8210d660ba79a3a694ae4ca4b3016e6523ab227a54ded

From 7b4229b03c2b70eda34e9d07cb3c9630556e3bb8 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0400/1853] breeze-gtk: update to 5.27.5

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

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 04bde046f314..ba5e31ead109 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo qt5-devel"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb967dcd258065f87a9cb43f8022378e7ead1db83590ca2eea4e77196226999f
+checksum=c4956ddab4d65471dcf26634672c088b4499d27f766e41b6a8d083442e55c968

From c3ec34386c1f4ceae95bc7971627ba40a68a42ce Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0401/1853] breeze: update to 5.27.5

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

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 3f4c8b43b157..8b16b3342bb9 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=62d80ebd690c7822bf05b19bec8b37af67cc1cd4bb3f38d2a88d8360fd6b1901
+checksum=70d8a35bf8c0758f9c3e3873b657250b1e09c1c79f92b066d3385a1e44fec868
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From c44433cd281086dab0d76eb40bfa430be070030a Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0402/1853] flatpak-kcm: update to 5.27.5

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

diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index b90605935277..37e14d15abf2 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak-kcm'
 pkgname=flatpak-kcm
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/flatpak-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ad6156443c3da839eed26e2577352af0d2e2b5729254243006175546223d2145
+checksum=7b7541780654c1007ff268c8e0460def4aa7a58360550410a57531cb0e45ba9a

From cf0454246fca064075d4d2aba49a399f0f472bc1 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0403/1853] kactivitymanagerd: update to 5.27.5

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

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 7ecbeed46e47..6cf9a1001ee7 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9e1fd492012127e20c8ae76cf6462c5690cf842f241ffa95f83c9bf6a91da72
+checksum=a209f4727bc5c44754f48ed1947fbe66419877407f83a0bad458dcab2d03b619

From 732f1754042ce8cc72d0d92dac845775bd2788c6 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0404/1853] kde-cli-tools: update to 5.27.5

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

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 4afaf139842b..0436ff1231a8 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c594fde05df078eb9d0455b0e298c201a3143b949c1c3b1ff5526b5e4340b419
+checksum=ed745637701210102e0e2e1354823e4e0f2bf8b7d4778cf5ed9c104fb57cef67
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From c213a7580bf4dc50d202c3ac686d43f6afb0cc79 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0405/1853] kde-gtk-config5: update to 5.27.5

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

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index a24f9bd57c58..0fda095c0818 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=98f5adf85bc56e01956f749849694d21c222e98d082e9b82ee8b469ffa6220e2
+checksum=477bb7c20901926faaaa0ad9d5ef61e33891a5d3bf4e51a5798eee6e5c5c1028
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 29d6c68feff638747e84ef755b14ab8933a836d9 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0406/1853] kdecoration: update to 5.27.5

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

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 2e81ce495d71..17d328c513fa 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=415f22a21073dcc8024eba45a5a8f19b83d3af8335404d3a253554b1a483fa6e
+checksum=effbf6c5c79802d07fa14f8bd40a9d57bbfc2af2861b6ed596687db48230be42
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 6e3733ab5689ce1fff34c713378f3e927df3ac6e Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0407/1853] kdeplasma-addons5: update to 5.27.5

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

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index b6f1a148d8f3..4e3e38d15db2 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=6a82a57988f336345738630217f49b191a379eeea586565a802bcebed7941f89
+checksum=c9351ab0317c75b0340be44cc906b7ba66e69f5c672d33fbfd5b32bc2a560ff9

From f4619e4a9f3239163b979a8c20f88d004ea90718 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0408/1853] kgamma5: update to 5.27.5

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

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 0f1b7de1767f..181febdc4142 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4a81c50b7f96b5a6f0e60b58a1d38fc375f445595e2e349e692d4c40d8355802
+checksum=7b6626473944a8b4afb8e986a9d06ffe9afb6f24938f24053b33fcfb5ce84dd9

From d5eb4d7aeaa3f5ed0a87ce1a48fde41ed82c0822 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0409/1853] khotkeys: update to 5.27.5

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

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 9c05eaf4f201..edcbecd5d0e1 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=841224dea79b4607ecebe79b5c94e36bfbc290b623d5efe5dbe1cd566a921023
+checksum=83e85326de1e3b430ebd0364955e2167ccee50d33fdaaba9fa0e5cf488e6ec20
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From bef17c79bf3f3e0315e03b3dc643bbdf5c0d098b Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0410/1853] kinfocenter: update to 5.27.5

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

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index c9508298f487..354a7a0b042c 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6875ca14c4fc139f007bc4b318fa3812f7d73ef26fa2ae54a49bd48bda67e495
+checksum=0be970049e2be8a5c21128a0ce3ba69e6b82415268a1ed1aa0a30c77c94adc48

From accd187545bb342936a999da4a3a826fcebb28e1 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0411/1853] kmenuedit: update to 5.27.5

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

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 5649e619d048..253320d9914b 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=37abb72d193ae1273b9a5265e8decfeeebee12811eb9977ba69af8850c8ca7b3
+checksum=446263c4bcc4592251c0e93f3bbab1635452b26e5650605928d4933d70f31127

From 64fb24175eb6649b6b3cba3dd85d0383bd0a2738 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0412/1853] kpipewire: update to 5.27.5

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

diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template
index 467ab823a5e1..05ad025944da 100644
--- a/srcpkgs/kpipewire/template
+++ b/srcpkgs/kpipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'kpipewire'
 pkgname=kpipewire
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules plasma-wayland-protocols gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kpipewire"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a653408693ea16fee1b12a447982af48823aae86e5813b30b5a889cd2b883165
+checksum=41326adceeaad0d5e0fba78af69403dea12c007b769ed4b5d5534c21f27bdd98
 
 kpipewire-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e617ded235243ba45b1d958dbb3affb2112c17bc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0413/1853] kscreen: update to 5.27.5

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

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 554fb82deb63..ba630a1f14a1 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=456f249772f53807dcc0b5076dcf6975d5b29b0b2b6a037ca0a5e45017a4c5ed
+checksum=7297aac39b79d477ecd66df5a5c464d2064d375e7b2249eb67f62195a9824468

From 70c19f08ea60cd963e1d9c2fb5247287754c95ce Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0414/1853] kscreenlocker: update to 5.27.5

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

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f328878846fd..262dd08205cb 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9da7f59b3fe35879adae4c67d1b2263085ee5c79004cd2bec46ce6901b97191
+checksum=4c8807f1c2ed8fa14a9b29639c7d5697b5d5bab44d6b88020e5d3f463880ec92
 
 kscreenlocker-devel_package() {
 	short_desc+=" - development"

From 92887876c8bc517bb082fb2319ba514fb7acae87 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0415/1853] ksshaskpass: update to 5.27.5

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

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 84987f1d8ef8..206db539f9f5 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9050264181d58eafb7aa36d797cf510eb55d3f4d8057746dfd76565cf3ef46a
+checksum=f6ed26693e3dea8387c0980bf7335d96dc18c5c68c9e289d009dba22c79b0cd7
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 3b8f30fca4c3829c8554e7bca1318d36bddc6b73 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0416/1853] ksystemstats: update to 5.27.5

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

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index e46a66c0357a..a899f447f23f 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1fd68961450fb8c37c6969a3a9b927a59aa7d13e0820898f2fe73d6fdc9edece
+checksum=d59d84cdf8c9cd8a2c3639ebb5986f50995f1f7f74a833af867709b7c336dcf8

From 4785431d473b6606f2835747bdd68a2b0e465ac5 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0417/1853] kwallet-pam: update to 5.27.5

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

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 264e3f3ad422..8a71a61a4d3f 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea13f6b4cc17cb692cf0f94880926e4a072f6af8f4c0bce343ef3d5eafc126c
+checksum=6a9aaa8dc25ed62058058c1d813d674c7b430b4915e42253f48227e997929190

From d3e7892518512b03d6c5749ca9ff70ddb7f180eb Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0418/1853] kwayland-integration: update to 5.27.5

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

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index c84cc73bf343..6f9815bcab65 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f74a856a93e0bd91ad7c34905603c2ed74df1dc85e687354d9d588274026fe08
+checksum=9ae1fc40a70d1453841e16dca2e399fc5c68de3a9ffa7475673f98bf7dcb18f9

From e638cd0b9d770b95bddee3f234c1f29fb358ff01 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0419/1853] kwin: update to 5.27.5

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

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 5d17ba513ad0..d04158fdf630 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,8 +21,8 @@ short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b39f1d3cc528505213dbb72958e80d6cdad75617cb26c215607d6f12bf0e02b1
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=bb1226b15919681ea5f1de58b24ea4b568ea3f2b5452411f76daa80eb30c20ea
 replaces="kwayland-server>=0"
 
 kwin-devel_package() {

From 5b1f981b067f9e4d71efaa6713705de9d11e36e9 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0420/1853] kwrited: update to 5.27.5

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

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 182daf30f919..2f3cd4b4af73 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed3a4b80d6c32c6a9ce4a5be1b6b02a662d2eb0a90ee7dfc6307a335b87407fc
+checksum=f2baec5827a87c035a116795615f2dba51ebaaab6297cbe8adf50410865fcc91

From a04bdb2c6dcc1a1b88923f7efbe93dff8e628a82 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0421/1853] layer-shell-qt: update to 5.27.5

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

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index d1b188a704fb..e03e6a3efa7f 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b3aedc14b23023c8e8a4e5d0a16711f24b505cd8a2f470baf595a6ed0e3d0fe
+checksum=ccdf6aa579f0437f3bad377ac35268dfab36f6816227c03bae0591301c8d1d21
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4fcb3b1548f2c115abcecbbd1da1f1c6962b3e5c Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0422/1853] libkscreen: update to 5.27.5

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

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 3fa88086bb73..b40c6b2d9151 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a89dfb5e8c40958a41c264f9b26ec4c39b386c2e416aa29a17967a22c107fa7e
+checksum=29aff3f28d8706e864b914dea4ab59e5518ed0381bb1c6625f454f08196deb65
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From ce390d085039ef7edd95358d8c12a28e7e6a5ab8 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0423/1853] libksysguard: update to 5.27.5

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

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index ebcecd70ba10..006ac131c898 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e0128d0c515cba3fde36c4a5cf5872dbf4e58c29a0d297b84f32bcfbe622f8f8
+checksum=7e7eb53af05fefcfea6b38fed4947409370ad303247892e4719bc2a809e85e14
 
 build_options="webengine"
 

From 73c2fdd110d2f6bf19cced66ad8b0ac4395484fe Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0424/1853] milou: update to 5.27.5

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

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 08da9b3637c8..8d94a9cad774 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4d0f67b80f0580dbd4479dfa65e597fed2b8f9ab671eca3d7f5156f6871f57a8
+checksum=1b1b0a3e672f06eb81f889b0c48726af4b3702b103eb1e680c3972ef5c8d0298
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f6009c458df47d2c88e148d77b5a6f5cff81a380 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0425/1853] oxygen-sounds: update to 5.27.5

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

diff --git a/srcpkgs/oxygen-sounds/template b/srcpkgs/oxygen-sounds/template
index ab3324ecd9fb..1713e184170a 100644
--- a/srcpkgs/oxygen-sounds/template
+++ b/srcpkgs/oxygen-sounds/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-sounds'
 pkgname=oxygen-sounds
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,4 +9,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen-sounds"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9ea3ad7497c74e796b49f36b23da1d0facda8d2c05466fd8c477cf0f3c9384ec
+checksum=21fb31e2c4047f56e3ec09cd4960f56120b746152485336f716c9101cd2c8566

From 52bfd7239d8e375f9a69c568e6bbfc16a77f33dc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0426/1853] oxygen: update to 5.27.5

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

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 750cc3b3bab3..7ce53c433e2a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e20e969b7b71eb19673153103142ad4fc6b78b0b6f152b87a54b61f4b5cde3eb
+checksum=fb764ea8820a01ab9c9d0cfccf588b64c4a5b9e6644b6e4188c618a793227ebd

From 66512608c7c80fcdcac0489c7f238c1c7ea1121b Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0427/1853] plasma-browser-integration: update to 5.27.5

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

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index f092b56b0f44..4210c96ba5bd 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d37af781b11ec1622476b51af25ac82c8d2373bb8ff9c23981cb8a1c6d97f466
+checksum=b490451d672bb2f0294f53422d41df7594690bc8761f9724081147d5fdd1d925

From 67b164725ec10adfed436b336c2023c1a0bfa4ab Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0428/1853] plasma-desktop: update to 5.27.5

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

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 79bf86afb24a..7fb502a99151 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.27.4
-revision=2
+version=5.27.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -20,6 +20,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b94f1cd5f121312268d757078041d83220556c90f73e895518fb19542ae3c800
+checksum=4f2b573134658f640717d6ee67eaee41d9df4c578856016efa769b4415e91cb1
 replaces="user-manager>=0"
 python_version=3

From 3f4e5fc8a72b5b83c3074b286454984355e19219 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0429/1853] plasma-disks: update to 5.27.5

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

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 990de15817f3..9b0da9de04cd 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=97f4aee2e2db0ce2dbc1bfbe4b5ad85253f435f58af5f402916ff2d1e0e98323
+checksum=ea10e289596b3ce53c0d6ea5ee714306918c5b7368262c22965f44a1dab1480b

From 2ffce123906790d864e020644581cc55c3b4c437 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0430/1853] plasma-firewall: update to 5.27.5

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

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 91063515e3ef..5ca700e07262 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=349db4a0908d7a6565eb8b80971eb2ed4f6d4f1730ee65de2fd23f2b1343a3ac
+checksum=e32c90aa52ec35d35fd04e04d00989f18d43ea1f7b244e53de7feb7745235b41

From fb72e0c744744c8924b2046fc150a92976ca6493 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0431/1853] plasma-integration: update to 5.27.5

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

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 66e01e2ed938..ae9952e93c10 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9aa095f628d601d71283bb7b3274e2b8bfebd913c5804e3b371a5326f24b892e
+checksum=8dedc5630828f0fb5912ca7cad9df5cde2492e17fd2956de6f514d43b4f89f7b

From 9b6882dd987dc2789fd2fde6171478ca7223c366 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0432/1853] plasma-nm: update to 5.27.5

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

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index cd076036ecee..a4b533ef4c38 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2ee6bff818e5168062e1e4358851697e4397d8b666e4a58a4883489c1a51214b
+checksum=152f48e44b6207a606b89548c9f298f1a12a9778ff4876c3ffeeb1f2188ca62e

From dbc43becc7585b7528fa9518b1b7ad42a1240ef9 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0433/1853] plasma-pa: update to 5.27.5

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

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 326295cc3871..fc410aa573f6 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed344553bd7516579f0c647414811f46b19789ebf4f5544181299ee52ad3f2e6
+checksum=c2ab3f73bfdeed68a5cda3bf72a67ef609bef1c3e96e43bab0a18df822d98188

From 267e9822f2a11a16eeed0d182a6c1ef61c7c9a57 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0434/1853] plasma-sdk: update to 5.27.5

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

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index e54873841579..d0fce312449e 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f98849e361c19b192998bb4966f561ea8539d6ceb98fc967e783edb36c36db21
+checksum=f10245b27687bbd21b18e78267a1895aab9644722456a2b92fb54f7ca0b06915
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f46b5a684e4200065304159badb7c7c4581bfc9f Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0435/1853] plasma-systemmonitor: update to 5.27.5

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

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 024f9d1371d7..01ded45075a8 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=294847847d9ade0cad8723f4af95bf5b36588c43c69ae4e624aaee3c2b45c3eb
+checksum=82e551398f208270f543d5f91be6f3f3b27b1ce9f2c0e90263f29f8d238b2e34

From c2c1802ed0c9cfc167665a8b061d099254285a33 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0436/1853] plasma-thunderbolt: update to 5.27.5

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

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 30511dad8cc9..ea02f0d85a7d 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=28f605034102572d406978b81f891ff5a15d50979116dd3bebc849e5712af4ff
+checksum=310564c501c6621c3d0f1421865d18839191bc82915ffba555a80214e0db90d5
 
 do_check() {
 	: # Requires running dbus and bolt services

From 1be50f04d45d035207b7c190b448a9e4e7b08a0e Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0437/1853] plasma-vault: update to 5.27.5

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

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index db994f5c2cda..ebc592f1c804 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -13,5 +13,5 @@ short_desc="Plasma applet and services for creating encrypted vaults"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e7d0d8f06767b849bd27937415b1098619d804f3870c62f7c40537f8843102ae
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=74f22be02ae0e02cf2e9eb3fad62a5ca9fb5f984775455f6c7e1c6aa553527e8

From f093a7882f7e1d9459ee5d331cf30d5fa9fe18e5 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0438/1853] plasma-workspace-wallpapers: update to 5.27.5

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

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index ff45328b2e51..d2c3eb5e5bb7 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,5 +9,5 @@ short_desc="KDE Plasma wallpapers"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e44d7bc716f99ce13bf034d4eeed99cdd33e12db7068d74ac37d2304ee44656b
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=23805edcc147377c7bd7444278e76327003d142f9c4048e3970000cb6f38c840

From e57c42b78e73f3e942fadf9d31aad17f2ab6c3ff Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0439/1853] plasma-workspace: update to 5.27.5

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

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index bfb480b88d94..027ec664e9e8 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -22,8 +22,8 @@ short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb3906ac954bfd0784614843b1aaf9abda640ea3ed944d8651aaa4149baf65a5
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=ed0b95b2eefd0782ea652c2c6eed262e8eb91f97ff72925bb3f7e161d1f72a17
 
 build_options="pipewire"
 build_options_default="pipewire"

From ef16e56d77b32654dabea5ff9b03bae5ec95279b Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0440/1853] polkit-kde-agent: update to 5.27.5

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

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 64af642c6368..9f5ce9a706c0 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,5 +11,5 @@ short_desc="KDE PolKit auth agent"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-1-${version}.tar.xz"
-checksum=26e795f6016e6e64e3fd4518b2a49e8df66716fab073784d943a3b7782ce70c6
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
+checksum=2ae3b4ff0c74d9f55fe85cb0fb8106401f0301a96760d0ffefb66161215a2a2f

From 34d8ea76ee9573af8a4c83d84f951c321b2510b6 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0441/1853] powerdevil: update to 5.27.5

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

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 4398c8730892..e6198d4f2cdb 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,5 +12,5 @@ short_desc="Power consumption settings of a Plasma"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=644994c77d071480d9df221b1d8f798ecc468380c174da24a3271ce5d83cd368
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=0379862c57efef4ce980f6c9583d66deafde1ed522f0e129aa50cef038fb500e

From 319fd8e1296b2063325c7e70d5f31af3d2511f01 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:14 -0700
Subject: [PATCH 0442/1853] sddm-kcm: update to 5.27.5

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

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 2e9f1cfed4ff..cd45480f71b6 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,5 +13,5 @@ short_desc="KDE Config Module for SDDM"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=977a526713fed18483234e6dd33347eece8bd02c7ca46fd473e50d59d1ac0551
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=5605f2dffe33b731b08ec51b7ef4cea8ec6fb796497ae46242fe8f40e8aa199a

From 9c89c93e41084fb41bee92cd66d2f8f97ca8b30f Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:14 -0700
Subject: [PATCH 0443/1853] systemsettings: update to 5.27.5

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

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 03969adefe6b..287ef9b9c8bd 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,5 +13,5 @@ short_desc="KDE System settings"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f9d1d2f2f829d75467798ceea471b79ecc7c91437fbcb5b8f36bd67d512730e
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=d5454eb0aaba331e724bd91650474bbe1658f26fcc543ab7804186bccf50b4db

From bd33e5ef34088718e79309110891e486ab2338fc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:14 -0700
Subject: [PATCH 0444/1853] xdg-desktop-portal-kde: update to 5.27.5

---
 srcpkgs/xdg-desktop-portal-kde/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 771f4d988b8f..818e2c721b77 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,5 +12,5 @@ short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF5"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efc6c2dda2893507acc574b7327140b8982752d6ed71740e1f4bf91128a63d43
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=7cfa3f24cff9b18baeef245e122f969092a89c41d872ea5a8df628061d8f1aab

From 8c407869da6048b6163371be90f8f79b8d0ff3d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Jun 2023 22:48:25 +0200
Subject: [PATCH 0445/1853] kde5: update to 5.27.5.

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

diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index ed6bb91633e9..08991643cc41 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.27.3
+version=5.27.5
 revision=1
 build_style=meta
 depends="bluedevil>=${version}

From cc667f8dbb32c1204f42ecf40205b6f4e1ade6cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Fri, 9 Jun 2023 11:20:28 +0400
Subject: [PATCH 0446/1853] go: update to 1.20.5.

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 18ee1751f2f9..0e28996e75e0 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.4
+version=1.20.5
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
+checksum=9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git

From 4341c5c683117ea2d78180e3ff4cff1226b199b2 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 9 Jun 2023 10:00:37 +0200
Subject: [PATCH 0447/1853] linux-firmware: update to 20230515

---
 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 411477bbf308..b1e33ee38296 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20230404
+version=20230515
 revision=1
 depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ 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=09343acd48cb1e33dd6e1f4c2736ceadaa943c42eb20d04a26a5701d05ddde0d
+checksum=8b8be098110f47ff6cb3e02e0c7cf0b25d9427a09870b1c2df3637e5708eb158
 python_version=3
 nostrip=yes
 
@@ -95,7 +95,7 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/mrvl
 		vmove "usr/lib/firmware/mt7*.bin"
 		# don't move mediatek SoC firmware
-		( shopt -s extglob; vmove "usr/lib/firmware/mediatek/!(mt7986*|mt81*|sof*)" )
+		( shopt -s extglob; vmove "usr/lib/firmware/mediatek/!(mt7981*|mt7986*|mt81*|sof*)" )
 		vmove usr/lib/firmware/ueagle-atm
 		vmove usr/lib/firmware/ti-connectivity
 		vmove usr/lib/firmware/dpaa2

From c7cc26eead8c06d8ff6cd197832bf1156465e561 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 8 Jun 2023 15:38:38 -0400
Subject: [PATCH 0448/1853] mdocml: fix hang when rendering stress-ng(1)

see https://inbox.vuxu.org/mandoc-discuss/ZIIbRuk+yJtoAJhv@asta-kit.de/
---
 srcpkgs/mdocml/patches/stress-ng-hang.patch | 75 +++++++++++++++++++++
 srcpkgs/mdocml/template                     |  2 +-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mdocml/patches/stress-ng-hang.patch

diff --git a/srcpkgs/mdocml/patches/stress-ng-hang.patch b/srcpkgs/mdocml/patches/stress-ng-hang.patch
new file mode 100644
index 000000000000..fd6a3a7c0037
--- /dev/null
+++ b/srcpkgs/mdocml/patches/stress-ng-hang.patch
@@ -0,0 +1,75 @@
+fixes hang from rendering stress-ng(1)
+
+from https://inbox.vuxu.org/mandoc-discuss/ZIIbRuk+yJtoAJhv@asta-kit.de/
+
+===================================================================
+RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
+retrieving revision 1.54
+retrieving revision 1.55
+diff -u -r1.54 -r1.55
+--- a/out.c	2021/09/07 17:05:30	1.54
++++ b/out.c	2021/09/28 17:06:17	1.55
+@@ -121,6 +121,7 @@
+ 	const struct tbl_dat	*dp;
+ 	struct roffcol		*col;
+ 	struct tbl_colgroup	*first_group, **gp, *g;
++	size_t			*colwidth;
+ 	size_t			 ewidth, min1, min2, wanted, width, xwidth;
+ 	int			 done, icol, maxcol, necol, nxcol, quirkcol;
+ 
+@@ -254,16 +255,28 @@
+ 			gp = &(*gp)->next;
+ 	}
+ 
++	colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));
+ 	while (first_group != NULL) {
+ 
+ 		/*
++		 * Rebuild the array of the widths of all columns
++		 * participating in spans that require expansion.
++		 */
++
++		for (icol = 0; icol <= maxcol; icol++)
++			colwidth[icol] = SIZE_MAX;
++		for (g = first_group; g != NULL; g = g->next)
++			for (icol = g->startcol; icol <= g->endcol; icol++)
++				colwidth[icol] = tbl->cols[icol].width;
++
++		/*
+ 		 * Find the smallest and second smallest column width
+ 		 * among the columns which may need expamsion.
+ 		 */
+ 
+ 		min1 = min2 = SIZE_MAX;
+ 		for (icol = 0; icol <= maxcol; icol++) {
+-			width = tbl->cols[icol].width;
++			width = colwidth[icol];
+ 			if (min1 > width) {
+ 				min2 = min1;
+ 				min1 = width;
+@@ -281,7 +294,7 @@
+ 		for (g = first_group; g != NULL; g = g->next) {
+ 			necol = 0;
+ 			for (icol = g->startcol; icol <= g->endcol; icol++)
+-				if (tbl->cols[icol].width == min1)
++				if (colwidth[icol] == min1)
+ 					necol++;
+ 			if (necol == 0)
+ 				continue;
+@@ -298,7 +311,7 @@
+ 		while ((g = *gp) != NULL) {
+ 			done = 0;
+ 			for (icol = g->startcol; icol <= g->endcol; icol++) {
+-				if (tbl->cols[icol].width != min1)
++				if (colwidth[icol] != min1)
+ 					continue;
+ 				if (g->wanted <= wanted - min1) {
+ 					tbl->cols[icol].width += g->wanted;
+@@ -315,6 +328,7 @@
+ 				gp = &(*gp)->next;
+ 		}
+ 	}
++	free(colwidth);
+ 
+ 	/*
+ 	 * Align numbers with text.
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 4dda1338fc9c..9b9d5394a292 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=6
+revision=7
 build_style=configure
 make_build_args="all man.cgi"
 make_check_target="regress"

From 3f487545a8b845d11fb79e6e83789f21cb6f417d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 18 Apr 2023 11:29:29 +0530
Subject: [PATCH 0449/1853] New package: python3-SQLAlchemy2-2.0.9

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

diff --git a/srcpkgs/python3-SQLAlchemy2/template b/srcpkgs/python3-SQLAlchemy2/template
new file mode 100644
index 000000000000..d445ccb52fe2
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy2/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-SQLAlchemy2'
+pkgname=python3-SQLAlchemy2
+version=2.0.9
+revision=1
+build_style=python3-pep517
+make_install_target="dist/SQLAlchemy-${version}-*-*-*.whl"
+hostmakedepends="python3-setuptools python3-Cython python3-wheel"
+makedepends="python3-devel"
+depends="python3-greenlet python3-typing_extensions"
+checkdepends="${depends} python3-mypy python3-pytest-xdist"
+short_desc="SQL Toolkit and Object Relational Mapper for Python3 (v2)"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://www.sqlalchemy.org"
+changelog="https://docs.sqlalchemy.org/en/20/changelog/"
+distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
+checksum=95719215e3ec7337b9f57c3c2eda0e6a7619be194a5166c07c1e599f6afc20fa
+
+conflicts="python3-SQLAlchemy"
+
+post_install() {
+	vlicense LICENSE
+}

From 9b2d81ffeb0173ea7519c3e41aa076e739680ce1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 17 Apr 2023 21:40:55 +0530
Subject: [PATCH 0450/1853] pychess: update to 1.0.4.

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

diff --git a/srcpkgs/pychess/template b/srcpkgs/pychess/template
index 92622121157e..7e52b7d8bf2f 100644
--- a/srcpkgs/pychess/template
+++ b/srcpkgs/pychess/template
@@ -1,23 +1,27 @@
 # Template file for 'pychess'
 pkgname=pychess
-version=1.0.3
-revision=2
+version=1.0.4
+revision=1
 build_style=python3-module
-_commondeps="python3-gobject python3-pexpect python3-SQLAlchemy
- gobject-introspection gtksourceview"
+_commondeps="python3-gobject python3-cairo python3-pexpect python3-SQLAlchemy2
+ gst1-python3 gtksourceview"
 hostmakedepends="python3-setuptools gettext ${_commondeps}"
-depends="stockfish gnome-icon-theme python3-websockets
+depends="stockfish hicolor-icon-theme python3-websockets
  python3-psutil gst-plugins-base1 ${_commondeps}"
 checkdepends="${depends} xvfb-run"
 short_desc="GTK chess client written in Python"
 maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-3.0-or-later"
 homepage="https://pychess.github.io"
-distfiles="https://github.com/pychess/${pkgname}/archive/${version}.tar.gz"
-checksum=86b193dd1af1f40d37820afb33b3b3b890be2737d57df5f8e024a489840b25a4
+distfiles="https://github.com/pychess/pychess/archive/refs/tags/${version}.tar.gz"
+checksum=68cd4a0197d7e325f0e46fb52b88ce8ac7425c6c9adea60c8838a57af713b0a5
+
+pre_build() {
+	PYTHONPATH=lib python3 pgn2ecodb.py
+	PYTHONPATH=lib python3 create_theme_preview.py
+}
 
 do_check() {
 	cd testing/
-	rm remotegame.py
-	PYTHONPATH=../lib PYCHESS_UNITTEST=true xvfb-run -a python3 -m unittest discover -p "*.py"
+	PYTHONPATH=../lib PYCHESS_UNITTEST=true xvfb-run -a python3 run_tests.py
 }

From c994f1f84278eac2213866601f88b31bf4f2f801 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 20:46:05 -0400
Subject: [PATCH 0451/1853] NetworkManager: update to 1.42.6

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

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 1e8c290705a3..6311d82924c1 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.42.4
+version=1.42.6
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-42/NEWS"
 distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
-checksum=86ee16a2f7f525629133fa0c3dc060caf96ae4f34084eda1c24551951abe5a3c
+checksum=8c388ac3775ac6bceb605fae21be2c3e261cafe6067994a89f0dfa4610ed0279
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes

From a0cf50acc476ff3db8abbd3b5d8d0e354abea177 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 20:48:25 -0400
Subject: [PATCH 0452/1853] network-manager-applet: update to 1.32.0

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

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index ee5e63b467ed..f6f79f9680c4 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.30.0
-revision=2
+version=1.32.0
+revision=1
 build_style=meson
 configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
@@ -16,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.gnome.org/GNOME/network-manager-applet/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/network-manager-applet/${version%.*}/network-manager-applet-${version}.tar.xz"
-checksum=9516b84e9d9f100db89a0c67cbfe57cedb0562310d45caafb6332e27bbeb5cd3
+checksum=a2b5affa1505ad43902959fdbe09e5bcec57b11ed333fa60458ffb9c62efba38
 lib32disabled=yes

From 7fe9c52ea999c378db1a6775da8792ea0c2de81a Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 3 May 2023 01:41:58 +0000
Subject: [PATCH 0453/1853] peru: update to 1.3.1.

---
 srcpkgs/peru/template | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template
index 164984d6f4fc..6b37a010445c 100644
--- a/srcpkgs/peru/template
+++ b/srcpkgs/peru/template
@@ -1,17 +1,31 @@
 # Template file for 'peru'
 pkgname=peru
-version=1.2.0
-revision=5
-build_style=python3-module
-pycompile_module="peru"
-hostmakedepends="python3-setuptools"
+version=1.3.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling python3-wheel"
 depends="curl git mercurial python3 python3-docopt python3-yaml"
+checkdepends="${depends} python3-pytest rsync subversion"
 short_desc="Tool for fetching code"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="MIT"
 homepage="https://github.com/buildinspace/peru"
 distfiles="https://github.com/buildinspace/peru/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=fb0fb02639e1c5403c9a6ddfd9719c5ea5ddf69fb440fbcfafe234470645e1dc
+checksum=6a21108f8b0417301d3cd76fa220906cea9d58f95208b70191282972f8bb8ff9
+
+do_check() {
+	local skiptests
+
+	skiptests+=" test_curl_plugin_fetch or"
+	skiptests+=" test_curl_plugin_fetch_archives or"
+	skiptests+=" test_curl_plugin_reup or"
+	skiptests+=" test_git_plugin_with_relative_submodule or"
+	skiptests+=" test_git_plugin_with_submodule or"
+	skiptests+=" test_plugin_fetch or"
+	skiptests+=" test_plugin_get_reup_fields"
+
+	PYTHONPATH="$(cd tests && pwd)" python3 -m pytest -k "not (${skiptests})"
+}
 
 post_install() {
 	vlicense LICENSE

From f2094b1c8b76ddf6709f4437b2e9a351b97fb873 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Tue, 6 Jun 2023 02:15:38 +0200
Subject: [PATCH 0454/1853] limine: update to 4.20230606.0.

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

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index 1fad25363c8a..25e23c5cd630 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230428.0
+version=4.20230606.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=8771a86769a3405dad729cabceac0a76316964c40dc2f0690398b1e6e01aae41
+checksum=8a6fdb8b520a030928ab4e11756126a7b80790889a5567d0c92b907a1b131759
 
 post_install() {
 	vlicense LICENSE

From 643f375e0b819a20fc43f274ffefde1c57c04aa9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 4 May 2023 11:57:34 +0530
Subject: [PATCH 0455/1853] xarchiver: update to 0.5.4.21.

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

diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index b669c6eae41d..47ef5230f29c 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
 # Template file for 'xarchiver'
 pkgname=xarchiver
-version=0.5.4.20
+version=0.5.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-doc --enable-gtk2=no"
@@ -12,4 +12,4 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ib/xarchiver"
 distfiles="https://github.com/ib/xarchiver/archive/refs/tags/${version}.tar.gz"
-checksum=929e8609d769ab97a18494ef75bef443e244a62b045f637078fe5df87bbcf9ff
+checksum=65329bff7e901452f3f927d913c47ffca759a36e83e8b82d04fe6945e7393fd4

From 4f71a61daacc0fc6d657609b964a952cdc4cd01e Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Fri, 5 May 2023 11:59:08 +0200
Subject: [PATCH 0456/1853] ncspot: update to 0.13.2.

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

diff --git a/srcpkgs/ncspot/template b/srcpkgs/ncspot/template
index 98b3d847ed12..19a47daeca3c 100644
--- a/srcpkgs/ncspot/template
+++ b/srcpkgs/ncspot/template
@@ -1,6 +1,6 @@
 # Template file for 'ncspot'
 pkgname=ncspot
-version=0.13.1
+version=0.13.2
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/hrkfdn/ncspot"
 changelog="https://github.com/hrkfdn/ncspot/releases"
 distfiles="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${version}.tar.gz"
-checksum=51394f0a4f75c6d6273f1a98be350dca3f50a8ba21e5b563e85b08b9da04af89
+checksum=c329fc3fe229c47c2b3490555b4c8df550a3e2bbe3d0ade4e07f59434fa14e77
 
 post_build() {
 	cargo auditable build --release --target ${RUST_TARGET} --package xtask

From bbff426db1de902159a320d34b03a8d448481192 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 7 May 2023 01:09:25 +0530
Subject: [PATCH 0457/1853] dust: update to 0.8.6.

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

diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index e52b02aeae3d..a59cdf788fea 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,6 +1,6 @@
 # Template file for 'dust'
 pkgname=dust
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=cargo
 short_desc="More intuitive version of du"
@@ -8,7 +8,7 @@ maintainer="Neel <neel@chot.ai>"
 license="Apache-2.0"
 homepage="https://github.com/bootandy/dust"
 distfiles="https://github.com/bootandy/dust/archive/refs/tags/v${version}.tar.gz"
-checksum=0eff8b1b4e53f5ec2ffc0cfb9e5500bf27a9a5a68b1ff115c98facb4d20a7b7c
+checksum=feede818e814011207c5bfeaf06dd9fc95825c59ab70942aa9b9314791c5d6b6
 
 post_install() {
 	vcompletion completions/dust.bash bash

From 64f858876d6b8eab84f5ea815622293e9b4312a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=2E=20C=2E=20Moreira?=
 <andrelcmoreira@disroot.org>
Date: Sat, 6 May 2023 23:36:08 -0300
Subject: [PATCH 0458/1853] volumeicon: add changelog, adopt.

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

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index 3d3e14eff617..2b15a200d804 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -7,9 +7,10 @@ configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André L. C. Moreira <andrelcmoreira@disroot.org>"
 license="GPL-3.0-only, ISC, MIT"
 homepage="http://nullwise.com/volumeicon.html"
+changelog="https://raw.githubusercontent.com/Maato/volumeicon/master/ChangeLog"
 distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 

From d70407d9de2e2a3d34fac6276949a8d63bdda007 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 6 May 2023 23:35:53 -0400
Subject: [PATCH 0459/1853] urlwatch: update to 2.28

---
 ...afbb047060277b00f570345e7e1969266712.patch | 88 -------------------
 srcpkgs/urlwatch/template                     |  4 +-
 2 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch

diff --git a/srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch b/srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch
deleted file mode 100644
index 832b963517e0..000000000000
--- a/srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 6b68afbb047060277b00f570345e7e1969266712 Mon Sep 17 00:00:00 2001
-From: Thomas Perl <m@thp.io>
-Date: Wed, 12 Apr 2023 15:22:02 +0200
-Subject: [PATCH] Rework handling of running from a source checkout (fixes
- #755)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 657e0494..fccf1f1d 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
- 
- The format mostly follows [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- 
-+## UNRELEASED
-+
-+### Fixed
-+
-+- Rework handling of running from a source checkout, fixes issues with example files
-+  when `urlwatch` was run as `/usr/sbin/urlwatch`, e.g. on Void Linux (fixes #755)
-+
- ## [2.26] -- 2023-04-11
- 
- ### Added
-diff --git a/lib/urlwatch/cli.py b/lib/urlwatch/cli.py
-index 75332f09..f6a5802a 100755
---- a/lib/urlwatch/cli.py
-+++ b/lib/urlwatch/cli.py
-@@ -47,9 +47,6 @@
- # Check if we are installed in the system already
- (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
- 
--if bindir != 'bin':
--    sys.path.insert(0, os.path.join(prefix, bindir, 'lib'))
--
- from urlwatch.command import UrlwatchCommand
- from urlwatch.config import CommandConfig
- from urlwatch.main import Urlwatch
-@@ -90,7 +87,7 @@ def main():
-     if os.path.exists(old_cache_file) and not os.path.exists(new_cache_file):
-         cache_file = old_cache_file
- 
--    command_config = CommandConfig(sys.argv[1:], pkgname, urlwatch_dir, bindir, prefix,
-+    command_config = CommandConfig(sys.argv[1:], pkgname, urlwatch_dir, prefix,
-                                    config_file, urls_file, hooks_file, cache_file, False)
-     setup_logger(command_config.verbose)
- 
-diff --git a/lib/urlwatch/config.py b/lib/urlwatch/config.py
-index c1075460..40d206ec 100644
---- a/lib/urlwatch/config.py
-+++ b/lib/urlwatch/config.py
-@@ -52,20 +52,12 @@ def __init__(self, pkgname, urlwatch_dir, config, urls, cache, hooks, verbose):
- 
- class CommandConfig(BaseConfig):
- 
--    def __init__(self, args, pkgname, urlwatch_dir, bindir, prefix, config, urls, hooks, cache, verbose):
-+    def __init__(self, args, pkgname, urlwatch_dir, prefix, config, urls, hooks, cache, verbose):
-         super().__init__(pkgname, urlwatch_dir, config, urls, cache, hooks, verbose)
--        self.bindir = bindir
--        self.prefix = prefix
-         self.migrate_cache = migrate_cache
-         self.migrate_urls = migrate_urls
- 
--        if self.bindir == 'bin':
--            # Installed system-wide
--            self.examples_dir = os.path.join(prefix, 'share', self.pkgname, 'examples')
--        else:
--            # Assume we are not yet installed
--            self.examples_dir = os.path.join(prefix, bindir, 'share', self.pkgname, 'examples')
--
-+        self.examples_dir = os.path.join(prefix, 'share', self.pkgname, 'examples')
-         self.urls_yaml_example = os.path.join(self.examples_dir, 'urls.yaml.example')
-         self.hooks_py_example = os.path.join(self.examples_dir, 'hooks.py.example')
- 
-diff --git a/lib/urlwatch/tests/test_handler.py b/lib/urlwatch/tests/test_handler.py
-index 1d5d22e6..7886acc9 100644
---- a/lib/urlwatch/tests/test_handler.py
-+++ b/lib/urlwatch/tests/test_handler.py
-@@ -89,8 +89,7 @@ def test_pep8_conformance():
- 
- class ConfigForTest(CommandConfig):
-     def __init__(self, config, urls, cache, hooks, verbose):
--        (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
--        super().__init__([], 'urlwatch', os.path.dirname(__file__), bindir, prefix, config, urls, hooks, cache, verbose)
-+        super().__init__([], 'urlwatch', os.path.dirname(__file__), root, config, urls, hooks, cache, verbose)
- 
- 
- @contextlib.contextmanager
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index 58287278fe90..809ce89c7b43 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,6 +1,6 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
-version=2.26
+version=2.28
 revision=1
 build_style=python3-module
 # skip the tests that require python modules that aren't packaged
@@ -19,7 +19,7 @@ license="BSD-3-Clause"
 homepage="https://thp.io/2008/urlwatch/"
 changelog="https://raw.githubusercontent.com/thp/urlwatch/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=b14bbe23d87b7d4ac8b4e71a51fd2066908a947ccf7b557c3e4f87b09f455e8f
+checksum=911df3abbd8923e46ec167a9657a812436caf93f7f9917cb7c95ebd73d28cce5
 
 post_install() {
 	vlicense COPYING

From 3e1fcbdcca5ed795b403c4df5d645403bf1b86fd Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Sun, 7 May 2023 12:41:03 +0200
Subject: [PATCH 0460/1853] swayimg: update to 1.11.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9361b4aa492d..389ee535394b 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
-version=1.10
-revision=2
+version=1.11
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel
@@ -12,7 +12,7 @@ maintainer="Orphan <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/artemsen/swayimg"
 distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz"
-checksum=fa20e9d5e260ca45ca3fb83343a6c7e7c93bcdb1184a99b19b630aec598f4b17
+checksum=b7853417caf3c928195107644df31ba80a906fc3ecca180db2841abbfac27736
 
 post_install() {
 	vcompletion extra/bash.completion bash

From accc60b220b15d4907b8b27b3ae9efb840904e4d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 7 May 2023 16:42:53 +0200
Subject: [PATCH 0461/1853] praat: update to 6.3.10

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

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 8a88f55deea6..56d62e1a18de 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.3.09
+version=6.3.10
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.fon.hum.uva.nl/praat/"
 changelog="https://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=047a8295a5097a4c101b62d49cf9e4e3f13655d94e35b4d9c00be0b3d2ca3330
+checksum=8aa1e19376d2ac730c1b191eab67e10708002747220baa9f1c807fbf5a5cec48
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 89a563e37c9c8034df305f02ce58b8bcb18716fc Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 11 Apr 2023 17:43:29 +0200
Subject: [PATCH 0462/1853] neovim-qt: update to 0.2.17

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

diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template
index 459fd23b19b7..faea60a20084 100644
--- a/srcpkgs/neovim-qt/template
+++ b/srcpkgs/neovim-qt/template
@@ -1,17 +1,18 @@
 # Template file for 'neovim-qt'
 pkgname=neovim-qt
-version=0.2.16.1
+version=0.2.17
 revision=1
 build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DUSE_SYSTEM_MSGPACK=ON"
 hostmakedepends="qt5-host-tools qt5-qmake neovim"
-makedepends="qt5-devel qt5-svg-devel"
+makedepends="msgpack-devel qt5-devel qt5-svg-devel"
 depends="neovim"
 short_desc="Neovim client library and GUI, in Qt5"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="ISC"
 homepage="https://github.com/equalsraf/neovim-qt"
 distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz"
-checksum=971d4597b40df2756b313afe1996f07915643e8bf10efe416b64cc337e4faf2a
+checksum=ac538c2e5d63572dd0543c13fafb4d428e67128ea676467fcda68965b2aacda1
 
 post_install() {
 	vlicense LICENSE

From 79b1a138260f2e1277f594575d2b32e525351159 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 19:58:00 +0200
Subject: [PATCH 0463/1853] falkon: update to 23.04.2.

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

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 3298c3cc1922..4a4d7be0ae3a 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,6 +1,6 @@
 # Template file for 'falkon'
 pkgname=falkon
-version=23.04.1
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
@@ -17,7 +17,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="https://www.falkon.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c56bc0224d6df90ae9959a8ee81dfe5ef570db2452040c7219d2939237019f02
+checksum=c14202fa08821d3f18436f309d3ae1ad410865be2453b3e4eba3fe6c137aa2c9
 
 LDFLAGS="-Wl,--no-fatal-warnings"
 

From aa684a30b35dcc9dc4585611a4e7887c07c0286e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 20:00:34 +0200
Subject: [PATCH 0464/1853] libkdcraw5: update to 23.04.2.

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

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 27e416dca9f8..09ef908651f1 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=23.04.1
-revision=2
+version=23.04.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
  gettext"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=14a61b808443ff8b3a6566e5f6141278ed71af223b39a4b0c322dd137de51701
+checksum=25d790c0d42534a55c3a95b084a1ee5fca8801d1fee52dc9add047b6e296ec69
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 1b170b0e8d620e3a9f930bb56c1aec3004ca81bb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 20:12:49 +0200
Subject: [PATCH 0465/1853] gwenview: update to 23.04.2.

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

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index adf26f060150..4ab9a1c9ab0a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=23.04.1
+version=23.04.2
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -19,4 +19,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b11c745999f20eaaa18c85d221063a77af28fc0e7a9176da651a5210fec8b0d5
+checksum=bf1de549931a53ea8298a186c63fb2778b414db9018dd86816d58e6731477922

From 3f5b824e02c0880e6d9fd4a31b3a0ce2ecd30cd7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 20:13:49 +0200
Subject: [PATCH 0466/1853] perl-Locale-Codes: update to 3.74.

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

diff --git a/srcpkgs/perl-Locale-Codes/template b/srcpkgs/perl-Locale-Codes/template
index 46bb8193d4e2..a161a9dcc886 100644
--- a/srcpkgs/perl-Locale-Codes/template
+++ b/srcpkgs/perl-Locale-Codes/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Locale-Codes'
 pkgname=perl-Locale-Codes
-version=3.73
+version=3.74
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Locale-Codes"
 distfiles="${CPAN_SITE}/Locale/${pkgname/perl-/}-${version}.tar.gz"
-checksum=9a6db8e2b0843eba8a2287785c9b7d051dee68c73f1e575780a097f375e8e682
+checksum=a310b4cad11d2708ab3d602724d16f5ef01362d57de57cb5e99e1221e9a16ecb

From 293c2051bd0eab6e21365e843f174e20794bf703 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:31:35 +0200
Subject: [PATCH 0467/1853] rust-bootstrap: update to 1.70.0

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

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 567c4ae1e69d..d1025550e850 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-bootstrap'
 pkgname=rust-bootstrap
-version=1.69.0
+version=1.70.0
 revision=1
 short_desc="Rust programming language bootstrap toolchain"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -31,24 +31,24 @@ case "$XBPS_TARGET_MACHINE" in
 		 ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
 		checksum="
-		 788ff61555857680d5ea7cf76023f74a7f4820dd1c26abf76536561d4de3cbe6
-		 bef330af5bfb381a01349186e05402983495a3e2d4d1c35723a8443039d19a2d"
+		 f89c90f80864f68e42b70d9c14984195629ed9894bb5cfe6c8a0f1140f7816ff
+		 0e5543c35196ca5b08f1b7e49fa3f3b671444d75648504cdbcfd854e2e7efd2d"
 		;;
 	x86_64)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
 		checksum="
-		 70e97ab5b9600328b977268fc92ca4aa53064e4e97468df35215d4396e509279
-		 4c95739e6f0f1d4defd937f6d60360b566e051dfb2fa71879d0f9751392f3709"
+		 7d891d3e9bc4f1151545c83cbe3bc6af9ed234388c45ca2e19641262f48615e2
+		 0c0129717da1e27ccf2c56da950d2fe56973f71beec9e80ae6904b282d2f0ee9"
 		;;
 	x86_64-musl)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
 		checksum="
-		 7d9e64850a79292d2cda6f4464dfd67d2cbd22ac8c7f3e170291396ef8be8041
-		 29d98c004629ab536bd2461f715f26ddce3b0f0212db85939c7bc66a8d234b2d"
+		 69a3ba1273aedaf7aadc91f6ccf59061eb00205c9c523f0b1f91ca14cfa2058c
+		 7ebaba08385d1ec87d0a27ca8b4e1eb454374da18ffa12621bd1578973754101"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 1930e457668d1281b461bd34a1fc9736117ada65 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:33:09 +0200
Subject: [PATCH 0468/1853] cargo-bootstrap: update to 1.70.0

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

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index b5dc2e9aed89..d591e4233c57 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-bootstrap'
 pkgname=cargo-bootstrap
-version=1.69.0
+version=1.70.0
 revision=1
 short_desc="Bootstrap binaries of Rust package manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,15 +24,15 @@ esac
 case "$XBPS_TARGET_MACHINE" in
 	i686)
 		distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
-		checksum="4c9b1b2fb692bb0c81e524df6368723f061c8bb0d21a1f487eb8e5c2bdf323ab"
+		checksum="5d20e9b8e56f641c3ef4aef965563806aa220044397485ec56f784657451a329"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="336eeabf231a7665c26c127a37b8aefffe28cb087c5c8d4ba0460419f5f8eff2"
+		checksum="650e7a890a52869cd14e2305652bff775aec7fc2cf47fc62cf4a89ff07242333"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="17f5c6481a881599adb5f665480d9985073155eda9c9fdc1e5663563db51b970"
+		checksum="4d7513e23b8710ebacb01ed333d00692331295e45191f5c0795aada00f291d19"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 01009665b4cf09ef23da8cf0cdfb65f1bf61a42f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:36:10 +0200
Subject: [PATCH 0469/1853] rust: update to 1.70.0

---
 srcpkgs/rust-src                              |   1 +
 ...dlib-and-musl_root-from-musl-targets.patch |  63 +++-----
 ...e-debugger-scripts-to-usr-share-rust.patch |  26 +--
 ...4-fix-shebang-on-install-template.sh.patch |  15 +-
 ...kage-of-musl-libc-for-the-libc-crate.patch |  28 ++--
 srcpkgs/rust/template                         | 149 +++++++++---------
 6 files changed, 124 insertions(+), 158 deletions(-)
 create mode 120000 srcpkgs/rust-src

diff --git a/srcpkgs/rust-src b/srcpkgs/rust-src
new file mode 120000
index 000000000000..6ef8575b5fa4
--- /dev/null
+++ b/srcpkgs/rust-src
@@ -0,0 +1 @@
+rust
\ No newline at end of file
diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 1759147c989f..07c24412f6d9 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -4,17 +4,6 @@ Date: Sun, 3 May 2020 17:53:33 +0200
 Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
 
 extended by various void contributors to match our musl setup
----
- compiler/rustc_target/src/spec/crt_objects.rs | 22 ----------
- .../rustc_target/src/spec/linux_musl_base.rs  |  7 ---
- config.toml.example                           |  8 ----
- src/bootstrap/cc_detect.rs                    | 25 +----------
- src/bootstrap/compile.rs                      | 43 +------------------
- src/bootstrap/config.rs                       |  9 ----
- src/bootstrap/configure.py                    | 28 ------------
- src/bootstrap/lib.rs                          | 19 --------
- src/bootstrap/sanity.rs                       | 23 ----------
- 9 files changed, 3 insertions(+), 181 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
 index c126390f5..7aef73d3b 100644
@@ -70,13 +59,13 @@ index 61553e71b..88f807a58 100644
  
      base
  }
-diff --git a/config.toml.example b/config.toml.example
-index ca54cbd2d..beec9bb04 100644
---- a/config.toml.example
-+++ b/config.toml.example
-@@ -540,14 +540,6 @@ changelog-seen = 2
+diff --git a/config.example.toml b/config.example.toml
+index 6d9c762ce..7a1375d8a 100644
+--- a/config.example.toml
++++ b/config.example.toml
+@@ -556,14 +556,6 @@ changelog-seen = 2
  # behavior -- this may lead to miscompilations or other bugs.
- #description = <none> (string)
+ #description = ""
  
 -# The root location of the musl installation directory. The library directory
 -# will also need to contain libunwind.a for an unwinding implementation. Note
@@ -90,10 +79,10 @@ index ca54cbd2d..beec9bb04 100644
  # platforms to ensure that the compiler is usable by default from the build
  # directory (as it links to a number of dynamic libraries). This may not be
 diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index 7128d542a..668245f3c 100644
+index 65c882fb8..f35a92821 100644
 --- a/src/bootstrap/cc_detect.rs
 +++ b/src/bootstrap/cc_detect.rs
-@@ -101,7 +101,7 @@ pub fn find(build: &mut Build) {
+@@ -103,7 +103,7 @@ pub fn find(build: &mut Build) {
          if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
              cfg.compiler(cc);
          } else {
@@ -102,7 +91,7 @@ index 7128d542a..668245f3c 100644
          }
  
          let compiler = cfg.get_compiler();
-@@ -122,7 +122,7 @@ pub fn find(build: &mut Build) {
+@@ -124,7 +124,7 @@ pub fn find(build: &mut Build) {
              cfg.compiler(cxx);
              true
          } else if build.hosts.contains(&target) || build.build == target {
@@ -111,7 +100,7 @@ index 7128d542a..668245f3c 100644
              true
          } else {
              // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
-@@ -158,7 +158,6 @@ fn set_compiler(
+@@ -160,7 +160,6 @@ fn set_compiler(
      compiler: Language,
      target: TargetSelection,
      config: Option<&Target>,
@@ -119,7 +108,7 @@ index 7128d542a..668245f3c 100644
  ) {
      match &*target.triple {
          // When compiling for android we may have the NDK configured in the
-@@ -194,26 +193,6 @@ fn set_compiler(
+@@ -196,26 +195,6 @@ fn set_compiler(
              }
          }
  
@@ -147,10 +136,10 @@ index 7128d542a..668245f3c 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 0deed3f99..0bddac5d1 100644
+index 4a4e7adcb..f2cdc4a07 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -228,39 +228,7 @@ fn copy_self_contained_objects(
+@@ -246,39 +246,7 @@ fn copy_self_contained_objects(
      let mut target_deps = vec![];
  
      // Copies the libc and CRT objects.
@@ -174,7 +163,7 @@ index 0deed3f99..0bddac5d1 100644
 -                DependencyType::TargetSelfContained,
 -            );
 -        }
--        let crt_path = builder.ensure(native::CrtBeginEnd { target });
+-        let crt_path = builder.ensure(llvm::CrtBeginEnd { target });
 -        for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"] {
 -            let src = crt_path.join(obj);
 -            let target = libdir_self_contained.join(obj);
@@ -191,7 +180,7 @@ index 0deed3f99..0bddac5d1 100644
          let srcdir = builder
              .wasi_root(target)
              .unwrap_or_else(|| {
-@@ -344,15 +312,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -375,15 +343,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
              .arg("--manifest-path")
              .arg(builder.src.join("library/test/Cargo.toml"));
  
@@ -208,10 +197,10 @@ index 0deed3f99..0bddac5d1 100644
              if let Some(p) = builder.wasi_root(target) {
                  let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap());
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index d8c15c76e..53f95e49b 100644
+index cc3b3bc25..eb472c5e8 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -200,7 +200,6 @@ pub struct Config {
+@@ -210,7 +210,6 @@ pub struct Config {
      pub missing_tools: bool,
  
      // Fallback musl-root for all targets
@@ -219,7 +208,7 @@ index d8c15c76e..53f95e49b 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -440,8 +439,6 @@ pub struct Target {
+@@ -456,8 +455,6 @@ pub struct Target {
      pub sanitizers: Option<bool>,
      pub profiler: Option<bool>,
      pub crt_static: Option<bool>,
@@ -228,7 +217,7 @@ index d8c15c76e..53f95e49b 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -734,7 +731,6 @@ define_config! {
+@@ -753,7 +750,6 @@ define_config! {
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
          description: Option<String> = "description",
@@ -236,7 +225,7 @@ index d8c15c76e..53f95e49b 100644
          rpath: Option<bool> = "rpath",
          verbose_tests: Option<bool> = "verbose-tests",
          optimize_tests: Option<bool> = "optimize-tests",
-@@ -781,8 +777,6 @@ define_config! {
+@@ -801,8 +797,6 @@ define_config! {
          sanitizers: Option<bool> = "sanitizers",
          profiler: Option<bool> = "profiler",
          crt_static: Option<bool> = "crt-static",
@@ -245,7 +234,7 @@ index d8c15c76e..53f95e49b 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -1187,7 +1181,6 @@ impl Config {
+@@ -1133,7 +1127,6 @@ impl Config {
              set(&mut config.llvm_tools_enabled, rust.llvm_tools);
              config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
              config.rustc_default_linker = rust.default_linker;
@@ -253,7 +242,7 @@ index d8c15c76e..53f95e49b 100644
              config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
              set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings));
              set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -1251,8 +1244,6 @@ impl Config {
+@@ -1293,8 +1286,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.map(PathBuf::from);
                  target.linker = cfg.linker.map(PathBuf::from);
                  target.crt_static = cfg.crt_static;
@@ -263,10 +252,10 @@ index d8c15c76e..53f95e49b 100644
                  target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
                  target.sanitizers = cfg.sanitizers;
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 6b139decb..a2e19b8f4 100755
+index abd28b400..6f0f8d879 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -112,34 +112,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -111,34 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
    "aarch64-linux-android NDK standalone path")
  v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
    "x86_64-linux-android NDK standalone path")
@@ -302,10 +291,10 @@ index 6b139decb..a2e19b8f4 100755
    "rootfs in qemu testing, you probably don't want to use this")
  v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 3ed534523..c7c7a75f0 100644
+index 419bcbc63..dc98f5197 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -1181,25 +1181,6 @@ impl Build {
+@@ -1139,25 +1139,6 @@ impl Build {
          }
      }
  
diff --git a/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch b/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch
index bc7053800945..b10510ca6f27 100644
--- a/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch
+++ b/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch
@@ -3,18 +3,11 @@ From: Daniel Kolesa <daniel@octaforge.org>
 Date: Mon, 20 Dec 2021 00:45:35 +0100
 Subject: [PATCH 03/15] move debugger scripts to /usr/share/rust
 
----
- src/bootstrap/dist.rs | 2 +-
- src/etc/rust-gdb      | 2 +-
- src/etc/rust-gdbgui   | 2 +-
- src/etc/rust-lldb     | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
 diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index b1fae356d..e7a077134 100644
+index 76aad16c1..db53459e8 100644
 --- a/src/bootstrap/dist.rs
 +++ b/src/bootstrap/dist.rs
-@@ -460,7 +460,7 @@ impl Step for DebuggerScripts {
+@@ -528,7 +528,7 @@ impl Step for DebuggerScripts {
      fn run(self, builder: &Builder<'_>) {
          let host = self.host;
          let sysroot = self.sysroot;
@@ -24,7 +17,7 @@ index b1fae356d..e7a077134 100644
          let cp_debugger_script = |file: &str| {
              builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
 diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index b950cea79..559bfe3f1 100755
+index 9abed30ea..4c7f953ed 100755
 --- a/src/etc/rust-gdb
 +++ b/src/etc/rust-gdb
 @@ -12,7 +12,7 @@ fi
@@ -33,11 +26,11 @@ index b950cea79..559bfe3f1 100755
  RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
 -GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 +GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
  
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
 diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
-index 9744913b6..8722acdcc 100755
+index 913269316..f444fbc4b 100755
 --- a/src/etc/rust-gdbgui
 +++ b/src/etc/rust-gdbgui
 @@ -41,7 +41,7 @@ fi
@@ -46,9 +39,9 @@ index 9744913b6..8722acdcc 100755
  RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
 -GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 +GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
  
- # Set the environment variable `RUST_GDB` to overwrite the call to a
- # different/specific command (defaults to `gdb`).
 diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
 index bce72f1ba..8abb01245 100755
 --- a/src/etc/rust-lldb
@@ -64,6 +57,3 @@ index bce72f1ba..8abb01245 100755
  
  # Call LLDB with the commands added to the argument list
  exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"
--- 
-2.37.2
-
diff --git a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
index 2ca7ffeaf73f..2326d3cc4232 100644
--- a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
+++ b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
@@ -3,20 +3,13 @@ From: Daniel Kolesa <daniel@octaforge.org>
 Date: Mon, 20 Dec 2021 00:55:18 +0100
 Subject: [PATCH 04/15] fix shebang on install-template.sh
 
----
- src/tools/rust-installer/install-template.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh
-index e68be8911..beaa90f7b 100644
+index 92a3f1f2c..fca281191 100644
 --- a/src/tools/rust-installer/install-template.sh
 +++ b/src/tools/rust-installer/install-template.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
- # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
- # file at the top-level directory of this distribution and at
- # http://rust-lang.org/COPYRIGHT.
--- 
-2.37.2
-
+ 
+ # No undefined variables
+ set -u
diff --git a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index f2780ae08dfb..0f09cef58f70 100644
--- a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -3,29 +3,23 @@ From: q66 <daniel@octaforge.org>
 Date: Sun, 3 May 2020 18:02:03 +0200
 Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate
 
----
- vendor/libc/src/unix/mod.rs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
 diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
-index ecee44411..7ae05f24e 100644
+index b005970b9..c53093a09 100644
 --- a/vendor/libc/src/unix/mod.rs
 +++ b/vendor/libc/src/unix/mod.rs
-@@ -337,11 +337,11 @@ cfg_if! {
+@@ -351,7 +351,14 @@ cfg_if! {
+         #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
          #[link(name = "c", cfg(not(target_feature = "crt-static")))]
          extern {}
-     } else if #[cfg(target_env = "musl")] {
+-    } else if #[cfg(any(target_env = "musl", target_env = "ohos"))] {
++    } else if #[cfg(target_env = "musl")] {
 +        #[link(name = "c")]
 +        extern {}
-         #[cfg_attr(feature = "rustc-dep-of-std",
--                   link(name = "c", kind = "static", modifiers = "-bundle",
++        #[cfg_attr(feature = "rustc-dep-of-std",
 +                   link(name = "gcc", kind = "static", modifiers = "-bundle",
++                        cfg(target_feature = "crt-static")))]
++        extern {}
++    } else if #[cfg(target_env = "ohos")] {
+         #[cfg_attr(feature = "rustc-dep-of-std",
+                    link(name = "c", kind = "static", modifiers = "-bundle",
                          cfg(target_feature = "crt-static")))]
--        #[cfg_attr(feature = "rustc-dep-of-std",
--                   link(name = "c", cfg(not(target_feature = "crt-static"))))]
-         extern {}
-     } else if #[cfg(target_os = "emscripten")] {
-         #[link(name = "c")]
--- 
-2.37.2
-
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 88e35a5a43ad..523f2ccfe58c 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
 # uploaded to https://repo-default.voidlinux.org/distfiles/
 #
 pkgname=rust
-version=1.69.0
+version=1.70.0
 revision=1
 hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
 makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15"
@@ -18,9 +18,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://www.rust-lang.org/"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=fb05971867ad6ccabbd3720279f5a94b99f61024923187b56bb5c455fa3cf60f
+checksum=b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c
 lib32disabled=yes
 make_check=no # CBA for now
+python_version=3 # needed for python files in rust-src
 
 build_options="bindist"
 desc_option_bindist="Generate tarballs for bootstrap"
@@ -70,97 +71,85 @@ post_patch() {
 }
 
 do_configure() {
-	local _local_rebuild _use_debug _use_debug_rustc _use_rpath _use_docs _llvm_shared
+	local _local_rebuild _debug _debug_rustc _rpath _docs _llvm_shared
+	local _cross_args
 
 	if [ "$CROSS_BUILD" ]; then
-		_local_rebuild="true"
+		_local_rebuild="enable"
 	else
-		_local_rebuild="false"
+		_local_rebuild="disable"
 	fi
 
 	# disable rustc debug info as it bloats up rust-std significantly
 	# set to 1 or 2 if you wish to have debug info for rustc, it won't
 	# link on 32-bit platforms though (too big)
-	_use_debug_rustc="0"
+	_debug_rustc="0"
 	# just disable debug for now
-	_use_debug="0"
+	_debug="0"
 
 	# if true, the binaries will be built with rpath, so the binaries will be
 	# usable directly from the build directory, this is not desirable for
 	# packaging but is useful when building bootstrap binaries
 	if [ "$build_option_bindist" ]; then
-		_use_rpath="true"
-		_use_docs="false"
-		_llvm_shared="false"
+		_rpath="enable"
+		_docs="disable"
+		_llvm_shared="disable"
 	else
-		_use_rpath="false"
-		_use_docs="true"
-		_llvm_shared="true"
+		_rpath="disable"
+		_docs="enable"
+		_llvm_shared="enable"
 	fi
 
-	cat > config.toml <<- EOF
-		changelog-seen = 2
-		[llvm]
-		ninja = false
-		link-shared = ${_llvm_shared}
-		[build]
-		build = "${RUST_BUILD}"
-		host = [ "${RUST_TARGET}" ]
-		target = [ "${RUST_TARGET}" ]
-		cargo = "/usr/bin/cargo"
-		rustc = "/usr/bin/rustc"
-		submodules = false
-		python = "python3"
-		locked-deps = true
-		vendor = true
-		full-bootstrap = false
-		local-rebuild = ${_local_rebuild}
-		extended = false
-		docs = ${_use_docs}
-		tools = []
-		[install]
-		prefix = "/usr"
-		[rust]
-		optimize = true
-		debug = false
-		codegen-units = 1
-		codegen-units-std = 1
-		debuginfo-level = ${_use_debug}
-		debuginfo-level-rustc = ${_use_debug_rustc}
-		debuginfo-level-tests = 0
-		incremental = false
-		parallel-compiler = false
-		channel = "stable"
-		description = "Void Linux"
-		rpath = ${_use_rpath}
-		verbose-tests = true
-		dist-src = false
-		jemalloc = false
-		llvm-libunwind = "no"
-		codegen-tests = false
-		[dist]
-		src-tarball = false
-		[target.${RUST_BUILD}]
-		llvm-config = "/usr/bin/llvm-config"
-		crt-static = false
-		cc = "${CC_host:-$CC}"
-		cxx = "${CXX_host:-$CXX}"
-		ar = "${AR_host:-$AR}"
-		linker = "${CC_host:-$CC}"
-	EOF
-
 	if [ "$CROSS_BUILD" ]; then
-		cat >> config.toml <<- EOF
-			[target.${RUST_TARGET}]
-			llvm-config = "/usr/bin/llvm-config"
-			crt-static = false
-			cc = "${CC}"
-			cxx = "${CXX}"
-			ar = "${AR}"
-			linker = "${CC}"
-			sysroot = "${XBPS_CROSS_BASE}"
-		EOF
+		_cross_args="--set=target.${RUST_TARGET}.llvm-config=/usr/bin/llvm-config
+		 --set=target.${RUST_TARGET}.crt-static=false
+		 --set=target.${RUST_TARGET}.cc=${CC}
+		 --set=target.${RUST_TARGET}.cxx=${CXX}
+		 --set=target.${RUST_TARGET}.ar=${AR}
+		 --set=target.${RUST_TARGET}.linker=${CC}"
 	fi
+
+	./configure \
+		--build="${RUST_BUILD}" \
+		--host="${RUST_TARGET}" \
+		--target="${RUST_TARGET}" \
+		--prefix=/usr \
+		--python=python3 \
+		--enable-vendor \
+		--enable-locked-deps \
+		--enable-verbose-tests \
+		--disable-full-bootstrap \
+		--disable-extended \
+		--disable-codegen-tests \
+		--disable-dist-src \
+		--${_llvm_shared}-llvm-link-shared \
+		--${_rpath}-rpath \
+		--${_local_rebuild}-local-rebuild \
+		--${_docs}-docs \
+		--debuginfo-level="${_debug}" \
+		--debuginfo-level-rustc="${_debug_rustc}" \
+		--debuginfo-level-tests=0 \
+		--release-channel=stable \
+		--release-description="Void Linux" \
+		--llvm-libunwind=no \
+		--llvm-config=/usr/bin/llvm-config \
+		--set="rust.optimize=true" \
+		--set="rust.debug=false" \
+		--set="rust.codegen-units=1" \
+		--set="rust.codegen-units-std=1" \
+		--set="rust.incremental=false" \
+		--set="rust.parallel-compiler=false" \
+		--set="rust.jemalloc=false" \
+		--set="build.submodules=false" \
+		--set="build.rustc=/usr/bin/rustc" \
+		--set="build.cargo=/usr/bin/cargo" \
+		--set="target.${RUST_BUILD}.crt-static=false" \
+		--set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \
+		--set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \
+		--set="target.${RUST_BUILD}.ar=${AR_host:-$AR}" \
+		--set="target.${RUST_BUILD}.linker=${CC_host:-$CC}" \
+		--set="dist.src-tarball=false" \
+		${_cross_args}
 }
 
 # Set the correct CFLAGS for the build host, we have to compile libbacktrace
@@ -213,6 +202,8 @@ do_install() {
 	 -C "$DESTDIR/usr/lib" --strip-components=3 --exclude=manifest.in
 	tar xf build/dist/rust-docs-${version}-${RUST_TARGET}.tar.gz \
 	 -C "$DESTDIR/usr" --strip-components=2 --exclude=manifest.in
+	tar xf build/dist/rust-src-${version}.tar.gz \
+	 -C "$DESTDIR/usr" --strip-components=2 --exclude=manifest.in
 
 	vlicense COPYRIGHT
 	vlicense LICENSE-APACHE
@@ -237,6 +228,14 @@ rust-std_package() {
 		depends="libexecinfo-devel"
 	fi
 	pkg_install() {
-		vmove usr/lib/rustlib
+		vmove usr/lib/rustlib/${RUST_TARGET}
+		vmove usr/lib/rustlib/rustc-src
+	}
+}
+
+rust-src_package() {
+	short_desc+=" - source code"
+	pkg_install() {
+		vmove usr/lib/rustlib/src
 	}
 }

From cb6ef91d3667c866bae6f1dc3c9c4b42a38582e7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:37:18 +0200
Subject: [PATCH 0470/1853] cargo: update to 1.70.0

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

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 6b748e7f95f3..3921088c1e04 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.69.0
+version=1.70.0
 revision=1
-_cargo_revision=0.70.0
+_cargo_revision=0.71.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
 makedepends="rust libcurl-devel openssl-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
-checksum=35d9a86e8d6d942e6c7c8e3333760de33a886063a918a86083724df02a43da7f
+checksum=43ddf8be33d0f9d2514a75ae0df57ed95c8e99a9869deddf49e6eeee5d56e940
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

From 66d1381156f7ba42fdca3c24a147508a2798da41 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:37:43 +0200
Subject: [PATCH 0471/1853] common/environment/build-style/cargo.sh: remove
 obsolete sparse crates.io config

---
 common/environment/build-style/cargo.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/environment/build-style/cargo.sh b/common/environment/build-style/cargo.sh
index bc836b06cf06..473750c7a359 100644
--- a/common/environment/build-style/cargo.sh
+++ b/common/environment/build-style/cargo.sh
@@ -8,6 +8,4 @@ if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"
 fi
 
-export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-
 build_helper+=" rust"

From f53d9525361e495b755117cda598ae80e17650b2 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 2 Jun 2023 14:36:47 +0200
Subject: [PATCH 0472/1853] gdu: update to 5.25.0.

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

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 7a56c0f4a7bd..35b31bc49406 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
 # Template file for 'gdu'
 pkgname=gdu
-version=5.23.0
+version=5.25.0
 revision=1
 build_style=go
 go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/dundee/gdu"
 distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=7fa8fbfb33e3abe71f89e90aac84111e49fb226ffba145822e1f2e0072668d70
+checksum=83fe876d953b4f2f7a856552e758aae4aa0cd9569dcf1aded61bdc834b834275
 
 post_install() {
 	vman gdu.1

From 19531639d08151f570f3bd3f56b74d11bf6f9761 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 8 Jun 2023 10:02:09 -0400
Subject: [PATCH 0473/1853] python3-phonenumbers: update to 8.13.13.

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

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 3690912d6585..e0fd2119165f 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.13.11
+version=8.13.13
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=3e3274d88cab3609b55ff5b93417075dbca2d13064f103fbf562e0ea1dda0f9a
+checksum=4bdf8c989aff0cdb105aef170ad2c21f14b4537bcb32cf349f1f710df992a40a

From 2e261e55567c75f1a0c5575cba6807553fa3b492 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 30 May 2023 08:19:35 -0400
Subject: [PATCH 0474/1853] synapse: update to 1.85.2.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 47e9393dcb8f..81f887e451ff 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.84.0
+version=1.85.2
 revision=1
 build_style=python3-pep517
 build_helper=rust
@@ -24,7 +24,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=f87b0565403bdf457f92c75e314fd3581e50bf48259089f22406dc5d90be44bd
+checksum=a227c7347996eae008e0f8f0f2e9290c70e1d96e7687293b2ebd1533766ad43b
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 0dace005aaff5c4acc3b10224e39371aacb7f827 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:22:52 -0400
Subject: [PATCH 0475/1853] syncthingtray: update to 1.4.3.

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

diff --git a/common/shlibs b/common/shlibs
index e34e372b84f0..0b1bca75e5d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,9 +4196,9 @@ libopensmtpd.so.0 libopensmtpd-0.7_1
 libiio.so.0 libiio-0.23_1
 libqtforkawesome.so.1 qtforkawesome-0.1.0_1
 libqtquickforkawesome.so.1 qtforkawesome-0.1.0_1
-libsyncthingwidgets.so.6 syncthingtray-1.4.1_1
-libsyncthingmodel.so.6 syncthingtray-1.4.1_1
-libsyncthingconnector.so.6 syncthingtray-1.4.1_1
+libsyncthingwidgets.so.7 syncthingtray-1.4.3_1
+libsyncthingmodel.so.7 syncthingtray-1.4.3_1
+libsyncthingconnector.so.7 syncthingtray-1.4.3_1
 libglibutil.so.1 libglibutil-1.0.64_1
 libgbinder.so.1 libgbinder-1.1.20_1
 libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 55d1086bd533..e77910beae02 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthingtray'
 pkgname=syncthingtray
-version=1.4.1
-revision=2
+version=1.4.3
+revision=1
 build_style=cmake
 configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
  -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)
@@ -18,7 +18,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Martchus/syncthingtray"
 distfiles="https://github.com/Martchus/syncthingtray/archive/refs/tags/v${version}.tar.gz"
-checksum=6a2102c82dc6a8d9b0cf72941e997bb300b5011fe877696edc762e1440abd133
+checksum=fa3ffe19210c0438fe513fcee49fae00b6087b4ad3f6855615e96c51bbb5150d
 
 # requires weird port-binding shenanigans that may not work on ipv6
 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=syncthingtray#n50

From e33f5108326e9d830745368fd0ca61c5f16f8854 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:06 -0400
Subject: [PATCH 0476/1853] pyright: update to 1.1.313.

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

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index 1ccc8edff5c9..28b0db32be36 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.311
+version=1.1.313
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=33c2aa5d47d05d24fa741c068d7e87cdc17aa4d7c72b2e255dc38aa4b5c54752
+checksum=3bdd9dbd026fb2dc580178753bcea113907797caa0971561aa3b8e00fe30112a
 
 do_configure() {
 	cd "$wrksrc"

From 99172409af4cef27187c5ced51247076ac0ee37f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:20 -0400
Subject: [PATCH 0477/1853] typst: update to 0.5.0.

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

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 81626e340ed7..7d517adbf6cd 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -1,7 +1,7 @@
 # Template file for 'typst'
 pkgname=typst
 reverts="23.03.28_1"
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=cargo
 make_install_args="--path cli"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://typst.app"
 changelog="https://typst.app/docs/changelog/"
 distfiles="https://github.com/typst/typst/archive/refs/tags/v${version}.tar.gz"
-checksum=97bc0f62d373595ace556677e581daea5845bac18863ff014ced3bf8e650d94b
+checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
 
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"

From 73e5d48befd3a236756afea3dff49b97272e5e9f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:34 -0400
Subject: [PATCH 0478/1853] typst-lsp: update to 0.5.1.

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

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index b67dec7ecfa2..6d4f0cef0ae2 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'typst-lsp'
 pkgname=typst-lsp
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=cargo
 short_desc="Language server for Typst"
@@ -8,7 +8,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
-checksum=8bd207a9af9e2498205148274260b45b392ad9d8eb80b62c36fad2adc73ee87c
+checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
 
 post_install() {
 	vlicense LICENSE-MIT.txt

From 1a3755ead3e9afd93bcf81458d19b84250b3aba8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:42 -0400
Subject: [PATCH 0479/1853] vivaldi: update to 6.1.3035.75.

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 12b5400171bf..13a1769c7d81 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
 # Permission to redistribute is granted.
 # see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.0.2979.25
+version=6.1.3035.75
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ 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=9b737b76f3ad4676b71582d97643e301f19117828027c5e50e5a469d3a00c156
+	checksum=f8acb92f5346ec0a7b4086b2f6709d1b1430ace9f0a27c1439443ecf6afdc96a
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=b918fd16b71943de7f2775ce9bf8ad4637e35a41a05f1a3aade1d5eb2667c012
+	checksum=fe1063fa6ccb14a4f1e6edbea47c0631334d6ea3f49daf319a0bf40eaab053c6
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=e0dfd628ca39962f3772687548d181a0fe5e3be823f8935368514983060b101a
+	checksum=f3af5b7cc192db0d69080b3c4348bc83cca3a39bd31f2beb29cf4e5c7bb119e9
 	;;
 *)
 	broken="No distfiles available for this target"

From 65ef21c9d081c1a7d46127dc91b12cc2c7490a85 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 22:15:28 -0400
Subject: [PATCH 0480/1853] typst-lsp: broken for now on i686

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

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 6d4f0cef0ae2..339ae5ddb0d5 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -10,6 +10,10 @@ homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
 checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
 
+if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
+fi
+
 post_install() {
 	vlicense LICENSE-MIT.txt
 }

From 363494ebbd44b17e199e20d90b16a6b7d887b9c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 22:18:26 -0400
Subject: [PATCH 0481/1853] typst: also broken on i686 for now

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

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 7d517adbf6cd..6e9ee26e16b8 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -16,6 +16,10 @@ checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"
 
+if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
+fi
+
 post_install() {
 	for f in cli/generated/*.?; do
 		vman "$f"

From 25b413a30e3d848faa60019617b8d72b467e8b23 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 4 Jun 2023 22:15:11 +0200
Subject: [PATCH 0482/1853] termdown: update to 1.18.0.

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

diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template
index 6f3ee136076a..29d0ee59dcb5 100644
--- a/srcpkgs/termdown/template
+++ b/srcpkgs/termdown/template
@@ -1,7 +1,7 @@
 # Template file for 'termdown'
 pkgname=termdown
-version=1.17.0
-revision=4
+version=1.18.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet"
@@ -10,4 +10,6 @@ maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="GPL-3.0-only"
 homepage="https://github.com/trehn/termdown"
 distfiles="https://github.com/trehn/termdown/archive/${version}.tar.gz"
-checksum=cfdfc20f73250492b57d26c6b2ebcafdda9f88dd3d164607090e6aa7e46542d6
+checksum=67c6393a117a41080e3b7fe912ffe401fe94281f7c5022641046282cef71a2de
+# no tests
+make_check=no

From 498233cdd912f9fd3890711c2dada088d8ea5dea Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 2 Jun 2023 03:30:08 +0000
Subject: [PATCH 0483/1853] MoarVM: update to 2023.05.

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

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 824c21761c0e..d5a1b302328c 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2023.04
+version=2023.05
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -13,7 +13,7 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
-distfiles="https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz"
-checksum=8e83e894a3e04a213adb340552520f30181d4d280c77a576b5c1ee2214a03364
+distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
+checksum=c8e75883c1e1936d71ac081b21e8c2a344c80c6db5b4f8e1e6bb9481dd8b7547
 nocross=yes
 shlib_provides="libmoar.so"

From 2223b58c292c860e32fe51953f088c2f4b6fa89c Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 2 Jun 2023 03:31:12 +0000
Subject: [PATCH 0484/1853] nqp: update to 2023.05.

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

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index b79dec039c5b..5c05ed55c9a5 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2023.04
+version=2023.05
 revision=1
 build_style=configure
 make_check_target=test
@@ -13,6 +13,6 @@ short_desc="Lightweight Raku-like environment for virtual machines"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
-distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz"
-checksum=6735e5e601921cd427651e99bdf63be8338f4b815520803a97985dec488e50b5
+distfiles="https://rakudo.org/dl/nqp/nqp-${version}.tar.gz"
+checksum=1402db7e3ca6f2f3dfc1e98aa32e0e2a937e49b2a777a74c62268a98abb3bbd2
 nocross=yes

From a00d122ae01ae89bf8fb121efa73703bb4fe16c3 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 2 Jun 2023 03:32:11 +0000
Subject: [PATCH 0485/1853] rakudo: update to 2023.05.

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

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 1a19842929b0..5ccd01e973fd 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2023.04
+version=2023.05
 revision=1
 build_style=configure
 make_check_target=test
@@ -30,8 +30,8 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
-distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz"
-checksum=810b12bd7ef45178fa92371c593094fa731a94e6e4894596bf542222fedd983d
+distfiles="https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"
+checksum=cfae1cf1321c8130e4746eb5f5c926f65adc9774e92c1b3a89c2c48f0b22236a
 nocross=yes
 provides="raku-${version}_${revision}"
 

From d6ea7705b56eca7784274232cc77e234933d24cb Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 9 Jun 2023 11:23:15 +0200
Subject: [PATCH 0486/1853] vscode: update to 1.79.0

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 554ed2ade55e..d7de2feef325 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.78.2
+version=1.79.0
 revision=1
 _electronver=24.2.0
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=30c98b459e2cded101d26deb050cbc554167ff0986b47229703e9d4acf74f48a
+checksum=37a5182d77fbe670be180d1e19907ef5a0b970afda0ba57626a1d2c3d715ce28
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 7f3f19aec93d36fa0edd85e169a23f88fba7543e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 9 Jun 2023 12:25:00 +0200
Subject: [PATCH 0487/1853] exiftool: update to 12.63.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 58c4d4c7a9d4..b2524e18874b 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.62
+version=12.63
 revision=1
 build_style=perl-module
 short_desc="Reader and rewriter of EXIF information that supports raw files"
@@ -9,4 +9,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=4990a46c69b656888d7d5732baf4039da964688edddf7a1c2eeb51404999ec1d
+checksum=15162912ac37cdc6a7018498435a8348b5e6d7a10385f38b75e053695c9b5658

From 1c77d6c6540b01c0e6b215323b00e5975549df4a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 10 Jun 2023 10:54:56 +0200
Subject: [PATCH 0488/1853] plocate: update to 1.1.19.

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

diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index f288bcf8dd32..bc37ca01e974 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.18
+version=1.1.19
 revision=1
 build_style=meson
 configure_args="
@@ -8,14 +8,14 @@ configure_args="
  -Dupdatedb_progname=pupdatedb
  -Dlocategroup=_plocate"
 hostmakedepends="pkg-config"
-makedepends="libzstd-devel"
+makedepends="libzstd-devel liburing-devel"
 short_desc="Much faster locate based on posting lists"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=939657050b70719b01ce04fc1c8b64270062a0d53da2c72eafbe036a1964e12c
+checksum=d95bc8ee8a9f79b9f69ce63df53fb85b202139f243bbb84c399555eda22e6165
 
 system_accounts="_plocate"
 

From 843fad25b2232058bd0dc2356f83523cb2456a45 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Jun 2023 12:47:53 +0200
Subject: [PATCH 0489/1853] bird_exporter: update to 1.4.2.

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

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 88ebcdd12186..44ded1c65e76 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
-version=1.4.1
-revision=2
+version=1.4.2
+revision=1
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/czerwonk/bird_exporter"
 distfiles="https://github.com/czerwonk/bird_exporter/archive/${version}.tar.gz"
-checksum=ee1286c08cd09f169c5f12178d5f956a234bdd386070d78bef48887ea55cdf6e
+checksum=7b7a627142ec60e7f0f616117f3f5c86d0c04487d1a20bef227e75b05cb38876
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From e3721e96ac70108c1fc6e3fe8d90449c4442b689 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Jun 2023 21:22:15 +0200
Subject: [PATCH 0490/1853] ksh: update to 1.0.5.

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

diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 1118fd30967d..cbde81e4e581 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,14 +1,14 @@
 # Template file for 'ksh'
 pkgname=ksh
 reverts="2020.0.0_1"
-version=1.0.4
+version=1.0.5
 revision=1
 short_desc="AT&T's Korn shell (community branch ksh93u+m)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/ksh93/ksh"
 distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=7ab7785a277f96acd8b645dc70769adf0cc92546dac356639852bff1d708275f
+checksum=940d6dd6b4204f4965cf87cbba5bdf2d2c5153975100ee242038425f9470c0fe
 nocross=yes
 
 register_shell="/bin/ksh"

From 8e799a929822c4ec993946c678cb2345b0f49242 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Jun 2023 07:11:28 +0200
Subject: [PATCH 0491/1853] stress-ng: update to 0.15.08.

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

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 5606e9cb47cd..c77ba2ecefda 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.15.07
+version=0.15.08
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=7ad1f30237011149e7f83451ea7cb49e88c0a79bed55e29b556c6a72b9f1d79d
+checksum=aca526f434bcf27fcf62da57f70458c7736899318b570bce0ee3da05a51cb84a
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From b10fff6080fc9e54aa658eec3a8adc5a9cd27a60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Jun 2023 11:17:02 +0200
Subject: [PATCH 0492/1853] python3-pipenv: update to 2023.6.2.

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

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index ad7b7d958cc1..593540c2e15b 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2023.4.29
+version=2023.6.2
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=98e5aed45bbae89832bedd874828b327adc6b429043e1d75fe1a833f0010604d
+checksum=be42b0a6d4e7d2c3fdeae4d825a91038610bc6be3c3e7eb26f35d8da7b3485ad
 conflicts="python-pipenv>=0"
 make_check=no # tests are not contained in release tarball
 

From ea1d3fef9024b56c043efeb76f76c0105c2453b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 6 Jun 2023 08:19:31 +0200
Subject: [PATCH 0493/1853] postfix: update to 3.8.1.

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

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

From dba2a4df9201a41546126fb36470d3a6121e5e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 6 Jun 2023 08:14:09 +0200
Subject: [PATCH 0494/1853] doctl: update to 1.96.1.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 03c6ca38bb4f..fd72254c2fb5 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.96.0
+version=1.96.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -15,4 +15,4 @@ license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 changelog="https://raw.githubusercontent.com/digitalocean/doctl/main/CHANGELOG.md"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=5963bfb113632df33d0ef6c2d076cedd180f73ce82f3162e7d1bc93b190a9951
+checksum=1a5d71a4c387fcc7d5bea60d2ee80188f539b77744be0db29bdfef1fb5ecda66

From cd6866a25e523f23d9159107b17d9604c34e86f2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 8 Jun 2023 18:17:37 +0100
Subject: [PATCH 0495/1853] gtk4: update to 4.10.4.

---
 ...7d7f1d0f1aea8a5697a50299594ef523faf7.patch | 100 ------------------
 srcpkgs/gtk4/template                         |  10 +-
 2 files changed, 5 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch

diff --git a/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch b/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
deleted file mode 100644
index 6232575a9395..000000000000
--- a/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 4f47683710bbb4b56c286c6ee6a5c394fcf2b755 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 29 Mar 2023 02:23:46 +0000
-Subject: [PATCH] Merge branch 'wip/otte/trelistmodel-fixage' into 'main'
-
-treelistmodel: Don't add items in reverse
-
-Closes #5707
-
-See merge request GNOME/gtk!5744
-
-(cherry picked from commit c5a53f235a2ed1b0acd0a8c29153e62377262d04)
-
-1718db14 treelistmodel: Don't add items in reverse
-cd860beb Add a test for splicing treelistmodel
----
- gtk/gtktreelistmodel.c        |  2 +-
- testsuite/gtk/treelistmodel.c | 46 +++++++++++++++++++++++++++++++++++
- 2 files changed, 47 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
-index dd3b3009ccc..1e55323c0a4 100644
---- a/gtk/gtktreelistmodel.c
-+++ b/gtk/gtktreelistmodel.c
-@@ -357,7 +357,7 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
-     }
- 
-   tree_added = added;
--  for (i = 0; i < added; i++)
-+  for (i = added; i-- > 0;)
-     {
-       child = gtk_rb_tree_insert_before (node->children, child);
-       child->parent = node;
-diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c
-index 941ac3d306b..98493a3ba56 100644
---- a/testsuite/gtk/treelistmodel.c
-+++ b/testsuite/gtk/treelistmodel.c
-@@ -261,6 +261,51 @@ test_remove_some (void)
-   g_object_unref (tree);
- }
- 
-+static void
-+splice (GListStore *store,
-+        guint       pos,
-+        guint       removed,
-+        guint      *numbers,
-+        guint       added)
-+{
-+  GObject **objects = g_newa (GObject *, added);
-+  guint i;
-+
-+  for (i = 0; i < added; i++)
-+    {
-+      /* 0 cannot be differentiated from NULL, so don't use it */
-+      g_assert_cmpint (numbers[i], !=, 0);
-+      objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
-+      g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
-+    }
-+
-+  g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
-+
-+  for (i = 0; i < added; i++)
-+    g_object_unref (objects[i]);
-+}
-+
-+static void
-+test_splice (void)
-+{
-+  GtkTreeListModel *tree = new_model (100, TRUE);
-+  gpointer item;
-+
-+  assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
-+  assert_changes (tree, "");
-+
-+  item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
-+  g_assert_true (G_IS_LIST_MODEL (item));
-+  splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
-+  /* expected */
-+  assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
-+  /* real outcome */
-+  // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
-+  assert_changes (tree, "2-5+5");
-+
-+  g_object_unref (tree);
-+}
-+
- /* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
- typedef struct _DemoNode DemoNode;
- 
-@@ -391,6 +436,7 @@ main (int argc, char *argv[])
- 
-   g_test_add_func ("/treelistmodel/expand", test_expand);
-   g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
-+  g_test_add_func ("/treelistmodel/remove_splice", test_splice);
-   g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
- 
-   return g_test_run ();
--- 
-GitLab
-
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 5fafa50f6f33..b318b7bae1dd 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,11 +1,11 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.10.3
-revision=2
+version=4.10.4
+revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dgtk_doc=true
- -Dbuild-tests=false -Dbuild-testsuite=false
+configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false
+ -Dbuild-testsuite=false -Dbuild-examples=false
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
@@ -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=4545441ad79e377eb6e0a705026dc7a46886e46a1b034db40912909da801cea9
+checksum=7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"

From a3a87d9f6cf5454c18882f183dc0f787481907c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:31 +0200
Subject: [PATCH 0496/1853] akonadi-calendar: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index f1569c8a5f12..e111f848545b 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=ee58cf76e820af9c51d14121a4b2e4a171c6ef702655aaa111ac96aadb0e6cda
+checksum=5cf3e5169a2b3caa58d19575adf8c4a4a69ff39fff2eb4b584a4ceaa96d055b7
 
 do_check() {
 	cd build

From ec303574084bff7691b30fdcea1abb9b78bfbda4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:33 +0200
Subject: [PATCH 0497/1853] akonadi-contacts: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index b56c84674ac5..bf1f45611177 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=afd816058723d4fda79b61f0f052b24d47b822699695522db21c1a2141d7f83b
+checksum=f48a51288623b6f8efaf78f0477efdbe9d19418d2c885953694601ca89b45d5b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From f6191b9861a75a34195ba53ad064e41ac4d6003b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:34 +0200
Subject: [PATCH 0498/1853] akonadi-import-wizard: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 2ec62397f60f..3611e1b4ff7a 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0969c6d87f027af12af96243c1af124a7a03b511067c95d5e82ae7bc7503d59b
+checksum=42fe5809c9f42f8df05817e4d0cf1064d6a2c50ffb19f3716d6e93012254a069
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 40eeaf1b192bed82926651eb748e6d09864ef926 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:35 +0200
Subject: [PATCH 0499/1853] akonadi-mime: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 2d1a3833d1fd..f33e548a93f4 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=a91275c5ce277eefc9da76430c2228cdea90ffee0cb523432fcccb01c695b780
+checksum=88a60b9b945b286ba8fdb163e91a90ebfca5c57a0050cd2f15ab94be8adf4802
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 40d8f4c5ca868066b35ab146f7347023ed6ac778 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:36 +0200
Subject: [PATCH 0500/1853] akonadi-notes: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 5589d60b0749..ed88f9d04e70 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c4f64ff89816ae14d8fc93e02ab0971d9beda6ae69dd710443d4efd0d94ff93f
+checksum=b24ad1c07ec2e41d18ffe5d0f627cf48ca0fdfd2eeb04cee9d8c7624570c9a81
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From df3221c5c5f0e4a5fce7172a7cf76316d5e226c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:38 +0200
Subject: [PATCH 0501/1853] akonadi-search: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 9a291fd0d637..a0adb06f6571 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=46d1893902ec874251b659b256e8b6e63b68de3862988d998e5307022c166fa1
+checksum=4037177c7bdf442341b6575c268caa439a855e0a30a35206121c4a5060e24257
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 1c9cd7022a634b072ee027cd0e02e806d85d1a66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:39 +0200
Subject: [PATCH 0502/1853] akonadi5: update to 23.04.2.

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

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 80ad8f782ac2..b38d9fe0d6a7 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=e528c3d737c742b2e359345b71f18f65d7973761714716d64b58d35e11094ece
+checksum=5e91b86e895263b76d6f1f00cd9fcd8399d5a6c293581e629ab310fc72dfa6a9
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 372072aaadaaed3ae23cfb759e71f9f54a6021ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:41 +0200
Subject: [PATCH 0503/1853] ark: update to 23.04.2.

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

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 3f878738a982..484995d7655d 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ae6645060a5cc497fc196f695378fa6057e77222fb1874f6b31fafbf5a5330e5
+checksum=de386d0a2aec6772fba51a7710e186718c75cecdf589fa3fd8d8dbd203e464ac
 
 do_check() {
 	cd build

From 646aab36d9ce2299390e7a9fc17ce8ad4737a033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:42 +0200
Subject: [PATCH 0504/1853] baloo-widgets5: update to 23.04.2.

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

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index b393db9dd19f..9fae1efe69f5 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=4eae3b9e4127e773daec2098969c7928b2ebc6908c26329b4a09da30b3125c95
+checksum=d3a01392811ab0a6e850e0058518a95617ad50a2e2bb8c553931130a13a98b66
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 3aa32f7d7a0d61e36afc93d67d7d1e80e76e0c49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:43 +0200
Subject: [PATCH 0505/1853] calendarsupport: update to 23.04.2.

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

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index a9685bf1cb38..d378cea9f1a1 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=2af0ccc66ec8d8b58a74da575413bf8b58bfee1619e82caa895343dc901232ca
+checksum=2daf1f1aef1d6b986b9a9fd8bc2741f407b89601585b94989a744b4942c855de
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c229175522a4b5c33400f1b3d70dc16bf47b7c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:45 +0200
Subject: [PATCH 0506/1853] dragon-player: update to 23.04.2.

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

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 16254114c485..452a3bea783a 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=c4c5c3d78be99c23efbf274ab45ee84f175ac494e78f9a18e2c1c1e2c9c9a9bb
+checksum=6fe4235543fab5931d1d4c3e9469ea4d1e72e2f98aa0fcd096d04f6c106b9d95

From 4737e445efc2308f987598a948d3d78e681c6810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:46 +0200
Subject: [PATCH 0507/1853] elisa: update to 23.04.2.

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

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 69e38aadc2ae..e0f743778adb 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=a086572cd0f721834a071a8748e7c1cc76ae01102f287a355a36507157784d63
+checksum=d16fd47b9a41d5ca51cafe1c09b41446b933b47c03fc55ef8f311aad40f1ea7a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 5886a63210ad33240ab4c75f287bd18275bbf695 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:47 +0200
Subject: [PATCH 0508/1853] grantleetheme: update to 23.04.2.

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

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0b804ab8a6e1..ee1e4398b228 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=5c6462d4cb4857460a61db4919081804e2451bc28f43a0b655ea8a37e7ab7395
+checksum=cba8b6ea835e560a01ba7382eac4e02c363e33ff71f281cdc6421533c17aec19
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 5e8bd8b20c7512982c42e948741516944664c135 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:48 +0200
Subject: [PATCH 0509/1853] juk: update to 23.04.2.

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

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index a9f7be2f1e72..7a674a8e0e03 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=982f2d58a13d7f2b8384eea8e938bbcff02c3d338b74957c63173d34a97a4846
+checksum=6ac44ab6a00df7b10e09b1e64361df7178b0d5ccb1785dd53ec5a0548b53309b

From 0eea94db73adacbfcc0c5f534af8ad7d678e9a1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:50 +0200
Subject: [PATCH 0510/1853] kate5: update to 23.04.2.

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

diff --git a/common/shlibs b/common/shlibs
index 0b1bca75e5d6..f02af5cf58ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -474,7 +474,7 @@ libfsimage.so.1.0 xen-libs-4.10.0_1
 libxenstat.so.4.14 xen-libs-4.14.0_1
 libfam.so.0 gamin-0.1.10_1
 libgamin-1.so.0 gamin-0.1.10_1
-libkateprivate.so.23.04.0 libkate-23.04.0_1
+libkateprivate.so.23.04.2 libkate-23.04.2_1
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libKPim5Libkleo.so.5 libkleo-23.04.0_1
 libKPim5GrantleeTheme.so.5 grantleetheme-23.04.0_1
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index d71d4f4606dd..d1d1820ab9b7 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=589c33501f98fa7937a7e3075c155e22a31f746ce4e5f15022b509c5fc1c1c0d
+checksum=7db103a3cb0f1cd771d4e63389ded0757d815f14b9a260b918d83c3e96f74485
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From d79df645394468bb761d762c6601882e23784746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:51 +0200
Subject: [PATCH 0511/1853] kcalutils: update to 23.04.2.

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

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 189259b555dc..34c08a6e54f7 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=9b62dc83f84151f71ee4766ecea38b23e266225b17e031fbb51ea480c09b5379
+checksum=09533df6deeaa7c69698a80c7626bf165b998b57791eb7327b179b8ddf3678dd
 
 do_check() {
 	cd build

From 0c62b818c3a54eeff043d326f73b7e9fdaeab2c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:52 +0200
Subject: [PATCH 0512/1853] kdeconnect: update to 23.04.2.

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

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 16747ea53cb7..89b073be13d3 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -21,5 +21,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=80bae0d03fd688ee30b7872e2ea04af690346a6d86ca2db17de9253f781a019d
+checksum=2edbbe3e0aef7e6e19603a7870fd14ac0388a53ea665720c9ece625efb445a00
 python_version=3

From 92b55bfdf79c2bea61312870b7506c1b9b256c11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:53 +0200
Subject: [PATCH 0513/1853] kdegraphics-thumbnailers: update to 23.04.2.

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

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 9f8adfc0423c..c0569b063423 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=bdbf4873402a8f0400abd661d18b94209e63d471e4bc6dbbfba6deb5d036d562
+checksum=29456352b96b5a10fa4b8feaaaa0e179209c34587401b2e087783eaf8ea58290
 
 kdegraphics-mobipocket_package() {
 	short_desc+=" (transitional dummy package)"

From 72c26b2fd383b4d586b1b4d2d1b8e1956c784bb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:55 +0200
Subject: [PATCH 0514/1853] kdepim-runtime: update to 23.04.2.

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

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 756e452ff0d7..aa01edcd05a5 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6ecb39a4235155471c58971b4ad79601bd16c454183b5a435f782592c0797949
+checksum=987d372f50f9e821f901d70b858a3af5a5830d75253fbe792a517c95b7f28f70
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From a85c56d1f1a188ee31fbb1d1a09cce1774415543 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:56 +0200
Subject: [PATCH 0515/1853] khelpcenter: update to 23.04.2.

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

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 2d9ebff0f470..8f7db92e58b9 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b6e05d020278729bf8b45ce5ec5097c8a209508764c12bcfaa296508aa33b5bf
+checksum=b8eb6e271839dcba0259891c71e2bdae8cc4f94aafe724aeb46f01ff2aa3bf63
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From faa97a238109c4ba6d25b31e02b57f6d0a2462e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:57 +0200
Subject: [PATCH 0516/1853] kidentitymanagement: update to 23.04.2.

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

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 81be124ac574..7ee3ced86b29 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=59a86d0fd424dead29f9c3a82c500830c7efa4a4e499e1a31e21e27480fbf098
+checksum=526b286c976d1d9296cfe42d26c0619a03bf179288b1e5d1fd769d4ffce630d7
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From bbd3e7efc3614485426b3aa5470e27339833f9b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:59 +0200
Subject: [PATCH 0517/1853] kimap: update to 23.04.2.

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

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index c6469f58b2f0..52dd23c3b579 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=64c20ff927ca2368a6aa9b6922f8db26d6a2f2d8461d278eb4be329d07ffb164
+checksum=bcc4a1ced8f55e5d7106b3cfb18ee639e23761a3cb23fdb8d63d925907b784de
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From ed98c6e4e971f6c29aaa16ce27841857bf76149f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:01 +0200
Subject: [PATCH 0518/1853] kldap: update to 23.04.2.

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

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..56ce6bc70d7c 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=b27a690c0502198caf334b8eab498fbd14ff7280d3bdadf2afd4904c29a84e31
+checksum=cccf41aa9a8e80944bb72e7baa271b81a84777ed672e662e0279582ea7e0c342
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c020d9cd31d11baf8b099ac368cab00bee9f2fcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:02 +0200
Subject: [PATCH 0519/1853] kmail-account-wizard: update to 23.04.2.

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

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 8172b4397985..0ab112cd1db9 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=1f1ac3bf9070d5f78270e4c00ba936ca6212295facba205251999eefe63518c4
+checksum=0e42467f176650b0888e614d3e4346c7e03c9b6f89e674581ac99fd0eb7bff59

From 9a0640b51375728f8f872eafac7dc0a7e7cf90ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:04 +0200
Subject: [PATCH 0520/1853] kmail: update to 23.04.2.

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

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 3909629f7f46..7bf67ab803dc 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=4a06cd4bddef1d507898f42203b334aed8e3bc50759fd46f2095dec00c1fd9bb
+checksum=08a05b95153b0178974427234e094c75093b0a54dd97db3a2e0c78b9d4a5e4e6

From c6f0d260b51c3d36e55b6dffb5d2fa1d093f392f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:05 +0200
Subject: [PATCH 0521/1853] kmailtransport: update to 23.04.2.

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

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 157f6da10a06..ccaf5562d101 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=431cd1d663b41b7de08b692a6fa6863c6e9fed5c245410caea48179fb396c6af
+checksum=c1ad46ef79451446a91c1c0c55099c16486ad026cfa9e96458091e4a68fb2b7b
 
 do_check() {
 	cd build

From 8f4aeea8e86cb46f13a9d66c1431c5a3f478376a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:06 +0200
Subject: [PATCH 0522/1853] kmbox: update to 23.04.2.

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

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 1954c347ac33..69f8fd5a3252 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=d587f87fb5358e8d7f0495c7e9e6dfea4a4de33671387a71fd4033145c26386b
+checksum=6c893e105aa88785a90c936e21cbc9c961d837982fee66e1f121625b438ebea9
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c672ee5a069e13158146ae2d37024896bb7b16a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:08 +0200
Subject: [PATCH 0523/1853] kmime: update to 23.04.2.

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

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 2c6d655d6677..286b46339ae2 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=a3cfb0ad644060a333a44a233f8f946f5f9c80ca55294843a91b1eb58091b24b
+checksum=0aa7a2463d91bae39c3a5339226b976a2a82e3b2a0829da2ee709860714e6c0a
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 6c0460c8709fdbea5b83e8b8c851581f9261ad99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:09 +0200
Subject: [PATCH 0524/1853] knights: update to 23.04.2.

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

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index b6ad242a431f..645ccfb4242a 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=067f470c3e8168e1e0f78981b193e97dae45d7532bdd9b5c104087336a809825
+checksum=fd9332601586c5c12a14d1eb92cc901a29d516c3c37051e6b257815cb1fdabe8

From d5c7bf41c04077a32134fae108fd543c63477f6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:10 +0200
Subject: [PATCH 0525/1853] konsole: update to 23.04.2.

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

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 74e94a9d424d..e210bd4803de 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=21ce6f3cbc9add1a33c27b8a32aa5f71001c106e7d2566d2dec7a23d8eb7a59c
+checksum=acc9565ede884284760e1b04654d2b187da82afde82c8a0411664943f23eecea
 replaces="konsole5>=0"
 
 konsole5_package() {

From 5a2ed0e1c9ae49d088d7254328944a41362dcf95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:12 +0200
Subject: [PATCH 0526/1853] kontactinterface: update to 23.04.2.

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

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index b6c6c7ce6db8..7967942b46f8 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=d7475f9abdb4809eaaf5aa78c4ac96f5118d84ceaa0015f70d3ed73f6c029cbb
+checksum=39566fa1ca2d37b167751419f93c5e8364a2dc6f6198852b3d5a45e14e97aed4
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From dc569103c7c6ce70032cbfdbf4866411ee544e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:13 +0200
Subject: [PATCH 0527/1853] kpimtextedit: update to 23.04.2.

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

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index b54fbfed1bd6..b0ad7b5d11e2 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=cc6819004d5e73aae9b3b8f0679b79cf49f1d3b9c9f0451e78bd1ef809319cf1
+checksum=3f843ce22bfe75c5841b40c1ee454efd8733c16fbc27d44f841242ee33b72e4b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 348eeb33cd15e1a08b00b49856eb6a45a6f49f1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:14 +0200
Subject: [PATCH 0528/1853] kqtquickcharts: update to 23.04.2.

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

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b01e2a9f89b8..f78a8793f73d 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=21797552c32393fe385060e856afac8d3f9abf60a5502cc61c66ab9306869a2d
+checksum=b6416561058dfd7cc66fc54a6bd6eb87d785b09abf8543d98b8efd0966bd9724
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d6e452789b587b0652ae27f742028baadcc48b03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:15 +0200
Subject: [PATCH 0529/1853] ksanecore: update to 23.04.2.

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

diff --git a/srcpkgs/ksanecore/template b/srcpkgs/ksanecore/template
index 1225a80380ee..c97fb62d0fee 100644
--- a/srcpkgs/ksanecore/template
+++ b/srcpkgs/ksanecore/template
@@ -1,6 +1,6 @@
 # Template file for 'ksanecore'
 pkgname=ksanecore
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/graphics"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksanecore"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksanecore-${version}.tar.xz"
-checksum=2434460fe67cf38293a1c90568ace1e52ffc8c3b6a1a57581d079d8237f482d8
+checksum=aecf6c6b6d53275ddf4a642e29118f515e85cb138693d5484caa15da5e6464de
 
 ksanecore-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ee34fc3af3cf1f433c483ac06354f65fc609d063 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:16 +0200
Subject: [PATCH 0530/1853] ksmtp: update to 23.04.2.

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

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 68f5d34a7044..40f16f0ea805 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=a0fa8bfc5ec158b2cfcabd025e93e381659b39da1b03678a82ef74f34678fb53
+checksum=20e0e15f793729aaa22971dc875582f3092421b8998bc4b140c242509798bed7
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From efb5a2fbf1b7314729ea942a9e98777b5eda2c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:17 +0200
Subject: [PATCH 0531/1853] ktnef: update to 23.04.2.

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

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index f795a3347848..4eed9ca546dd 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=4adc253d58d47be7ec6488b120ae750c47e182975275ba2a94a051e88d446ba8
+checksum=dad17abcaabd4f7556286dea82f00f7cb4d754e7e6031629d5d5f2faa06136e8
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8e7f5f18e6c35d89fa2cf435d0aab13c85184be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:19 +0200
Subject: [PATCH 0532/1853] libgravatar: update to 23.04.2.

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

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index c74753f5aa51..984437a08bcc 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=6891bce0ebeeda6676f938a296c020b42ed192463986959687ad55c298e6cf24
+checksum=760077d270bc17ce7bcad9e498b7ce041200d8cedd136655a387df660783538f
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e707abbf25f1356b4465b50d80bb12f7e093eaef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:20 +0200
Subject: [PATCH 0533/1853] libkdepim: update to 23.04.2.

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

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 1b1446c603f9..33bb12b6ec4b 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=605b1725c2dc656016ff3ea16e3119354caeb9e555e7de79dd752883d440ebcb
+checksum=11c56b7d8e0f24ba28ff84a69d7eb68739e55c6b2f6b68f17b7221422ddb410c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 15bfac29d5cde0b03aea779e8175b7d1a7964b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:21 +0200
Subject: [PATCH 0534/1853] libkgapi: update to 23.04.2.

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

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index c62a3512f116..1efc658ddd6b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=aceb156db7c7caee88fd1ea57b3e06e94200e94196e4a420c3896db1709d6551
+checksum=14ed86e65d753ec5c967caeacfe40b300fc812778aaffcf6d7460785803e9856
 
 do_check() {
 	:

From ebc9e8765a7c29e17e00e71df116559ee1749ba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:23 +0200
Subject: [PATCH 0535/1853] libkipi5: update to 23.04.2.

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

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 56e7384be9c3..a6e4e509cf9a 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=a07859eed5cb9c130a6abc1f1b8c1ec895a32e735d13be609e26ca722deacca6
+checksum=987f6b1125465b2e32db9013612071e044bee0bd3da0c1df2d96ea0a5fa6522f
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 9a31a07f9d6f9c3f47c93e2fab2baadc1dc5ef62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:24 +0200
Subject: [PATCH 0536/1853] libkleo: update to 23.04.2.

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

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index e53644615e85..b0fe59f71183 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=ae210e3849395044be778cc7b92746e209be91722928c991a3324932adda6e69
+checksum=1b478d60775c2ec87372d2b8d012eb343d16b01dff3bd2a10cf6baf74f44a4c5
 
 do_check() {
 	cd build

From 6facaae83a4883513889e22a64240baa1637240e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:26 +0200
Subject: [PATCH 0537/1853] libksieve: update to 23.04.2.

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

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 2196b1fafffa..724cb5dcf740 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=146be9aad30c711b6f7666a34ad385aeb91a44f01186838b56d46da393625f1b
+checksum=d91f0eeba9e851a5bf0478553ce2de45975586d16bb7955e9e8f0a597c072b85
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 463c7034e3b69b355c35b7358205f24a918aaaf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:27 +0200
Subject: [PATCH 0538/1853] mailcommon: update to 23.04.2.

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

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 3a883325e357..0c5a36189cf7 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=f4ea4dcccaf5c35cb96e374e01ca8d6e40c2a92bd6e661834685a451cfc75951
+checksum=d02582735ebaea6d669e4b7393247b073299366d03681a87aa1c7d42d6e40857
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From a4520ead5a41ded2ca1879add346fafbd6bf789a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:28 +0200
Subject: [PATCH 0539/1853] mailimporter: update to 23.04.2.

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

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 8eb6e73c6655..989f9e5315cf 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=52ad8927a1b1f9b155824a26dc7307c04d870b369afa7c1dd0f2736a100402cc
+checksum=b3e599e726b3cfe32f2d3ee41d9b024b38002c0767d9ced312d0fff6dface775
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 26ce915ea7c6d27f0cba4050cdfda3b69f61ba1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:30 +0200
Subject: [PATCH 0540/1853] messagelib: update to 23.04.2.

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

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 20ae0f232502..d49add61f4e4 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=9f6263f032e8f93da2cf6e68da6f477587ab720020f46b7fb62cc71840f1afde
+checksum=9b9fcce6bec1c4b499b30b32ff37c76953a8bff46c2e39eb67844f96ef14d88e
 
 #TODO: fix build without qca-qt5
 

From d3d16dcf91325aace5ae2eca7de9faf2ec71b0d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:31 +0200
Subject: [PATCH 0541/1853] okular: update to 23.04.2.

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

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 10e6b8f36ad0..f92fe9c8fc26 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6c0dff299abf86df88d86e7d31d1dac2633775a2cca801ab3ca5104fafbcd40c
+checksum=5f86f2be71c47dcaaf10a21b6bbc6b92cc2c6d8930530d201a06643a34aba825
 
 do_check() {
 	cd build

From 2738ef14b1bab5297e3f315a8a771b05bd9c336d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:33 +0200
Subject: [PATCH 0542/1853] pim-data-exporter: update to 23.04.2.

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

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 3d6c9653e6c8..ec5a6f24cf8d 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4121db2bff1190090b4d63e2e9ad6a99e2953f3da0cb1b72051bafaee12bae9f
+checksum=a4bf2e0096805a74581428b43b2eae73a4ca3c6b15e974cb78174aaea6f83c49

From 59b90eb77fcc44eaf0ab4b2fc225e48502d694c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:34 +0200
Subject: [PATCH 0543/1853] pimcommon: update to 23.04.2.

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

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 30345799581f..973ecaf378ba 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=3446344b154fe444848efea27368be6da8e21aca30a9c6b03d9a078ead6681ac
+checksum=44b7584f0095b5e55a75e56722b7a5c9e5cd968e7a3a2b553405d8e524352bef
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f3d199c788bcd791034f10a32591f292a5c1360a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:35 +0200
Subject: [PATCH 0544/1853] spectacle: update to 23.04.2.

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

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index d00b5eeffe42..a8828fbb68ec 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=db8d4a668b532847b0031038037b42c83d2d600b5084eb40fe29698131d14b17
+checksum=278bf372cf6ac8270b77e12aaf2440278a874939f2b29608b677955da4309659

From da7b5d528c8b2537f6cfafb039568392f0055f0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:26:42 +0200
Subject: [PATCH 0545/1853] ghostwriter: update to 23.04.2.

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

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index d8ede7e67dd1..5b4008d43274 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,11 +1,11 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=23.03.90
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools
  kcoreaddons kdoctools"
-makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
+makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
  qt5-webengine-devel qt5-location-devel qt5-webchannel-devel
  qt5-declarative-devel sonnet-devel kcoreaddons-devel kxmlgui-devel
  kconfigwidgets-devel"
@@ -14,8 +14,8 @@ short_desc="Distraction-free Markdown editor"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://kde.github.io/ghostwriter"
-distfiles="https://invent.kde.org/office/ghostwriter/-/archive/v${version}/ghostwriter-v${version}.tar.bz2"
-checksum=38a2598ea27e5c72d8678c1a085814d1e889b22f92f42eb3beed9a92f03ff432
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=db8b1c9370863a9596cd00e1dc230caf94cac01ad963e962820db58281efbdda
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From 2fbbd76161edeaab498c83e18d2bc81c173a1522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:36 +0200
Subject: [PATCH 0546/1853] filelight: update to 23.04.2.

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

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 6a162e2f4236..29ae6615a011 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,4 +13,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=2caa450ed7eeaeefa1c00f2b53bc5180b6249381d05589c81362a7ba92050f26
+checksum=3c8fa00479e59c1b2b313193a259616a0c853a6a960fc345d31c4c550bd9850d

From b91401e8f8ab1c445c08cbaf51eeef43edc1ee5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:37 +0200
Subject: [PATCH 0547/1853] kaccounts-integration: update to 23.04.2.

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

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 08ca325d1439..c58d1a96ba0b 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kaccounts-integration"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=9a068cf7579ca376a27abee31ca0b2a6544b0a08d1f204d88a4833c41d8ae698
+checksum=10eac98f0f5f432b43a36cc748e8029924e8cf9128735bfe91bb0ff5e0ce6d55
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From b17d80340951e5245aa594d31a968d32bfa5be85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:39 +0200
Subject: [PATCH 0548/1853] kaccounts-providers: update to 23.04.2.

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

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 8305f10fad11..41a00795b35a 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kaccounts-providers"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=cf37813acf5b1895d5a6d2315c60f186ccd7b798ef7bb3b0ad98bd6e29547b1e
+checksum=10350da084e979027189b73a688d0065c0625cf87935d22a0edb81ffd8290a45
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 83ac0822b2462affaba1bbea53f47b3b78e81209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:40 +0200
Subject: [PATCH 0549/1853] kcachegrind: update to 23.04.2.

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

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 2fcb92b544c7..d1c738844aab 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=e721f45994ca756876914008951191b54ca21a01c4019e3bcfe64058232028c4
+checksum=9bb17cc9e85e396e8591d06e04974d6f106b1d8de00596af77555afc93915902
 python_version=2

From ab83c99c0bfe734f0d24ef48a47f6ecd6699f5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:41 +0200
Subject: [PATCH 0550/1853] kcron: update to 23.04.2.

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

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 90555a62ab45..68926c58e865 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=e0b4cbbc0ce3d43298694449c05c6761b46f4421efac6c076a96ec80383d5b59
+checksum=64f2680f71304304656400a2fa6b5aa5c8976c86a9c732f0974e1e8cbca60fd3

From 69addd1a5df07f2b3ef88340f907030d25105365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:43 +0200
Subject: [PATCH 0551/1853] kdialog: update to 23.04.2.

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

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 1b4214e398fc..dbceae98fb78 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=4aa31abdb191504d123f293ef50e3058588679df4969e37d9c5ff121298436ae
+checksum=ec4054c2f319f01668bdecff796a91c7c055775ae15b0dd72b86a5538fee591a

From f2683ac1c0e5884f55b6fff0f30ca9be3eeebd51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:44 +0200
Subject: [PATCH 0552/1853] keditbookmarks: update to 23.04.2.

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

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 043842721b5f..6c2fbc632259 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=dd0296cc85ac8de39eebb96ff2322598acb6ab3fec0dddabb033489419c3558a
+checksum=4103680487bc9e9bada50736608f0d98bed4c0f537a2aeda49d8972d3e76dc7e

From 14ab895cecca547e6a590b71795217f845ca9bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:45 +0200
Subject: [PATCH 0553/1853] kfind: update to 23.04.2.

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

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 2346e3ebfe45..bf4ef41ff5e5 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=e806f337e8ed689a7bdd0066360a81dfe38dd1d1fc79ec1637a5294cf5364ceb
+checksum=f9fe6dde619e45b9122824a3bc704f36ba367995bbcc93b8d08bb601c596dc38

From 280ba0ef485d1698b6cc497249964c38a8f727f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:47 +0200
Subject: [PATCH 0554/1853] kig: update to 23.04.2.

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

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index e479f46c3bea..9719dbc661cc 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
 # Template file for 'kig'
 pkgname=kig
-version=22.12.3
-revision=2
+version=23.04.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
  pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=657adb23885f755af40a085ff8eeb45571a7756e576ba2a3c05c2df15ee5b1d9
+checksum=21f78d9b2e85ab70438cb19a72c5c5669dbf00ef289e5a8931e9da405926ee2a

From b13fad4f84ac17f0c2dc1bcf4e370a15a9909d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:48 +0200
Subject: [PATCH 0555/1853] kio-gdrive: update to 23.04.2.

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

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 52215d38790b..956b0bae0fa1 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=23.04.0
-revision=2
+version=23.04.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
  kcoreaddons libaccounts-qt5-devel kdoctools"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=3998ee8ad380ccc90963e2439674c692e9ee8495ae775b6486e55476785b5442
+checksum=2d823b5f41a30ebaf566991856999029dda0df8885cf502be6d597396616eb59

From d3bbeafe0385e1f3019bb4d212c696d8b93ae7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:49 +0200
Subject: [PATCH 0556/1853] kmag: update to 23.04.2.

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

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index b5258b7e2819..5e854ee09346 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=6fe6d8d119e987c928bff9db92bfec10628c7d38ddbecd5e7c45e5b6d7d1b207
+checksum=05a053874f112a5add21d62b46c06ab83efcd042bafed8e179a4119dc93d5108

From cbc0da91061b89000c174672286ae8e50ca45ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:51 +0200
Subject: [PATCH 0557/1853] kmix: update to 23.04.2.

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

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 3e6747d6cfff..17fd0f6818df 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=523e0aa22cb3413b962d3eba2ba638fe6ecdfb7de4f019fa8bff03dbeee46fb8
+checksum=2cab30dc756a612e503d6bf95a6e1fa0a46108bc5bd09526d42886f954f3b4d8

From b32d7b1dc91e616e895403c5bfe26a509fcd6805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:52 +0200
Subject: [PATCH 0558/1853] kolourpaint: update to 23.04.2.

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

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index f79546c23206..9a1f2d8729fd 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=8e03434746ac62b367ea945edb10f37cbe51e73ed08339059a03ea041f7d2268
+checksum=fec26e6ae0c2e0e155a9e12c0776a69ed5c0c278509bef7d90e2d4ec20bde090
 
 post_install() {
 	vlicense COPYING

From dd376b56cedb2e69bf30bca88c27ab1f0af39cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:54 +0200
Subject: [PATCH 0559/1853] kompare: update to 23.04.2.

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

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index b273a0a5dc77..444ca997e084 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=a4af41c00d495c5a71ce327bde6b413981324e39cf09feb3f0b6885908f65561
+checksum=b58ad6898de895a54f9d61e869d8f78e7acb44f989b9a17e8d93b0f1965654cf

From a5b2113f9f764c5cf88c010e08a7c52607d85ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:55 +0200
Subject: [PATCH 0560/1853] konversation: update to 23.04.2.

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

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9f446b757953..84f976f7ba37 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -13,5 +13,5 @@ license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=9b644c4c609c195aa98e3d59e3b8b89e7add3dbe34e1182981ddd260c8aa4765
+checksum=01a24fdd01e3dcff9465c295c7d7eae0fda59654af40d90cbe7323eb1ab887d6
 python_version=3

From 9cce416549aad5002f60a2ea79df81d801285e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:56 +0200
Subject: [PATCH 0561/1853] kpat: update to 23.04.2.

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

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 37439e860be5..19de3064422f 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=9fae8b86624b44714751f14ecea652b6ef2be338beb08a6a698a0f516ad35239
+checksum=191583e363e1544d5f9423094e0e494c421d10a34193fb8ead0e9bccae941942

From 2d99c500bfab3eb72fb2e59f3a9fb8952bd9f525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:58 +0200
Subject: [PATCH 0562/1853] kruler: update to 23.04.2.

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

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index c30722590409..396d476b4755 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=67d80e608003d698623cbce5ee2048d44d89349a074349d884f784d08f2f0b49
+checksum=d324691c067610726a5a37265f2dfa8d4b4b2d4d989f4c1a7b20a697c1e38d48

From bf3a7b6ba093dd76571576f0c322beeb4e7822de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:59 +0200
Subject: [PATCH 0563/1853] ksystemlog: update to 23.04.2.

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

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 275f4229221b..7bf44e3ce1c0 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=0cf79c529641a087c83a3f6249ec1b9a493c5a28d954478ca8ddd5c16e8e7f42
+checksum=10040138c02ed49433c77e82ac82349f2d3885c0fda2e264ca4aa0373482af8a

From 3d7cc6257f769e772a318d793d8c96cd1dd20e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:00 +0200
Subject: [PATCH 0564/1853] kteatime: update to 23.04.2.

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

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 183eee3ccaaf..50e8336e6533 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=d8f1e562bf69ff1acee04e38ba514d29ee998ed8042789e8cf9b510e8f9e7ca9
+checksum=3b6fd3d343ba79e5ecba05dc7f6d2d02ddc9f60a296737dea4242ff5d0042404

From 329e53f7128d7805ff8de4ac729708c2eb335e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:02 +0200
Subject: [PATCH 0565/1853] kturtle: update to 23.04.2.

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

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index fcff3aac40c9..9ceb2173c5bf 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=8ed5580324dd0f5a65f64f95e5ce7387de9160f543e59818bffca2a35385258b
+checksum=009870ebfb38fbf51daeea9177bb3e87ec4610ea1b3de7ba31761b306a93ef50

From 010f748203f90813504232248c90c7923e047027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:03 +0200
Subject: [PATCH 0566/1853] kwalletmanager: update to 23.04.2.

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

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 5ef43cf18512..a765e72a059b 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=fed842eaa53a2fdc0ef04d1a623388a0dde386bf8d0cdec55ac2f96d9eacc288
+checksum=f0447365f75834c18ac9833a86e86acbb56309143afbc6daf1e63aa63d95c101

From b0a7173204cac14a8eecedc0e007c09990221765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:05 +0200
Subject: [PATCH 0567/1853] libkcddb: update to 23.04.2.

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

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index c24955fbe8d1..cf971184918c 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,18 +1,19 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=22.12.3
+version=23.04.2
 revision=1
 build_style=cmake
+configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
- qt5-host-tools qt5-qmake"
-makedepends="kio-devel libmusicbrainz5-devel"
+ qt5-host-tools qt5-qmake kcmutils-devel"
+makedepends="kcmutils-devel kio-devel libmusicbrainz5-devel"
 short_desc="KDE CDDB library"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=530a5e377bd55409c8fe789b8efb71510d49fe38a23241189235aaf51e057a1a
+checksum=519d321b6cf079f8ac514cf37ac338577ac1fc6fb305c85fa8868bd93427f384
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 273ea7e82c03c91c7bb8cbd2b8ddde2e121b6574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:06 +0200
Subject: [PATCH 0568/1853] libkdegames: update to 23.04.2.

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

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 011797e6820d..e59f7a4f5fc4 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=26c3afffd24b1efe41ebb839daba7ecbd7feceb290281e5b9ea5195a80bf55f2
+checksum=05ec31527325980f30dbcbc342b0c1092ad9593a19bb88a1b80e735d1f632593
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 57012cea469e0ca751779adc76bc38ab1b5ed8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:07 +0200
Subject: [PATCH 0569/1853] libkomparediff2: update to 23.04.2.

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

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index c6a886d84daa..13b20a4c7d55 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=305a54f663203f549bc5a3c0903a3cc5353b459a9278a39d26c4566268812115
+checksum=958595c10e95ec19cf3451604f871edef69912f2496e1ac2870c2d871cd8a990
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9b2b866c88bdc394e8a780eaf9fa0e3cd29ddada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:09 +0200
Subject: [PATCH 0570/1853] marble5: update to 23.04.2.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 4dd68bfddfe3..fc68f8cd358b 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=195f7d921c16f494e2d1df4073bf45cd97044f207fc2db3181caeb838277ae54
+checksum=3b1d8c53db6c71ec727f7e8153cf667be6d1aa2b2f5befa4ef499bc6b79da09b
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 1542094ac858753512789f51da0516e77a38bf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:31 +0200
Subject: [PATCH 0571/1853] signon-kwallet-extension: update to 23.04.2.

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

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 4b9dcf2b2cd0..3b4f3e95447e 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://invent.kde.org/network/signon-kwallet-extension"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=07c9dbe4470d8cd4e1b81661138ea2adbcd5077ec99203445d27257ddb2de8fb
+checksum=d27b3f9f4eacf39096ccbbd02c4f6e307ee6596b24b11c528a757f604f17ca96

From a3b0ec113da0bd84a12c68fd94afcb95d67290ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:32 +0200
Subject: [PATCH 0572/1853] svgpart: update to 23.04.2.

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

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index dfd62ceb7f2a..a728d61b6a52 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/svgpart"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=51c8f20eb1d18b4edc8d130d4132818f11e3f8dc5eb12aff505714448ab298cb
+checksum=c93c80c702442d821967bd13ff456afbc054b9e67fc7574fe076104c25f77649

From d395a88bfe48256fa1b482559c8f324bff8a2294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:35 +0200
Subject: [PATCH 0573/1853] umbrello: update to 23.04.2.

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

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 79acdb13f4e9..3632a6030c91 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=e8209ed8579e983016e1f4dae3a961a0a7a81892d6be00922c0bb07bb464a445
+checksum=2e643111347fb79f40321f82725f92c293cd3bc6bba75f3caf912b3fa0b7fb00
 python_version=2
 
 pre_configure() {

From 8b5bb4c11904954076ded28d9f09312d45e7bce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:37 +0200
Subject: [PATCH 0574/1853] yakuake: update to 23.04.2.

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

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index e22fd6e69cb6..72bd208a460e 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -13,7 +13,7 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=0f769bbb226f44f502d482b415f0403a68c1f95b25fbc255dc8df319ab12c061
+checksum=2810931947dd2dd11195caf2c8ae99293d6155cfef923a3c5859322abf091ae4
 
 build_options="wayland"
 build_options_default="wayland"

From e0132cdc15decd53cf1664aa1b7d463334d35951 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 10 Jun 2023 21:40:46 -0400
Subject: [PATCH 0575/1853] openjdk17: update to 17.0.8+5.

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

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 7aff34f6e911..a937dc0640d7 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.7+7
+version=17.0.8+5
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${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="43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8
+checksum="adf42ea4a9bb2cffa4689c9eb98605a7cd804034cb88312c2b7bf4c5285e32ce
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"

From f56afbf958cae1925d62bad6d7d073df8ed3163f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Jun 2023 09:33:19 +0200
Subject: [PATCH 0576/1853] wine: update to 8.10.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 785393a98776..18d0a93517fd 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.9
+version=8.10
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="8cdf86b250d9080fcd4e3b939680fcd38ebf0f274a7afa2dcc65f74fa2c1b320
- ad5fef3487240033aed83c0a7d5b449c85b2d1af5aeb7efe02db12903221a9d4"
+checksum="c4f36dd73c176cef8e7016ca4139ee76f5b498a4afd7edb517e14c0d5394736f
+ 04ff999dd3c8a469f66cb559296051bb234ab355991374deceabeaf546b7d5e3"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 992357c3afaefb4f3f62cd3bcc9f455d8bc5057e Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 26 May 2023 12:14:17 +0200
Subject: [PATCH 0577/1853] angrysearch: update to 1.0.3.

---
 srcpkgs/angrysearch/patches/00-fiximport.patch | 13 -------------
 srcpkgs/angrysearch/template                   |  8 ++++----
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/angrysearch/patches/00-fiximport.patch

diff --git a/srcpkgs/angrysearch/patches/00-fiximport.patch b/srcpkgs/angrysearch/patches/00-fiximport.patch
deleted file mode 100644
index 4143059338de..000000000000
--- a/srcpkgs/angrysearch/patches/00-fiximport.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git angrysearch.py angrysearch.py
-index 33c181d..ef9d5a2 100644
---- a/angrysearch.py
-+++ b/angrysearch.py
-@@ -18,6 +18,8 @@ import subprocess
- import sys
- import time
-
-+sys.path.append('/usr/share/angrysearch/')
-+
- # QT RESOURCE FILE WITH MIME ICONS AND DARK GUI THEME ICONS
- # IF NOT AVAILABLE ONLY 2 ICONS REPRESENTING FILE & DIRECTORY ARE USED
- try:
diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index b6dc5ecde7a7..05306db0a28f 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,7 +1,7 @@
 # Template file for 'angrysearch'
 pkgname=angrysearch
-version=1.0.1
-revision=5
+version=1.0.3
+revision=1
 pycompile_dirs="usr/share/angrysearch"
 hostmakedepends="python3"
 depends="python3-PyQt5 xdg-utils"
@@ -9,8 +9,8 @@ short_desc="Instant file search"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/dotheevo/angrysearch/"
-distfiles="http://github.com/dotheevo/${pkgname}/archive/v${version}.tar.gz"
-checksum=9a550649c3efafb26660860758f2e75702ce96a0a0c50dc34ced2967b51a843f
+distfiles="http://github.com/dotheevo/angrysearch/archive/v${version}.tar.gz"
+checksum=bb20907d97804931863f377fe19ac2008a9e43c80517f775667f9fe49792c585
 python_version=3
 
 do_install() {

From a56f01ca2e87e4f01de63d24680a43648b6395a1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 25 May 2023 15:28:31 +0530
Subject: [PATCH 0578/1853] rust-analyzer: update to 2023.06.05.

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

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 1f5c7e62e5b6..ec58fe55835a 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.05.15
+version=2023.06.05
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=4724405553135e9ee399a435f95d89defbcba9b8b6261640921d1c46dbecbd39
+checksum=ae616d81e31df1f97342d2f55c0fe1b82fe88f4773a98bb6cb04e9303bf3d612
 # tests require Rust source code
 make_check=no
 

From b43d1b064b284ca65c506d16aa3cc3a68aad7a6c Mon Sep 17 00:00:00 2001
From: astral <astral@astralchan.xyz>
Date: Fri, 10 Mar 2023 02:47:30 -0700
Subject: [PATCH 0579/1853] jamulus: update to 3.9.1

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

diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
index db577f6dd83a..452d9d6f513d 100644
--- a/srcpkgs/jamulus/template
+++ b/srcpkgs/jamulus/template
@@ -1,6 +1,6 @@
 # Template file for 'jamulus'
 pkgname=jamulus
-version=3.9.0
+version=3.9.1
 revision=1
 _version=r${version//./_}
 build_style=qmake
@@ -11,5 +11,6 @@ short_desc="Play music online. With friends. For free"
 maintainer="astralchan <astral@astralchan.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://jamulus.io"
-distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
-checksum=742b1954111c55b39ea7b2863c762d6731359e2b4793ef2409b150096fb196a5
+changelog="https://raw.githubusercontent.com/jamulussoftware/jamulus/main/ChangeLog"
+distfiles="https://github.com/jamulussoftware/jamulus/archive/${_version}.tar.gz"
+checksum=758381a92ff7b264534773b71b6bf8e098bbeb6d693efdc2916609f2ff842889

From 7de2cf3a2e1086b411331851be871f06e1edeb54 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 07:37:31 -0400
Subject: [PATCH 0580/1853] chezmoi: update to 2.34.1.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 0204f59e0984..346c8f4ae203 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.34.0
+version=2.34.1
 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=66a65bb283ba8259d0ca0205b3c3457da220c55d486da10b42f31fe5e478f5e8
+checksum=d81bb3a9f4632ab27422c05bb243692f1d55e33cae2c55c691f7f0b9248f46cf
 
 pre_build() {
 	local _date

From 12f3155f96bbec98a34e142b82c9b0f76db81b8b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 0581/1853] libgit2: update to 1.6.4

---
 common/shlibs                                 |  2 +-
 ...-remove-ftrunacte-from-libgit2-tests.patch | 15 ------------
 ...test-validate_current_user_ownership.patch |  8 +++----
 .../patches/fix-missing-oid-type.patch        | 24 +++++++++++++++++++
 srcpkgs/libgit2/template                      |  6 ++---
 5 files changed, 32 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
 create mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch

diff --git a/common/shlibs b/common/shlibs
index f02af5cf58ea..d83c2b6a1c9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1353,7 +1353,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
- 
- include(AddClarTest)
- add_clar_test(libgit2_tests offline             -v -xonline)
--add_clar_test(libgit2_tests invasive            -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive            -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online              -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert   -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon           -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
 diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
 --- a/tests/util/path.c
 +++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
  #else
  	cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
--	cl_assert_equal_i(is_cur, 0);
-+	//cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+-	cl_assert_equal_i(is_cur, (geteuid() == 0));
++	//cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
  
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
  #endif
diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
new file mode 100644
index 000000000000..8d24809f244a
--- /dev/null
+++ b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
@@ -0,0 +1,24 @@
+From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001
+From: Oliver Reiche <oliver.reiche@gmail.com>
+Date: Wed, 3 May 2023 12:57:06 +0200
+Subject: [PATCH] Fix missing oid type for "fake" repositories
+
+... otherwise git_tree__parse_raw() will fail to obtain
+the correct oid size, which causes the entire parse to fail.
+---
+ src/libgit2/repository.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
+index 804e436abeb..c45c5855058 100644
+--- a/src/libgit2/repository.c
++++ b/src/libgit2/repository.c
+@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb)
+ 	repo = repository_alloc();
+ 	GIT_ERROR_CHECK_ALLOC(repo);
+ 
++	repo->oid_type = GIT_OID_DEFAULT;
++
+ 	git_repository_set_odb(repo, odb);
+ 	*repo_out = repo;
+ 
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 9d9da1496d67..24b56f20099a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
 hostmakedepends="python3 pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
 homepage="https://libgit2.org"
 distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

From 8bd091fb4aa5b4001f07ebe19cfa802e14530f47 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 0582/1853] python3-pygit2: update to 1.12.1

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

diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 307a83fff604..b8db662c7715 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-pygit2'
 pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools python3-cffi"
+version=1.12.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
 makedepends="python3-devel libgit2-devel python3-cached-property libssh2-devel
  openssl-devel"
 depends="python3-cached-property python3-cffi"
@@ -14,4 +14,4 @@ license="LGPL-2.0-only"
 homepage="https://www.pygit2.org/"
 changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz"
-checksum=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=8218922abedc88a65d5092308d533ca4c4ed634aec86a3493d3bdf1a25aeeff3

From 4e7d42c690ec8e10fdc6448bc155f356ab4e868d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 0583/1853] DarkRadiant: rebuild for libgit2

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

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=3.8.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From 6a5bcbfe9026a8384fc8c7bc22b5b08bd1438ee9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 0584/1853] Fritzing: rebuild for libgit2

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

diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
 # Template file for 'Fritzing'
 pkgname=Fritzing
 version=0.9.3b
-revision=6
+revision=7
 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
 create_wrksrc=yes
 build_wrksrc="app"

From 042abbe67cb476bd4034252a63da451062aaab49 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 0585/1853] geany-plugins: rebuild for libgit2

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

diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index c5de461efb17..f0bb0b04ed80 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
 version=1.38.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"

From c69b190a1ad66326d0d4989af1b25264809a5b80 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 0586/1853] kup: rebuild for libgit2

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

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
 # Template file for 'kup'
 pkgname=kup
 version=0.9.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
  kpackage gettext kconfig"

From cc9b9bb1818ef2992e319fb029cdfc45a5db5e0d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 0587/1853] slcp: rebuild for libgit2

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

diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
 # Template file for 'slcp'
 pkgname=slcp
 version=0.2
-revision=13
+revision=14
 build_style=gnu-makefile
 makedepends="libgit2-devel"
 short_desc="Simple shell prompt written in C"

From f15626619d8e5299cbaf413c069f746874312ce3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 0588/1853] stagit: rebuild for libgit2

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

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
 # Template file for 'stagit'
 pkgname=stagit
 version=1.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"

From bf238d1e88b892da5c4826d43283a650068be8b5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 0589/1853] libgit2-glib: rebuild for libgit2

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

diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 7873e51a0b28..f20b53b73211 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
 version=1.1.0
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)

From 8f3a6781c677dfc9acd80245c171792f91438890 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 0590/1853] gnome-builder: rebuild for libgit2

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=44.1
-revision=2
+revision=3
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
  libsoup3-devel cmark-devel pango-devel libportal-devel
  libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 14751824f43d2797b96ee8173a03e14bccd340c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:29:54 +0200
Subject: [PATCH 0591/1853] juCi++: rebuild for libgit2

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

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index ad903e98b150..1948023bd290 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
 # Template file for 'juCi++'
 pkgname=juCi++
 version=1.7.2
-revision=4
+revision=5
 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
 _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
 create_wrksrc=yes

From ded9540b6141446b70f6d88ab61f9a22ff6ae49a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:30:40 +0200
Subject: [PATCH 0592/1853] horizon: rebuild for libgit2

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

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 4d7fe5cb44d9..1d1b8cf1891c 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From a10913bb406951d37951da4c3c59dd47747df369 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:18:59 +0200
Subject: [PATCH 0593/1853] calligra: rebuild for libgit2

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

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index d0bdd2fec265..38d7984727af 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=13
+revision=14
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 34b44d38857e627ac3c554899d95e1f47900a849 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 0594/1853] cargo: rebuild for libgit2

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

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 3921088c1e04..5c610b2bcf83 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=1.70.0
-revision=1
+revision=2
 _cargo_revision=0.71.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"

From 330995544fbaef425a75c0a83c7817e6ecd61bf8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:39:55 +0200
Subject: [PATCH 0595/1853] cargo-edit: update to 0.12.0

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

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index e8cf16b500cb..c6f1015c91a2 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
-version=0.11.11
+version=0.12.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # uses ring
 build_style=cargo
-configure_args="--no-default-features -F add,rm,upgrade,set-version"
+configure_args="--no-default-features -F upgrade,set-version"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libgit2-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/killercup/cargo-edit"
 changelog="https://raw.githubusercontent.com/killercup/cargo-edit/master/CHANGELOG.md"
 distfiles="https://github.com/killercup/cargo-edit/archive/refs/tags/v${version}.tar.gz"
-checksum=9ce140e840498d61c1573ff4206214d0c41c8db24048f0f0f27b7f4464310f9a
+checksum=a8168ea2320c095f55d2b32f8bede8c814dcdc4290c250df36dc8ce0f6fb2095
 
 post_install() {
 	vlicense LICENSE

From 66ca589c56bdbd3f980f7a29096f84b7d074b38c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:44:29 +0200
Subject: [PATCH 0596/1853] exa: rebuild for libgit2

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

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index ec5649613174..89bf6611d9fb 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,7 +1,7 @@
 # Template file for 'exa'
 pkgname=exa
 version=0.10.1
-revision=3
+revision=4
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=cargo

From b085bd2d18e8dd8879ff8bd0bc273dddab9bd3a7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:45:07 +0200
Subject: [PATCH 0597/1853] git-series: rebuild for libgit2

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

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 79c561af76b6..365dc53ab02d 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=15
+revision=16
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -10,7 +10,7 @@ short_desc="Track patch series in git"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/git-series/git-series"
-distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
+distfiles="https://github.com/git-series/git-series/archive/refs/tags/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
@@ -18,9 +18,11 @@ post_extract() {
 	cargo update --package url@1.2.3 --precise 1.7.2
 	cargo update --package openssl-sys@0.9.1 --precise 0.9.60
 }
+
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes
 }
+
 post_install() {
 	vman git-series.1
 	vlicense LICENSE.txt

From 5d23c295eec207b6594d3a3a436c9a61f3fd505d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:00:03 +0200
Subject: [PATCH 0598/1853] bat: rebuild for libgit2

---
 srcpkgs/bat/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/bat/template                |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bat/patches/bump-git2.patch

diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
new file mode 100644
index 000000000000..842b57d4ee6b
--- /dev/null
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 44460e0..78dfbde 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
+ bytesize = { version = "1.1.0" }
+ 
+ [dependencies.git2]
+-version = "0.16"
++version = "0.17"
+ optional = true
+ default-features = false
+ 
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index c20fc0e09edd..6d6b39fae611 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
 # Template file for 'bat'
 pkgname=bat
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="cmake llvm clang pkg-config"
 makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -19,7 +19,9 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
-export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
+}
 
 pre_build() {
 	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"

From fda93158394e98f66304d881e5e347f5ef096e5e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:05:15 +0200
Subject: [PATCH 0599/1853] cargo-update: rebuild for libgit2

---
 srcpkgs/cargo-update/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/cargo-update/template                |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cargo-update/patches/bump-git2.patch

diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
new file mode 100644
index 000000000000..90a31fbdcb02
--- /dev/null
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index e62e9c8..1aa0658 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -52,7 +52,7 @@ tabwriter = "1.2"
+ lazysort = "0.2"
+ regex = "1.6"
+ serde = "1.0"
+-git2 = "0.16"
++git2 = "0.17"
+ home = "0.5"
+ toml = "0.5"
+ hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 086d3660bfaa..b411c99f0a7c 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
 version=13.0.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
 makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"

From 653095896627ebe559f08b6be0184011fa90219f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:11:08 +0200
Subject: [PATCH 0600/1853] cocogitto: rebuild for libgit2

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

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index dbed47399d80..a4399ef38921 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
 version=5.3.1
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -17,6 +17,10 @@ checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
 post_install() {
 	local cog="${DESTDIR}/usr/bin/cog"
 	for shell in bash zsh fish; do

From 401e02d277060540ff9be2bab0349cbcbc9fe835 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:21:18 +0200
Subject: [PATCH 0601/1853] delta: rebuild for libgit2

---
 srcpkgs/delta/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/delta/template                |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/delta/patches/bump-git2.patch

diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/bump-git2.patch
new file mode 100644
index 000000000000..05255c23c9cc
--- /dev/null
+++ b/srcpkgs/delta/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 8c0c6d8..4fdaa9d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -46,7 +46,7 @@ vte = "0.11.0"
+ xdg = "2.4.1"
+ 
+ [dependencies.git2]
+-version = "0.16.1"
++version = "0.17"
+ default-features = false
+ features = []
+ 
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 7904e323b89f..e0e2c44370d7 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
 # Template file for 'delta'
 pkgname=delta
 version=0.16.5
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel oniguruma-devel"
@@ -13,8 +13,8 @@ homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
 checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
 
-pre_build() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
 }
 
 post_install() {

From b5f0f79f5634589d5f4bd2239f31cd2ed77a5a51 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:25:52 +0200
Subject: [PATCH 0602/1853] git-absorb: rebuild for libgit2

---
 srcpkgs/git-absorb/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/git-absorb/template                |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/git-absorb/patches/bump-git2.patch

diff --git a/srcpkgs/git-absorb/patches/bump-git2.patch b/srcpkgs/git-absorb/patches/bump-git2.patch
new file mode 100644
index 000000000000..bab771ba1be8
--- /dev/null
+++ b/srcpkgs/git-absorb/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 20a0ec5..7b86eed 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ name = "git-absorb"
+ path = "src/main.rs"
+ 
+ [dependencies.git2]
+-version = "~0.16"
++version = "~0.17"
+ default-features = false
+ 
+ [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 9af2b5ca4edb..5f7d34c5fb31 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,7 +1,7 @@
 # Template file for 'git-absorb'
 pkgname=git-absorb
 version=0.6.10
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://github.com/tummychow/git-absorb"
 distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
 checksum=6cc58d2ae50027a212811faa065623666ccb6e8bd933e801319aaf92b164aa0a
 
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
 post_install() {
 	vlicense LICENSE.md
 	vman Documentation/git-absorb.1

From 94fd6e60ac366410ff4584cd1588f9f6b4d5bd5f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:39:34 +0200
Subject: [PATCH 0603/1853] gitui: rebuild for libgit2

closes #43435
---
 srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/gitui/template                |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gitui/patches/bump-git2.patch

diff --git a/srcpkgs/gitui/patches/bump-git2.patch b/srcpkgs/gitui/patches/bump-git2.patch
new file mode 100644
index 000000000000..e4b5dfc1fad5
--- /dev/null
+++ b/srcpkgs/gitui/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
+index 5ab4da1..f17fbbe 100644
+--- a/asyncgit/Cargo.toml
++++ b/asyncgit/Cargo.toml
+@@ -14,7 +14,7 @@ keywords = ["git"]
+ [dependencies]
+ crossbeam-channel = "0.5"
+ easy-cast = "0.5"
+-git2 = "0.15"
++git2 = "0.17"
+ log = "0.4"
+ # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
+ # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index a97b179e2331..14a6deb5ba43 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,8 +1,9 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.22.1
-revision=1
+revision=2
 build_style=cargo
+make_check_args="-- --skip  components::textinput::tests::test_visualize_newline"
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"
 short_desc="Blazing fast terminal-ui for git"
@@ -13,6 +14,10 @@ changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
 checksum=285e86c136ee7f410fdd52c5284ccf0d19011cc5f7709e5e10bb02f439a218ea
 
+post_patch() {
+	cargo update --package git2@0.15.0 --precise 0.17.2
+}
+
 post_install() {
 	vlicense LICENSE.md
 }

From 591bacb7015ce67f89bc28087f2c1fde0dc981fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 May 2023 18:07:35 +0200
Subject: [PATCH 0604/1853] abseil-cpp: add more entries to common/shlibs.

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

diff --git a/common/shlibs b/common/shlibs
index d83c2b6a1c9c..005700403d0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,6 +4225,31 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_base.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_civil_time.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cord_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_functions.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_handle.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_debugging_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_demangle_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_exponential_biased.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_graphcycles_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_hashtablez_sampler.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_int128.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_log_severity.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_low_level_hash.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_malloc_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_distributions.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_platform.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_hwaes.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_seed_material.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_seed_gen_exception.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_seed_sequences.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_raw_logging_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_stacktrace.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strerror.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strings_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_symbolize.so.2206.0.0 abseil-cpp-20220623.1_1
 libairspyhf.so.0 libairspyhf-1.6.8_1
 libtraceevent.so.1 libtraceevent-1.6.2_1
 libtracefs.so.1 libtracefs-1.4.2_1

From ec01b0694492cfa0536f4b28ae045a3c06edf1b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Dec 2022 19:19:02 +0100
Subject: [PATCH 0605/1853] New package: justbuild-1.1.2.

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

diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
new file mode 100644
index 000000000000..1ad8e334617d
--- /dev/null
+++ b/srcpkgs/justbuild/template
@@ -0,0 +1,68 @@
+# Template file for 'justbuild'
+pkgname=justbuild
+version=1.1.2
+revision=1
+create_wrksrc=yes
+hostmakedepends="jo pandoc pkg-config python3 tar unzip wget"
+makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
+ libarchive-devel libcurl-devel libgit2-devel openssl-devel re2-devel"
+depends="python3"
+short_desc="Generic build system supporting multi-repository builds"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://github.com/just-buildsystem/justbuild/"
+changelog="https://github.com/just-buildsystem/justbuild/blob/master/CHANGELOG.md"
+distfiles="https://github.com/just-buildsystem/justbuild/archive/v${version}.tar.gz"
+checksum=50341bdf3742ad6dec20454b338770e8428b531d04c675ca976d1e410c5b33ba
+conflicts="just>=0"
+nocross="not supported by bootstrapping"
+
+do_build() {
+	mkdir -p just-work
+	export JUST_BUILD_CONF=$(jo \
+		AR=/usr/bin/ar \
+		COMPILER_FAMILY=gnu \
+		CC=$CC \
+		CXX=$CXX \
+		CFLAGS=$(jo -a -- $CFLAGS) \
+		CXXFLAGS=$(jo -a -- $CXXFLAGS) \
+		LDFLAGS=$(jo -a -- $LDFLAGS) \
+		SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH \
+		VERSION_EXTRA_SUFFIX=-void
+	)
+	export NON_LOCAL_DEPS=$(jo -a \
+		bazel_remote_apis \
+		cli11 \
+		com_github_microsoft_gsl \
+		google_apis \
+		protobuf
+	)
+
+	PACKAGE=YES LOCALBASE=/usr python3 \
+		justbuild-${version}/bin/bootstrap.py \
+		justbuild-${version}/ $PWD/just-work
+
+	./just-work/src/out-boot/bin/just install \
+		-C $PWD/just-work/repo-conf.json \
+		-D "$JUST_BUILD_CONF" \
+		-o $PWD/just-work/out \
+		--local-build-root $PWD/just-work/.just \
+		'' just-mr
+
+	for m in justbuild-${version}/share/man/*.md; do
+		pandoc --standalone --to man -o ${m%.md}.man $m
+	done
+}
+
+do_install() {
+	vbin just-work/out/bin/just
+	vbin just-work/out/src/other_tools/just_mr/just-mr
+	vbin just-work/src/bin/just-import-git.py just-import-git
+
+	eval vcompletion justbuild-${version}/share/just_complete.bash bash
+
+	for m in justbuild-${version}/share/man/*.man; do
+		echo $m
+		vman $m ${m%.man}
+	done
+}

From edbf432f3b9d68b8a6ffcbe70823e661d0b5e60f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 12:27:20 -0400
Subject: [PATCH 0606/1853] typst: unbroken

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

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 6e9ee26e16b8..7d517adbf6cd 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -16,10 +16,6 @@ checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"
 
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
-fi
-
 post_install() {
 	for f in cli/generated/*.?; do
 		vman "$f"

From 94ffa5d51be379d0c059791f9d397b12a07993f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 12:27:44 -0400
Subject: [PATCH 0607/1853] typst-lsp: unbroken

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

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 339ae5ddb0d5..6d4f0cef0ae2 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -10,10 +10,6 @@ homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
 checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
 
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
-fi
-
 post_install() {
 	vlicense LICENSE-MIT.txt
 }

From aee81a221444d2be3eebeaea5190cae91f5b3963 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 12:54:16 -0400
Subject: [PATCH 0608/1853] wezterm: depend on wezterm-terminfo

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

diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
index 44b465839329..c3041986e395 100644
--- a/srcpkgs/wezterm/template
+++ b/srcpkgs/wezterm/template
@@ -1,7 +1,7 @@
 # Template file for 'wezterm'
 pkgname=wezterm
 version=20230408
-revision=1
+revision=2
 _srcver=${version}-112425-69ae8472
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="fontconfig-devel freetype-devel harfbuzz-devel openssl-devel
  libssh2-devel libX11-devel libxkbcommon-devel wayland-devel xcb-util-devel
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel"
-depends="noto-fonts-emoji fonts-roboto-ttf"
+depends="noto-fonts-emoji fonts-roboto-ttf wezterm-terminfo-${version}_${revision}"
 short_desc="GPU-accelerated cross-platform terminal emulator and multiplexer"
 maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"

From 4012652984a704b43e1e55e16a317343c557dbe6 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 14:07:10 +0100
Subject: [PATCH 0609/1853] libheif: update to 1.16.2.

Closes: #44331 [via git-merge-pr]
---
 srcpkgs/libheif/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 59d6fe2778c2..2056a8d8d491 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,9 +1,8 @@
 # Template file for 'libheif'
 pkgname=libheif
-version=1.14.2
+version=1.16.2
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf pkg-config libtool"
+build_style=cmake
 makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
  libaom-devel"
 short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -12,18 +11,13 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/strukturag/libheif"
 changelog="https://github.com/strukturag/libheif/releases"
 distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=e9c88e75e3b7fad9df32e42d28646752de2679df57efddfb3f63cd25110ce9d9
-
-pre_configure() {
-	./autogen.sh
-}
+checksum=d207f2ff5c86e6af3621c237f186130b985b7a9ff657875944b58ac5d27ba71c
 
 libheif-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} libde265-devel x265-devel libaom-devel"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}

From 23e5253cc6c024d1c592251e7322ef62db1fe8f2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 12:52:01 +0100
Subject: [PATCH 0610/1853] pcre2: update to 10.42.

Closes: #44329 [via git-merge-pr]
---
 srcpkgs/pcre2/patches/ppc-icache-flush.patch | 102 -------------------
 srcpkgs/pcre2/template                       |   7 +-
 2 files changed, 4 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/pcre2/patches/ppc-icache-flush.patch

diff --git a/srcpkgs/pcre2/patches/ppc-icache-flush.patch b/srcpkgs/pcre2/patches/ppc-icache-flush.patch
deleted file mode 100644
index b1abb1109a9a..000000000000
--- a/srcpkgs/pcre2/patches/ppc-icache-flush.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-GCC's version of __builtin___clear_cache() is a no-op on PowerPC.
-Change to use an improved version of the existing ppc_cache_flush().
-
---- a/src/sljit/sljitConfigInternal.h	2021-08-20 09:51:28.000000000 -0700
-+++ b/src/sljit/sljitConfigInternal.h	2022-02-11 20:56:43.159092563 -0800
-@@ -320,7 +320,8 @@
- /****************************/
- 
- #if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin)
--#if __has_builtin(__builtin___clear_cache)
-+#if __has_builtin(__builtin___clear_cache) && \
-+	!(defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
- 
- #define SLJIT_CACHE_FLUSH(from, to) \
- 	__builtin___clear_cache((char*)(from), (char*)(to))
---- a/src/sljit/sljitNativePPC_common.c	2022-02-12 20:46:28.383224561 -0800
-+++ b/src/sljit/sljitNativePPC_common.c	2022-02-12 20:48:22.210099029 -0800
-@@ -46,6 +46,39 @@
- #define SLJIT_PASS_ENTRY_ADDR_TO_CALL 1
- #endif
- 
-+#ifdef __linux__
-+#include <sys/auxv.h>
-+
-+/* Return the instruction cache line size, in bytes. */
-+static SLJIT_INLINE sljit_u32 get_icache_line_size()
-+{
-+	static sljit_u32 icache_line_size = 0;
-+	if (SLJIT_UNLIKELY(!icache_line_size)) {
-+		icache_line_size = (sljit_u32) getauxval(AT_ICACHEBSIZE);
-+		SLJIT_ASSERT(icache_line_size != 0);
-+	}
-+	return icache_line_size;
-+}
-+
-+/* Cache and return the first hardware capabilities word. */
-+static SLJIT_INLINE unsigned long get_hwcap()
-+{
-+	static unsigned long hwcap = 0;
-+	if (SLJIT_UNLIKELY(!hwcap)) {
-+		hwcap = getauxval(AT_HWCAP);
-+		SLJIT_ASSERT(hwcap != 0);
-+	}
-+	return hwcap;
-+}
-+
-+/* Return non-zero if this CPU has the icache snoop feature. */
-+static SLJIT_INLINE unsigned long has_feature_icache_snoop()
-+{
-+	return (get_hwcap() & PPC_FEATURE_ICACHE_SNOOP);
-+}
-+
-+#endif  /* __linux__ */
-+
- #if (defined SLJIT_CACHE_FLUSH_OWN_IMPL && SLJIT_CACHE_FLUSH_OWN_IMPL)
- 
- static void ppc_cache_flush(sljit_ins *from, sljit_ins *to)
-@@ -68,14 +101,40 @@
- #	error "Cache flush is not implemented for PowerPC/POWER common mode."
- #	else
- 	/* Cache flush for PowerPC architecture. */
--	while (from < to) {
-+	/* For POWER5 and up with icache snooping, only one icbi in the range
-+ 	 * is required. The sync flushes the store queue, and the icbi/isync
-+	 * kills the local prefetch.
-+	 */
-+	if (has_feature_icache_snoop()) {
- 		__asm__ volatile (
--			"dcbf 0, %0\n"
- 			"sync\n"
- 			"icbi 0, %0\n"
--			: : "r"(from)
-+			"isync\n"
-+			: : "r"(from) : "memory"
-+		);
-+		return;
-+	}
-+
-+	sljit_u32 cache_line_bytes = get_icache_line_size();
-+	sljit_u32 cache_line_words = cache_line_bytes / sizeof(sljit_ins);
-+	uintptr_t cache_line_mask = ~(uintptr_t)(cache_line_bytes - 1);
-+
-+	/* Round down to start of cache line to simplify the end condition. */
-+	sljit_ins* start = (sljit_ins*)((uintptr_t)(from) & cache_line_mask);
-+
-+	for (from = start; from < to; from += cache_line_words) {
-+		__asm__ volatile (
-+			"dcbf 0, %0"
-+			: : "r"(from) : "memory"
-+		);
-+	}
-+	__asm__ volatile ( "sync" );
-+
-+	for (from = start; from < to; from += cache_line_words) {
-+		__asm__ volatile (
-+			"icbi 0, %0"
-+			: : "r"(from) : "memory"
- 		);
--		from++;
- 	}
- 	__asm__ volatile ( "isync" );
- #	endif
diff --git a/srcpkgs/pcre2/template b/srcpkgs/pcre2/template
index cbb58f41e9ee..24677648eb60 100644
--- a/srcpkgs/pcre2/template
+++ b/srcpkgs/pcre2/template
@@ -1,7 +1,7 @@
 # Template file for 'pcre2'
 pkgname=pcre2
-version=10.39
-revision=2
+version=10.42
+revision=1
 build_style=gnu-configure
 configure_args="--with-pic --enable-pcre2-16 --enable-pcre2-32
 --enable-pcre2test-libreadline --enable-pcre2grep-libz --enable-pcre2grep-libbz2
@@ -11,8 +11,9 @@ short_desc="Perl Compatible Regular Expressions (2nd version)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.pcre.org/"
+changelog="https://raw.githubusercontent.com/PCRE2Project/pcre2/master/NEWS"
 distfiles="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"
-checksum=0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440
+checksum=8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
 
 post_install() {
 	vlicense LICENCE

From e30dbdf96d3a8e5fecd1bb40c6a2173009f2ad67 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 5 Jun 2023 20:25:32 +0100
Subject: [PATCH 0611/1853] fribidi: update to 1.0.13, adopt.

Fixes empty manpages, see https://github.com/fribidi/fribidi/issues/197.

Closes: #44283 [via git-merge-pr]
---
 srcpkgs/fribidi/template | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index 39f2fbc41ca9..6f3ffad86454 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,26 +1,20 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.12
+version=1.0.13
 revision=1
 build_style=gnu-configure
-configure_args="--disable-docs"
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config"
 short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
 changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS"
-distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d
-disable_parallel_build=yes
-
-pre_configure() {
-	NOCONFIGURE=1 autoreconf -fi
-}
+distfiles="https://github.com/fribidi/fribidi/releases/download/v${version}/fribidi-${version}.tar.xz"
+checksum=7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
-		sed -i gen.tab/Makefile \
+		vsed -i gen.tab/Makefile \
 			-e "s;^\(CC =\) .*;\1 cc;" \
 			-e "s;^\(CFLAGS =\) .*;\1 -O2 -pipe;" \
 			-e "s;^\(LDFLAGS =\) .*;\1 -s;"
@@ -28,7 +22,7 @@ pre_build() {
 }
 
 fribidi-devel_package() {
-	depends="fribidi>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 4199e8184e2952eedb0e474c71fc20573d60cc05 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 24 May 2023 17:27:10 +0100
Subject: [PATCH 0612/1853] xcb-util-errors: update to 1.0.1.

Closes: #44061 [via git-merge-pr]
---
 srcpkgs/xcb-util-errors/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xcb-util-errors/template b/srcpkgs/xcb-util-errors/template
index cff1bb5d3902..31efb626ab66 100644
--- a/srcpkgs/xcb-util-errors/template
+++ b/srcpkgs/xcb-util-errors/template
@@ -1,17 +1,17 @@
 # Template file for 'xcb-util-errors'
 pkgname=xcb-util-errors
-version=1.0
+version=1.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config m4"
-makedepends="libxcb-devel"
+hostmakedepends="pkg-config m4 python3"
+makedepends="libxcb-devel xcb-proto"
 short_desc="XCB errors library"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"
 homepage="https://xcb.freedesktop.org"
-distfiles="https://xcb.freedesktop.org/dist/${pkgname}-${version}.tar.bz2"
-checksum=682681769e818ba085870d1ccd65f1f282ca16ca7d6f0f73ee70bc3642aa1995
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-errors-${version}.tar.xz"
+checksum=5628c87b984259ad927bacd8a42958319c36bdf4b065887803c9d820fb80f357
 
 post_install() {
 	vlicense COPYING

From 326b177859b7f86d29507f8d88718ba9e64dab7e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 24 May 2023 10:02:16 +0100
Subject: [PATCH 0613/1853] gtk+3: update to 3.24.38.

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

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 44843eb762c0..bc2ab1ad90fd 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.37
+version=3.24.38
 revision=1
 build_style=meson
 build_helper="gir"
@@ -32,14 +32,17 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57
+checksum=ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7
+make_check_pre="xvfb-run dbus-run-session"
 # _broken_tests=""
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) _broken_tests="reftests/linear-gradient.ui" ;;
 esac
 
-if [ -z "$XBPS_CHECK_PKGS" ]; then
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=true"
+else
 	configure_args+=" -Dtests=false"
 fi
 
@@ -63,10 +66,6 @@ pre_check() {
 	done
 }
 
-do_check() {
-	xvfb-run dbus-run-session ninja -C build ${makejobs} test
-}
-
 post_install() {
 	rm ${DESTDIR}/usr/bin/gtk-update-icon-cache
 	rm ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1

From baa1e0e77c6aaa79eb466933f019c1bc0975ba24 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:30:15 +0100
Subject: [PATCH 0614/1853] telepathy-idle: move to python3.

Closes: #43890 [via git-merge-pr]
---
 srcpkgs/telepathy-idle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template
index 96758ec345ab..e518153fefc3 100644
--- a/srcpkgs/telepathy-idle/template
+++ b/srcpkgs/telepathy-idle/template
@@ -3,10 +3,10 @@ pkgname=telepathy-idle
 version=0.2.2
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config python libxslt"
+hostmakedepends="pkg-config python3 libxslt"
 makedepends="dbus-glib-devel telepathy-glib-devel"
 depends="telepathy-glib>=0.22"
-checkdepends="python-dbus"
+checkdepends="python3-dbus"
 short_desc="IRC connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 025ea59fe4c33629bf9d8f8f8bfd0488f785580a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 3 May 2023 01:38:56 +0300
Subject: [PATCH 0615/1853] thin-provisioning-tools: update to 1.0.4.

Closes: #43722 [via git-merge-pr]
---
 .../patches/fix-musl.patch                    | 90 +++++++++++++++++++
 srcpkgs/thin-provisioning-tools/template      | 22 +++--
 2 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thin-provisioning-tools/patches/fix-musl.patch

diff --git a/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch b/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch
new file mode 100644
index 000000000000..8e433e96a32a
--- /dev/null
+++ b/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch
@@ -0,0 +1,90 @@
+From fbce51f27fa164ebad7994b177908e5a200b95c9 Mon Sep 17 00:00:00 2001
+From: triallax <triallax@tutanota.com>
+Date: Thu, 4 May 2023 20:42:39 +0300
+Subject: [PATCH] [build] fix build on musl
+
+Before this commit, compilation would fail with this error:
+
+```
+error[E0308]: mismatched types
+   --> src/file_utils.rs:59:28
+    |
+59  |         if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
+    |            -----------     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
+    |            |
+    |            arguments to this function are incorrect
+    |
+note: function defined here
+   --> /host/cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.142/src/unix/linux_like/linux/musl/mod.rs:739:12
+    |
+739 |     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+    |            ^^^^^
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+    |
+59  |         if libc::ioctl(fd, (BLKGETSIZE64 as libc::c_ulong).try_into().unwrap(), &mut cap) == 0 {
+    |                            +                             +++++++++++++++++++++
+
+error[E0308]: mismatched types
+   --> src/thin/trim.rs:138:28
+    |
+138 |         if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
+    |            -----------     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
+    |            |
+    |            arguments to this function are incorrect
+    |
+note: function defined here
+   --> /host/cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.142/src/unix/linux_like/linux/musl/mod.rs:739:12
+    |
+739 |     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+    |            ^^^^^
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+    |
+138 |         if libc::ioctl(fd, (BLKDISCARD as libc::c_ulong).try_into().unwrap(), range) == 0 {
+    |                            +                           +++++++++++++++++++++
+
+For more information about this error, try `rustc --explain E0308`.
+```
+---
+ src/file_utils.rs | 8 +++++++-
+ src/thin/trim.rs  | 7 ++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/file_utils.rs b/src/file_utils.rs
+index 0ca3c0fc..81d4a8a7 100644
+--- a/src/file_utils.rs
++++ b/src/file_utils.rs
+@@ -55,8 +55,14 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+     let file = File::open(path.as_ref())?;
+     let fd = file.as_raw_fd();
+     let mut cap = 0u64;
++
++    #[cfg(target_env = "musl")]
++    type RequestType = libc::c_int;
++    #[cfg(not(target_env = "musl"))]
++    type RequestType = libc::c_ulong;
++
+     unsafe {
+-        if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
++        if libc::ioctl(fd, BLKGETSIZE64 as RequestType, &mut cap) == 0 {
+             Ok(cap)
+         } else {
+             Err(io::Error::last_os_error())
+diff --git a/src/thin/trim.rs b/src/thin/trim.rs
+index 3d938caf..0d1fb590 100644
+--- a/src/thin/trim.rs
++++ b/src/thin/trim.rs
+@@ -134,8 +134,13 @@ impl<'a> Iterator for RangeIterator<'a> {
+ 
+ const BLKDISCARD: u32 = 0x1277;
+ fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> {
++    #[cfg(target_env = "musl")]
++    type RequestType = libc::c_int;
++    #[cfg(not(target_env = "musl"))]
++    type RequestType = libc::c_ulong;
++
+     unsafe {
+-        if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
++        if libc::ioctl(fd, BLKDISCARD as RequestType, range) == 0 {
+             Ok(())
+         } else {
+             Err(std::io::Error::last_os_error())
diff --git a/srcpkgs/thin-provisioning-tools/template b/srcpkgs/thin-provisioning-tools/template
index d74be6fe5d72..71b00ac1e89e 100644
--- a/srcpkgs/thin-provisioning-tools/template
+++ b/srcpkgs/thin-provisioning-tools/template
@@ -1,21 +1,25 @@
 # Template file for 'thin-provisioning-tools'
 pkgname=thin-provisioning-tools
-version=0.9.0
+version=1.0.4
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf libtool pkg-config"
-makedepends="boost-devel expat-devel libaio-devel"
+build_style=cargo
+hostmakedepends="pkg-config"
+# Note: statically links to libzstd.
+makedepends="libzstd-devel"
 short_desc="Tools for manipulating the metadata of dm-thin device-mapper targets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jthornber/thin-provisioning-tools"
+changelog="https://raw.githubusercontent.com/jthornber/thin-provisioning-tools/main/CHANGES"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8
+checksum=a973786fb9cb49d30be6fb8178d6739bc23609d4114ab601f0983ecdbf349abf
+# Does a ton of disk IO.
+make_check=extended
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -e "s:target/release/pdata_tools:target/${RUST_TARGET}/release/pdata_tools:" -i Makefile
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin MANDIR=/usr/share/man install
+post_install() {
+	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install
 }

From b6c2ad067ab1899941cf9f872f9a3a38757a4e6a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 23 Mar 2023 19:35:21 +0000
Subject: [PATCH 0616/1853] iproute2: update to 6.2.0.

`check` is the make target to run tests, at least in iproute2 6.2.0, so
that's why I removed `do_check`.

Closes: #42955 [via git-merge-pr]
---
 .../0001-ipstats-Add-param.h-for-musl.patch   | 28 ----------------
 .../0002-ipstats-add-missing-headers.patch    | 32 -------------------
 srcpkgs/iproute2/template                     | 12 +++----
 3 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
 delete mode 100644 srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch

diff --git a/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch b/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
deleted file mode 100644
index 82363b263654..000000000000
--- a/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From beb3215602f9a3a8fa5404bd308e0f2820492b19 Mon Sep 17 00:00:00 2001
-From: Changhyeok Bae <changhyeok.bae@gmail.com>
-Date: Tue, 9 Aug 2022 04:01:05 +0000
-Subject: [PATCH 1/2] ipstats: Add param.h for musl
-
-Fix build error for musl
-| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: undefined reference to `MIN'
-
-Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
----
- ip/ipstats.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ip/ipstats.c b/ip/ipstats.c
-index 5cdd15ae..1ac275bd 100644
---- a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0+
- #include <assert.h>
- #include <errno.h>
-+#include <sys/param.h>
- 
- #include "list.h"
- #include "utils.h"
--- 
-2.37.3
-
diff --git a/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch b/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch
deleted file mode 100644
index d6825e4e77d2..000000000000
--- a/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7115ca05b23d66ce5a88e52a05b7813443f5059e Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Tue, 9 Aug 2022 13:27:33 -0700
-Subject: [PATCH 2/2] ipstats: add missing headers
-
-IWYU reports several headers are not explicitly
-included by ipstats.
-
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- ip/ipstats.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ip/ipstats.c b/ip/ipstats.c
-index 1ac275bd..dadded14 100644
---- a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,7 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0+
-+#include <alloca.h>
- #include <assert.h>
- #include <errno.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <sys/param.h>
-+#include <sys/socket.h>
- 
- #include "list.h"
- #include "utils.h"
--- 
-2.37.3
-
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 4e4beeed7be8..413c49151c02 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.19.0
+version=6.2.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -10,8 +10,10 @@ short_desc="IP Routing Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
-distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791
+distfiles="${KERNEL_SITE}/utils/net/iproute2/iproute2-${version}.tar.xz"
+checksum=4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62
+# Requires unshare, which is not provided by chroot-util-linux.
+make_check=no
 
 conf_files="
  /etc/iproute2/ematch_map
@@ -24,10 +26,6 @@ conf_files="
  /etc/iproute2/group
  /etc/iproute2/nl_protos"
 
-do_check() {
-	make -C testsuite
-}
-
 post_install() {
 	rm -r ${DESTDIR}/usr/share/man/man3
 }

From 434d6116dc0c00936f4ac18a0002daa6af1b3cd0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 24 Mar 2023 20:22:05 +0000
Subject: [PATCH 0617/1853] python3-msgpack: update to 1.0.5.

Closes: #42984 [via git-merge-pr]
---
 srcpkgs/python3-msgpack/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
index ab557acf721a..173ef79642ae 100644
--- a/srcpkgs/python3-msgpack/template
+++ b/srcpkgs/python3-msgpack/template
@@ -1,16 +1,16 @@
 # Template file for 'python3-msgpack'
 pkgname=python3-msgpack
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
-short_desc="Python module for Msgpack serializer (Python3)"
+short_desc="Python module for Msgpack serializer"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
-homepage="https://msgpack.org/"
+homepage="https://github.com/msgpack/msgpack-python"
 changelog="https://raw.githubusercontent.com/msgpack/msgpack-python/main/ChangeLog.rst"
 distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f
+checksum=c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c

From 5060ae5e1b263d1050fe20685333caeb704ba4b4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 11 Mar 2023 11:00:20 +0000
Subject: [PATCH 0618/1853] sudo: update to 1.9.13p3.

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

diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 9482385e0508..0cd929eb9eba 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.9.13p2
-revision=2
+version=1.9.13p3
+revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
  --enable-shell-sets-home --enable-noargs-shell --without-sendmail
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d
+checksum=92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 

From 5273fdb8a3b930f0633d3baf3866b4d237bad1f5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 15 Dec 2022 00:23:46 +0000
Subject: [PATCH 0619/1853] bash: update to 5.2.015.

Closes: #41098 [via git-merge-pr]
---
 srcpkgs/bash/template | 49 ++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index a1c2a25cd6e5..b7057db94dbe 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,13 +1,14 @@
 # Template file for 'bash'
 pkgname=bash
-version=5.1.016
-revision=2
+version=5.2.015
+revision=1
 _bash_distver=${version%.*}
 _bash_patchlevel=${version##*.}
 _patchprefix="bash${_bash_distver/./}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --without-installed-readline"
 make_build_args="TERMCAP_LIB=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
+make_check_target=tests
 hostmakedepends="bison"
 makedepends="ncurses-devel"
 checkdepends="perl"
@@ -15,7 +16,7 @@ short_desc="GNU Bourne Again Shell"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/bash/bash.html"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_bash_distver}.tar.gz"
+distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 $_bash_patchlevel); do
@@ -25,23 +26,22 @@ done
 unset _url
 unset _p
 
-checksum="cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
- ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa
- 15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe
- 22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1
- 9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86
- cccbb5e9e6763915d232d29c713007a62b06e65126e3dd2d1128a0dc5ef46da5
- 75e17d937de862615c6375def40a7574462210dce88cf741f660e2cc29473d14
- acfcb8c7e9f73457c0fb12324afb613785e0c9cef3315c9bbab4be702f40393a
- f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1
- e45cda953ab4b4b4bde6dc34d0d8ca40d1cc502046eb28070c9ebcd47e33c3ee
- a2c8d7b2704eeceff7b1503b7ad9500ea1cb6e9393faebdb3acd2afdd7aeae2a
- 58191f164934200746f48459a05bca34d1aec1180b08ca2deeee3bb29622027b
- 10f189c8367c4a15c7392e7bf70d0ff6953f78c9b312ed7622303a779273ab98
- c7acb66df435d284304c16ca83a5265f9edd9368612095b01a733d45c77ed5ad
- 6a4ee0c81b437b96279a792c1efcec4ba56f009195a318083db6b53b096f83d0
- 1b37692ef1f6cc3dcec246773443276066e6b1379868f8c14e01f4dfd4df80f0
- 8899144f76a5db1fb41a89ed881c9f19add95728dd71db324f772ef225c5384f"
+checksum="a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
+ f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a
+ 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8
+ 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff
+ 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512
+ ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357
+ d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c
+ 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490
+ 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8
+ f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd
+ c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd
+ 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4
+ 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c
+ 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
+ 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
+ ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a"
 
 make_dirs="/etc/bash/bashrc.d 755 root root"
 conflicts="chroot-bash>=0"
@@ -62,15 +62,6 @@ post_patch() {
 	done
 }
 
-do_check() {
-	# when xbps-src is run from interactive shell, this tests receives SIGTTIN,
-	# and suspends xbps-src
-	sed -i tests/read2.sub -e '/read -t 2 a < \/dev\/tty/,/echo $a/ d'
-	sed -i tests/read.right -e '/timeout 1: ok/,+1 d'
-	sed -i tests/read.right -e '/read2.sub: line 36: read:/s/ 36:/ 27:/'
-	make tests
-}
-
 post_install() {
 	rm -r ${DESTDIR}/usr/share/doc
 	ln -s bash ${DESTDIR}/usr/bin/rbash

From 19514833abdd00b20ac3f2f28b98a1e672197161 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 9 Feb 2023 20:56:25 +0000
Subject: [PATCH 0620/1853] libreadline8: update to 8.2.001.

Closes: #42170 [via git-merge-pr]
---
 .../patches/no-rpath-and-link.patch           | 42 +------------------
 srcpkgs/libreadline8/template                 | 15 ++++---
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
index 45548e5fb9b4..bec079ef31ae 100644
--- a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
+++ b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
@@ -4,49 +4,9 @@ Date: Thu, 5 Nov 2020 02:49:21 +0100
 Subject: [PATCH] drop rpath and link against the termcap library
 
 ---
- configure          | 8 ++++----
- configure.ac       | 8 ++++----
  support/shobj-conf | 2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 1 insertions(+), 1 deletions(-)
 
-diff --git configure configure
-index 7d7bce0..eff4e76 100755
---- a/configure
-+++ b/configure
-@@ -6823,10 +6823,10 @@ if test -f ${srcdir}/support/shobj-conf; then
- $as_echo_n "checking configuration for building shared libraries... " >&6; }
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 
- 
- 
-diff --git configure.ac configure.ac
-index db788a6..9ac3eef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,10 +227,10 @@ if test -f ${srcdir}/support/shobj-conf; then
-         AC_MSG_CHECKING(configuration for building shared libraries)
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 	
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)
 diff --git support/shobj-conf support/shobj-conf
 index 7920f1b..7ac9c9f 100644
 --- a/support/shobj-conf
diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template
index e0bca94a7a7e..8517bf9854b2 100644
--- a/srcpkgs/libreadline8/template
+++ b/srcpkgs/libreadline8/template
@@ -1,25 +1,30 @@
 # Template file for 'libreadline8'
 pkgname=libreadline8
-version=8.1.000
+version=8.2.001
 revision=1
 _dist_ver="${version%.*}"
 _patch_ver="${version##*.}"
 bootstrap=yes
 build_style=gnu-configure
-configure_args="--with-curses --enable-multibyte bash_cv_termcap_lib=libncursesw"
+configure_args="--with-curses --with-shared-termcap-library --enable-multibyte
+ bash_cv_termcap_lib=libncursesw"
 makedepends="ncurses-devel"
 short_desc="GNU Readline Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
-distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz"
-checksum=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
+changelog="https://tiswww.cwru.edu/php/chet/readline/NEWS"
+distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001"
+checksum="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
+ bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7"
+skip_extraction="readline${_dist_ver/./}-001"
 
 post_patch() {
 	cd ${wrksrc}
 	for p in $(seq -w 001 ${_patch_ver}); do
 		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
-		msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
+		msg_normal "Applying patch readline${_dist_ver/./}-$p.\n"
 	done
 }
 

From cfecf6717f6909e7c94821bf9ba6db6e9fb6cb5d Mon Sep 17 00:00:00 2001
From: chax <mcakaric@gmail.com>
Date: Sat, 29 Apr 2023 00:00:14 +0200
Subject: [PATCH 0621/1853] budgie-desktop: update to 10.7.2

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

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index bfde56e60dc7..48c4dd2b55c9 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,25 +1,25 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.7.1
+version=10.7.2
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dwith-gtk-doc=false"
+configure_args="-Dwith-gtk-doc=false -Duse-old-zenity=true"
 hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
- sassc budgie-screensaver"
+ sassc budgie-screensaver zenity"
 makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel
  accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel
  gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel
  gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala
  libupower-glib3 libuuid-devel"
 depends="gnome-session gnome-settings-daemon budgie-control-center elogind
- gnome-themes-extra budgie-screensaver budgie-desktop-view"
+ gnome-themes-extra budgie-screensaver budgie-desktop-view zenity"
 short_desc="Modern desktop environment from the Solus Project"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=f8b277fb674f4c9e9d1dac9e45a7f93a1364d2f25cb1b3b513ec8154cfd7d6bd
+checksum=cce9ebe21b4bba4886bb2a227d739b7340c35085f08c132d3d8ae6b6621ba7b4
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 90aef8cd81cfb0bc282c9736ecd66ddf3da89314 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Jun 2023 14:16:35 -0400
Subject: [PATCH 0622/1853] pcsclite: update to 2.0.0.

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

diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 195c54e8bf58..457ba7120a9d 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.9
+version=2.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libudev --disable-libsystemd"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=a945e7cf0ffa81b8c1dfa6e2d20299b44dbb010a52be3c7f88aacf3cd99df75e
+checksum=0c75a2266b9962c7eb3853492b245d471127fa22ef342adfe76300fcc89cbaab
 
 post_install() {
 	vsv pcscd

From 99355c0968e7937af1a5e6d37d0d33920f460bea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Jun 2023 14:22:29 -0400
Subject: [PATCH 0623/1853] pcsc-acsccid: update to 1.1.9.

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

diff --git a/srcpkgs/pcsc-acsccid/template b/srcpkgs/pcsc-acsccid/template
index fe03eed971c8..2bc8a9103698 100644
--- a/srcpkgs/pcsc-acsccid/template
+++ b/srcpkgs/pcsc-acsccid/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-acsccid'
 pkgname=pcsc-acsccid
-version=1.1.8
+version=1.1.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-udev"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://acsccid.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname/pcsc-/}/${pkgname/pcsc-/}-${version}.tar.bz2"
-checksum=f86fd846bc88594a569ea27040cb441d933b7eca8d51d2a90bacf161e7740051
+checksum=cd7e41817364d2ad2e049e55bd2d10b073e1eec99dbc5a08dfb787dd449f5a48
 
 post_install() {
 	vinstall src/92_pcscd_acsccid.rules 644 usr/lib/udev/rules.d/

From 83cead6fde53deedc23dc71d265143cb73825207 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 15:25:47 +0200
Subject: [PATCH 0624/1853] git-cliff: update to 1.2.0

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

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 9596ab6b7436..c957b30cb061 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,19 +1,21 @@
 # Template file for 'git-cliff'
 pkgname=git-cliff
-version=1.1.2
+version=1.2.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
 build_helper=qemu
 make_install_args="--path git-cliff"
 make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
 short_desc="Changelog generator based on conventional commits"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/orhun/git-cliff"
 changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=26f05e4cfea07768d06ae92cd4b34bae786ed354089d9b5b1659d6408bf583c6
+checksum=10db6fd8fe777f384de2e00336b1cb664095a2f068526f8ace4e7944a7ada270
 
 post_install() {
 	vdoc README.md

From b55e53e49b18569bd5a98154ce74d8410cd9fd9c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:46:17 +0300
Subject: [PATCH 0625/1853] opera: update to 99.0.4788.65.

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

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 5608978f6725..309afaa56fa5 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=98.0.4759.6
+version=99.0.4788.65
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=1deac0d4ba218a731870123608a96c712eb53901226b5f097962d51678d43016
+checksum=62bf232a8b648b59616a2a870a2afc0f4be77f74f8e898d2dfe1295058e1b2db
 repository="nonfree"
 nostrip=yes
 

From 37083e4974cbfb878ca9675a5fa38433f71b9433 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:54:13 +0300
Subject: [PATCH 0626/1853] skype: update to 8.98.0.402.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 908f4addd4e5..9928e91e7c9e 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.97.0.204
+version=8.98.0.402
 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=5b2fbb303db5cc10b90713a404cb6cedf227cc0b0e6f16599b513853127ba984
+checksum=a7ca6b4a81ce8a28f0d6106dbd928c9b7e6c6dff987b413d8f73e1757dc0de1c
 repository="nonfree"
 nostrip="yes"
 

From 0ab445b58eba13fcb4eea56bdeefc4eef35beaa0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 12:05:00 +0300
Subject: [PATCH 0627/1853] stremio-shell: update to 4.4.160.

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

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 2b0c0b23af69..c2a2e14dbfeb 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.159
-revision=3
+version=4.4.160
+revision=1
 _singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
 create_wrksrc=yes
@@ -21,11 +21,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://raw.githubusercontent.com/mpv-player/mpv/v0.32.0/libmpv/qthelper.hpp
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="aca0e5bf026e31399571f5cdc1485cbb2540e7ad7b981f10adb0e87ee47b9af5
+checksum="08c2f8e916fd60fd7bf756eb600e3a49848969880bf047c128e61a7ddb57654e
  ddab4bec60e4221580f8bb65ac200619bd2d1c9144a8ac7dccc0c78ea4667dc2
  86e1fcba6001829b7e23a856db84d01ebc76e63528f74064d7bc5705015a2684
- c31c98fe4cd8158523c45685ba2a949cffd3fc0f06dffef66797d07e3a2bbbee
- d01ba5d69cf0e94f3d44c8e4ed5b10eaab67e83398a7d86f86f378ade59cf8f9"
+ 3088ef4dfb26426cca5d54386a65066d07a20b5c7729742e30522cd96d2786e8
+ b253331df5aef953208691e5bece1e33c8e9705c981979d9392052356c1eb352"
 skip_extraction="server.js stremio.asar qthelper.hpp"
 
 post_extract() {

From 5b91216e2780954d96199d808ec1089c9a881a93 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:38:46 +0300
Subject: [PATCH 0628/1853] xfce4-screensaver: update to 4.18.2.

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

diff --git a/srcpkgs/xfce4-screensaver/template b/srcpkgs/xfce4-screensaver/template
index bb3fc877275b..af28a7f3fd7c 100644
--- a/srcpkgs/xfce4-screensaver/template
+++ b/srcpkgs/xfce4-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-screensaver'
 pkgname=xfce4-screensaver
-version=4.18.1
+version=4.18.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-elogind --with-libgl --with-shadow --with-mit-ext
@@ -15,4 +15,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.xfce.org/apps/xfce4-screensaver"
 changelog="https://gitlab.xfce.org/apps/xfce4-screensaver/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/xfce4-screensaver/${version%.*}/xfce4-screensaver-${version}.tar.bz2"
-checksum=b731e8abd68a18cc5d3b523351aa8f9f293c9f63290c1781c9155259deb04a5c
+checksum=e4fcd2c414d3a4215e9e86a55edd87e2545b15c961917f5d72cace35b76e2b98

From ca37f2963bd3bdf9277b0147699274896f2947c4 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 11 Jun 2023 01:30:54 +0300
Subject: [PATCH 0629/1853] io.elementary.files: update to 6.3.1

---
 srcpkgs/io.elementary.files/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index 5ebfcb8499f2..50aa71c44a75 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=6.2.1
+version=6.3.1
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=780ae93df5eff6d201c3b07d3f3d22226ba24cd56687b96a9d187600b96bd605
+checksum=a14e7aeca4a1e9e19e4ecec6fea3fded73da701e2cd0131075767e2a96336012
 
 CFLAGS="-fcommon"
 

From 980ea155faefba82e1080825da883de0316825f6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 10 Jun 2023 14:11:03 +0530
Subject: [PATCH 0630/1853] muon: update to 0.2.0.

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

diff --git a/srcpkgs/muon/template b/srcpkgs/muon/template
index 310187b9aac5..31ea11c5109b 100644
--- a/srcpkgs/muon/template
+++ b/srcpkgs/muon/template
@@ -1,23 +1,23 @@
 # Template file for 'muon'
 pkgname=muon
-version=0.1.0
+version=0.2.0
 revision=1
 build_style=meson
-build_helper=qemu
+build_helper="qemu"
 configure_args="
  -Dlibcurl=enabled
  -Dlibarchive=enabled
  -Dlibpkgconf=enabled
  -Dsamurai=disabled
  -Dbestline=enabled"
-hostmakedepends="pkg-config samurai cmake"
+hostmakedepends="pkg-config samurai cmake scdoc"
 makedepends="pkgconf-devel libcurl-devel libarchive-devel"
 depends="samurai"
-checkdepends="git"
 short_desc="Meson implementation in C"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-only, Apache-2.0"
 homepage="https://muon.build"
-changelog="https://git.sr.ht/~lattis/muon/refs/$version"
+changelog="https://muon.build/releases/v${version}/docs/release_notes.html"
 distfiles="https://git.sr.ht/~lattis/muon/archive/$version.tar.gz"
-checksum="9d3825c2d562f8f8ad96d1f02167e89c4e84973decf205d127efd9293d7da35b"
+checksum=d73db1be5388821179a25a15ba76fd59a8bf7c8709347a4ec2cb91755203f36c
+make_check_pre="env PATH=/usr/libexec/chroot-git:${PATH}"

From 59078e761670059edcb0ba510d5ef0f5c3a6a7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 10 Jun 2023 18:54:43 +0100
Subject: [PATCH 0631/1853] font-sil-harmattan: update to 4.000.

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

diff --git a/srcpkgs/font-sil-harmattan/template b/srcpkgs/font-sil-harmattan/template
index 79a4f8d22f43..902316a6adbf 100644
--- a/srcpkgs/font-sil-harmattan/template
+++ b/srcpkgs/font-sil-harmattan/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sil-harmattan'
 pkgname=font-sil-harmattan
-version=2.000
+version=4.000
 revision=1
 depends="font-util"
 short_desc="Arabic Warsh font designed to suit the needs of West African languages"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1"
 homepage="https://software.sil.org/harmattan/"
 distfiles="https://software.sil.org/downloads/r/harmattan/Harmattan-${version}.zip"
-checksum=0b2e1fad07b6101bfb140801a71bc53956105376fd8ac261dd76eab178280a5c
+checksum=f777b86bf874ce299895f78768d7a034e893b89bd1dfee7bd947075fd2656973
 font_dirs="/usr/share/fonts/SIL"
 
 do_install() {

From 0388095e445b2fe69a2e74ee31a980240732e2af Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Sun, 11 Jun 2023 10:15:54 -0700
Subject: [PATCH 0632/1853] zoom: update to 5.14.10.3738

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 61471d7dc3f4..7c2f5befa040 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.14.7.2928
+version=5.14.10.3738
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=86155c03b7620f31ed227ba2a83027f9a6e28deb653a020d0fbe9293ca8aa25a
+checksum=a0b2b0b1d7cab73ad884ab469d22f2a2ba895593eae78b91f2f3d5ec91710e8a
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 67d14d42d3c86c4ad507e97830355b022ac4b59e Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:27:10 +0200
Subject: [PATCH 0633/1853] zrepl: update to 0.6.0.

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

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index 11716ebcee40..bdc82dcf8a60 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
-version=0.5.0
-revision=2
+version=0.6.0
+revision=1
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"
@@ -10,8 +10,8 @@ short_desc="One-stop ZFS backup & replication solution"
 maintainer="Frans Bergman <frans@tankernn.eu>"
 license="MIT"
 homepage="https://github.com/zrepl/zrepl"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4acfde9e7a09eca2de3de5c7d2987907ae446b345b69133e4b3c58a99c294465
+distfiles="https://github.com/zrepl/zrepl/archive/v${version}.tar.gz"
+checksum=0bf1dcf634a43af81cd9a0d7b9ae65f63a5938c35d3e6cd804177c8db52929f4
 
 conf_files="/etc/zrepl/*"
 

From 27c559f75a43c7230932f28237f1280b58415f6f Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Tue, 30 May 2023 15:13:40 +0200
Subject: [PATCH 0634/1853] tpacpi-bat: update to 3.2.

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

diff --git a/srcpkgs/tpacpi-bat/template b/srcpkgs/tpacpi-bat/template
index 59b39817b201..f2d118fcefdb 100644
--- a/srcpkgs/tpacpi-bat/template
+++ b/srcpkgs/tpacpi-bat/template
@@ -1,15 +1,15 @@
 # Template file for 'tpacpi-bat'
 pkgname=tpacpi-bat
-version=3.1
-revision=2
+version=3.2
+revision=1
 archs="i686 x86_64*"
 depends="acpi_call-dkms perl"
 short_desc="ThinkPad ACPI Battery Util using acpi_call"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/teleshoes/$pkgname"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=017084cc82061ebf2837373adb516f1fd1beb78694bbef257a1d112d6081d9d6
+homepage="https://github.com/teleshoes/tpacpi-bat"
+distfiles="https://github.com/teleshoes/tpacpi-bat/archive/v$version.tar.gz"
+checksum=ac3c2dad1db2175e8e650b81941a87a591cf50e9cdb4a64afaa70f25aa069250
 
 do_install() {
 	vbin $pkgname

From bfdd896d5bf1acf816635ca00e731c5e0a239b80 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 11 Jun 2023 00:16:57 +0300
Subject: [PATCH 0635/1853] gnome-mahjongg: update to 3.40.0

---
 .../gnome-mahjongg/patches/meson-0.61.patch   | 37 -------------------
 srcpkgs/gnome-mahjongg/template               | 11 +++---
 2 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
deleted file mode 100644
index 2a17ad713752..000000000000
--- a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:22:48 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:24:0: ERROR: Function does not take positional arguments.
-data/meson.build:45:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 8740503..edb8583 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
- install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
- 
- desktop_file = i18n.merge_file (
--  'desktop-file',
-   input:       'org.gnome.Mahjongg.desktop.in',
-   output:      'org.gnome.Mahjongg.desktop',
-   install:     true,
-@@ -41,7 +40,7 @@ if desktop_file_validate.found()
-   )
- endif
- 
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-                  input: 'org.gnome.Mahjongg.appdata.xml.in',
-                  output: 'org.gnome.Mahjongg.appdata.xml',
-                  install: true,
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 9cf1ef18d634..8f4d5992c527 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-mahjongg'
 pkgname=gnome-mahjongg
-version=3.38.3
+version=3.40.0
 revision=1
 build_style=meson
-configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
-hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="librsvg-devel gtk+3-devel libglib-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config vala
+ gtk-update-icon-cache"
+makedepends="librsvg-devel libadwaita-devel"
 short_desc="GNOME Mahjongg solitaire game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190
+checksum=5a8ac86d763c5660dd9025f7bc08310b922346fa7e2df7b648c9894dae3f183f

From 15c9bf1edc8712a391bb766879c96496f241ea5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 30 May 2023 18:00:45 +0200
Subject: [PATCH 0636/1853] quickjs: Fix stack overflow in CVE-2023-31922

---
 .../patch-gh-issue-178-cve-2023-31922.patch   | 42 +++++++++++++++++++
 srcpkgs/quickjs/template                      |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch

diff --git a/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch b/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch
new file mode 100644
index 000000000000..754924c60639
--- /dev/null
+++ b/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch
@@ -0,0 +1,42 @@
+From 056459314305f666aee132565df710c42f41ec04 Mon Sep 17 00:00:00 2001
+From: Nick Vatamaniuc <vatamane@gmail.com>
+Date: Sun, 28 May 2023 01:50:46 -0400
+Subject: [PATCH] Fix stack overflow in CVE-2023-31922
+
+isArray and proxy isArray can call each other indefinitely in a mutually
+recursive loop.
+
+Add a stack overflow check in the js_proxy_isArray function before calling
+JS_isArray(ctx, s->target).
+
+With ASAN the the poc.js from issue 178:
+
+```
+./qjs ./poc.js
+InternalError: stack overflow
+  at isArray (native)
+  at <eval> (./poc.js:4)
+```
+
+Fix: https://github.com/bellard/quickjs/issues/178
+---
+ quickjs.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/quickjs.c b/quickjs.c
+index 79160139..a3b0b55f 100644
+--- a/quickjs.c
++++ b/quickjs.c
+@@ -45243,6 +45243,12 @@ static int js_proxy_isArray(JSContext *ctx, JSValueConst obj)
+     JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
+     if (!s)
+         return FALSE;
++
++    if (js_check_stack_overflow(ctx->rt, 0)) {
++        JS_ThrowStackOverflow(ctx);
++        return -1;
++    }
++
+     if (s->is_revoked) {
+         JS_ThrowTypeErrorRevokedProxy(ctx);
+         return -1;
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 7cfe6f3e7f43..562ca371bc5d 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickjs'
 pkgname=quickjs
 version=2021.03.27
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=true
 make_build_args="CONFIG_LTO="

From 6a13508744b79214e786fbf4cf925ad53ea80bf1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 12 Jun 2023 00:56:01 +0200
Subject: [PATCH 0637/1853] terragrunt: update to 0.46.3.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fc654aa02f70..8be2655d6368 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.46.2
+version=0.46.3
 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=0d8bb4e98276e68c76d770e662bb434fb5c89f8fc06c3c00e14e717417123ec5
+checksum=7ccb057317d5c7073a3c510ab9670cdb429dde87e5c6b18597a3118a6b0107dc
 
 post_install() {
 	vlicense LICENSE.txt

From 6b55bd5924dd9200eff70313c2ada85acec551a9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 10 Jun 2023 12:09:22 +0530
Subject: [PATCH 0638/1853] d2: update to 0.5.1.

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

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index a9417fefa503..57f3d732b43a 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,6 +1,6 @@
 # Template file for 'd2'
 pkgname=d2
-version=0.4.2
+version=0.5.1
 revision=1
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
@@ -11,4 +11,4 @@ license="MPL-2.0"
 homepage="https://d2lang.com/"
 changelog="https://d2lang.com/releases/intro/"
 distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
-checksum=5a7fb24f2116ff63f7350c60933134a80d93f0e4f298f7d2b654e2e3ee58378a
+checksum=245e3864fcdf2f82eafd7878a38f57e43065324fd7709332e2b8544af8f1f131

From 5f58142a995acf880337bcf4fee878f200b83b0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 12 Jun 2023 12:20:29 +0200
Subject: [PATCH 0639/1853] youtube-viewer: update to 3.10.8.

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

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 26710b9f4e82..353c253df8a5 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.10.7
+version=3.10.8
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=aa929b3157486587c70c6757d7995c8d6a0a89bc41a6c0fdb587aa3447c37c94
+checksum=010e2af3337842b039f9e582330a5ac0ffa1bf94b53bed016e4a07049f3a6b94
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 7c70139ac1cb19b44772cbf6cd058811e0a991a8 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 12 Jun 2023 08:26:59 +0200
Subject: [PATCH 0640/1853] acme.sh: update to 3.0.6

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

diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template
index 20a13462210c..92c12cb60636 100644
--- a/srcpkgs/acme.sh/template
+++ b/srcpkgs/acme.sh/template
@@ -1,13 +1,13 @@
 # Template file for 'acme.sh'
 pkgname=acme.sh
-version=3.0.5
+version=3.0.6
 revision=1
 short_desc="Pure Unix shell script implementing ACME client protocol"
 maintainer="Emil Miler <em@0x45.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/acmesh-official/acme.sh"
 distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz"
-checksum=a19132ed65491409a8d8a93c264dcbcf265a91d45a46de674811b93f5995398f
+checksum=4a8e44c27e2a8f01a978e8d15add8e9908b83f9b1555670e49a9b769421f5fa6
 
 do_install() {
 	vmkdir usr/share/acme.sh/deploy

From 93e3bce1a2adb6b6301ca0ca333760f09172d6b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 12 Jun 2023 14:36:27 +0200
Subject: [PATCH 0641/1853] scrot: update to 1.10.

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

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 4e5b5b44492e..7c3edc74ee6e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,6 +1,6 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.9
+version=1.10
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=c4bf3fc88331a1fb0c78dba541a873b43fdeb6f7cde673162950a1290d0bf688
+checksum=5f18f5234964513409141eb08b268c83e9e5d340062de37c3a04772be4bf4058
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"

From 6a9ecd60f4c2dcb64b8e6e643640096794fdaa7f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 12 Jun 2023 14:39:14 +0200
Subject: [PATCH 0642/1853] nsd: update to 4.7.0.

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

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 96d681ab0191..fae1cf58b12e 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.6.1
+version=4.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3f60a3a13ec3f68e84bfa7e19daff663c82bcf1de96e4f53f2246525e773a27a
+checksum=8faca44e299ad2915fa000887ab1632631ea68709c62ce35f110bfe721ecf214
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From c639023d0d486d49d9dfba78452091cc466c3c45 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Jun 2023 15:22:27 -0400
Subject: [PATCH 0643/1853] curl: disable ssh option to break build cycle

Now that libssh2 builds with cmake, enabling SSH support in curl
introduces a build cycle:

    binutils -> elfutils -> curl -> libssh2 -> cmake -> curl

Because SSH support in curl seems superfluous anyway, just disable it.
---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 1ce72a58c188..b43961934747 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=8.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  --enable-websockets --with-random=/dev/urandom
@@ -27,7 +27,7 @@ changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/curl-${version}.tar.bz2"
 checksum=9b6b1e96b748d04b968786b6bdf407aa5c75ab53a3d37c1c8c81cdb736555ccf
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
-build_options_default="ssh ssl zstd"
+build_options_default="ssl zstd"
 vopt_conflict ssl gnutls
 
 if [ "$CROSS_BUILD" ]; then

From 30cb872e0366ac26aa2a0752e376f389cee05dc2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 11 Jun 2023 18:34:26 +0200
Subject: [PATCH 0644/1853] pnpm: update to 8.6.1

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

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 5e3f10c0aa8b..f3e52bc62974 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=8.6.0
+version=8.6.1
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=1e9c17c34c2eebaba02e78b619e296db08d302c296e58c2f51b0cd4e3e5bcda2
+checksum=5380612e01e0a3029991d3f329f07429313f4825de47b885b4bb3d1aec9e44e1
 python_version=3
 
 do_install() {

From 112e814c76c2444e8700929ef019d582b24b3bd2 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 10 Jun 2023 11:49:08 +0530
Subject: [PATCH 0645/1853] python3-platformdirs: update to 3.5.3.

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

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index 033324479559..dc60d45ecfa4 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.5.1
+version=3.5.3
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f
+checksum=e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From bfe1f8c3fe985120062fdf2532df06d83983ca2c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 5 Jun 2023 19:28:15 +0530
Subject: [PATCH 0646/1853] usql: update to 0.14.8.

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

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index c2b9ba4a303e..10451ea33b52 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
 # Template file for 'usql'
 pkgname=usql
-version=0.14.6
+version=0.14.8
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="MIT"
 homepage="https://github.com/xo/usql"
 distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=b6ec5aa900f10ff34a2120b8a8de473c3ac192d887215fc58722093fd27054e8
+checksum=56e4a0c384a32abe61b7aa37fa5d72e830ed459757c06da9cc000333892f1094
 
 post_install() {
 	vlicense LICENSE

From 96c0c215cc16f376b9258ce256e03893de14eb40 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Thu, 1 Jun 2023 01:51:40 -0300
Subject: [PATCH 0647/1853] python3-lsp-server: update to 1.7.3.

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

diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
index d3624735f4db..e1f6d28beaed 100644
--- a/srcpkgs/python3-lsp-server/template
+++ b/srcpkgs/python3-lsp-server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-lsp-server'
 pkgname=python3-lsp-server
-version=1.7.2
-revision=2
+version=1.7.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
 depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://github.com/python-lsp/python-lsp-server"
 changelog="https://raw.githubusercontent.com/python-lsp/python-lsp-server/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/python-lsp-server/python-lsp-server-${version}.tar.gz"
-checksum=b2433467d0fcb8fd45828463ff1cc805837c08731fcea5d7d953d9be776881e1
+checksum=a31b0525be6ec831c7d2b476b744e5aa5074633e1d1b77ee97f332cde15983ea
 
 do_check() {
 	python3 -m pytest \

From 30690087ebf3cb8421cc3b4b6254c79f22ca9cdb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 13:54:44 +0200
Subject: [PATCH 0648/1853] trace-cmd: update to 3.2.

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

diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template
index 22bae936a8e2..9ebbb861b63e 100644
--- a/srcpkgs/trace-cmd/template
+++ b/srcpkgs/trace-cmd/template
@@ -1,6 +1,6 @@
 # Template file for 'trace-cmd'
 pkgname=trace-cmd
-version=3.1.6
+version=3.2
 revision=1
 build_style=gnu-makefile
 make_build_args="libdir_relative=lib${XBPS_TARGET_WORDSIZE}"
@@ -10,13 +10,13 @@ make_install_target="install install_libs install_doc"
 make_use_env=yes
 hostmakedepends="asciidoc xmlto source-highlight pkg-config"
 makedepends="libzstd-devel libtracefs-devel libtraceevent-devel"
-checkdepends="CUnit-devel"
 short_desc="Tools to use ftrace Linux kernel internal tracer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, LGPL-2.1-only"
 homepage="https://trace-cmd.org"
 distfiles="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"
-checksum=f9198ea306deee9cda3b262342b03b6029e82c1b9c671ba521739a9703e115b9
+checksum=62af2c6062eeb434925921bb5936774b0a0e17a5f86671fa2ea2f40704a080cd
+make_check=no # needs privileges
 
 post_install() {
 	rm ${DESTDIR}/etc/bash_completion.d/*

From 7b583fb2d2f94d55ebd1acc27a716d8f0772da17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 13:55:33 +0200
Subject: [PATCH 0649/1853] b3sum: update to 1.4.0.

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

diff --git a/srcpkgs/b3sum/template b/srcpkgs/b3sum/template
index 80b08f8fddcf..8d5ef73962e2 100644
--- a/srcpkgs/b3sum/template
+++ b/srcpkgs/b3sum/template
@@ -1,6 +1,6 @@
 # Template file for 'b3sum'
 pkgname=b3sum
-version=1.3.3
+version=1.4.0
 revision=1
 build_wrksrc="b3sum"
 build_style=cargo
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CC0-1.0"
 homepage="https://github.com/BLAKE3-team/BLAKE3/"
 distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
-checksum=27d2bc4ee5945ba75434859521042c949463ee7514ff17aaef328e23ef83fec0
+checksum=012db50d676c177842650ff55235990b8dc73d18e4e4730824773df22257fb51

From ba8e5b0cbc4a7e095c92da27d766bf174c60a004 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 13:56:34 +0200
Subject: [PATCH 0650/1853] byacc: update to 20230521.

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

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 926937cb4d33..de2d3a3f2047 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20230219
+version=20230521
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://invisible-island.net/byacc/"
 distfiles="https://invisible-island.net/archives/byacc/byacc-${version}.tgz"
-checksum=36b972a6d4ae97584dd186925fbbc397d26cb20632a76c2f52ac7653cd081b58
+checksum=5ad915a7d5833aa38a5e31bd077505666029c35e365dff8569fe4598eaa9fef2
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From b849ae1c0e6dcb0192466ef5805acd5ad4e345f2 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sat, 10 Jun 2023 11:15:41 +0200
Subject: [PATCH 0651/1853] antimicrox: update to 3.3.4

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

diff --git a/srcpkgs/antimicrox/template b/srcpkgs/antimicrox/template
index 11e54c4cc47f..c2207a398fcb 100644
--- a/srcpkgs/antimicrox/template
+++ b/srcpkgs/antimicrox/template
@@ -1,6 +1,6 @@
 # Template file for 'antimicrox'
 pkgname=antimicrox
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules itstool gettext qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/AntiMicroX/antimicrox"
 changelog="https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/CHANGELOG.md"
 distfiles="https://github.com/AntiMicroX/antimicrox/archive/${version}.tar.gz"
-checksum=80c446b1149b742b51e3b6d355866294bd6171f48534b3cf23848011736edc2b
+checksum=c5e8d7c827f64b0a162133f9cac2ddc8dc0c9243541fae1a8ced5424b4fb7b3c
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From b0a175943bae787fcf7350053b46832513831e70 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Sat, 10 Jun 2023 09:59:56 +0200
Subject: [PATCH 0652/1853] got: update to 0.89

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

diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 6cae12702ada..873094582d8a 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
 # Template file for 'got'
 pkgname=got
-version=0.88
+version=0.89
 revision=1
 build_style=gnu-configure
 hostmakedepends="byacc pkg-config"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://gameoftrees.org"
 changelog="https://gameoftrees.org/releases/CHANGES"
 distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="17c10730a010abf7d5fe2ebe55fe3686656385ba6dbae88ef337c4f647f3cea0"
+checksum="27404932c07713400124c15e318417385411b7a1fe7ee534e48f2b9e4f096d8c"
 
 post_install() {
 	sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE

From b97fafa9883e12170ff7e378b3f758bf3c0076a4 Mon Sep 17 00:00:00 2001
From: voidbert <humbertogilgomes@protonmail.com>
Date: Fri, 9 Jun 2023 15:23:16 +0100
Subject: [PATCH 0653/1853] doxygen: update to 1.9.7.

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

diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 981eb49049a9..f627aa84027b 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,7 +1,7 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.5
-revision=2
+version=1.9.7
+revision=1
 build_style=cmake
 hostmakedepends="perl python3 flex"
 checkdepends="libxml2 texlive-BibTeX"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=55b454b35d998229a96f3d5485d57a0a517ce2b78d025efb79d57b5a2e4b2eec
+checksum=87007641c38e2c392c8596f36711eb97633b984c8430f389e7bcf6323a098d94
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From e3f63e5b2e631184f06225640eb968f07d5dfa06 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 9 Jun 2023 12:15:23 +0300
Subject: [PATCH 0654/1853] python3-regex: update to 2023.6.3.

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

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 9bb4c0912487..bf85b2b4db12 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2023.5.5
+version=2023.6.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://github.com/mrabarnett/mrab-regex"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=7d76a8a1fc9da08296462a18f16620ba73bcbf5909e42383b253ef34d9d5141e
+checksum=72d1a25bf36d2050ceb35b517afe13864865268dfb45910e2e17a84be6cbfeb0
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 3314e14cc02d1e640554f706c7ac26077ed7bcb3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 9 Jun 2023 12:07:37 +0300
Subject: [PATCH 0655/1853] nghttp2: update to 1.54.0.

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

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 13dc332d9ca6..592193c90792 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,6 +1,6 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
-version=1.53.0
+version=1.54.0
 revision=1
 build_style=gnu-configure
 # build system errors out if python isn't available
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://nghttp2.org"
 distfiles="https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=b867184254e5a29b0ba68413aa14f8b0ce1142a371761374598dec092dabb809
+checksum=20533c9354fbb6aa689b6aa0ddb77f91da1d242587444502832e1864308152df
 python_version=3
 
 post_install() {

From 212b257a57a6e335758b45954cf96606beacf8ec Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Fri, 9 Jun 2023 03:29:14 -0300
Subject: [PATCH 0656/1853] oil: update to 0.16.0

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

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 72f6708e5157..e39a0124d456 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.15.0
+version=0.16.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="https://www.oilshell.org/download/oil-${version}.tar.xz"
-checksum=d6860ffec461606da825863cd163b1a925f0ab250c6e32197739c11dc9c63318
+checksum=7111c8a8571d1a6d1d620131bc67f377dd8fe6224edbeff249e1d5d68f1dd566
 register_shell="/usr/bin/osh /usr/bin/oil"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 80d9e13b7ab98f016ba51d4c0c70d33817f345a6 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Tue, 13 Jun 2023 08:02:56 -0400
Subject: [PATCH 0657/1853] font-iosevka: update to 24.1.3.

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index c464f5a8d207..aeadf16c95b6 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=24.1.1
+version=24.1.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
 changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
 distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="f452e564737131c4425c6784024d9b9fb83d24a4775ca7fb1f03e21a466137f5
- e33e7785e34892506e60def6d6e2b38b2bb87edd9fdeaedc53913e6d0fb66ea0"
+checksum="25ec1fff2d7ed2707be5a5ae40cd4c0d929cd78c80f8ff9445326951ce746987
+ a03ab099709b7a988065ef94ff25edc98ed1491b29fd3246233963e7f343d357"
 
 font_dirs="/usr/share/fonts/TTF"
 

From a10abbbfe29824de1c2c671df26c3b9f6fac4b34 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 02:15:37 +0300
Subject: [PATCH 0658/1853] python3-setproctitle: update to 1.3.1

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

diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
index 42bd3cf78d18..fd707cfb9908 100644
--- a/srcpkgs/python3-setproctitle/template
+++ b/srcpkgs/python3-setproctitle/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-setproctitle'
 pkgname=python3-setproctitle
-version=1.2.1
-revision=3
+version=1.3.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest procps-ng"
 short_desc="Python3 library to allow customization of the process title"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/dvarrazzo/py-setproctitle"
 distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=5f0eecb27815e31799a69eb6a06b4d375d38887d079d410565b0be82da65c950
+checksum=3d134c2effeb945e8227f7d3d24ea8ad49c03c87ac91a8d67bf967730fa9daba
 
 post_install() {
 	vlicense COPYRIGHT LICENSE

From 0250a0e508ec59ee94f6129c186977642ff64986 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Tue, 13 Jun 2023 01:06:49 +0200
Subject: [PATCH 0659/1853] docker-compose: update to 2.18.1

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

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 5d33c60c9209..7271843da8cf 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=2.17.2
+version=2.18.1
 revision=1
 build_style=go
 go_import_path="github.com/docker/compose/v2/cmd"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 changelog="https://github.com/docker/compose/releases"
 distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=d6e6de858ecdb0104991c86c66dde5dd4fb6a1160d707308d8ad3167450c8094
+checksum=192c47c177d9bfd8492ed0c49214af0c740586da6db0b7e9c9a07da37c9dc722
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins

From f0506bceaa047f9ca3548edbb51c8b6f073baf23 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Jun 2023 13:34:54 +0530
Subject: [PATCH 0660/1853] pscircle: update to 1.4.0.

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

diff --git a/srcpkgs/pscircle/template b/srcpkgs/pscircle/template
index 792245d8f2b6..6ca3a0d0990f 100644
--- a/srcpkgs/pscircle/template
+++ b/srcpkgs/pscircle/template
@@ -1,6 +1,6 @@
 # Template file for 'pscircle'
 pkgname=pscircle
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,5 +9,6 @@ short_desc="Radial tree process visualisation"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/mildlyparallel/pscircle"
+changelog="https://gitlab.com/mildlyparallel/pscircle/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/mildlyparallel/pscircle/-/archive/v${version}/pscircle-v${version}.tar.gz"
-checksum=29e278e34816be06b3355394b15a8db6b5818ddb305181be7dd408f4cdc43f43
+checksum=99a4fa1d7e4ca28b067c5c2bb977352b4e6fcb9eb22349c9d33456971f282d7f

From b5c4d15484cec7819ae0110f9bec920f0a08b968 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Jun 2023 14:01:06 +0530
Subject: [PATCH 0661/1853] python3-requests-toolbelt: update to 1.0.0.

Adopt.
---
 srcpkgs/python3-requests-toolbelt/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-requests-toolbelt/template b/srcpkgs/python3-requests-toolbelt/template
index 01b8272cca2e..c87ee8e31c16 100644
--- a/srcpkgs/python3-requests-toolbelt/template
+++ b/srcpkgs/python3-requests-toolbelt/template
@@ -1,13 +1,16 @@
 # Template file for 'python3-requests-toolbelt'
 pkgname=python3-requests-toolbelt
-version=0.9.1
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=1.0.0
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_x509_adapter.py"
+hostmakedepends="python3-wheel python3-setuptools"
 depends="python3-requests"
+checkdepends="python3-pytest python3-openssl python3-betamax python3-trustme"
 short_desc="Utilities for advanced use of python-requests (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="Apache-2.0"
 homepage="https://toolbelt.readthedocs.io"
+changelog="https://raw.githubusercontent.com/requests/toolbelt/master/HISTORY.rst"
 distfiles="${PYPI_SITE}/r/requests-toolbelt/requests-toolbelt-${version}.tar.gz"
-checksum=968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0
+checksum=7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6

From dfddbcbd768b7a6ed68b859ddf7dd032ec7e3d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 12 Jun 2023 17:02:26 +0200
Subject: [PATCH 0662/1853] tectonic: update to 0.14.0.

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

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 59f2209266a9..e07f8841815b 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.13.1
+version=0.14.0
 revision=1
 build_style=cargo
 configure_args="--features=external-harfbuzz"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=bc16c2d7c85b646f5d168371a6cf1f2c219d8fcdcc919addcc9d74ce0cfbd442
+checksum=2191e3599b7e34f01d24a8d0ed873d8a8696e5ed4af05e9ce30685a053e9b57a
 
 post_install() {
 	vlicense LICENSE

From 27637a151a184b079b6709cfc7ab16880e86f18e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 12 Jun 2023 11:07:17 -0400
Subject: [PATCH 0663/1853] jdupes: update to 1.24.0

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

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index df162703bb76..3124ed79ffea 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.23.0
+version=1.24.0
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=5fdf7646518a26fefc322d7c9a5953c61db72d96626120ffa7f18197b59153d1
+checksum=76ee1ffcf958958c3e093bbe9674c9410d4b1d730081b50f6d1e2dc342b230dd
 
 post_install() {
 	vlicense LICENSE

From 5e576d02bc20872776d22c157a82a6307e5d1e52 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 15:20:10 +0100
Subject: [PATCH 0664/1853] diff-pdf: update to 0.5.1.

---
 srcpkgs/diff-pdf/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index d58932a4a0df..1b1c1b690814 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,18 +1,15 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
-version=0.5
-revision=2
+version=0.5.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
-hostmakedepends="automake pkg-config"
-makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
+hostmakedepends="pkg-config"
+makedepends="wxWidgets-gtk3-devel cairo-devel poppler-glib-devel"
 short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
-homepage="http://vslavik.github.io/diff-pdf/"
-distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
-checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475
-
-pre_configure() {
-	./bootstrap
-}
+homepage="https://vslavik.github.io/diff-pdf/"
+changelog="https://github.com/vslavik/diff-pdf/releases"
+distfiles="https://github.com/vslavik/diff-pdf/releases/download/v${version}/diff-pdf-${version}.tar.gz"
+checksum=017d52cb7ddabdbf63c6a47f39b2e5a1790022b95295b0d047817904e093245c

From 52e046c3251a36be7fce98f158890825d65f87fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 12 Jun 2023 16:24:50 +0200
Subject: [PATCH 0665/1853] epy: update to 2023.6.11.

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

diff --git a/srcpkgs/epy/template b/srcpkgs/epy/template
index ba5c54cef647..de7963bce66f 100644
--- a/srcpkgs/epy/template
+++ b/srcpkgs/epy/template
@@ -1,9 +1,9 @@
 # Template file for 'epy'
 pkgname=epy
-version=2023.2.8
+version=2023.6.11
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="CLI ebook reader"
@@ -11,4 +11,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/wustho/epy"
 distfiles="https://github.com/wustho/epy/archive/refs/tags/v${version}.tar.gz"
-checksum=22404cb30a4886d1fa7f75c6792b81a280ccb1d458ac56e0ec08adc864e507ff
+checksum=9f29b7fdc6312bc89adafd86acce93959b5d9eb62ea0a942c8d345c18ee5c87f

From f832143bb91b1d542e93dff0d91ebeb955f212e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 12 Jun 2023 15:12:00 +0100
Subject: [PATCH 0666/1853] xorg-server-xwayland: update to 23.1.2.

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

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index d3268e282961..e4c44e034575 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=23.1.1
+version=23.1.2
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
@@ -16,7 +16,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=5a10b26c62495435449f9bd5aad3db8ad29fe8eccd7cf7324011cd981d82dbf0
+checksum=ea63218a4608cf88e98b1437de87f4757acf0d162eae8160559465385e01d391
 make_check=no # needs xtest repository
 
 post_install() {

From f4f0243a43f24a3cd12e671aef357fa52c4370d5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Jun 2023 10:10:36 -0400
Subject: [PATCH 0667/1853] memtest86+: update to 6.20, adopt.

- improve grub hook to support the efi bundle from upstream
- fix update check
---
 srcpkgs/memtest86+/files/20_memtest86+ | 62 +++++++++++++++++++-------
 srcpkgs/memtest86+/template            | 17 ++++---
 srcpkgs/memtest86+/update              |  3 +-
 3 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/memtest86+/files/20_memtest86+ b/srcpkgs/memtest86+/files/20_memtest86+
index aa9b84013548..38648b365f86 100644
--- a/srcpkgs/memtest86+/files/20_memtest86+
+++ b/srcpkgs/memtest86+/files/20_memtest86+
@@ -9,21 +9,49 @@ fi
 
 . /usr/share/grub/grub-mkconfig_lib
 
-if test -e /boot/memtest86+ ; then
-  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
-  echo "Found memtest86+ image: $MEMTESTPATH" >&2
-  cat << EOF
-menuentry "Memory test (memtest86+)" {
-EOF
-  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
-  cat << EOF
-	linux16 $MEMTESTPATH
-}
-menuentry "Memory test (memtest86+, serial console 115200)" {
-EOF
-  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
-  cat << EOF
-	linux16 $MEMTESTPATH console=ttyS0,115200n8
-}
-EOF
+if [ "${grub_platform}" != "efi" ]; then
+	MEMTESTSFX="bin"
+else
+	MEMTESTSFX="efi"
+fi
+
+if [ -e /boot/memtest.bin ]; then
+	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.bin" )
+	echo "Found memtest86+ image: $MEMTESTPATH" >&2
+	cat <<- EOF
+	if [ "\${grub_platform}" != "efi" ]; then
+	menuentry "Memory test (memtest86+)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH
+	}
+	menuentry "Memory test (memtest86+, serial console 115200)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH console=ttyS0,115200n8
+	}
+	fi
+	EOF
+fi
+if [ -e /boot/memtest.efi ]; then
+	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.efi" )
+	echo "Found memtest86+ image: $MEMTESTPATH" >&2
+	cat <<- EOF
+	if [ "\${grub_platform}" = "efi" ]; then
+	menuentry "Memory test (memtest86+)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH
+	}
+	menuentry "Memory test (memtest86+, serial console 115200)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH console=ttyS0,115200n8
+	}
+	fi
+	EOF
 fi
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index ecffaa62c401..1fc9559e9908 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,20 +1,19 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
-version=5.01
-revision=6
+version=6.20
+revision=1
 archs="i686* x86_64*"
 short_desc="Advanced Memory Diagnostic Tool - upstream binary"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz"
-checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8
-
-create_wrksrc=yes
+distfiles="https://www.memtest.org/download/v${version}/mt86plus_${version}.binaries.zip"
+checksum=ccabd43063b65e53be4fddb08de0cc6bedc94b4ab44706855e4145e17fa52c72
 nostrip=yes
 noverifyrdeps=yes
 
 do_install() {
-	vinstall memtest86+-5.01.bin 755 boot memtest86+
-	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
+	vinstall "memtest${XBPS_TARGET_WORDSIZE}.bin" 755 boot memtest.bin
+	vinstall "memtest${XBPS_TARGET_WORDSIZE}.efi" 755 boot memtest.efi
+	vinstall "${FILESDIR}/20_memtest86+" 755 etc/grub.d
 }
diff --git a/srcpkgs/memtest86+/update b/srcpkgs/memtest86+/update
index 7730266b3518..9aa0b361aefd 100644
--- a/srcpkgs/memtest86+/update
+++ b/srcpkgs/memtest86+/update
@@ -1 +1,2 @@
-ignore="*[!0-9]"
+site="https://github.com/memtest86plus/memtest86plus/tags"
+pattern='/archive/refs/tags/v\K[0-9.]+(?=\.tar\.gz)'

From 33b339cc606b724c8a02c6fbba4f35060fa39c5e Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 11 Jun 2023 20:45:46 +0200
Subject: [PATCH 0668/1853] pyradio: update to 0.9.2.7.

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

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index cfd11b0339af..65c463fe6539 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.6
+version=0.9.2.7
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=92f46fde9b298392f8f236126b47e3f0214d152b3f07ef04e8f2ae9b1800bd97
+checksum=3694b423aa7b3302f90db9a620aa8155ee05501493d748544522f70f50a50d81
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 94b2b73f1fa7efa6a58aa02155e3528a3637eebf Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Mon, 12 Jun 2023 11:12:12 +0200
Subject: [PATCH 0669/1853] element-desktop: update to 1.11.33.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4c805a19f318..884a022da7f5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.11.32
+version=1.11.33
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -17,8 +17,8 @@ homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
 distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
-checksum="be4cc53354741690361aa5c933828a6f16a9826546650f03202005d449afc1d2
- 5aa9c183a8e23e0114d51339519be1a14081c76531a4828057fec1a7f171f2b2"
+checksum="ac657d25576c6151f4a96ce067363d27bbc0ed940b3c16d79eee5fafc5ce0024
+ 4015804125d448065c68e1f9e8673c1fea9f11a2e937159edbdc64113c564d45"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 2551d0285147eccbbb570c2fed5ae016e4e9f715 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 12 Jun 2023 01:36:53 +0300
Subject: [PATCH 0670/1853] timeshift: update to 23.06.2

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

diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 3e8fa0d212c4..05a171c266e9 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,26 +1,26 @@
 # Template file for 'timeshift'
 pkgname=timeshift
-version=22.11.2
+version=23.06.2
 revision=1
-build_style=gnu-makefile
-hostmakedepends="gettext pkg-config vala which"
-makedepends="libgee-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
-depends="rsync psmisc"
+build_style=meson
+hostmakedepends="gettext pkg-config vala help2man"
+makedepends="libgee-devel json-glib-devel vte3-devel libgirepository-devel
+ xapps-devel libxkbfile-devel"
+depends="rsync psmisc xhost"
 short_desc="System restore tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/linuxmint/timeshift"
 changelog="https://raw.githubusercontent.com/linuxmint/timeshift/master/debian/changelog"
 distfiles="https://github.com/linuxmint/timeshift/archive/${version}/timeshift-${version}.tar.gz"
-checksum=36fd19865d1d30dc5f6eca468ceaa3dad01cd95d9090d050d67f5c2cd98fe37d
+checksum=a88c947a70e850fcac11e34484bd9074ec48302998f9d734f579387b5b88eeaf
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends=${hostmakedepends%help2man}
+	configure_args="-Dman=false"
+fi
 
 # Remove hard-dep on crontab, leave up to user to decide
 post_extract() {
 	vsed -i src/Core/Main.vala -e '/dependencies/s:"crontab",::'
 }
-
-# timeshift.1.gz is not a gzip file.
-pre_install() {
-	mv man/timeshift.1.gz man/timeshift.1
-	gzip man/timeshift.1
-}

From 0f8139e2f4d0d8adfdb07cc5ee6a6984d5b44ec8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 11 Jun 2023 22:46:22 +0100
Subject: [PATCH 0671/1853] fluidsynth: update to 2.3.2.

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

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index eab2facc39a7..31594e422a73 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.3.0
+version=2.3.2
 revision=1
 build_style=cmake
 make_check_target=check
@@ -11,9 +11,10 @@ makedepends="SDL2-devel glib-devel jack-devel libsndfile-devel pipewire-devel pu
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.fluidsynth.org/"
+homepage="https://www.fluidsynth.org/"
+changelog="https://github.com/FluidSynth/fluidsynth/releases"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=1df5a1afb91acf3b945b7fdb89ac0d99877622161d9b5155533da59113eaaa20
+checksum=cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 08fed2c913f88b2109c12eaf33233de80446262a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:51:02 -0400
Subject: [PATCH 0672/1853] aravis: update to 0.8.27.

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

diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 2c7f25f2c958..09ecb091d08e 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -1,6 +1,6 @@
 # Template file for 'aravis'
 pkgname=aravis
-version=0.8.26
+version=0.8.27
 revision=1
 build_style=meson
 configure_args="-Ddocumentation=enabled"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/AravisProject/aravis"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fb6f0f0c1b47bb29d19ce8e5630be6e22534015fa56000891940c78e064b194
+checksum=68700b2f1b871707f92a89f0aa22941bc525ca3657620968b4b90a9d9b512b2b
 # Network test causes timeout in CI
 make_check=ci-skip
 

From 86e89536aafa99d49a8180ebef16654bd00160ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:52:07 -0400
Subject: [PATCH 0673/1853] maturin: update to 1.1.0.

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

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 210d359f7e56..a0b5a85dbf40 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=python3-pep517
 build_helper="qemu rust"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c4141615078313a5afbb581fefc4b3673c24466d37c939dc44a816a265067c74
+checksum=57b990348a9182897d64e7bc2b7be6e323912500c10a56174090fa8008173ad0
 # Tests use unstable features and fail to build
 make_check=no
 

From 1971d4f57684c96232829293e527c95b22a0e6f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:52:50 -0400
Subject: [PATCH 0674/1853] python3-imageio: update to 2.31.1.

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

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 859954e3973c..f8854d04daa1 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.31.0
+version=2.31.1
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2833a9e648a7d95d3dbbe74d3488283de59722463c67fa4d0481185f7de29ed6
+checksum=7aef6dc3d10e270404ab9f826612a4b851198beacea5416af615bf29d87e2a35
 
 post_install() {
 	vlicense LICENSE

From 7c112baf32d857ec75f56116ec3fe2dd767645bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:54:27 -0400
Subject: [PATCH 0675/1853] python3-hypothesis: update to 6.78.0.

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

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 67321c20e2d2..21f3e940e2d3 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.76.0
+version=6.78.0
 revision=1
 build_wrksrc=hypothesis-python
 build_style=python3-pep517
@@ -24,7 +24,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=4564bbd860413af105dcdee6d5a9f8a1d08274f940266dfd2b45492d61f8b847
+checksum=d0d9059f9f87da798802a6cc92e55b15bb3c16e4df824618e6d6f9d508cdbae6
 
 if [ "$XBPS_CHECK_PKGS" != full ]; then
 	# Skip "full" tests unless explicitly requested"

From 22de3e5d21bd72c4d703d85ebe1cd65426fc1c57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:57:44 -0400
Subject: [PATCH 0676/1853] python3-iso8601: update to 2.0.0.

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

diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template
index 52cdd1f1b6da..3a5281c7a98e 100644
--- a/srcpkgs/python3-iso8601/template
+++ b/srcpkgs/python3-iso8601/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-iso8601'
 pkgname=python3-iso8601
-version=1.1.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=2.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3"
 checkdepends="python3-pytest python3-hypothesis python3-pytz"
 short_desc="ISO8601 formatted dated parser for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/micktwomey/pyiso8601"
+changelog="https://raw.githubusercontent.com/micktwomey/pyiso8601/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f
+checksum=739960d37c74c77bd9bd546a76562ccb581fe3d4820ff5c3141eb49c839fda8f
 replaces="python3-iso-8601>=0"
 
 post_install() {

From 974fc41104a073e73824aa0674fcd9b25fae8321 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:58:26 -0400
Subject: [PATCH 0677/1853] python3-ultrajson: update to 5.8.0.

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

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index b01ead00f297..2fb7a15f6bcc 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=5.7.0
+version=5.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23
+checksum=78e318def4ade898a461b3d92a79f9441e7e0e4d2ad5419abed4336d702c7425
 
 export UJSON_BUILD_NO_STRIP=1
 

From 682a03891e647a44b63221870fc9aaa7c6716d10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:58:50 -0400
Subject: [PATCH 0678/1853] qtutilities: update to 6.12.2.

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

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 06cc1b888bd8..a92b9858837b 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.12.1
+version=6.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=83a68a39a2edbd1ba3ec2e50b9b4c84ed5a54c30fb3cb1bc3088e8d0290989c2
+checksum=1e8ad562fdf02e6a8d8fbbfda43ba7082a97d632fe330862b6cf661a3dd6b22a
 
 pre_check() {
 	ninja -C build tests

From f6456c388a43e1bbc45bd99a35bac7c8a2fc31f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:59:18 -0400
Subject: [PATCH 0679/1853] tageditor: update to 3.8.1.

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

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 26b4421b4396..d780c96fbd64 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.8.0
+version=3.8.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz"
-checksum=9ab25924be61b1ddd12510c2fa90a9fd9ebae1b634764e50415f47c1e0be28ab
+checksum=92965ed67676e46196d3178c99deb043d0af36c78f3756d72837de9fdfa10937
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 7cf0ba7c2528ccaaa25badecca4baf1858bd08f3 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 12 Jun 2023 15:01:12 +0200
Subject: [PATCH 0680/1853] kteatime: update homepage.

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

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 50e8336e6533..023218632f31 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -9,7 +9,7 @@ makedepends="kparts-devel knotifyconfig-devel"
 short_desc="Handy timer for steeping tea"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
-homepage="https://www.kde.org/applications/games/kteatime/"
+homepage="https://apps.kde.org/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
 checksum=3b6fd3d343ba79e5ecba05dc7f6d2d02ddc9f60a296737dea4242ff5d0042404

From fb41003602d5f34aace484d3f3275e594ba0d799 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 3 Jun 2023 20:16:37 +0200
Subject: [PATCH 0681/1853] hcloud: update to 1.34.1.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 8307a8578f4e..fcdc3c3963fc 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.33.1
+version=1.34.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,8 +11,9 @@ short_desc="Command-line interface for Hetzner Cloud"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
+changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=bbd337684b51ecd6848f6b7531f3a2793c43d0fbe2ece13f153ce1504a1e72f6
+checksum=00ec9466bedca9fbe3ab5151a79df4db6a8997b263bcc6bffb50f25ccc191c80
 
 post_install() {
 	vlicense LICENSE

From c129078427e019b9f0472c21bc98638eb78bd179 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:02:43 -0400
Subject: [PATCH 0682/1853] python3-nbxmpp: update to 4.3.0.

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

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index c0b5750436b7..3243c1b3c6a8 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=ba16ab684c678f15cb85f582a51be690e48330bbcb569aa32b7d104293392d28
+checksum=60124e8ad0f84ade76df44c54354c040c5d14bfdef262598988e7c9e31b4a6f7
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

From 7e1cbbc6dde7a26938852499adfd35cb3c8cf60f Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:08:54 -0400
Subject: [PATCH 0683/1853] New package: python3-omemo-dr-1.0.0

This is the python library required by Gajim since v1.8.0
---
 srcpkgs/python3-omemo-dr/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-omemo-dr/template

diff --git a/srcpkgs/python3-omemo-dr/template b/srcpkgs/python3-omemo-dr/template
new file mode 100644
index 000000000000..51ea07714c96
--- /dev/null
+++ b/srcpkgs/python3-omemo-dr/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-omemo-dr'
+pkgname=python3-omemo-dr
+version=1.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+makedepends="python3-devel"
+depends="python3-cryptography python3-protobuf"
+short_desc="Python library implementing OMEMO cryptography"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://dev.gajim.org/gajim/omemo-dr"
+distfiles="${PYPI_SITE}/o/omemo-dr/omemo-dr-${version}.tar.gz"
+checksum=b0fe5023e947a17b740fb7ed4aa246120d6f21d819b5812e94dfc9570520be61

From d8d9627e095a713337a7caa75f9e6da418cc74bf Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:12:31 -0400
Subject: [PATCH 0684/1853] gajim: update to 1.8.0.

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

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 918d84bec7e9..ea8982bcfbe3 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,6 +1,6 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="gettext python3-wheel"
@@ -8,6 +8,7 @@ depends="python3-gobject python3-setuptools python3-Pillow
  python3-cairo python3-dbus libsecret gsound libnm
  python3-nbxmpp python3-openssl python3-css-parser python3-keyring
  python3-precis-i18n python3-packaging python3-setuptools python3-distro
+ python3-qrcode python3-omemo-dr
  python3-netifaces python3-pyasn1 python3-jeepney libsoup3 farstream gst-plugins-base1
  gst-plugins-ugly1 gst-libav gtksourceview4"
 checkdepends="${depends} python3-packaging"
@@ -17,7 +18,7 @@ license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/-/raw/master/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=b9a26a353549189fe65e0bc130cf98cbc42bd7105e72ac2041cb4a7f9d7543c6
+checksum=1201fc9add1a9b697dcf872c1871faae92ea4f3162051cce3c1e0d0843fc4d43
 
 post_build() {
 	./pep517build/build_metadata.py -o dist/metadata

From bc5b3f86f4e4140fb8b157823f65c3bf210fa5a9 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:16:07 -0400
Subject: [PATCH 0685/1853] gajim-omemo: change to dummy package

The functionality of Gajim's OMEMO plugin has been merged into the
client since v1.8.0.
---
 srcpkgs/gajim-omemo          |  1 +
 srcpkgs/gajim-omemo/template | 19 -------------------
 srcpkgs/gajim-omemo/update   |  2 --
 srcpkgs/gajim/template       |  6 ++++++
 4 files changed, 7 insertions(+), 21 deletions(-)
 create mode 120000 srcpkgs/gajim-omemo
 delete mode 100644 srcpkgs/gajim-omemo/template
 delete mode 100644 srcpkgs/gajim-omemo/update

diff --git a/srcpkgs/gajim-omemo b/srcpkgs/gajim-omemo
new file mode 120000
index 000000000000..61722e706beb
--- /dev/null
+++ b/srcpkgs/gajim-omemo
@@ -0,0 +1 @@
+gajim
\ No newline at end of file
diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
deleted file mode 100644
index 917b9e7d676e..000000000000
--- a/srcpkgs/gajim-omemo/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gajim-omemo'
-pkgname=gajim-omemo
-version=2.9.0
-revision=1
-create_wrksrc="omemo"
-hostmakedepends="unzip"
-depends="python3 python3-setuptools python3-cryptography python3-axolotl
- python3-qrcode gajim"
-short_desc="Gajim plugin for OMEMO Encryption"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="GPL-3.0-or-later"
-homepage="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
-distfiles="https://ftp.gajim.org/plugins/master/omemo/omemo_${version}.zip"
-checksum=076396ac441b4e5bae62328575be85492a87229c7a214b23f7edd1ac5dcac97b
-
-do_install() {
-	install -d "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
-	cp -r * "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
-}
diff --git a/srcpkgs/gajim-omemo/update b/srcpkgs/gajim-omemo/update
deleted file mode 100644
index 693efdeaed67..000000000000
--- a/srcpkgs/gajim-omemo/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://dev.gajim.org/gajim/gajim-plugins/raw/gajim_1.3/omemo/manifest.ini
-pattern="version: \K[\d.]+"
diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index ea8982bcfbe3..16ba231c9064 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -32,3 +32,9 @@ post_install() {
 do_check() {
 	python -m unittest discover -s test
 }
+
+gajim-omemo_package() {
+	depends="gajim"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 92ef91229170eb7a9bb29360efb27a39eeff3c2d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 20:51:33 +0200
Subject: [PATCH 0686/1853] ksh: update to 1.0.6.

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

diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index cbde81e4e581..8e238126bdcf 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,14 +1,14 @@
 # Template file for 'ksh'
 pkgname=ksh
 reverts="2020.0.0_1"
-version=1.0.5
+version=1.0.6
 revision=1
 short_desc="AT&T's Korn shell (community branch ksh93u+m)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/ksh93/ksh"
 distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=940d6dd6b4204f4965cf87cbba5bdf2d2c5153975100ee242038425f9470c0fe
+checksum=bcb230cb3cbe045e0c08ed8d379fb4e1b434784bb0aab0e990c51a03e63d6721
 nocross=yes
 
 register_shell="/bin/ksh"

From 2b79120feb85a33edb51bc1f34c583cb7ad3fb83 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 7 Jun 2023 08:50:17 -0500
Subject: [PATCH 0687/1853] zfs: update to 2.1.12.

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

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 914114f1cfb7..e53f25d27084 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.11
+version=2.1.12
 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=a54fe4e854d0a207584f1799a80e165eae66bc30dc8e8c96a1f99ed9d4d8ceb2
+checksum=64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From 679710d33b0bf1738b9f4a423194954e41d29034 Mon Sep 17 00:00:00 2001
From: toomyem <toomyem@gmail.com>
Date: Mon, 12 Jun 2023 13:49:55 +0200
Subject: [PATCH 0688/1853] moosefs: update to 3.0.117

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

diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index adc8125a13e6..0c14645f9b22 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -1,7 +1,7 @@
 # Template file for 'moosefs'
 pkgname=moosefs
-version=3.0.113
-revision=2
+version=3.0.117
+revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib --with-default-user=_mfs
  --with-default-group=_mfs"
@@ -10,10 +10,10 @@ makedepends="zlib-devel libpcap-devel fuse-devel"
 short_desc="Fault tolerant, network distributed file system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://moosefs.org/"
-distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
-checksum=f88cc0142b5fe8a6a4c3fcb2ae58053fcb98787848cf09286a57718a982093a9
-python_version=2 #unverified
+homepage="https://moosefs.com/"
+distfiles="https://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
+checksum=d77947d0d8b699e2373926a1274ae81a9a8b24445c5ab986a1ec5e9203e3c3ba
+python_version=3
 system_accounts="_mfs"
 
 pre_configure() {

From c8e8f41cd0c845a3b5452d29128f2496ec57fd95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 07:15:42 -0400
Subject: [PATCH 0689/1853] kdenlive: update to 23.04.2.

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

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 66e562d99f25..429126ef3c3b 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -10,14 +10,15 @@ makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
-depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols"
+depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols
+ kirigami2 mediainfo"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
-distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=eba17db62714e56eb9433499d559dab0657677c6876b0735a756b0d9afc48e6a
+distfiles="${KDE_SITE}/release-service/${version}/src/kdenlive-${version}.tar.xz"
+checksum=8f754f2e000d2536e88a63f7a3f3ec7abe992d396f3d957899da978f7a255992
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From 6884b651f8a33e929b0c98dc47fc3436fb7d97c1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 13:39:30 -0400
Subject: [PATCH 0690/1853] kitty: update to 0.28.1, adopt.

add subpackages for components that can be used in remote/headless envs
---
 srcpkgs/kitty-kitten              |   1 +
 srcpkgs/kitty-shell-integration   |   1 +
 srcpkgs/kitty/patches/cross.patch | 128 ++++++++++++++++++++++++++++++
 srcpkgs/kitty/template            |  51 +++++++++---
 4 files changed, 171 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/kitty-kitten
 create mode 120000 srcpkgs/kitty-shell-integration
 create mode 100644 srcpkgs/kitty/patches/cross.patch

diff --git a/srcpkgs/kitty-kitten b/srcpkgs/kitty-kitten
new file mode 120000
index 000000000000..659fb6b426aa
--- /dev/null
+++ b/srcpkgs/kitty-kitten
@@ -0,0 +1 @@
+kitty
\ No newline at end of file
diff --git a/srcpkgs/kitty-shell-integration b/srcpkgs/kitty-shell-integration
new file mode 120000
index 000000000000..659fb6b426aa
--- /dev/null
+++ b/srcpkgs/kitty-shell-integration
@@ -0,0 +1 @@
+kitty
\ No newline at end of file
diff --git a/srcpkgs/kitty/patches/cross.patch b/srcpkgs/kitty/patches/cross.patch
new file mode 100644
index 000000000000..b718adb3e6d3
--- /dev/null
+++ b/srcpkgs/kitty/patches/cross.patch
@@ -0,0 +1,128 @@
+From 88a5086f71f44e09539cae9af0cf62697df01f45 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 13 Jun 2023 07:56:16 +0530
+Subject: [PATCH] Add rudimentary support for cross-compilation
+
+Not really tested, actual cross compilers, feel free to send patches.
+Fixes #6354
+---
+
+diff --git a/setup.py b/setup.py
+index 1d3c76f0f7..2b1ba6fde9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -62,6 +62,8 @@ class Options(argparse.Namespace):
+     sanitize: bool = False
+     prefix: str = './linux-package'
+     dir_for_static_binaries: str = 'build/static'
++    skip_code_generation: bool = False
++    clean_for_cross_compile: bool = False
+     incremental: bool = True
+     profile: bool = False
+     libdir_name: str = 'lib'
+@@ -841,16 +843,17 @@ def extract_rst_targets() -> Dict[str, Dict[str, str]]:
+     return cast(Dict[str, Dict[str, str]], m['main']())
+ 
+ 
+-def build_ref_map() -> str:
+-    d = extract_rst_targets()
+-    h = 'static const char docs_ref_map[] = {\n' + textwrap.fill(', '.join(map(str, bytearray(json.dumps(d).encode('utf-8'))))) + '\n};\n'
++def build_ref_map(skip_generation: bool = False) -> str:
+     dest = 'kitty/docs_ref_map_generated.h'
+-    q = ''
+-    with suppress(FileNotFoundError), open(dest) as f:
+-        q = f.read()
+-    if q != h:
+-        with open(dest, 'w') as f:
+-            f.write(h)
++    if not skip_generation:
++        d = extract_rst_targets()
++        h = 'static const char docs_ref_map[] = {\n' + textwrap.fill(', '.join(map(str, bytearray(json.dumps(d).encode('utf-8'))))) + '\n};\n'
++        q = ''
++        with suppress(FileNotFoundError), open(dest) as f:
++            q = f.read()
++        if q != h:
++            with open(dest, 'w') as f:
++                f.write(h)
+     return dest
+ 
+ 
+@@ -868,7 +871,7 @@ def build(args: Options, native_optimizations: bool = True, call_init: bool = Tr
+     if call_init:
+         init_env_from_args(args, native_optimizations)
+     sources, headers = find_c_files()
+-    headers.append(build_ref_map())
++    headers.append(build_ref_map(args.skip_code_generation))
+     compile_c_extension(
+         kitty_env(), 'kitty/fast_data_types', args.compilation_database, sources, headers
+     )
+@@ -881,6 +884,9 @@ def safe_makedirs(path: str) -> None:
+ 
+ 
+ def update_go_generated_files(args: Options, kitty_exe: str) -> None:
++    if args.skip_code_generation:
++        print('Skipping generation of Go files due to command line option', flush=True)
++        return
+     # update all the various auto-generated go files, if needed
+     if args.verbose:
+         print('Updating Go generated files...', flush=True)
+@@ -1493,7 +1499,7 @@ def clean_launcher_dir(launcher_dir: str) -> None:
+             os.remove(x)
+ 
+ 
+-def clean() -> None:
++def clean(for_cross_compile: bool = False) -> None:
+ 
+     def safe_remove(*entries: str) -> None:
+         for x in entries:
+@@ -1506,7 +1512,9 @@ def safe_remove(*entries: str) -> None:
+     safe_remove(
+         'build', 'compile_commands.json', 'link_commands.json',
+         'linux-package', 'kitty.app', 'asan-launcher',
+-        'kitty-profile', 'docs/generated')
++        'kitty-profile')
++    if not for_cross_compile:
++        safe_remove('docs/generated')
+     clean_launcher_dir('kitty/launcher')
+ 
+     def excluded(root: str, d: str) -> bool:
+@@ -1521,7 +1529,9 @@ def excluded(root: str, d: str) -> bool:
+             dirs.remove(d)
+         for f in files:
+             ext = f.rpartition('.')[-1]
+-            if ext in ('so', 'dylib', 'pyc', 'pyo') or f.endswith('_generated.h') or f.endswith('_generated.go') or f.endswith('_generated.bin'):
++            if ext in ('so', 'dylib', 'pyc', 'pyo') or (not for_cross_compile and (
++                    f.endswith('_generated.h') or f.endswith('_generated.go') or f.endswith('_generated.bin'))
++            ):
+                 os.unlink(os.path.join(root, f))
+     for x in glob.glob('glfw/wayland-*-protocol.[ch]'):
+         os.unlink(x)
+@@ -1581,6 +1591,19 @@ def option_parser() -> argparse.ArgumentParser:  # {{{
+         default=Options.dir_for_static_binaries,
+         help='Where to create the static kitten binary'
+     )
++    p.add_argument(
++        '--skip-code-generation',
++        default=Options.skip_code_generation,
++        action='store_true',
++        help='Do not create the *_generated.* source files. This is useful if they'
++        ' have already been generated by a previous build, for example during a two-stage cross compilation.'
++    )
++    p.add_argument(
++        '--clean-for-cross-compile',
++        default=Options.clean_for_cross_compile,
++        action='store_true',
++        help='Do not clean generated Go source files. Useful for cross-compilation.'
++    )
+     p.add_argument(
+         '--full',
+         dest='incremental',
+@@ -1743,7 +1766,7 @@ def main() -> None:
+         texe = os.path.abspath(os.path.join(launcher_dir, 'kitty'))
+         os.execl(texe, texe, '+launch', 'test.py')
+     if args.action == 'clean':
+-        clean()
++        clean(for_cross_compile=args.clean_for_cross_compile)
+         return
+ 
+     with CompilationDatabase(args.incremental) as cdb:
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 90eb7261085c..6ec5e8af4a50 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,20 +1,26 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.26.5
-revision=2
+version=0.28.1
+revision=1
+build_helper="python3"
 pycompile_dirs="usr/lib/kitty"
-hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
+hostmakedepends="go pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
- python3-devel wayland-devel wayland-protocols librsync-devel libcanberra-devel openssl-devel"
-depends="kitty-terminfo-${version}_${revision}"
+ python3-devel wayland-devel wayland-protocols librsync-devel libcanberra-devel
+ openssl-devel dbus-devel libXcursor-devel libXrandr-devel libXi-devel
+ fontconfig-devel libxcb-devel lcms2-devel"
+depends="kitty-terminfo-${version}_${revision} kitty-shell-integration-${version}_${revision}
+ kitty-kitten-${version}_${revision}"
 short_desc="Modern, hackable, featureful, OpenGL based terminal emulator"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
+checksum=c11c545ca56adf1c26cfd8f5b4a3ba5f149f00542fbf0fa2c4439bd9bf6f78a5
 python_version=3
+nopie_files="/usr/bin/kitten"
+
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
 # TIOCSWINSZ on ppc overflows signed int, used in ioctl()
@@ -23,11 +29,22 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*-musl) CFLAGS+=" -Wno-error=overflow";;
 esac
 
+if [ "$CROSS_BUILD" ]; then
+	# cursed but this build system is a hot mess
+	hostmakedepends+=" $makedepends"
+fi
+
 do_build() {
+	local _cross_args
 	if [ "$CROSS_BUILD" ]; then
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+		# hot mess, continued
+		env CC="cc" CFLAGS="$XBPS_CFLAGS" LDFLAGS="$XBPS_LDFLAGS" python3 setup.py build \
+			--prefix="${DESTDIR}/usr" --update-check-interval=0 --verbose
+		python3 setup.py clean --clean-for-cross-compile
+		_cross_args=(--skip-code-generation)
 	fi
-	python3 setup.py linux-package --prefix=${DESTDIR}/usr --update-check-interval=0 --verbose
+	. /void-packages/common/environment/build-style/go.sh
+	python3 setup.py linux-package --prefix="${DESTDIR}/usr" --update-check-interval=0 --verbose "${_cross_args[@]}"
 }
 
 do_install() {
@@ -40,3 +57,17 @@ kitty-terminfo_package() {
 		vmove usr/share/terminfo
 	}
 }
+
+kitty-shell-integration_package() {
+	short_desc+=" - shell integration scripts"
+	pkg_install() {
+		vmove usr/lib/kitty/shell-integration
+	}
+}
+
+kitty-kitten_package() {
+	short_desc+=" - kitten client"
+	pkg_install() {
+		vmove usr/bin/kitten
+	}
+}

From 5ecdd70a24499d3c62da04fd4e4d0d4a829c1468 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 12:57:05 -0400
Subject: [PATCH 0691/1853] openlierox: remove package

python 2, no release/activity upstream since 2018
---
 srcpkgs/openlierox/patches/fix-cflags.patch | 17 ---------
 srcpkgs/openlierox/patches/ppc-musl.patch   | 24 ------------
 srcpkgs/openlierox/template                 | 41 ---------------------
 srcpkgs/openlierox/update                   |  1 -
 srcpkgs/removed-packages/template           |  1 +
 5 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 srcpkgs/openlierox/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/openlierox/patches/ppc-musl.patch
 delete mode 100644 srcpkgs/openlierox/template
 delete mode 100644 srcpkgs/openlierox/update

diff --git a/srcpkgs/openlierox/patches/fix-cflags.patch b/srcpkgs/openlierox/patches/fix-cflags.patch
deleted file mode 100644
index 711358a3bf68..000000000000
--- a/srcpkgs/openlierox/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: CMakeOlxCommon.cmake
-===================================================================
---- a/CMakeOlxCommon.cmake
-+++ b/CMakeOlxCommon.cmake
-@@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support
- OPTION(DISABLE_JOYSTICK "Disable joystick support" No)
- OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No)
- 
--IF (DEBUG)
--	SET(CMAKE_BUILD_TYPE Debug)
--ELSE (DEBUG)
--	SET(CMAKE_BUILD_TYPE Release)
--ENDIF (DEBUG)
--
- IF (DEDICATED_ONLY)
- 	SET(X11 No)
- 	SET(WITH_G15 No)
diff --git a/srcpkgs/openlierox/patches/ppc-musl.patch b/srcpkgs/openlierox/patches/ppc-musl.patch
deleted file mode 100644
index dc1441fc726e..000000000000
--- a/srcpkgs/openlierox/patches/ppc-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/client/CrashHandler.cpp
-+++ b/src/client/CrashHandler.cpp
-@@ -23,6 +23,9 @@
- 
- #include "../breakpad/BreakPad.h"
- 
-+#if defined(__linux__) && defined(__powerpc__)
-+#include <asm/ptrace.h>
-+#endif
- 
- #ifdef NBREAKPAD
- 
-@@ -320,7 +322,11 @@ public:
- 		pnt = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0x3UL ;
- #	elif (defined (__ppc__)) || (defined (__powerpc__))
- 		ucontext_t* uc = (ucontext_t*) secret;
-+#	if !defined(__GLIBC__) && !defined(__powerpc64__)
-+		pnt = (void*) ((struct pt_regs *)uc->uc_regs)->nip ;
-+#	else
- 		pnt = (void*) uc->uc_mcontext.regs->nip ;
-+#	endif
- #	elif defined(__sparc__)
- 		struct sigcontext* sc = (struct sigcontext*) secret;
- #		if __WORDSIZE == 64
diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
deleted file mode 100644
index 626bdd4d97a8..000000000000
--- a/srcpkgs/openlierox/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'openlierox'
-pkgname=openlierox
-version=0.58.rc5
-revision=2
-build_style=cmake
-configure_args="-DSYSTEM_DATA_DIR=/usr/share -DDEBUG=OFF -DBREAKPAD=OFF"
-hostmakedepends="pkg-config python"
-makedepends="SDL_image-devel SDL_mixer-devel freealut-devel
- gd-devel libcurl-devel libvorbis-devel libxml2-devel libzip-devel"
-depends="virtual?libGL python"
-short_desc="Addictive real-time excessive Worms-clone"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.openlierox.net/"
-distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2"
-checksum=3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb
-python_version=2
-replaces="openlierox-data>=0"
-
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libexecinfo-devel";;
-esac
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i CMakeLists.txt -e "/^TARGET_LINK_LIBRARIES/s/)/ execinfo)/" ;;
-	esac
-}
-
-do_install() {
-	# This package uses cmake yet it lacks an install target
-	vbin build/bin/openlierox
-	vman doc/openlierox.6
-	vinstall share/OpenLieroX.svg 644 usr/share/pixmaps
-	vinstall share/openlierox-openlierox.desktop 644 usr/share/applications openlierox.desktop
-	vmkdir usr/share/OpenLieroX
-	vcopy share/gamedir/* usr/share/OpenLieroX
-	find ${DESTDIR}/usr/share/OpenLieroX -type d -exec chmod 755 "{}" \;
-	find ${DESTDIR}/usr/share/OpenLieroX -type f -exec chmod 644 "{}" \;
-}
diff --git a/srcpkgs/openlierox/update b/srcpkgs/openlierox/update
deleted file mode 100644
index fdb55f617cda..000000000000
--- a/srcpkgs/openlierox/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='OpenLieroX_\K[\d]+\.[\d]+(_rc[\d]+)?(?=\.src.tar.bz2)'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9b0ce9c93fce..12b6b96fed5d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -379,6 +379,7 @@ replaces="
  oce<=0.18.3_1
  onionshare<=2.2_5
  opencl-clhpp<=2.0.15_1
+ openlierox<=0.58.rc5_2
  orage<=4.12.1_7
  parallel-rust<=0.11.3_2
  paraview<=5.8.1_3

From 8057d7071c9eac1cbc08a0f4229ba63fea692c8b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 13:06:02 -0400
Subject: [PATCH 0692/1853] libproxy: move to python3

---
 srcpkgs/{libproxy-python => libproxy-python3} |  0
 srcpkgs/libproxy/template                     | 13 +++++++------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename srcpkgs/{libproxy-python => libproxy-python3} (100%)

diff --git a/srcpkgs/libproxy-python b/srcpkgs/libproxy-python3
similarity index 100%
rename from srcpkgs/libproxy-python
rename to srcpkgs/libproxy-python3
diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template
index 3b516025354e..bb619c15ec74 100644
--- a/srcpkgs/libproxy/template
+++ b/srcpkgs/libproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'libproxy'
 pkgname=libproxy
 version=0.4.18
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0
- -DWITH_PERL=0 -DWITH_PYTHON=1 -DWITH_WEBKIT=0"
-hostmakedepends="pkg-config python"
+ -DWITH_PERL=0 -DWITH_PYTHON3=1 -DWITH_WEBKIT=0"
+hostmakedepends="pkg-config python3"
 makedepends="zlib-devel"
 short_desc="Library handling all the details of proxy configuration"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -28,9 +28,10 @@ libproxy-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-libproxy-python_package() {
-	depends="libproxy>=${version} python"
-	short_desc+=" - python bindings"
+
+libproxy-python3_package() {
+	depends="libproxy>=${version} python3"
+	short_desc+=" - python3 bindings"
 	pkg_install() {
 		vmove "usr/lib/python*"
 	}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 12b6b96fed5d..20fce6e997ee 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -312,6 +312,7 @@ replaces="
  libpipewire0.2-devel<=0.2.7_2
  libpipewire0.2<=0.2.7_2
  libpng12<=1.2.59_1
+ libproxy-python<=0.4.18_1
  libpyside-python3<=5.15.0_2
  libqmatrixclient-devel<=0.5.3.2_1
  libqmatrixclient<=0.5.3.2_1

From 5d17668d306614f1cf1d19210c46eec827a3d067 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 02:58:11 -0400
Subject: [PATCH 0693/1853] base-files: add MPL-2.0 to licenses

---
 srcpkgs/base-files/files/licenses/MPL-2.0 | 373 ++++++++++++++++++++++
 srcpkgs/base-files/template               |   2 +-
 2 files changed, 374 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/base-files/files/licenses/MPL-2.0

diff --git a/srcpkgs/base-files/files/licenses/MPL-2.0 b/srcpkgs/base-files/files/licenses/MPL-2.0
new file mode 100644
index 000000000000..a612ad9813b0
--- /dev/null
+++ b/srcpkgs/base-files/files/licenses/MPL-2.0
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 27b83604b648..b96d09351a08 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=1
+revision=2
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 94642c47e6b89e72fe9a3c5180791980ce46b057 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 14 Jun 2023 14:38:14 +0200
Subject: [PATCH 0694/1853] libmd: update to 1.1.0.

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

diff --git a/srcpkgs/libmd/template b/srcpkgs/libmd/template
index 51ea5f1d5d61..858dbb8e0b0d 100644
--- a/srcpkgs/libmd/template
+++ b/srcpkgs/libmd/template
@@ -1,6 +1,6 @@
 # Template file for 'libmd'
 pkgname=libmd
-version=1.0.4
+version=1.1.0
 revision=1
 build_style=gnu-configure
 short_desc="Message Digest functions from BSD systems"
@@ -8,7 +8,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause, BSD-2-Clause, ISC, Beerware, custom:Public Domain"
 homepage="https://www.hadrons.org/software/libmd/"
 distfiles="https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz"
-checksum=f51c921042e34beddeded4b75557656559cf5b1f2448033b4c1eec11c07e530f
+checksum=1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332
 
 post_install() {
 	vlicense COPYING

From e26db9f12c26761d9fb14f752da4e4b585a15b82 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 14 Jun 2023 11:10:55 +0200
Subject: [PATCH 0695/1853] man-db: update to 2.11.2

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

diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 3d60f4e91878..cea1193c9d6e 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.10.2
+version=2.11.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.nongnu.org/man-db/"
 changelog="https://gitlab.com/cjwatson/man-db/-/raw/main/NEWS.md"
 distfiles="${NONGNU_SITE}/man-db/man-db-${version}.tar.xz"
-checksum=ee97954d492a13731903c9d0727b9b01e5089edbd695f0cdb58d405a5af5514d
+checksum=cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d
 provides="man-0_1"
 lib32disabled=yes
 system_accounts="_man"

From 7d0856378c4a8fc1c66ca477035095a74a86a09e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 10 Jun 2023 21:46:22 +0300
Subject: [PATCH 0696/1853] atomix: update to 44.0

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

diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 31f34e1efc59..23dc8bdcfd03 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -1,6 +1,6 @@
 # Template file for 'atomix'
 pkgname=atomix
-version=3.34.0
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config gettext"
@@ -10,6 +10,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0054c3b3830f1fe4383e17d716e6034b608859f4352a102130c13156894a2041
+checksum=c8849317688d87da734c9063035631052007f2a8799b6c6cc915265880b55fb4
 
 CFLAGS="-fcommon"

From cb9287c891ef5ddf2219f85b89e2e6f5491df054 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 11 Jun 2023 23:26:17 +0200
Subject: [PATCH 0697/1853] New package: wlrctl-0.2.2

---
 srcpkgs/wlrctl/patches/fix-ascii-check.patch | 13 +++++++++++++
 srcpkgs/wlrctl/template                      | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/wlrctl/patches/fix-ascii-check.patch
 create mode 100644 srcpkgs/wlrctl/template

diff --git a/srcpkgs/wlrctl/patches/fix-ascii-check.patch b/srcpkgs/wlrctl/patches/fix-ascii-check.patch
new file mode 100644
index 000000000000..aa1803c9eaca
--- /dev/null
+++ b/srcpkgs/wlrctl/patches/fix-ascii-check.patch
@@ -0,0 +1,13 @@
+diff --git a/keyboard.c b/keyboard.c
+index 8dc090c..3afd490 100644
+--- a/keyboard.c
++++ b/keyboard.c
+@@ -90,7 +90,7 @@ static bool
+ is_ascii(const char str[])
+ {
+ 	for (int i = 0; str[i] != '\0'; i++) {
+-		if (str[i] < 0) {
++		if (!isprint(str[i]) && !iscntrl(str[i])) {
+ 			return false;
+ 		}
+ 	}
diff --git a/srcpkgs/wlrctl/template b/srcpkgs/wlrctl/template
new file mode 100644
index 000000000000..82ccb2aedeb5
--- /dev/null
+++ b/srcpkgs/wlrctl/template
@@ -0,0 +1,17 @@
+# Template file for 'wlrctl'
+pkgname=wlrctl
+version=0.2.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="libxkbcommon-devel wayland-devel"
+short_desc="Utility for miscellaneous wlroots extensions"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://git.sr.ht/~brocellous/wlrctl"
+distfiles="https://git.sr.ht/~brocellous/wlrctl/archive/v${version}.tar.gz"
+checksum=b5b3836091c41de09a832df1e5eb4747841d7ae670367e413487d5be7a5f2849
+
+post_install() {
+	vlicense LICENSE
+}

From ef7c9625bd5db762a25d768b31c1b335f60f99d1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 14:44:14 +0100
Subject: [PATCH 0698/1853] gwe: update to 0.15.5.

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

diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index ce70ed78573c..ea56c8f02967 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,20 +1,17 @@
 # Template file for 'gwe'
 pkgname=gwe
-version=0.15.2
-revision=4
+version=0.15.5
+revision=1
 build_style=meson
-hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
- python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
- python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
- python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
-makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
+hostmakedepends="gobject-introspection pkg-config ninja appstream-glib glib-devel"
+makedepends="gtk+3-devel python3-devel"
+depends="python3 libayatana-appindicator libdazzle python3-matplotlib
  python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
- python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
- python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
+ python3-nvml python3-injector"
 short_desc="Utility for overclocking NVIDIA cards"
 maintainer="Duje Mihanovic <mihaduje@pm.me>"
 license="GPL-3.0-or-later"
-homepage="https://www.gitlab.com/leinardi/gwe"
+homepage="https://gitlab.com/leinardi/gwe"
+changelog="https://gitlab.com/leinardi/gwe/-/raw/release/CHANGELOG.md"
 distfiles="https://gitlab.com/leinardi/gwe/-/archive/${version}/gwe-${version}.tar.gz"
-checksum=a827eeb8f18fd08213fb22e0e1ef6437ea749eb4b34fcea9d0ae5282912753a0
+checksum=67c30c735b6160c2f4af61ce353108dc9709b6c850ce8bc21d2d2a506dfa3b70

From 335aba1cc588edace89810f6a4355acd6d6a0bb0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 16 May 2023 16:49:33 -0400
Subject: [PATCH 0699/1853] New package: python3-aputils-0.1.4

---
 srcpkgs/python3-aputils/template | 18 ++++++++++++++++++
 srcpkgs/python3-aputils/update   |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-aputils/template
 create mode 100644 srcpkgs/python3-aputils/update

diff --git a/srcpkgs/python3-aputils/template b/srcpkgs/python3-aputils/template
new file mode 100644
index 000000000000..feb418822aa0
--- /dev/null
+++ b/srcpkgs/python3-aputils/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-aputils'
+pkgname=python3-aputils
+version=0.1.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-pycryptodome"
+short_desc="Various classes and functions for ActivityPub servers"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="custom:CNPL"
+homepage="https://git.barkshark.xyz/barkshark/aputils"
+changelog="https://git.barkshark.xyz/barkshark/aputils/releases"
+distfiles="https://git.barkshark.xyz/barkshark/aputils/archive/${version}.tar.gz"
+checksum=2fa255df5998f10d9eeb2791ce3fe6ea3fc4f1701d84942d81ba8e4f66642896
+
+post_install() {
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/python3-aputils/update b/srcpkgs/python3-aputils/update
new file mode 100644
index 000000000000..f906de7f0769
--- /dev/null
+++ b/srcpkgs/python3-aputils/update
@@ -0,0 +1,2 @@
+site="https://git.barkshark.xyz/barkshark/aputils/tags"
+pattern='<a.*>\K[\d.]+(?=</a>)'

From 351c30b36fcc0b6cbc63ab21f76bc140175f8230 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 16 May 2023 11:47:28 -0400
Subject: [PATCH 0700/1853] activityrelay: update to 0.2.4.

---
 srcpkgs/activityrelay/files/activityrelay/run | 2 +-
 srcpkgs/activityrelay/template                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/activityrelay/files/activityrelay/run b/srcpkgs/activityrelay/files/activityrelay/run
index 2082710dd442..695abd209d17 100755
--- a/srcpkgs/activityrelay/files/activityrelay/run
+++ b/srcpkgs/activityrelay/files/activityrelay/run
@@ -2,4 +2,4 @@
 [ -r ./conf ] && . ./conf
 exec 2>&1
 exec chpst -u _activityrelay:_activityrelay activityrelay \
-	-c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml}
+	-c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml} run
diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template
index 4b8d80b8f6b0..74b8e8dbc880 100644
--- a/srcpkgs/activityrelay/template
+++ b/srcpkgs/activityrelay/template
@@ -1,17 +1,17 @@
 # Template file for 'activityrelay'
 pkgname=activityrelay
-version=0.2.2
-revision=2
+version=0.2.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-aiohttp python3-cachetools python3-click python3-pycryptodome
+depends="python3-aiohttp python3-aputils python3-cachetools python3-click
  python3-yaml"
 short_desc="Generic LitePub relay (works with LitePub consumers and Mastodon)"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="AGPL-3.0-or-later"
 homepage="https://git.pleroma.social/pleroma/relay"
 distfiles="https://git.pleroma.social/pleroma/relay/-/archive/${version}/relay-${version}.tar.gz"
-checksum=f460037a522e45fd030735da893e5851d90b6340caab0bcd24346996474aac25
+checksum=32c127b789d3305301f6a408299a9d59035665674dae6806fb4bb3206698b40e
 make_check=no # no tests specified
 
 system_accounts="_activityrelay"

From 417d23bae0c9e6250bdf78df1ff374c4b6656a31 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 5 Jun 2023 21:43:29 -0400
Subject: [PATCH 0701/1853] syft: update to 0.83.0

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

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index e76deeba40c9..dd7ea798ffb6 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,6 +1,6 @@
 # Template file for 'syft'
 pkgname=syft
-version=0.80.0
+version=0.83.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/syft"
 distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz"
-checksum=f53b05b2092118c02010c9be35c5a094834afbd057a2c0cbebe08333b52de76d
+checksum=46124db55e6c56a09f80be123737716a9b6e35e675908639ba3bf34d10e650f6
 
 post_install() {
 	syft="${DESTDIR}/usr/bin/syft"

From 2aca7a0e3a2f4d9568b63dbb39053b005b511b32 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 5 Jun 2023 21:44:05 -0400
Subject: [PATCH 0702/1853] grype: update to 0.62.3

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

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 56b8bc759698..47170f268d9e 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,6 +1,6 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.61.1
+version=0.62.3
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=e9599fbf1c42133e1d07719a3bb1489a5d261a099af8ec515be3409e12dbc56c
+checksum=f97c8412f7c5f74a348fe011f84f5926153d23475d875e2dc61ddca30872e489
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

From 998d3fa657c82e8a9178d32bb8a940c96ba1f90d Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Mon, 29 May 2023 18:35:33 +0000
Subject: [PATCH 0703/1853] mesa: update to 23.1.1.

---
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 -------------------
 srcpkgs/mesa/template                         | 14 ++--
 2 files changed, 6 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
deleted file mode 100644
index f56327367526..000000000000
--- a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sun, 12 Feb 2023 22:33:30 +0100
-Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
-
-resource_from_handle implementations create an additional reference to
-the scanout resource, which caused lima to leak those resources after
-commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
-
-Do as the other drivers do and import the bo directly while creating
-the scanount resource.
-
-Cc: 22.3 mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
----
- src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
-index 54869ec03d24..0b7691f2b46f 100644
---- a/src/gallium/drivers/lima/lima_resource.c
-+++ b/src/gallium/drivers/lima/lima_resource.c
-@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    struct lima_screen *screen = lima_screen(pscreen);
-    struct renderonly_scanout *scanout;
-    struct winsys_handle handle;
--   struct pipe_resource *pres;
-+
-+   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
-+   if (!res)
-+      return NULL;
- 
-    struct pipe_resource scanout_templat = *templat;
-    scanout_templat.width0 = width;
-@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    if (!scanout)
-       return NULL;
- 
-+   res->base = *templat;
-+   res->base.screen = pscreen;
-+   pipe_reference_init(&res->base.reference, 1);
-+   res->levels[0].offset = handle.offset;
-+   res->levels[0].stride = handle.stride;
-+
-    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
--   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
--                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
-+   res->bo = lima_bo_import(screen, &handle);
-+   if (!res->bo) {
-+      FREE(res);
-+      return NULL;
-+   }
-+
-+   res->modifier_constant = true;
- 
-    close(handle.handle);
--   if (!pres) {
-+   if (!res->bo) {
-       renderonly_scanout_destroy(scanout, screen->ro);
-+      FREE(res);
-       return NULL;
-    }
- 
--   struct lima_resource *res = lima_resource(pres);
-    res->scanout = scanout;
- 
--   return pres;
-+   return &res->base;
- }
- 
- static uint32_t
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 132263d3599f..04d3a1dfe680 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.3.5
-revision=2
+version=23.1.1
+revision=1
 build_style=meson
+#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
+checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
 
 build_options="wayland"
 build_options_default="wayland"
@@ -48,8 +49,6 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# pre-gallium drivers are mostly for old ati + i915/965
-_dri_drivers=" -Ddri-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -156,9 +155,8 @@ fi
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}
-_dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes

From b5c9db830b3dd3a45d58cbef34ec49d9cd3071a5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 8 Jun 2023 09:38:16 -0400
Subject: [PATCH 0704/1853] subfinder: update to 2.6.0

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

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index 7a74a7e2e9de..b772ca6cff7d 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
-version=2.5.7
-revision=2
+version=2.6.0
+revision=1
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"
@@ -11,7 +11,7 @@ maintainer="w. fnintr <wfnintr@null.net>"
 license="MIT"
 homepage="https://github.com/projectdiscovery/subfinder"
 distfiles="https://github.com/projectdiscovery/subfinder/archive/refs/tags/v${version}.tar.gz"
-checksum=6ff2b05189727ab3bd8e3391b7c5c9c4ae2079a81e766f509fe21033c435134d
+checksum=a98dc92135ff462aa9e99f3bdfe079a14849c9f926028a7bb44af591ed18aa21
 
 post_install() {
 	vlicense ../LICENSE.md

From 408ac7b6171a8fcabdc2c2f63f4a7dfcc16e001e Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+github@gmail.com>
Date: Sat, 20 May 2023 15:54:27 -0500
Subject: [PATCH 0705/1853] python3-dpkt: update to 1.9.8

Closes: https://github.com/void-linux/void-packages/pull/43976
---
 srcpkgs/python3-dpkt/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-dpkt/template b/srcpkgs/python3-dpkt/template
index d2da82f8bf86..72b6a4081982 100644
--- a/srcpkgs/python3-dpkt/template
+++ b/srcpkgs/python3-dpkt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dpkt'
 pkgname=python3-dpkt
-version=1.9.7.2
-revision=3
+version=1.9.8
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -9,8 +9,9 @@ short_desc="Basic TCP/IP packet creation and parsing"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/kbandla/dpkt"
+changelog="https://raw.githubusercontent.com/kbandla/dpkt/master/docs/changelog.md"
 distfiles="${PYPI_SITE}/d/dpkt/dpkt-${version}.tar.gz"
-checksum=80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b
+checksum=43f8686e455da5052835fd1eda2689d51de3670aac9799b1b00cfd203927ee45
 
 post_install() {
 	vlicense LICENSE

From b5e47c1175dbcae41fefdaf84e22168b8daddb88 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 23 May 2023 22:16:53 +0530
Subject: [PATCH 0706/1853] qsv: update to 0.106.0.

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

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index 98108a8addee..30448b946128 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.103.1
+version=0.106.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,4 +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=6c67f0eac5e011e94cd8d034c7e9d519a6eeddfad5dba53abc6d91aea55ccd99
+checksum=ce7c3eac35d495188ceda49536ce1997a78a319a42d715d3b0b1712b57c3267c

From 5e81b5d1084394e8eb1ccd3d341e53cb63e708e1 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 19 May 2023 17:35:37 +0300
Subject: [PATCH 0707/1853] gummi: update to 0.8.3

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

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index b56271b07ca6..fe1ae455c552 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,18 +1,19 @@
 # Template file for 'gummi'
 pkgname=gummi
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+3-devel gettext-devel"
 makedepends="gtksourceview-devel glib-devel gtk+3-devel poppler-glib-devel
  gtkspell3-devel gettext-devel texlive-devel"
+depends="virtual?tex"
 short_desc="Simple LaTeX editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/alexandervdm/gummi/"
 changelog="https://raw.githubusercontent.com/alexandervdm/gummi/master/ChangeLog"
 distfiles="https://github.com/alexandervdm/gummi/releases/download/$version/gummi-$version.tar.gz"
-checksum=5ad486da1f98407a806519f3a8b2b149b145af6f9cf0a438519dd1df8c066728
+checksum=c1769fea45c23bf892bdbf524c92ddf83eae21b1ddba358d4173155aadea898e
 
 pre_configure() {
 	autoreconf -fi

From 84f27dd094e849dbdf38b21f143bbde42e96c6e4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 10 May 2023 10:18:20 -0400
Subject: [PATCH 0708/1853] dhcpcd: update to 10.0.1

---
 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch |  23 ---
 srcpkgs/dhcpcd/patches/revert-eloop.patch    | 150 -------------------
 srcpkgs/dhcpcd/template                      |   8 +-
 3 files changed, 4 insertions(+), 177 deletions(-)
 delete mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
 delete mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch

diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
deleted file mode 100644
index 38a4264a59cd..000000000000
--- a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 156383a2ff84c01b347579ec8651a0a21384adf4
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Apr 3 20:18:51 2022 +0200
-
-    use correct SECCOMP_AUDIT_ARCH
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 9534fb0..b866bce 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- #elif defined(__or1k__)
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
- #elif defined(__powerpc64__)
--#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+#  ifdef __LITTLE_ENDIAN__
-+#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
-+#  else
-+#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+#  endif
- #elif defined(__powerpc__)
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
- #elif defined(__riscv)
diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
deleted file mode 100644
index e41beb84b62b..000000000000
--- a/srcpkgs/dhcpcd/patches/revert-eloop.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 12 Nov 2021 16:24:32 +0000
-Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
- poll(2)"
-
-This stops dumping leases when privsep is compiled out.
-This change works fine on master, but we also have eloop using
-more of a native poll(2) style interface.
-Easier for now to just revert this on the dhcpcd-9 branch.
-
-This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
----
- src/eloop.c | 56 ++++++++++++++++-------------------------------------
- 1 file changed, 17 insertions(+), 39 deletions(-)
-
-diff --git a/src/eloop.c b/src/eloop.c
-index a6ab43fb..c3330817 100644
---- a/src/eloop.c
-+++ b/src/eloop.c
-@@ -32,7 +32,6 @@
- #include <errno.h>
- #include <limits.h>
- #include <poll.h>
--#include <stdbool.h>
- #include <signal.h>
- #include <stdint.h>
- #include <stdlib.h>
-@@ -137,7 +136,6 @@ struct eloop {
- 	TAILQ_HEAD (event_head, eloop_event) events;
- 	size_t nevents;
- 	struct event_head free_events;
--	bool events_need_setup;
- 
- 	struct timespec now;
- 	TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
-@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
- static void
- eloop_event_setup_fds(struct eloop *eloop)
- {
--	struct eloop_event *e, *ne;
-+	struct eloop_event *e;
- 	struct pollfd *pfd;
- 
- 	pfd = eloop->fds;
--	TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
--		if (e->fd == -1) {
--			TAILQ_REMOVE(&eloop->events, e, next);
--			TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
--			continue;
--		}
-+	TAILQ_FOREACH(e, &eloop->events, next) {
- #ifdef ELOOP_DEBUG
- 		fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
- 		    __func__, getpid(), e->fd, e->read_cb, e->write_cb);
-@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
- 		pfd->revents = 0;
- 		pfd++;
- 	}
--	eloop->events_need_setup = false;
- }
- 
- size_t
-@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
- 	}
- 
- setup:
--	e->pollfd = NULL;
--	eloop->events_need_setup = true;
-+	eloop_event_setup_fds(eloop);
- 	return 0;
- }
- 
-@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- 	struct eloop_event *e;
- 
- 	assert(eloop != NULL);
--	if (fd == -1) {
--		errno = EINVAL;
--		return -1;
--	}
- 
- 	TAILQ_FOREACH(e, &eloop->events, next) {
- 		if (e->fd == fd)
-@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- 			goto remove;
- 		e->write_cb = NULL;
- 		e->write_cb_arg = NULL;
--		if (e->pollfd != NULL) {
--			e->pollfd->events &= ~POLLOUT;
--			e->pollfd->revents &= ~POLLOUT;
--		}
--		return 1;
-+		goto done;
- 	}
- 
- remove:
--	e->fd = -1;
-+	TAILQ_REMOVE(&eloop->events, e, next);
-+	TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
- 	eloop->nevents--;
--	eloop->events_need_setup = true;
-+
-+done:
-+	eloop_event_setup_fds(eloop);
- 	return 1;
- }
- 
-@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- 		} else
- 			tsp = NULL;
- 
--		if (eloop->events_need_setup)
--			eloop_event_setup_fds(eloop);
--
- 		n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
- 		if (n == -1) {
- 			if (errno == EINTR)
-@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- 			continue;
- 
- 		TAILQ_FOREACH(e, &eloop->events, next) {
--			/* Skip freshly added events */
--			if (e->pollfd == NULL)
--				continue;
--			if (e->pollfd->revents)
--				n--;
--			if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
--				if (e->write_cb != NULL)
-+			if (e->pollfd->revents & POLLOUT) {
-+				if (e->write_cb != NULL) {
- 					e->write_cb(e->write_cb_arg);
-+					break;
-+				}
- 			}
--			if (e->fd != -1 &&
--			    e->pollfd != NULL && e->pollfd->revents)
--			{
--				if (e->read_cb != NULL)
-+			if (e->pollfd->revents) {
-+				if (e->read_cb != NULL) {
- 					e->read_cb(e->read_cb_arg);
-+					break;
-+				}
- 			}
--			if (n == 0)
--				break;
- 		}
- 	}
- 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 93b3a8d66d9e..b30bb7c24af4 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=9.4.1
-revision=2
+version=10.0.1
+revision=1
 build_style=configure
 make_check_target=test
 configure_args="
@@ -13,8 +13,8 @@ short_desc="RFC2131 compliant DHCP client"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
-distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz"
+checksum=2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 

From 14240b009b648df18598bbf169bd11d71febf349 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 21 May 2023 04:01:50 +0300
Subject: [PATCH 0709/1853] tlpui: update to 1.5.0-7

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

diff --git a/srcpkgs/tlpui/template b/srcpkgs/tlpui/template
index d4d2aeae5852..84e1a213d238 100644
--- a/srcpkgs/tlpui/template
+++ b/srcpkgs/tlpui/template
@@ -1,7 +1,7 @@
 # Template file for 'tlpui'
 pkgname=tlpui
-version=1.5.0+5
-revision=3
+version=1.5.0+7
+revision=1
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="gtk+3 tlp python3-gobject"
@@ -10,11 +10,10 @@ maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/d4nj1/TLPUI"
 distfiles="https://github.com/d4nj1/TLPUI/archive/refs/tags/tlpui-${version/+/-}.tar.gz"
-checksum=563794d142acb79d5654aca70af52c5e8da4cf9677e5058d151474d0af47ea77
+checksum=1d82fe2d52d47c2888d07ba7e70840c06129bbd3f673166c861097cfb8e2ce52
 make_check=no #tests fail inside chroot
 
 post_install() {
-	vmkdir usr/share/icons
-	vcopy tlpui/icons/themeable/hicolor usr/share/icons
-	rm -r "$DESTDIR/$py3_sitelib/tlpui/icons/themeable"
+	vinstall tlpui/icons/themeable/hicolor/scalable/apps/tlpui.svg 644 \
+		usr/share/icons/hicolor/scalable/apps
 }

From 0b9f7937815db90b3f51a52987fc1191c7c4f9b9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 May 2023 09:04:43 -0400
Subject: [PATCH 0710/1853] OpenRCT2: update to 0.4.5.

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

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 774b45dda13c..87f68c27927a 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,12 +2,12 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-version=0.4.4
-revision=2
+version=0.4.5
+revision=1
 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
-_objects_version=1.3.8
+_objects_version=1.3.11
 _titles_version=0.4.0
-_replays_version=0.0.77
+_replays_version=0.0.78
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -35,8 +35,8 @@ changelog="https://openrct2.org/changelog"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="18970bfffe49c77fa81ea6c295119b173a613c7310d7762963458e3e77c24913
- 84a95590d13a753b1d239f7f06c8d121e36fd28694b21f33646518e2012904ae
+checksum="eb9e20dc0dcbf10b02b5f334a029983a0a2b43d931f95a2088a64e8b2657bab1
+ bf85d88e4fb11ca2e5915567390898747dc2459b3c7a057bdc32b829c91780b4
  6e7c7b554717072bfc7acb96fd0101dc8e7f0ea0ea316367a05c2e92950c9029"
 skip_extraction="objects.zip title-sequences.zip"
 
@@ -72,7 +72,7 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DWITH_TESTS=1 -DSYSTEM_GTEST=1"
 	# download replays, used in tests
 	distfiles+=" https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip"
-	checksum+=" 7e6c889368a3b266a2301dfcde9e2a52f9e84041dd6a9252d6201c555ea2cdb2"
+	checksum+=" a6bdfdcc7d916ce060961c5fe7beaf43679fbfad9838cfdbd067617ae0ac0ddf"
 	skip_extraction+=" replays.zip"
 fi
 

From bf250664d000b842cb43bdec2304c39c8b49c8ef Mon Sep 17 00:00:00 2001
From: unknowncartridge <violetnetwork@disroot.org>
Date: Sat, 6 May 2023 15:57:09 +0300
Subject: [PATCH 0711/1853] gimp: update to 2.10.34

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

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8e68f2403d8f..d47a0f208542 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
-version=2.10.32
-revision=4
+version=2.10.34
+revision=1
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -19,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-3.0-only"
 homepage="https://www.gimp.org"
 distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25
+checksum=84004642d351b398a4293cd7fd3592044a944f05bb52850ee6068f247c657aa3
 python_version=2
 lib32disabled=yes
 no_generic_pkgconfig_link=yes
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		vsed -i 's:^py_prefix=$(:py_prefix='"$XBPS_CROSS_BASE"'):' configure
 	fi
 	# don't allow configure to set DATADIRNAME=lib
 	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From ea37166835021a11a7adb290d2ffb03b50fd2b2d Mon Sep 17 00:00:00 2001
From: unknowncartridge <violetnetwork@disroot.org>
Date: Sun, 7 May 2023 03:39:15 +0300
Subject: [PATCH 0712/1853] gimp: update to 2.10.34

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

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d47a0f208542..336e33ae83cc 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i 's:^py_prefix=$(:py_prefix='"$XBPS_CROSS_BASE"'):' configure
+		vsed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 	# don't allow configure to set DATADIRNAME=lib
 	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From f844d981d2a1e2f1fc9df6f5533428094790ec3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=2E=20S=C3=A1nchez?= <o-sanchez@linuxmail.org>
Date: Wed, 12 Apr 2023 02:20:46 -0600
Subject: [PATCH 0713/1853] loksh: update to 7.3

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

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

From e539db12b9a922b3c0acfce88839c44ca09194ae Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 May 2023 07:54:09 +0200
Subject: [PATCH 0714/1853] fwupd: update to 1.9.1.

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

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 5533d2284f56..4389a718783e 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.8.8
+version=1.9.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -20,11 +20,11 @@ conf_files="
  /etc/fwupd/*.conf
  /etc/fwupd/remotes.d/*.conf"
 short_desc="Daemon to allow session software to update firmware"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
+maintainer="dataCobra <datacobra@thinkbot.de>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8f90680c1598407380ad57c15898bd48a903f2a74f3a97469a8e68b18f1fc1
+checksum=0fe2c371a17007af70034e5393f67a23008111f2a5d1fac96440966029a4e8eb
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -62,7 +62,6 @@ pre_build() {
 }
 
 post_install() {
-	vcompletion data/bash-completion/fwupdagent bash fwupdagent
 	vcompletion data/bash-completion/fwupdmgr bash fwupdmgr
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool
 }

From 567109169051d31a88d264b2c9ae7991d0454d2f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 13 Apr 2023 21:20:11 +0100
Subject: [PATCH 0715/1853] wayland: update to 1.22.0.

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

diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 697663da10f8..8382afd36974 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'wayland'
 pkgname=wayland
-version=1.21.0
+version=1.22.0
 revision=1
 build_style=meson
 # "Tests must not be built with NDEBUG defined, they rely on assert()."
@@ -12,7 +12,13 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/wayland-${version}.tar.xz"
-checksum=6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac
+checksum=1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=true"
+else
+	configure_args+=" -Dtests=false"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 3be6e4ab5bd7da5f9c1a9588daadde3b10b4d24c Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 14 Apr 2023 08:18:15 +0200
Subject: [PATCH 0716/1853] qmidiarp: update to 0.6.7

---
 .../patches/add-missing-includes.patch        | 21 -------------------
 srcpkgs/qmidiarp/template                     |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/qmidiarp/patches/add-missing-includes.patch

diff --git a/srcpkgs/qmidiarp/patches/add-missing-includes.patch b/srcpkgs/qmidiarp/patches/add-missing-includes.patch
deleted file mode 100644
index 13cb6658aed0..000000000000
--- a/srcpkgs/qmidiarp/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -69,6 +69,8 @@
- #include "mainwindow.h"
- #include "main.h"
- 
-+#include <sys/types.h>
-+#include <unistd.h>
- 
- static struct option options[] = {
-     {"version", 0, 0, 'v'},
---- a/src/midiworker.h
-+++ b/src/midiworker.h
-@@ -28,6 +28,7 @@
- #include "main.h"
- #include <cstdlib>
- #include <cstdio>
-+#include <sys/types.h>
- 
- 
- /*! @brief MIDI worker base class for QMidiArp modules.
diff --git a/srcpkgs/qmidiarp/template b/srcpkgs/qmidiarp/template
index 04ada9038b07..964024906a6f 100644
--- a/srcpkgs/qmidiarp/template
+++ b/srcpkgs/qmidiarp/template
@@ -1,6 +1,6 @@
 # Template file for 'qmidiarp'
 pkgname=qmidiarp
-version=0.6.5
+version=0.6.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config qt5-host-tools"
@@ -9,8 +9,8 @@ short_desc="MIDI arpeggiator and LFO"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="http://qmidiarp.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=22a3a26d3dbe4bf215aa33c0fd4a79c088549328477840d00e72e50c6e807e10
+distfiles="${SOURCEFORGE_SITE}/project/qmidiarp/qmidiarp/${version}/qmidiarp-${version}.tar.bz2"
+checksum=1bc73896e33da0aa52e90f16f393acb437594b0a9ad8fc97d73b39e028589c2c
 CXXFLAGS="-D_GNU_SOURCE"
 
 pre_configure() {

From 06d536472ad14e5b256020ab74b6c5ab2262ee8c Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Fri, 14 Apr 2023 07:23:46 -0400
Subject: [PATCH 0717/1853] vit: update to 2.3.0

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

diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template
index da2297d91eb5..0a38afbfe215 100644
--- a/srcpkgs/vit/template
+++ b/srcpkgs/vit/template
@@ -1,17 +1,17 @@
 # Template file for 'vit'
 pkgname=vit
-version=2.2.0
-revision=2
+version=2.3.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="task python3-urwid python3-tasklib"
 checkdepends="python3-pytest $depends"
 short_desc="Visual Interactive Taskwarrior full-screen terminal interface"
-maintainer="Cullen Ross <cullenrss@gmail.com>"
+maintainer="Cullen Ross <cullen.ross@proton.me>"
 license="MIT"
 homepage="https://github.com/vit-project/vit"
 distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz"
-checksum=e866c8739822b9e73152ab30c9a009c3aef947533c06f7a5cb244d15c4ea296f
+checksum=f3efd871c607f201251a5d1e0082e5e31e9161dde0df0c6d8b5a3447c76c87c6
 
 do_check() {
 	TERM=linux python3 -m pytest

From ca505d58b6ff29b8346f026b00e3038046f9e17a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Fri, 14 Apr 2023 14:45:09 +0200
Subject: [PATCH 0718/1853] tflint: update to 0.46.1.

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

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index b5b2c4af211b..256db9390a32 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
-version=0.45.0
-revision=2
+version=0.46.1
+revision=1
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"
@@ -9,7 +9,7 @@ maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
 license="MPL-2.0"
 homepage="https://github.com/terraform-linters/tflint"
 distfiles="https://github.com/terraform-linters/tflint/archive/v${version}.tar.gz"
-checksum=74d2852d7f20535458bad329c128c189183c8ba1944deed38c4b820798279b6e
+checksum=a37f2095765a7706e7c2dbdd7f2cd7a14f11b1ff2b7186c61f92c6414d729932
 
 post_install() {
 	vlicense LICENSE

From 9de45ed285dfba55125e0d9760ccd4e7fefc232d Mon Sep 17 00:00:00 2001
From: Justinas Grigas <jstn_as@protonmail.com>
Date: Fri, 14 Apr 2023 21:17:30 +0300
Subject: [PATCH 0719/1853] Bear: update to 3.1.2

Closes: #43445 [via git-merge-pr]
---
 srcpkgs/Bear/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fac8c45145e3..cebf51b64728 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,6 +1,6 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=3.1.0
+version=3.1.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz"
-checksum=33c1f4663d94508f11cbd999dd5571359be7d15b0f473f7cfbea2c0b3190a891
+checksum=5f94e98480bd8576a64cd1d59649f34b09b4e02a81f1d983c92af1113e061fc3
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DENABLE_FUNC_TESTS=OFF -DENABLE_UNIT_TESTS=OFF"

From a0e6824873991541534b7db50452afba6fba53a1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 21 Apr 2023 10:19:56 +0200
Subject: [PATCH 0720/1853] yarn-bin: update to 1.22.19

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

diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 01ce68263ade..46ae0c0a1623 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.22.18
+version=1.22.19
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
@@ -8,7 +8,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=816e5c073b3d35936a398d1fe769ebbcd517298e3510b649e8fc67cd3a62e113
+checksum=732620bac8b1690d507274f025f3c6cfdc3627a84d9642e38a07452cc00e0f2e
 conflicts="yarn>=0"
 
 do_extract() {

From 1672f7df27ce1e0875a7735bffa089bb56d54a11 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 21 Apr 2023 10:22:49 +0200
Subject: [PATCH 0721/1853] yarn: update to 1.22.19

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

diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template
index 834d72024cc7..e63a97e9abca 100644
--- a/srcpkgs/yarn/template
+++ b/srcpkgs/yarn/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn'
 pkgname=yarn
-version=1.22.18
+version=1.22.19
 revision=1
 hostmakedepends="yarn-bin nodejs tar"
 depends="virtual?nodejs-runtime"
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz"
-checksum=accb0911b05329220a6fe7fd14d091add3b62535811ea97503e8579ae5812c2e
+checksum=50af0025d2ef942bf3e6cdd0587dc9c4dd8d6e6e69501b84935d09f2b2b5de8b
 
 conflicts="yarn-bin>=0"
 

From 621100e56ee4dc1cc3ae19ece392fcf1db708355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= <duje.mihanovic@skole.hr>
Date: Wed, 14 Jun 2023 11:52:04 +0200
Subject: [PATCH 0722/1853] srcpkgs: remove myself from maintainer fields

---
 srcpkgs/gwe/template               | 2 +-
 srcpkgs/python3-coveralls/template | 2 +-
 srcpkgs/python3-injector/template  | 2 +-
 srcpkgs/python3-nvml/template      | 2 +-
 srcpkgs/python3-rx/template        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index ea56c8f02967..edc4bff01f77 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -9,7 +9,7 @@ depends="python3 libayatana-appindicator libdazzle python3-matplotlib
  python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
  python3-nvml python3-injector"
 short_desc="Utility for overclocking NVIDIA cards"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/leinardi/gwe"
 changelog="https://gitlab.com/leinardi/gwe/-/raw/release/CHANGELOG.md"
diff --git a/srcpkgs/python3-coveralls/template b/srcpkgs/python3-coveralls/template
index 9a959168a468..6a1730e00366 100644
--- a/srcpkgs/python3-coveralls/template
+++ b/srcpkgs/python3-coveralls/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools python3-coverage"
 depends="python3"
 short_desc="Python API for coveralls.io"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/z4r/python-coveralls"
 distfiles="https://github.com/z4r/python-coveralls/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-injector/template b/srcpkgs/python3-injector/template
index b39d5c6992bd..a44b7907b6e5 100644
--- a/srcpkgs/python3-injector/template
+++ b/srcpkgs/python3-injector/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-typing_extensions python3-setuptools"
 depends="python3 python3-typing_extensions"
 checkdepends="python3-pytest python3-pytest-cov"
 short_desc="Python dependency injection framework"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/alecthomas/injector"
 distfiles="https://github.com/alecthomas/injector/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-nvml/template b/srcpkgs/python3-nvml/template
index 6b417b18728c..ef12edc578c7 100644
--- a/srcpkgs/python3-nvml/template
+++ b/srcpkgs/python3-nvml/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-xmltodict"
 short_desc="Python bindings for NVML library"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/fbcotter/py3nvml"
 distfiles="https://github.com/fbcotter/py3nvml/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-rx/template b/srcpkgs/python3-rx/template
index cc3306dfdfd6..067d6f40767d 100644
--- a/srcpkgs/python3-rx/template
+++ b/srcpkgs/python3-rx/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-pytest"
 depends="python3 python3-pytest"
 checkdepends="python3-gobject python3-gobject-devel gtk+3-devel"
 short_desc="Reactive Extensions for Python"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://rxpy.rtfd.io/"
 distfiles="https://github.com/ReactiveX/RxPY/archive/v${version}.tar.gz"

From bff6ed48c5eab28fedbe27fe657238286b462410 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 13 Apr 2023 09:51:23 +0000
Subject: [PATCH 0723/1853] diffr: update to 0.1.5.

---
 ...51190affd4ce676bb184cd8cc52e20947bfc.patch | 78 -------------------
 srcpkgs/diffr/template                        | 13 ++--
 2 files changed, 7 insertions(+), 84 deletions(-)
 delete mode 100644 srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch

diff --git a/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch b/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch
deleted file mode 100644
index 60b9b2f86df9..000000000000
--- a/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From eca551190affd4ce676bb184cd8cc52e20947bfc Mon Sep 17 00:00:00 2001
-From: Nathan Moreau <nathan.moreau@m4x.org>
-Date: Thu, 19 Mar 2020 23:47:50 +0100
-Subject: [PATCH] Fix build on 32 bits plateforms.
-
----
- src/main.rs | 8 ++++----
- src/test.rs | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/main.rs b/src/main.rs
-index bccc6c4..333438f 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -574,7 +574,7 @@ struct HunkHeader {
-     plus_range: (usize, usize),
- }
- 
--const WIDTH: [usize; 20] = [
-+const WIDTH: [u64; 20] = [
-     0,
-     9,
-     99,
-@@ -597,7 +597,7 @@ const WIDTH: [usize; 20] = [
-     9999999999999999999,
- ];
- 
--fn width1(x: usize) -> usize {
-+fn width1(x: u64) -> usize {
-     let result = WIDTH.binary_search(&x);
-     match result {
-         Ok(i) | Err(i) => i,
-@@ -613,8 +613,8 @@ impl HunkHeader {
-     }
- 
-     fn width(&self) -> usize {
--        2 * width1(self.minus_range.0 + self.minus_range.1)
--            .max(width1(self.plus_range.0 + self.plus_range.1))
-+        2 * width1((self.minus_range.0 + self.minus_range.1) as u64)
-+            .max(width1((self.plus_range.0 + self.plus_range.1) as u64))
-             + 1
-     }
- }
-diff --git a/src/test.rs b/src/test.rs
-index d1254d3..5de7ba4 100644
---- a/src/test.rs
-+++ b/src/test.rs
-@@ -63,12 +63,12 @@ fn parse_line_number_test() {
- #[test]
- fn test_width() {
-     for (i, x) in WIDTH.iter().enumerate() {
--        if x < &usize::max_value() {
-+        if x < &u64::max_value() {
-             assert_eq!(format!("{}", x + 1).len(), i + 1);
-         }
-     }
-     assert_eq!(0, width1(0));
--    fn test(x: usize) {
-+    fn test(x: u64) {
-         assert_eq!(format!("{}", x).len(), width1(x));
-     }
-     for i in 1..=10000 {
-@@ -80,7 +80,7 @@ fn test_width() {
-     for i in 0..64 {
-         test(1 << i);
-     }
--    test(usize::max_value());
-+    test(u64::max_value());
- 
-     assert_eq!("123:456".len(), HunkHeader::new((123, 5), (456, 9)).width());
-     assert_eq!(
-@@ -88,5 +88,5 @@ fn test_width() {
-         HunkHeader::new((123, 999), (456, 9)).width()
-     );
-     assert_eq!("   :456".len(), HunkHeader::new((0, 0), (456, 9)).width());
--    assert_eq!(MAX_MARGIN, 2 * width1(usize::max_value()) + 1);
-+    assert_eq!(MAX_MARGIN, 2 * width1(u64::max_value()) + 1);
- }
diff --git a/srcpkgs/diffr/template b/srcpkgs/diffr/template
index 871bf6988fa6..5a8e3e744ce3 100644
--- a/srcpkgs/diffr/template
+++ b/srcpkgs/diffr/template
@@ -1,18 +1,19 @@
 # Template file for 'diffr'
 pkgname=diffr
-version=0.1.4
-revision=2
+version=0.1.5
+revision=1
 build_style=cargo
-short_desc="LCS based diff highlighting tool to ease code review from your terminal"
+# skip cli tests: fail to find executable
+make_check_args="-- --skip tests_cli"
+short_desc="Yet another diff highlighting tool"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="MIT"
 homepage="https://github.com/mookid/diffr"
 changelog="https://github.com/mookid/diffr/raw/master/CHANGELOG.md"
 distfiles="https://github.com/mookid/diffr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2613b57778df4466a20349ef10b9e022d0017b4aee9a47fb07e78779f444f8cb
+checksum=6c5861e5b8f5d798e027fe69cc186452848dc4ae5641326b41b5c160d3e91654
 
-do_install() {
-	vbin "target/${RUST_TARGET}/release/diffr"
+post_install() {
 	vlicense LICENSE.txt
 	vdoc README.md
 }

From cddc35bc44426c546dd81817a48dc9665365564b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:18:38 -0400
Subject: [PATCH 0724/1853] aide: update to 0.18.4.

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

diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index cfd14f0d6d4a..32e90793100e 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.18.3
+version=0.18.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=d47da12c4bf085bfdf1828e087a1db5195a4d217ff4c89f40dbd94e2a887a6a2
+checksum=4f7e2c7f49f3ca25fdafad6170390a4d8c8334af17bbd48ad34dbd6dde4ee757
 
 export MHASH_CFLAGS="=I${XBPS_CROSS_BASE}/usr/include"
 export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"

From 3da465bbe9649a9e0b97bcce8b0f1463a6511732 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:19:46 -0400
Subject: [PATCH 0725/1853] python3-art: update to 6.0.

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

diff --git a/srcpkgs/python3-art/template b/srcpkgs/python3-art/template
index 83be4113b138..0c07a817a57b 100644
--- a/srcpkgs/python3-art/template
+++ b/srcpkgs/python3-art/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-art'
 pkgname=python3-art
-version=5.9
+version=6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.ascii-art.site/"
 changelog="https://raw.githubusercontent.com/sepandhaghighi/art/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/a/art/art-${version}.tar.gz"
-checksum=6a311ec0a227c6554c6789e91e74c3f2c86453a2a8e76947788695b7a91ccff0
+checksum=884ef1c10e900387cce97789e8668125720cbf4459206641b91fc298c859cda9
 make_check=no # no tests available
 
 post_install() {

From e996eb67540dac99ab7f66d612f87ff62a47842d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:24:45 -0400
Subject: [PATCH 0726/1853] python3-google-i18n-address: update to 3.1.0.

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

diff --git a/srcpkgs/python3-google-i18n-address/template b/srcpkgs/python3-google-i18n-address/template
index 81c5425c20e2..9e9e68a6c84b 100644
--- a/srcpkgs/python3-google-i18n-address/template
+++ b/srcpkgs/python3-google-i18n-address/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-google-i18n-address'
 pkgname=python3-google-i18n-address
-version=3.0.0
+version=3.1.0
 revision=1
 build_style=python3-pep517
 make_check_target="tests/"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mirumee/google-i18n-address"
 distfiles="https://github.com/mirumee/google-i18n-address/archive/refs/tags/${version}.tar.gz"
-checksum=387b4683936bbc19d1cf9a1dbf8f08610742f5ad3db72b681240b2e43a120c05
+checksum=96044d9a09fed1b7c5a289b4880bee23d7de26696a7908c4e6e7c07668f2b9af

From 5724c1da163b4e167e798e39142f775c8aadc35b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:26:00 -0400
Subject: [PATCH 0727/1853] python3-rich: update to 13.4.2.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 914fac194563..c3f2e7da0ff2 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=13.4.1
+version=13.4.2
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=76f6b65ea7e5c5d924ba80e322231d7cb5b5981aa60bfc1e694f1bc097fe6fe1
+checksum=d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898
 make_check=extended # some checks only work on windows
 
 post_install() {

From 5a4c0cf27b115bc0e05d9086449403900925178b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:27:35 -0400
Subject: [PATCH 0728/1853] yara: update to 4.3.2.

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

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index f593415a3385..fda4eee8dd0b 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.3.1
+version=4.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=f64538279c018bcf7cda368c51b9c660556108ab2e7eb24de043738df2271d92
+checksum=a9587a813dc00ac8cdcfd6646d7f1c172f730cda8046ce849dfea7d3f6600b15
 
 pre_configure() {
 	autoreconf -fi

From 66710696bcfb99d78d45583de1d39a0113f457f5 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Thu, 15 Jun 2023 10:46:35 +0100
Subject: [PATCH 0729/1853] dotool: orphan

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

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 2b86e31ad314..7503b8d71a5b 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"
 short_desc="Command to simulate input anywhere (X11, Wayland, TTYs)"
-maintainer="John Gebbie <me@johngebbie.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://sr.ht/~geb/dotool"
 changelog="https://git.sr.ht/~geb/dotool/blob/master/CHANGELOG.md"

From 3a6ee88305bbfa055a8056a9f592c853acdfbee1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Thu, 15 Jun 2023 10:46:51 +0100
Subject: [PATCH 0730/1853] openfst: orphan

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

diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..9449a7085279 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -24,7 +24,7 @@ configure_args="
 "
 hostmakedepends="autoconf automake libtool"
 short_desc="Finite-state transducers library"
-maintainer="John Gebbie <me@johngebbie.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.openfst.org"
 distfiles="https://www.openfst.org/twiki/pub/FST/FstDownload/openfst-$version.tar.gz"

From fa9102437a24a2d588ce4b432fe14b3b7ec62eaf Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Thu, 15 Jun 2023 10:47:07 +0100
Subject: [PATCH 0731/1853] vosk-api: orphan

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

diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..5af846b55795 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -12,7 +12,7 @@ make_use_env=yes
 make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
 makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
 short_desc="Offline speech recognition toolkit"
-maintainer="John Gebbie <me@johngebbie.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://alphacephei.com/vosk"
 distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz

From f48d8e88551a65468d168e5307d7ef9ad6c67726 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 18:26:15 +0100
Subject: [PATCH 0732/1853] fuse3: update to 3.15.0.

---
 srcpkgs/fuse3/patches/804.patch | 38 +++++++++++++++++++++++++++++++++
 srcpkgs/fuse3/template          |  7 +++---
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/fuse3/patches/804.patch

diff --git a/srcpkgs/fuse3/patches/804.patch b/srcpkgs/fuse3/patches/804.patch
new file mode 100644
index 000000000000..6894337fe198
--- /dev/null
+++ b/srcpkgs/fuse3/patches/804.patch
@@ -0,0 +1,38 @@
+From 6d21930baa4379023414706ce1750e0d729b99f0 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 12 Jun 2023 12:15:35 +0000
+Subject: [PATCH] Wrapper around test applications for cross compiler
+ environment in meson.build
+
+This enhances commit 7be56c57f93e3436b1fbd9ecc320de5c03a3e4b8 to allow build
+fuse to be built using a cross compiler
+
+Fixes:
+../meson.build:180:12: ERROR: Can not run test applications in this cross environment.
+---
+https://github.com/libfuse/libfuse/pull/804
+
+ meson.build | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 7aa4e0d47..9707ea3e2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -177,10 +177,12 @@ int main()
+ }
+ '''
+ 
+-result = cc.run(detect_getmntent_needs_unescape)
+-if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping'
+-  message('getmntent does not unescape')
+-  add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c')
++if not meson.is_cross_build()
++  result = cc.run(detect_getmntent_needs_unescape)
++  if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping'
++    message('getmntent does not unescape')
++    add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c')
++  endif
+ endif
+ 
+ # Write private test results into fuse_config.h (stored in build directory)
diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index 5593044a0483..38e46546995c 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,9 +1,10 @@
 # Template file for 'fuse3'
 pkgname=fuse3
-version=3.14.1
+version=3.15.0
 revision=1
 build_style=meson
-configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false"
+configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false
+ -Dtests=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"
 short_desc="Filesystem in Userspace 3.x"
@@ -12,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/libfuse/libfuse"
 changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst"
 distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=126919d72b46b3e0eb58a9c6933a2a50c36f2ea69f61fe9e78bdba9f463ffa20
+checksum=70589cfd5e1cff7ccd6ac91c86c01be340b227285c5e200baa284e401eea2ca0
 conf_files="/etc/fuse.conf"
 # Tests require root
 make_check=no

From 52eaa40957b2836e94ee5a8c2c0a5d3ea13f7744 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 14 Jun 2023 11:39:54 -0400
Subject: [PATCH 0733/1853] pueue: update to 3.2.0

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

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index 39d676079257..a747b9c4557a 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -1,6 +1,6 @@
 # Template file for 'pueue'
 pkgname=pueue
-version=3.1.2
+version=3.2.0
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/Nukesor/pueue"
 changelog="https://raw.githubusercontent.com/Nukesor/pueue/main/CHANGELOG.md"
 distfiles="https://github.com/Nukesor/pueue/archive/refs/tags/v${version}.tar.gz"
-checksum=653eac9b7fc111cc4b9bddacbbf514932a8d273a059b20b1cc66af74e500eb5e
+checksum=0c3126579661f894fb02a0d8c0e138ab23b277e97cea2d85e48d3d2b9fb1c372
 make_check=no  # tests are nondeterministic
 
 case "$XBPS_TARGET_MACHINE" in

From 9b53e7c686b1276f52d34f746debeeeaef3278b0 Mon Sep 17 00:00:00 2001
From: toomyem <toomyem@gmail.com>
Date: Wed, 14 Jun 2023 11:55:13 +0200
Subject: [PATCH 0734/1853] moosefs: added mfscgiserv service

---
 srcpkgs/moosefs/files/mfscgiserv/run | 4 ++++
 srcpkgs/moosefs/template             | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/moosefs/files/mfscgiserv/run

diff --git a/srcpkgs/moosefs/files/mfscgiserv/run b/srcpkgs/moosefs/files/mfscgiserv/run
new file mode 100644
index 000000000000..4eee2a80277e
--- /dev/null
+++ b/srcpkgs/moosefs/files/mfscgiserv/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -e conf ] && . ./conf
+exec mfscgiserv -f $OPTS start
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index 0c14645f9b22..6903e7e07ec1 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -1,7 +1,7 @@
 # Template file for 'moosefs'
 pkgname=moosefs
 version=3.0.117
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib --with-default-user=_mfs
  --with-default-group=_mfs"
@@ -23,7 +23,7 @@ pre_configure() {
 
 post_install() {
 	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
-	for f in chunkserver master metalogger; do
+	for f in chunkserver master metalogger cgiserv; do
 		vsv mfs${f}
 	done
 }

From 9e7f16b5f58691cdf8b039229cacc9b3173fd5c2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 19:04:56 +0100
Subject: [PATCH 0735/1853] jack: update to 1.9.22.

---
 srcpkgs/jack/patches/python3.11.patch | 36 ---------------------------
 srcpkgs/jack/template                 | 14 +++++------
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/jack/patches/python3.11.patch

diff --git a/srcpkgs/jack/patches/python3.11.patch b/srcpkgs/jack/patches/python3.11.patch
deleted file mode 100644
index 5b52a9bfb43f..000000000000
--- a/srcpkgs/jack/patches/python3.11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-U is included by default and deprecated since 3.3 and an error since 3.11
-
-https://github.com/jackaudio/jack2/issues/898
-adapted from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
-
---- a/waflib/ConfigSet.py
-+++ b/waflib/ConfigSet.py
-@@ -312,7 +312,7 @@ class ConfigSet(object):
- 		:type filename: string
- 		"""
- 		tbl = self.table
--		code = Utils.readf(filename, m='rU')
-+		code = Utils.readf(filename, m='r')
- 		for m in re_imp.finditer(code):
- 			g = m.group
- 			tbl[g(2)] = eval(g(3))
---- a/waflib/Context.py
-+++ b/waflib/Context.py
-@@ -266,7 +266,7 @@ class Context(ctx):
- 				cache[node] = True
- 				self.pre_recurse(node)
- 				try:
--					function_code = node.read('rU', encoding)
-+					function_code = node.read('r', encoding)
- 					exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
- 				finally:
- 					self.post_recurse(node)
-@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
- 
- 	module = imp.new_module(WSCRIPT_FILE)
- 	try:
--		code = Utils.readf(path, m='rU', encoding=encoding)
-+		code = Utils.readf(path, m='r', encoding=encoding)
- 	except EnvironmentError:
- 		raise Errors.WafError('Could not read the file %r' % path)
- 
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 7e4de615e0ad..05c1ae08ce04 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,13 +1,12 @@
 # Template file for 'jack'
 pkgname=jack
-version=1.9.21
+version=1.9.22
 revision=1
 build_style=waf3
-configure_args="--alsa --classic --dbus --example-tools"
+configure_args="--alsa --classic --dbus"
 hostmakedepends="pkg-config"
-makedepends="eigen opus-devel libsamplerate-devel readline-devel
- dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel)
- $(vopt_if zalsa 'zita-alsa-pcmi-devel zita-resampler-devel')"
+makedepends="eigen opus-devel libsamplerate-devel dbus-devel db-devel celt-devel
+ $(vopt_if ffado libffado-devel)"
 depends="python3-dbus"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,13 +14,12 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://jackaudio.org/"
 changelog="https://raw.githubusercontent.com/jackaudio/jack2/master/ChangeLog.rst"
 distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d
+checksum=1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849
 python_version=3
 
 # Package build options
-build_options="ffado zalsa"
+build_options="ffado"
 desc_option_ffado="Enable support for FireWire audio devices"
-desc_option_zalsa="Enable support for internal zita-a2j/j2a clients"
 
 post_install() {
 	# pam_limits(8) support

From c1053c603434ee034b1b2f023f3d179dde2aaede Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 14 Jun 2023 20:57:34 +0200
Subject: [PATCH 0736/1853] treeline: update to 3.1.6

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

diff --git a/srcpkgs/treeline/template b/srcpkgs/treeline/template
index c7357c76dce1..c500da127d46 100644
--- a/srcpkgs/treeline/template
+++ b/srcpkgs/treeline/template
@@ -1,7 +1,7 @@
 # Template file for 'treeline'
 pkgname=treeline
-version=3.1.5
-revision=2
+version=3.1.6
+revision=1
 pycompile_dirs="usr/share/treeline"
 hostmakedepends="python3"
 depends="python3-PyQt5"
@@ -10,7 +10,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://treeline.bellz.org/"
 distfiles="https://github.com/doug-101/TreeLine/archive/v${version}.tar.gz"
-checksum=8bef3c3819dab7968f8cd46e3a1e817a06259270d3d01f4eb9f22b1821094650
+checksum=c4f187797365ef224bb285ef5d7e90a64b0ae33573d27599fb18d7af54b42d4d
 python_version=3
 
 do_install() {

From 64ff34b22f26b92f03d5a45f5194d0abfb9fd5d4 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 14 Jun 2023 11:47:43 +0200
Subject: [PATCH 0737/1853] soundtouch: update to 2.3.2

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

diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template
index f2ed0f607fdf..f9a7c06bee7a 100644
--- a/srcpkgs/soundtouch/template
+++ b/srcpkgs/soundtouch/template
@@ -1,6 +1,6 @@
 # Template file for 'soundtouch'
 pkgname=soundtouch
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-openmp"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.surina.net/soundtouch"
 distfiles="https://www.surina.net/soundtouch/soundtouch-${version}.tar.gz"
-checksum=6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1
+checksum=3bde8ddbbc3661f04e151f72cf21ca9d8f8c88e265833b65935b8962d12d6b08
 
 pre_configure() {
 	./bootstrap

From 10f763a6052dcd677f75155068f052d0cf9d67d5 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 14 Jun 2023 11:40:42 +0200
Subject: [PATCH 0738/1853] parted: update to 3.6

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

diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 32c62d8e8072..0d2a4fff3a4e 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -1,6 +1,6 @@
 # Template file for 'parted'
 pkgname=parted
-version=3.5
+version=3.6
 revision=1
 build_style=gnu-configure
 # parted wants off_t as 64bit type
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/parted/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2
+checksum=3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612
 
 libparted_package() {
 	short_desc+=" - shared library"

From 6a284b860171c3dd3cd67456d7269bafaaad305d Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Wed, 14 Jun 2023 19:07:01 +0000
Subject: [PATCH 0739/1853] mesa: update to 23.1.2.

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

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 04d3a1dfe680..2ebb1cff2013 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=23.1.1
+version=23.1.2
 revision=1
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -17,13 +17,13 @@ makedepends="elfutils-devel expat-devel libXdamage-devel
  libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
  libarchive-devel"
 depends="libglvnd"
-short_desc="Graphics library similar to SGI's OpenGL"
+short_desc="Open source implementation of OpenGL and Vulkan"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
+checksum=60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e
 
 build_options="wayland"
 build_options_default="wayland"

From f6a6a863a608bc8327314c86e66abf97c2991274 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:24:25 -0500
Subject: [PATCH 0740/1853] haproxy: update to 2.6.14.

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

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index fbf13377f601..635755fe4173 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.6.13
+version=2.6.14
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 changelog="https://www.haproxy.org/download/${version%.*}/src/CHANGELOG"
 distfiles="https://www.haproxy.org/download/${version%.*}/src/haproxy-${version}.tar.gz"
-checksum=d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243
+checksum=bd3dd9fa60391ca09e1225e1ac3163e45be83c3f54f2fd76a30af289cc6e4fd4
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From e1a661d5d3dd193c6f9842e0b81a7e0cac35a82f Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 4 May 2023 21:37:33 +0300
Subject: [PATCH 0741/1853] openrazer-meta: update to 3.6.1.

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

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index e824d9f7d293..81300dbfddb5 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,6 +1,6 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
-version=3.5.1
+version=3.6.1
 revision=1
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -12,7 +12,7 @@ maintainer="Martin Dimov <martin@dmarto.com>"
 license="GPL-2.0-or-later"
 homepage="https://openrazer.github.io"
 distfiles="https://github.com/openrazer/openrazer/releases/download/v${version}/openrazer-${version}.tar.xz"
-checksum=0dd242fe95a804e437359f1730be8bbb1ffc19b9d60bc3f23d481e541eb25bec
+checksum=bbb33fc3fbe329d178793fe3e24e60cbe5369c5996b8e1546de2950669ef675b
 
 do_build() {
 	:

From 48317718b74b7de61bc6c888f56993aa7a654db3 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 15 Jun 2023 01:23:03 +0300
Subject: [PATCH 0742/1853] mate-tweak: update to 22.10.0

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

diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 511a09af4b39..256efec8ef71 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
-version=21.10.0
-revision=2
+version=22.10.0
+revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
 depends="mate-panel python3-gobject python3-psutil python3-setproctitle
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ubuntu-mate/mate-tweak"
 distfiles="https://github.com/ubuntu-mate/mate-tweak/archive/${version}.tar.gz"
-checksum=1bacc9b92960c712697e0c44fbcaaebed9683b4ff899af5af88506f7e13e1aff
+checksum=c33c092b0151b50d8a5706825f1bcef57f1738f8f5cf22af49c11f45bc14e84a

From 20648e54fff25231992d467371dbd167c88ad59d Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 14 Jun 2023 19:50:22 -0500
Subject: [PATCH 0743/1853] Signal-Desktop: update to 6.21.0.

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 88a862a26a14..6bd0160a886c 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,20 +1,20 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.20.2
+version=6.21.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
 # https://git.alpinelinux.org/aports/tree/testing/signal-desktop
 # ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
 archs="x86_64"
-hostmakedepends="git git-lfs nodejs python3 tar"
+hostmakedepends="git git-lfs nodejs-lts python3 tar"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
 maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=8cca38e0ce70bec39a9d3f4c1d51bfec95a1455187c5ec1001ce98ec55f9c3e5
+checksum=fea24e57de48cf60f42f40764429176cd236a0a765bb18e1815e2d56511923f7
 nostrip_files="signal-desktop"
 
 post_extract() {

From 579fa2eba411187ccf7bde7806b869e127370492 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 17 May 2023 09:56:01 +0200
Subject: [PATCH 0744/1853] curl: update to 8.1.2

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

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index b43961934747..df7d4ed01555 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=8.0.1
-revision=2
+version=8.1.2
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  --enable-websockets --with-random=/dev/urandom
@@ -22,10 +22,10 @@ checkdepends="python3 stunnel nghttp2 impacket"
 short_desc="Client that groks URLs"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
-homepage="https://curl.haxx.se"
-changelog="https://curl.haxx.se/changes.html#${version//./_}"
-distfiles="${homepage}/download/curl-${version}.tar.bz2"
-checksum=9b6b1e96b748d04b968786b6bdf407aa5c75ab53a3d37c1c8c81cdb736555ccf
+homepage="https://curl.se"
+changelog="https://curl.se/changes.html"
+distfiles="https://curl.se/download/curl-${version}.tar.gz"
+checksum=2e5a9b8fcdc095bdd2f079561f369de71c5eb3b80f00a702fbe9a8b8d9897891
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssl zstd"
 vopt_conflict ssl gnutls

From 85fa2fa0c7fa2c4f1c158c497b3b7784ad1086b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 15 Jun 2023 14:59:44 +0200
Subject: [PATCH 0745/1853] openbsd-netcat: update to 1.225.

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

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 4b09dfe9a28b..ed569eadb2d4 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.219
+version=1.225
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="576487c3a4930987a5dc7b369340f07f3ef15abe7cd743d88036990bd8d89dca
- 3f5f801bacd740075d563137387004a6e651d56801e369026c2387a041b4d357"
+checksum="ab3f2e789160e3f46a1fdff6465d20efa1e40c505a8262e1121adbf1adf79d65
+ 8ddff3d8567e24c3886dceda6ae70d21d21df2d4c23c6e78bf69bdd72c81f26a"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From 8d093212d4a98faa42320932631bf1c549c13269 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 19:22:15 +0100
Subject: [PATCH 0746/1853] intel-ucode: update to 20230613, adopt.

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

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index f6673a50ae32..090c0c57a1ff 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,14 +1,14 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20230516
+version=20230613
 revision=1
 archs="i686* x86_64*"
 short_desc="Microcode update files for Intel CPUs"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${version}.tar.gz"
-checksum=ad8cbc5a273f4640003f6a3f1b129ac6a046f3498ce037921ebac1adf267e55d
+checksum=894d822d2347222a2595d4fc47d358e01d35a54780123100c317dfc31b1b0cc9
 repository=nonfree
 
 do_install() {

From c8942ce3e38aed7657ef33f3f0ac276ac38ff673 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 8 Jun 2023 17:41:04 +0200
Subject: [PATCH 0747/1853] New package: linux-wifi-hotspot-4.5.0

---
 .../linux-wifi-hotspot/patches/makefile.patch | 24 +++++++++++++++++++
 srcpkgs/linux-wifi-hotspot/template           | 19 +++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/linux-wifi-hotspot/patches/makefile.patch
 create mode 100644 srcpkgs/linux-wifi-hotspot/template

diff --git a/srcpkgs/linux-wifi-hotspot/patches/makefile.patch b/srcpkgs/linux-wifi-hotspot/patches/makefile.patch
new file mode 100644
index 000000000000..7f1eecea7b75
--- /dev/null
+++ b/srcpkgs/linux-wifi-hotspot/patches/makefile.patch
@@ -0,0 +1,24 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,7 +1,7 @@
+ CC=gcc
+ PKGCONFIG = $(shell which pkg-config)
+
+-CFLAGS=`pkg-config --cflags gtk+-3.0`
++CFLAGS_PKGCONF=`pkg-config --cflags gtk+-3.0`
+ LIBS=`pkg-config --libs gtk+-3.0 --libs x11` -lstdc++ -lpng -lqrencode
+
+ APP_NAME="wihotspot"
+@@ -32,10 +32,10 @@ resources.c: ui/glade/wifih.gresource.xml ui/glade/wifih.ui
+ 	@$(MAKE) -f $(THIS_FILE) wihotspot-gui
+
+ $(ODIR)/%.o: ui/%.c
+-	$(CC) -c -o $@ $< $(CFLAGS)
++	$(CC) -c -o $@ $< $(CFLAGS) $(CFLAGS_PKGCONF)
+
+ $(ODIR)/%.o: ui/%.cpp
+-	g++ -c -o $@ $<
++	$(CXX) -c -o $@ $< $(CXXFLAGS)
+
+ wihotspot-gui: $(OBJ)
+ 	$(CC) -o $(ODIR)/$@ $^ $(CFLAGS) $(LIBS)
\ No newline at end of file
diff --git a/srcpkgs/linux-wifi-hotspot/template b/srcpkgs/linux-wifi-hotspot/template
new file mode 100644
index 000000000000..a2c03b268264
--- /dev/null
+++ b/srcpkgs/linux-wifi-hotspot/template
@@ -0,0 +1,19 @@
+# Template file for 'linux-wifi-hotspot'
+pkgname=linux-wifi-hotspot
+version=4.5.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config which glib-devel"
+makedepends="gtk+3-devel libpng-devel qrencode-devel"
+depends="bash dnsmasq hostapd iproute2 iptables iw procps-ng util-linux"
+short_desc="Feature-rich wifi hotspot creator"
+maintainer="Bnyro <bnyro@tutanota.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/lakinduakash/linux-wifi-hotspot"
+distfiles="https://github.com/lakinduakash/linux-wifi-hotspot/archive/refs/tags/v${version}.tar.gz"
+checksum=9e4222b7d3129347b01eef711911ec87c9a04e20efd12d88565f682a14eb91da
+conflicts="create_ap"
+
+post_install() {
+	vlicense LICENSE
+}

From 8d64b4511946e040b30afc5c873f36f23b8e6598 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 15 Jun 2023 16:05:02 +0200
Subject: [PATCH 0748/1853] vpm: fix deleted source repo

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

diff --git a/srcpkgs/vpm/template b/srcpkgs/vpm/template
index 39ee867e1306..e17df504af7f 100644
--- a/srcpkgs/vpm/template
+++ b/srcpkgs/vpm/template
@@ -5,9 +5,9 @@ revision=3
 short_desc="XBPS package management helper for VoidLinux"
 maintainer="Armin Jenewein <github@m2m.pm>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/netzverweigerer/vpm"
-distfiles="https://github.com/netzverweigerer/${pkgname}/archive/${version}.tar.gz"
-checksum=56994ba90aaf9055d0c20a7fbbce7faf6b6d245fba551a427312114f7cb78ae4
+homepage="https://codeberg.org/armin/vpm"
+distfiles="https://codeberg.org/armin/${pkgname}/archive/${version}.tar.gz"
+checksum=ba5349344de9c9b3e2e0f1553792b1f8d6939d9f82d77b76b494d16a482ceb13
 
 do_install() {
 	vbin vpm

From e9c41563ca975fe264c39c3a4718072c2ad8f47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 01:01:14 -0300
Subject: [PATCH 0749/1853] python3-argcomplete: update to 3.1.1.

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

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index abe32205b908..62593c46ff10 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,13 +1,20 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
-version=3.0.5
+version=3.1.1
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-wheel"
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3"
+checkdepends="python3-pexpect python3-pip zsh"
 short_desc="Bash tab completion for argparse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/argcomplete"
+changelog="https://raw.githubusercontent.com/kislyuk/argcomplete/develop/Changes.rst"
 distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz"
-checksum=fe3ce77125f434a0dd1bffe5f4643e64126d5731ce8d173d36f62fa43d6eb6f7
+checksum=6c4c563f14f01440aaffa3eae13441c5db2357b5eec639abe7c0b15334627dff
+
+do_check() {
+	# pytest is not supported
+	python3 -m unittest -b test/test.py
+}

From d133c0169b495a8c8feb5a0dd56b159504307694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 12:59:09 -0300
Subject: [PATCH 0750/1853] python3-BeautifulSoup4: update to 4.12.2.

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

diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 882ea8a33214..25d104f6d0d4 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-BeautifulSoup4'
 pkgname=python3-BeautifulSoup4
-version=4.11.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3 python3-soupsieve"
-checkdepends="python3-pytest $depends"
+version=4.12.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-soupsieve"
+checkdepends="$depends python3-pytest python3-html5lib python3-lxml"
 short_desc="Python3 HTML/XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.crummy.com/software/BeautifulSoup"
-changelog="https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/CHANGELOG"
+changelog="https://git.launchpad.net/beautifulsoup/plain/CHANGELOG"
 distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693
+checksum=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da
 
 post_install() {
 	vlicense LICENSE

From d829f339769a1da84338342b62529b2fd8b43bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 12:25:30 -0300
Subject: [PATCH 0751/1853] python3-bleach: update to 6.0.0.

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

diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index aea09c368c1f..1a14acbfc21f 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-bleach'
 pkgname=python3-bleach
-version=4.1.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-six python3-webencodings python3-packaging"
+version=6.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-six python3-webencodings"
 checkdepends="python3-pytest $depends"
 short_desc="Easy safelist-based HTML-sanitizing tool (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/mozilla/bleach"
 changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
 distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da
+checksum=1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414

From caf090d391d0d3148abd7e264faf0a54e9ca548c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 10:28:43 -0300
Subject: [PATCH 0752/1853] python3-fastjsonschema: update to 2.17.1.

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

diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
index 7e4495b9456b..54fbdb6dde10 100644
--- a/srcpkgs/python3-fastjsonschema/template
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-fastjsonschema'
 pkgname=python3-fastjsonschema
-version=2.16.3
+version=2.17.1
 revision=1
-build_style=python3-module
-make_check_args="--deselect tests/benchmarks/test_benchmark.py"
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-benchmark"
 short_desc="Fastest Python implementation of JSON schema"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://github.com/horejsek/python-fastjsonschema"
 changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
 distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
-checksum=f9834e4994830942d58949043820024261dc22e2640bcf787391deb607cc91c6
+checksum=9295090b468152cea7a53c651a46d6a1afb83f0124f86c9a64da43fd3453a9f4
 
 post_install() {
 	vlicense LICENSE

From 8b6319a345c22220606d165f192551d8ee9a2a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Jun 2023 23:00:05 -0300
Subject: [PATCH 0753/1853] python3-jsonpointer: update to 2.3.

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

diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
index 1da8295d63fc..59b38c2228d6 100644
--- a/srcpkgs/python3-jsonpointer/template
+++ b/srcpkgs/python3-jsonpointer/template
@@ -1,18 +1,23 @@
 # Template file for 'python3-jsonpointer'
 pkgname=python3-jsonpointer
-version=2.0
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=2.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 short_desc="Resolve JSON Pointers according to RFC 6901 (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/stefankoegl/python-json-pointer"
 distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
-checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
+checksum=97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a
 conflicts="python-jsonpointer>=0"
 
+do_check() {
+	# pytest is not supported
+	python3 tests.py
+}
+
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }

From 7936acd7afa2e1a6074a3b523baac95073ed8db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 00:30:38 -0300
Subject: [PATCH 0754/1853] python3-nest_asyncio: update to 1.5.6.

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

diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index 41981f82fc19..d0165041eb17 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-nest_asyncio'
 pkgname=python3-nest_asyncio
-version=1.5.4
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+version=1.5.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Python asyncio patch to allow nested event loops"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/erdewit/nest_asyncio"
 distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
-checksum=f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd
+checksum=d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290
 
 post_install() {
 	vlicense LICENSE

From 9fd409954ef5e9d089f9df5649af4419a5758bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Jun 2023 23:08:30 -0300
Subject: [PATCH 0755/1853] python3-pyrsistent: update to 0.19.3.

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

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index 50ead293041f..d8e8578064ae 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel"
+version=0.19.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-devel"
 depends="python3"
 checkdepends="python3-pytest python3-hypothesis"
 short_desc="Python persistent immutable data structures"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
+changelog="https://raw.githubusercontent.com/tobgu/pyrsistent/master/CHANGES.txt"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96
+checksum=1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440
 
 post_install() {
 	vlicense LICENSE.mit LICENSE

From f06aa95b4416b3d9a197d9ecb9a1d58b9ca0552d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 00:32:26 -0300
Subject: [PATCH 0756/1853] python3-tornado: update to 6.3.2.

---
 srcpkgs/python3-tornado/template | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index 48c9e57b0bdb..bd8a8803689f 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,20 +1,32 @@
 # Template file for 'python3-tornado'
 pkgname=python3-tornado
-version=6.2
+version=6.3.2
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 makedepends="python3-devel"
 depends="python3 ca-certificates"
+checkdepends="python3-curl python3-pycares python3-Twisted"
 short_desc="Python3 web framework and asynchronous networking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://www.tornadoweb.org/"
+changelog="https://www.tornadoweb.org/en/stable/releases.html"
 distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13
-make_check=no # tests failing, already with 6.1
+checksum=4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba
 
-pre_build() {
-	# use system ca-certificates
-	sed -i "/install_requires.append('certifi')/d" setup.py
+do_check() {
+	# There is one instance of test_bind_source_ip (the one for
+	# curl_httpclient_test.CurlHTTPClientCommonTestCase)
+	# which for some reason is taking a little bit over 5s
+	# (but only on x86_64-musl and only on CI).
+	#
+	# The default test timeout is 5s so the test times out and fails.
+	# See: https://github.com/void-linux/void-packages/pull/44312#issuecomment-1582361791
+	#
+	# Setting the timeout to 6 works around it.
+	local -x ASYNC_TEST_TIMEOUT=6
+
+	# pytest is not supported
+	python3 -m tornado.test
 }

From d0ac546b33326c21d8df2d7e65758a32cb6ca2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 14 Jun 2023 22:52:21 -0300
Subject: [PATCH 0757/1853] python3-terminado: update to 0.17.1.

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

diff --git a/srcpkgs/python3-terminado/template b/srcpkgs/python3-terminado/template
index e31129323a30..5d524d3e803a 100644
--- a/srcpkgs/python3-terminado/template
+++ b/srcpkgs/python3-terminado/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-terminado'
 pkgname=python3-terminado
-version=0.17.0
+version=0.17.1
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-flit_core python3-tornado hatchling"
+hostmakedepends="hatchling"
 depends="python3-ptyprocess python3-tornado"
 checkdepends="python3-pytest $depends"
-short_desc="Terminals served to term.js using Tornado websockets (Python3)"
+short_desc="Terminals served to term.js using Tornado websockets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/takluyver/terminado"
 distfiles="${PYPI_SITE}/t/terminado/terminado-${version}.tar.gz"
-checksum=520feaa3aeab8ad64a69ca779be54be9234edb2d0d6567e76c93c2c9a4e6e43f
+checksum=6ccbbcd3a4f8a25a5ec04991f39a0b8db52dfcd487ea0e578d977e6752380333
 
 post_install() {
 	vlicense LICENSE

From 631917a22252b57954f72c5ee353b15c2e04d3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 May 2023 20:46:40 -0300
Subject: [PATCH 0758/1853] python3-traitlets: cleanup dependencies, adopt.

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

diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 7b4e13ff871b..a8ed6611188c 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-traitlets'
 pkgname=python3-traitlets
 version=5.9.0
-revision=1
+revision=2
 build_style=python3-pep517
-hostmakedepends="python3-flit_core hatchling"
-depends="python3-decorator python3-ipython_genutils python3-six"
-checkdepends="$depends python3-pytest"
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-argcomplete python3-pytest-mock"
 short_desc="Configuration system for Python applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://github.com/ipython/traitlets"
 changelog="https://github.com/ipython/traitlets/raw/main/CHANGELOG.md"

From 0b960ac24242a9acf37367eb3bdd6606dab989d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 00:25:45 -0300
Subject: [PATCH 0759/1853] python3-comm: update to 0.1.3.

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

diff --git a/srcpkgs/python3-comm/template b/srcpkgs/python3-comm/template
index 0bbba8dc0eda..29ebd5afd772 100644
--- a/srcpkgs/python3-comm/template
+++ b/srcpkgs/python3-comm/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-comm'
 pkgname=python3-comm
-version=0.1.1
+version=0.1.3
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling"
@@ -10,8 +10,9 @@ short_desc="Python comm implementation for the Jupyter kernel protocol"
 maintainer="dkwo <npiazza@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ipython/comm/"
-distfiles="https://github.com/ipython/comm/archive/refs/tags/$version.tar.gz"
-checksum=2868dfd1e482b821a929d662bf3d89adeb8a091239bf1497187797fe9e4c12fa
+changelog="https://raw.githubusercontent.com/ipython/comm/main/CHANGELOG.md"
+distfiles="https://github.com/ipython/comm/archive/refs/tags/v$version.tar.gz"
+checksum=9bdea650a6194bf1628b17c2668bf74bf5295c87a7528a8aa4fe4472904b26f2
 
 post_install() {
 	vlicense LICENSE

From 13b44feb39cad4e8042995a430393291d82a141f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 26 May 2023 20:03:16 -0300
Subject: [PATCH 0760/1853] New package: python3-strict-rfc3339-0.7

---
 srcpkgs/python3-strict-rfc3339/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-strict-rfc3339/template

diff --git a/srcpkgs/python3-strict-rfc3339/template b/srcpkgs/python3-strict-rfc3339/template
new file mode 100644
index 000000000000..411d2e93535a
--- /dev/null
+++ b/srcpkgs/python3-strict-rfc3339/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-strict-rfc3339'
+pkgname=python3-strict-rfc3339
+version=0.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Strict, simple, lightweight RFC3339 functions"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/strict-rfc3339/"
+distfiles="${PYPI_SITE}/s/strict-rfc3339/strict-rfc3339-${version}.tar.gz"
+checksum=5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277
+make_check=no  # no tests available

From 0eecc4303944d4f143643a0699f4f0c44215f519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:09:32 -0300
Subject: [PATCH 0761/1853] New package: python3-rfc3339-validator-0.1.4

---
 srcpkgs/python3-rfc3339-validator/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3339-validator/template

diff --git a/srcpkgs/python3-rfc3339-validator/template b/srcpkgs/python3-rfc3339-validator/template
new file mode 100644
index 000000000000..bc572b2f301a
--- /dev/null
+++ b/srcpkgs/python3-rfc3339-validator/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-rfc3339-validator'
+pkgname=python3-rfc3339-validator
+version=0.1.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-six"
+checkdepends="$depends python3-hypothesis python3-pytest python3-strict-rfc3339"
+short_desc="Pure python RFC3339 validator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/naimetti/rfc3339-validator"
+distfiles="${PYPI_SITE}/r/rfc3339-validator/rfc3339_validator-${version}.tar.gz"
+checksum=138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b
+
+post_install() {
+	vlicense LICENSE
+}

From 6b278063cb9ede2ab8ecd13357fb462a6ae71b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Jun 2023 23:34:03 -0300
Subject: [PATCH 0762/1853] New package: python3-rfc3987-1.3.8

---
 srcpkgs/python3-rfc3987/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3987/template

diff --git a/srcpkgs/python3-rfc3987/template b/srcpkgs/python3-rfc3987/template
new file mode 100644
index 000000000000..f25379e582b7
--- /dev/null
+++ b/srcpkgs/python3-rfc3987/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rfc3987'
+pkgname=python3-rfc3987
+version=1.3.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="http://pypi.python.org/pypi/rfc3987"
+distfiles="${PYPI_SITE}/r/rfc3987/rfc3987-${version}.tar.gz"
+checksum=d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733
+make_check=no  # no tests available

From 2e5445d569f1a848aebb9c6b96fa853eebcd6e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:22:20 -0300
Subject: [PATCH 0763/1853] New package: python3-rfc3986-validator-0.1.1

---
 .../python3-rfc3986-validator/patches/3.patch | 40 +++++++++++++++++++
 srcpkgs/python3-rfc3986-validator/template    | 18 +++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3986-validator/patches/3.patch
 create mode 100644 srcpkgs/python3-rfc3986-validator/template

diff --git a/srcpkgs/python3-rfc3986-validator/patches/3.patch b/srcpkgs/python3-rfc3986-validator/patches/3.patch
new file mode 100644
index 000000000000..991662d5fb52
--- /dev/null
+++ b/srcpkgs/python3-rfc3986-validator/patches/3.patch
@@ -0,0 +1,40 @@
+From f34f482530170972947b259844d00830a15f81a4 Mon Sep 17 00:00:00 2001
+From: chedi toueiti <chedi.toueiti@gmail.com>
+Date: Tue, 12 Jul 2022 21:01:31 +0100
+Subject: [PATCH] Removing deprecated pytest-runner and adding missing test
+ dependencies
+
+---
+ setup.cfg | 5 +++++
+ setup.py  | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 21c0a34..db0c26b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -23,3 +23,8 @@ test = pytest
+ [tool:pytest]
+ collect_ignore = ['setup.py']
+ 
++[options.extras_require]
++test =
++    pytest >= 3
++    rfc3987
++    hypothesis
+diff --git a/setup.py b/setup.py
+index 53ebea7..1652285 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,9 +10,9 @@
+ 
+ requirements = []
+ 
+-setup_requirements = ['pytest-runner', ]
++setup_requirements = []
+ 
+-test_requirements = ['pytest>=3', ]
++test_requirements = []
+ 
+ setup(
+     author="Nicolas Aimetti",
diff --git a/srcpkgs/python3-rfc3986-validator/template b/srcpkgs/python3-rfc3986-validator/template
new file mode 100644
index 000000000000..fc402d543d14
--- /dev/null
+++ b/srcpkgs/python3-rfc3986-validator/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-rfc3986-validator'
+pkgname=python3-rfc3986-validator
+version=0.1.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest python3-hypothesis python3-rfc3987"
+short_desc="Pure python RFC3986 validator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/naimetti/rfc3986-validator"
+distfiles="${PYPI_SITE}/r/rfc3986-validator/rfc3986_validator-${version}.tar.gz"
+checksum=3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055
+
+post_install() {
+	vlicense LICENSE
+}

From 0dbcc37e4caee1344594cef4a5bc4a109f57c554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:34:09 -0300
Subject: [PATCH 0764/1853] python3-jsonschema: add rfc3339 and rfc3986
 validators.

---
 srcpkgs/python3-jsonschema/template | 10 +++-------
 srcpkgs/python3-jsonschema/update   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 8ec7cef8d755..272eb06edbdd 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 version=4.17.3
-revision=1
+revision=2
 build_style=python3-pep517
-make_check_args="--deselect jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug"
 hostmakedepends="hatchling hatch-vcs"
-depends="python3-attrs python3-pyrsistent"
+depends="python3-attrs python3-idna python3-jsonpointer python3-pyrsistent
+ python3-rfc3339-validator python3-rfc3986-validator"
 checkdepends="${depends} python3-pytest python3-pip"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -15,10 +15,6 @@ changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
 checksum=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d
 
-pre_build() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
-}
-
 post_install() {
 	vlicense COPYING LICENSE
 }
diff --git a/srcpkgs/python3-jsonschema/update b/srcpkgs/python3-jsonschema/update
index c94d83e1b1b5..12175d032c85 100644
--- a/srcpkgs/python3-jsonschema/update
+++ b/srcpkgs/python3-jsonschema/update
@@ -1 +1 @@
-ignore="*a[1-9]"
+ignore="*a[1-9]*"

From 839ea653fe592d1c26ebf2e11c7058b7355c4c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 10:31:37 -0300
Subject: [PATCH 0765/1853] New package: hatch-jupyter-builder-0.8.3

---
 srcpkgs/hatch-jupyter-builder/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/hatch-jupyter-builder/template

diff --git a/srcpkgs/hatch-jupyter-builder/template b/srcpkgs/hatch-jupyter-builder/template
new file mode 100644
index 000000000000..674c221e1ebb
--- /dev/null
+++ b/srcpkgs/hatch-jupyter-builder/template
@@ -0,0 +1,19 @@
+# Template file for 'hatch-jupyter-builder'
+pkgname=hatch-jupyter-builder
+version=0.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="hatchling"
+checkdepends="python3-pytest-mock python3-tomli"
+short_desc="Hatch plugin to help build Jupyter packages"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyterlab/hatch-jupyter-builder"
+changelog="https://raw.githubusercontent.com/jupyterlab/hatch-jupyter-builder/main/CHANGELOG.md"
+distfiles="https://github.com/jupyterlab/hatch-jupyter-builder/archive/refs/tags/v${version}.tar.gz"
+checksum=b167709e9bd196b3b92fe13a20b10c09cd30ca550759a9f06834378eb371af96
+
+post_install() {
+	vlicense LICENSE.txt
+}

From d365a7a985e164d6bc335efb4619b690752585bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 18:18:06 -0300
Subject: [PATCH 0766/1853] New package: hatch-nodejs-version-0.3.1

---
 srcpkgs/hatch-nodejs-version/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/hatch-nodejs-version/template

diff --git a/srcpkgs/hatch-nodejs-version/template b/srcpkgs/hatch-nodejs-version/template
new file mode 100644
index 000000000000..389c85500bf2
--- /dev/null
+++ b/srcpkgs/hatch-nodejs-version/template
@@ -0,0 +1,19 @@
+# Template file for 'hatch-nodejs-version'
+pkgname=hatch-nodejs-version
+version=0.3.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="hatchling"
+checkdepends="python3-pytest"
+short_desc="Hatch plugin to read pyproject.toml metadata from package.json"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/agoose77/hatch-nodejs-version"
+changelog="https://github.com/agoose77/hatch-nodejs-version/releases"
+distfiles="https://github.com/agoose77/hatch-nodejs-version/archive/refs/tags/v${version}.tar.gz"
+checksum=9959efbee3021dba4da7f8c152cacf104c746341ed176cd0488cbf3b45deba4d
+
+post_install() {
+	vlicense LICENSE.txt
+}

From f130aafc275d38d4e7a174bd53f4144e9e48b65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 28 May 2023 00:07:40 -0300
Subject: [PATCH 0767/1853] New package: python3-async-lru-2.0.2

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

diff --git a/srcpkgs/python3-async-lru/template b/srcpkgs/python3-async-lru/template
new file mode 100644
index 000000000000..130589174c1c
--- /dev/null
+++ b/srcpkgs/python3-async-lru/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-async-lru'
+pkgname=python3-async-lru
+version=2.0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-typing_extensions"
+checkdepends="$depends python3-pytest-asyncio python3-pytest-cov
+ python3-pytest-timeout"
+short_desc="Simple LRU cache for asyncio"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/aio-libs/async-lru"
+changelog="https://github.com/aio-libs/async-lru/blob/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/a/async-lru/async-lru-${version}.tar.gz"
+checksum=3b87ec4f2460c52cc7916a0138cc606b584c75d1ef7d661853c95d1d3acb869a
+
+post_install() {
+	vlicense LICENSE
+}

From b1b5063360264d25fbb911aac6cfb3db97dbde48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 10:56:29 -0300
Subject: [PATCH 0768/1853] New package: python3-json-logger-2.0.7

---
 srcpkgs/python3-json-logger/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-json-logger/template

diff --git a/srcpkgs/python3-json-logger/template b/srcpkgs/python3-json-logger/template
new file mode 100644
index 000000000000..747a925d56f0
--- /dev/null
+++ b/srcpkgs/python3-json-logger/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-json-logger'
+pkgname=python3-json-logger
+version=2.0.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Json Formatter for the standard python logger"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/madzak/python-json-logger"
+changelog="https://raw.githubusercontent.com/madzak/python-json-logger/master/CHANGELOG.md"
+distfiles="https://github.com/madzak/python-json-logger/archive/refs/tags/v${version}.tar.gz"
+checksum=1d743e5573642bed1a5698dbfa5fc1c2a8e076fea95212e67518bec940e43ec1
+
+post_install() {
+	vlicense LICENSE
+}

From 6b9999e356311b9fecfa9261d85316ed299f6ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 23:58:52 -0300
Subject: [PATCH 0769/1853] New package: python3-jupyter_packaging-0.12.3

---
 .../patches/178.patch                         | 23 +++++++++++++++++++
 srcpkgs/python3-jupyter_packaging/template    | 20 ++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/python3-jupyter_packaging/patches/178.patch
 create mode 100644 srcpkgs/python3-jupyter_packaging/template

diff --git a/srcpkgs/python3-jupyter_packaging/patches/178.patch b/srcpkgs/python3-jupyter_packaging/patches/178.patch
new file mode 100644
index 000000000000..a158454dbb73
--- /dev/null
+++ b/srcpkgs/python3-jupyter_packaging/patches/178.patch
@@ -0,0 +1,23 @@
+From e963fb27aa3b58cd70c5ca61ebe68c222d803b7e Mon Sep 17 00:00:00 2001
+From: Steven Silvester <steven.silvester@ieee.org>
+Date: Tue, 7 Mar 2023 10:47:22 -0600
+Subject: [PATCH] Ignore warning raised when importing
+ setuptools.command.develop
+
+---
+ pyproject.toml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index e4c1e27..b316257 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -81,5 +81,7 @@ filterwarnings= [
+   # Fail on warnings
+   "error",
+   # Ignore our own deprecation warnings.
+-  "ignore:.*:deprecation.DeprecatedWarning"
++  "ignore:.*:deprecation.DeprecatedWarning",
++  # Ignore warning raised when importing setuptools.command.develop.
++  "ignore:pkg_resources is deprecated as an API:DeprecationWarning"
+ ]
diff --git a/srcpkgs/python3-jupyter_packaging/template b/srcpkgs/python3-jupyter_packaging/template
new file mode 100644
index 000000000000..8c064fb464c6
--- /dev/null
+++ b/srcpkgs/python3-jupyter_packaging/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-jupyter_packaging'
+pkgname=python3-jupyter_packaging
+version=0.12.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-deprecation python3-packaging python3-setuptools
+ python3-tomlkit python3-wheel"
+checkdepends="$depends python3-pytest-timeout python3-pytest-mock"
+short_desc="Tools to help build and install Jupyter Python packages"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/jupyter-packaging"
+changelog="https://raw.githubusercontent.com/jupyter/jupyter-packaging/main/CHANGELOG.md"
+distfiles="https://github.com/jupyter/jupyter-packaging/archive/refs/tags/v${version}.tar.gz"
+checksum=3a326f3b4e8b7fea8b7abf775741996095a4caf13767a9c017e9f17043e591e0
+
+post_install() {
+	vlicense LICENSE
+}

From a34157d7674bc5075b6ffdc191dc84f6cc2ecc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 19:19:18 -0300
Subject: [PATCH 0770/1853] New package: python3-overrides-7.3.1

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

diff --git a/srcpkgs/python3-overrides/template b/srcpkgs/python3-overrides/template
new file mode 100644
index 000000000000..9c1b507e9240
--- /dev/null
+++ b/srcpkgs/python3-overrides/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-overrides'
+pkgname=python3-overrides
+version=7.3.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Decorator to automatically detect mismatch when overriding a method"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/mkorpela/overrides"
+changelog="https://github.com/mkorpela/overrides/releases"
+distfiles="https://github.com/mkorpela/overrides/archive/refs/tags/${version}.tar.gz"
+checksum=ff904c45a8a664aaeeac0a849f5097567d52a88c2324b12ad002c8b58e83625c

From 2632740ac3f6d5fd38436da89f20d1cbdfe23e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 26 May 2023 21:18:00 -0300
Subject: [PATCH 0771/1853] New package: python3-pathable-0.4.3

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

diff --git a/srcpkgs/python3-pathable/template b/srcpkgs/python3-pathable/template
new file mode 100644
index 000000000000..70892d570eaa
--- /dev/null
+++ b/srcpkgs/python3-pathable/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pathable'
+pkgname=python3-pathable
+version=0.4.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest-cov python3-toml"
+short_desc="Object-oriented paths"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/p1c2u/pathable"
+changelog="https://github.com/p1c2u/pathable/releases"
+distfiles="https://github.com/p1c2u/pathable/archive/refs/tags/${version}.tar.gz"
+checksum=eea76120e5fdc54f4e9b7bc5e24748d163cef61c3e60ed32675828ade141cf4b

From d3a2b518dd6d424ceeca5fa100721e6502765f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 26 May 2023 20:52:44 -0300
Subject: [PATCH 0772/1853] New package: python3-jsonschema-spec-0.1.6

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

diff --git a/srcpkgs/python3-jsonschema-spec/template b/srcpkgs/python3-jsonschema-spec/template
new file mode 100644
index 000000000000..6caba5a29370
--- /dev/null
+++ b/srcpkgs/python3-jsonschema-spec/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-jsonschema-spec'
+pkgname=python3-jsonschema-spec
+version=0.1.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-jsonschema python3-pathable python3-yaml"
+checkdepends="$depends python3-pytest-cov python3-toml"
+short_desc="JSONSchema Spec with object-oriented paths"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/p1c2u/jsonschema-spec"
+changelog="https://github.com/p1c2u/jsonschema-spec/releases"
+distfiles="https://github.com/p1c2u/jsonschema-spec/archive/refs/tags/${version}.tar.gz"
+checksum=ab1d01d3ed40f83c3e272ffc86505830085a5306ad43db04a6e8edf560fedd1d

From ac63f7cc4a4cf27b357489526fda9e4ea56538b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 00:39:45 -0300
Subject: [PATCH 0773/1853] New package: python3-openapi-schema-validator-0.4.4

---
 .../python3-openapi-schema-validator/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-openapi-schema-validator/template

diff --git a/srcpkgs/python3-openapi-schema-validator/template b/srcpkgs/python3-openapi-schema-validator/template
new file mode 100644
index 000000000000..bb26e4a7d603
--- /dev/null
+++ b/srcpkgs/python3-openapi-schema-validator/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-openapi-schema-validator'
+pkgname=python3-openapi-schema-validator
+version=0.4.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-jsonschema"
+checkdepends="$depends python3-pytest-cov python3-toml"
+short_desc="OpenAPI schema validation for Python"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-openapi/openapi-schema-validator"
+changelog="https://github.com/python-openapi/openapi-schema-validator/releases"
+distfiles="${PYPI_SITE}/o/openapi-schema-validator/openapi_schema_validator-${version}.tar.gz"
+checksum=c573e2be2c783abae56c5a1486ab716ca96e09d1c3eab56020d1dc680aa57bf8
+
+post_install() {
+	vlicense LICENSE
+}

From a2372cf0c7e64e8a2f2fcbb0ab69f96e79ddf8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 00:40:13 -0300
Subject: [PATCH 0774/1853] New package: python3-openapi-spec-validator-0.5.7

---
 srcpkgs/python3-openapi-spec-validator/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-openapi-spec-validator/template

diff --git a/srcpkgs/python3-openapi-spec-validator/template b/srcpkgs/python3-openapi-spec-validator/template
new file mode 100644
index 000000000000..f75c24694c30
--- /dev/null
+++ b/srcpkgs/python3-openapi-spec-validator/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-openapi-spec-validator'
+pkgname=python3-openapi-spec-validator
+version=0.5.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-jsonschema-spec python3-lazy-object-proxy
+ python3-openapi-schema-validator"
+checkdepends="$depends python3-pytest-cov python3-toml"
+short_desc="OpenAPI spec validator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/python-openapi/openapi-spec-validator"
+changelog="https://github.com/python-openapi/openapi-spec-validator/releases"
+distfiles="${PYPI_SITE}/o/openapi-spec-validator/openapi_spec_validator-${version}.tar.gz"
+checksum=6c2d42180045a80fd6314de848b94310bdb0fa4949f4b099578b69f79d9fa5ac

From 73e5a711bfb9cb0311488b2044e1b06875e0f200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 01:38:55 -0300
Subject: [PATCH 0775/1853] New package: python3-openapi-core-0.17.1

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

diff --git a/srcpkgs/python3-openapi-core/template b/srcpkgs/python3-openapi-core/template
new file mode 100644
index 000000000000..2dd5dceab1d6
--- /dev/null
+++ b/srcpkgs/python3-openapi-core/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-openapi-core'
+pkgname=python3-openapi-core
+version=0.17.1
+revision=1
+build_style=python3-pep517
+# disable tests requiring unpackaged dependencies
+make_check_args="
+ --ignore=tests/unit/contrib/django
+ --ignore=tests/integration/contrib/django
+ --ignore=tests/integration/contrib/falcon
+ --ignore=tests/integration/contrib/starlette
+ "
+hostmakedepends="python3-poetry-core"
+depends="python3-isodate python3-more-itertools python3-openapi-spec-validator
+ python3-parse python3-Werkzeug"
+checkdepends="$depends python3-pytest-cov python3-Flask python3-requests
+ python3-responses python3-toml python3-WebOb"
+short_desc="Support for the OpenAPI Specification v3"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-openapi/openapi-core"
+changelog="https://github.com/python-openapi/openapi-core/releases"
+distfiles="${PYPI_SITE}/o/openapi-core/openapi_core-${version}.tar.gz"
+checksum=561b7e2b37b336e9c62d4634b9059d12d9bb2e1859062a39d3a0fa6afc8c9de6
+
+post_install() {
+	vlicense LICENSE
+}

From 7c7004cec7bb471be0fbf00ca8efb65ca0ad1e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 21:11:54 -0300
Subject: [PATCH 0776/1853] New package: python3-pep440-0.1.2

Closes: #44312 [via git-merge-pr]
---
 srcpkgs/python3-pep440/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pep440/template

diff --git a/srcpkgs/python3-pep440/template b/srcpkgs/python3-pep440/template
new file mode 100644
index 000000000000..3048d03ae671
--- /dev/null
+++ b/srcpkgs/python3-pep440/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pep440'
+pkgname=python3-pep440
+version=0.1.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+checkdepends="python3-pytest-console-scripts"
+short_desc="Utils to check whether version numbers match PEP 440"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/Carreau/pep440"
+distfiles="https://github.com/Carreau/pep440/archive/refs/tags/${version}.tar.gz"
+checksum=4f38145d7b71aad9743b3f4aec6338a2dad4010a14a223493bf0b3b7b99027ef
+
+post_install() {
+	vlicense LICENSE
+}

From 71867396ef7ae870e14f2074e9523ccd151e6ccf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 18:05:19 -0500
Subject: [PATCH 0777/1853] ghidra: update to 10.3.1.

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

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index dcf99743570a..6a2b9cb6b37f 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,7 +1,7 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.3
-revision=2
+version=10.3.1
+revision=1
 _dex_ver=2.1
 _yajsw_ver=13.09
 archs="x86_64* aarch64*"
@@ -29,7 +29,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2019_x86.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x64.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x86.fidb"
-checksum="28efb03692d67292711e559541545118182e58051064edaf48ba77a37eaf9796
+checksum="b1e07e4224473db71129f48c4ebf59c69dbfcb78b3e0464f9d063f54e4c371de
  7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08
  4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d

From 48591a825395a0ed3ec36e8dad2f1e1bf5f12ae4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 13:44:32 +0200
Subject: [PATCH 0778/1853] python: update to 2.7.18.7.

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

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index a1abf2c8772c..db6977233517 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
 #
 pkgname=python
-version=2.7.18.6
+version=2.7.18.7
 revision=1
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
+checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
 
 alternatives="
  python:idle:/usr/bin/idle2.7

From 1f226b5db4faf8947362ee5ff7bab017ae85dde8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 13:46:09 +0200
Subject: [PATCH 0779/1853] python-tkinter: update to 2.7.18.7.

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

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 274efb18c7ac..858a70a97c9a 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,7 +7,7 @@
 _desc="Interpreted, interactive, object-oriented programming language"
 
 pkgname=python-tkinter
-version=2.7.18.6
+version=2.7.18.7
 revision=1
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
+checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
 
 pre_configure() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.

From bccb97cc5f451bbd858751cc2e53879ed2343ffb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 13:53:29 +0200
Subject: [PATCH 0780/1853] openssh: add /usr/local/bin,sbin to default PATH.

Most Linux distros do this, and there are cases where our profile isn't
applied in all cases.

Closes #43338.
---
 srcpkgs/openssh/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 88f39d31fbb3..c74b56e08ac3 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,12 +1,13 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.3p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
  --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth
  --disable-strip --with-privsep-path=/var/chroot/ssh
+ --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
  --with-pid-dir=/run --with-pam
  --with-libedit --with-Werror
  $(vopt_if ldns --with-ldns=$XBPS_CROSS_BASE/usr)

From 67d7e40181d5046302445ad5f03b7d72c624100e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 1 Apr 2023 13:57:27 +0100
Subject: [PATCH 0781/1853] runit: remove zsh completions.

Fixes #36593.
---
 srcpkgs/runit/files/_sv | 44 -----------------------------------------
 srcpkgs/runit/template  |  9 ++++-----
 2 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/runit/files/_sv

diff --git a/srcpkgs/runit/files/_sv b/srcpkgs/runit/files/_sv
deleted file mode 100644
index 465fbfde640c..000000000000
--- a/srcpkgs/runit/files/_sv
+++ /dev/null
@@ -1,44 +0,0 @@
-#compdef sv
-
-# completion for runit sv(1)
-# Leah Neukirchen <leah@vuxu.org>
-# runit 2.1.1, services in /var/service are completed by default
-
-local ret=1 services
-
-_arguments \
-    '-v[verbose]' \
-    '-w[wait]:seconds' \
-    '1: :->cmds' \
-    '*:: :->args' && ret=0
-
-case $state in
-cmds)
-    _values "sv command" \
-        status \
-        up \
-        down \
-        once \
-        pause cont hup alarm interrupt quit 1 2 term kill \
-        exit
-    # above allow one-character shortcuts, complete these
-    [[ $words[CURRENT] = [sudopchaiq12tke] ]] ||
-    _values "sv command" \
-        start \
-        stop \
-        restart \
-        shutdown \
-        force-stop \
-        force-reload \
-        force-restart \
-        force-shutdown \
-        check
-    ret=0;;
-args)
-    services=( /var/service/*(-/N:t) )
-    (( $#services )) && _values services $services && ret=0
-    [[ $words[CURRENT] = */* ]] && _directories && ret=0
-    ;;
-esac
-
-return $ret
diff --git a/srcpkgs/runit/template b/srcpkgs/runit/template
index 661d141f1ec7..eb436f5bae0b 100644
--- a/srcpkgs/runit/template
+++ b/srcpkgs/runit/template
@@ -8,7 +8,7 @@ short_desc="UNIX init scheme with service supervision"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://smarden.org/runit/"
-distfiles="http://smarden.org/runit/runit-$version.tar.gz"
+distfiles="http://smarden.org/runit/runit-${version}.tar.gz"
 checksum=6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
 patch_args=-Np0
 # FIXME: this is caused by some bonk tests that should be fixed in void-linux/runit at some point
@@ -22,14 +22,14 @@ if [ "$build_option_static" ]; then
 fi
 
 pre_build() {
-	sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
+	vsed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
 
 	echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc
 	echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld
 	# set default service path to /var/service
-	sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c
+	vsed -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' -i sv.c
 	# change type short to gid_t for getgroups(2) and setgroups(2)
-	sed -i -e 's:short x\[4\];$:gid_t x[4];:' chkshsgr.c
+	vsed -e 's:short x\[4\];$:gid_t x[4];:' -i chkshsgr.c
 }
 
 do_install() {
@@ -50,6 +50,5 @@ do_install() {
 		vman $f
 	done
 
-	vinstall ${FILESDIR}/_sv 644 usr/share/zsh/site-functions
 	vinstall ${FILESDIR}/sv  644 usr/share/bash-completion/completions
 }

From 57543fb2f67801f13f86743768ba1fd6afaf68c7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 14:25:15 +0200
Subject: [PATCH 0782/1853] zsh: default runit completion to /var/service

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

diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index ae3b90fbca30..e24837f88aab 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,7 +1,7 @@
 # Template file for 'zsh'
 pkgname=zsh
 version=5.9
-revision=2
+revision=3
 build_style=gnu-configure
 make_build_target="all info"
 make_install_args="install.info"
@@ -41,6 +41,8 @@ post_patch() {
 	rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
 	rm -f Completion/Unix/Command/_{notmuch,osc,systemd}
 
+	vsed -i -e 's,/etc/service,/var/service,g' Completion/Unix/Command/_runit
+
 	vsed -i -e 's,/etc/z,/etc/zsh/z,g' \
 		Doc/zsh.texi Doc/{zsh,zshall,zshoptions,zshmodules}.1
 }

From 56fffb323604155533ebca89afc3949e4f464c89 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:17:12 +0200
Subject: [PATCH 0783/1853] xsetmode: removed, upstream retired.

Replaced by: xinput --set-mode "device name" ABSOLUTE
---
 srcpkgs/xsetmode/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/xsetmode/template

diff --git a/srcpkgs/xsetmode/template b/srcpkgs/xsetmode/template
deleted file mode 100644
index 01bfa7e6e8df..000000000000
--- a/srcpkgs/xsetmode/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'xsetmode'
-pkgname=xsetmode
-version=1.0.0
-revision=5
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel libXi-devel"
-short_desc="Switch mode of XInput devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
-
-post_install() {
-	vlicense COPYING
-}

From 20bf9607fe45b677979324946516d201afff6b57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:18:06 +0200
Subject: [PATCH 0784/1853] xsetpointer: removed, upstream retired.

Doesn't work with xorg-server 1.4 (Sept. 2007) and later.
---
 srcpkgs/xsetpointer/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/xsetpointer/template

diff --git a/srcpkgs/xsetpointer/template b/srcpkgs/xsetpointer/template
deleted file mode 100644
index 19d882cca94a..000000000000
--- a/srcpkgs/xsetpointer/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template build file for 'xsetpointer'.
-pkgname=xsetpointer
-version=1.0.1
-revision=4
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libXi-devel"
-short_desc="Set an X Input device as the main pointer"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571
-
-post_install() {
-	vlicense COPYING
-}

From 8476f3ff1bc7d327eb2f5903b7e8da17f17c4cb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:21:05 +0200
Subject: [PATCH 0785/1853] libXevie: removed, upstream retired.

The server side of XEvIE was removed in xorg-server 1.6 (Feb. 2009).
GNOME's at-spi2-core used libXevie starting in August 2003, but that
code was disabled by default in 2015 for the 2.20.0 release, and then
removed altogether in the 2.26.0 release in 2017.
---
 common/shlibs             |  1 -
 srcpkgs/libXevie-devel    |  1 -
 srcpkgs/libXevie/template | 29 -----------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/libXevie-devel
 delete mode 100644 srcpkgs/libXevie/template

diff --git a/common/shlibs b/common/shlibs
index 005700403d0d..e55083cc0d8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -836,7 +836,6 @@ libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
 libshumate-1.0.so.1 libshumate-1.0.0_1
 libvpx.so.6 libvpx6-1.8.0_1
 libvpx.so.7 libvpx7-1.11.0_1
-libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
 libvte-2.91.so.0 vte3-0.68.0_1
diff --git a/srcpkgs/libXevie-devel b/srcpkgs/libXevie-devel
deleted file mode 120000
index 6db64925021f..000000000000
--- a/srcpkgs/libXevie-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXevie
\ No newline at end of file
diff --git a/srcpkgs/libXevie/template b/srcpkgs/libXevie/template
deleted file mode 100644
index 29b0a7340840..000000000000
--- a/srcpkgs/libXevie/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libXevie'
-pkgname=libXevie
-version=1.0.3
-revision=8
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="xorgproto libX11-devel libXext-devel"
-short_desc="X Event Interceptor Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73
-
-post_install() {
-	vlicense COPYING
-}
-
-libXevie-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}

From 68bd6fee5d44269826415df807a579a4065669cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:24:19 +0200
Subject: [PATCH 0786/1853] libXfontcache: removed, retired upstream.

The server side of the FontCache extension was disabled by default in
X11R6.8.0 (Sep. 2004) and was removed in xorg-server 1.6 (Feb. 2009).
---
 common/shlibs                  |  1 -
 srcpkgs/libXfontcache-devel    |  1 -
 srcpkgs/libXfontcache/template | 29 -----------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/libXfontcache-devel
 delete mode 100644 srcpkgs/libXfontcache/template

diff --git a/common/shlibs b/common/shlibs
index e55083cc0d8a..bd38bd396d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -303,7 +303,6 @@ libXcursor.so.1 libXcursor-1.1.9_1
 libXxf86dga.so.1 libXxf86dga-1.0.2_1
 libXxf86misc.so.1 libXxf86misc-1.0.1_1
 libXp.so.6 libXp-1.0.0_1
-libXfontcache.so.1 libXfontcache-1.0.4_1
 libXv.so.1 libXv-1.0.4_1
 libXvMC.so.1 libXvMC-1.0.4_1
 libXvMCW.so.1 libXvMC-1.0.4_1
diff --git a/srcpkgs/libXfontcache-devel b/srcpkgs/libXfontcache-devel
deleted file mode 120000
index 515a1a9705e4..000000000000
--- a/srcpkgs/libXfontcache-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXfontcache
\ No newline at end of file
diff --git a/srcpkgs/libXfontcache/template b/srcpkgs/libXfontcache/template
deleted file mode 100644
index 58cfcce12cf7..000000000000
--- a/srcpkgs/libXfontcache/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template build file for 'libXfontcache'.
-pkgname=libXfontcache
-version=1.0.5
-revision=2
-build_style=gnu-configure
-configure_args="--enable-malloc0returnsnull"
-hostmakedepends="pkg-config"
-makedepends="xorgproto libXext-devel"
-short_desc="X-TrueType font cache extension client library"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce
-
-post_install() {
-	vlicense COPYING
-}
-
-libXfontcache-devel_package() {
-	depends="xorgproto ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-		vmove usr/share
-	}
-}

From 4adebb435d029781c1edba4e8675d2646d360830 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:26:00 +0200
Subject: [PATCH 0787/1853] libXxf86misc: removed, upstream retired.

The server side of the XFree86-Misc extension was removed in
xorg-server 1.6 (Feb. 2009).
---
 common/shlibs                 |  1 -
 srcpkgs/libXxf86misc-devel    |  1 -
 srcpkgs/libXxf86misc/template | 29 -----------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/libXxf86misc-devel
 delete mode 100644 srcpkgs/libXxf86misc/template

diff --git a/common/shlibs b/common/shlibs
index bd38bd396d20..16bac9228706 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -301,7 +301,6 @@ libXaw7.so.7 libXaw-1.0.5_1
 libXft.so.2 libXft-2.1.13_1
 libXcursor.so.1 libXcursor-1.1.9_1
 libXxf86dga.so.1 libXxf86dga-1.0.2_1
-libXxf86misc.so.1 libXxf86misc-1.0.1_1
 libXp.so.6 libXp-1.0.0_1
 libXv.so.1 libXv-1.0.4_1
 libXvMC.so.1 libXvMC-1.0.4_1
diff --git a/srcpkgs/libXxf86misc-devel b/srcpkgs/libXxf86misc-devel
deleted file mode 120000
index 19541ac9080b..000000000000
--- a/srcpkgs/libXxf86misc-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXxf86misc
\ No newline at end of file
diff --git a/srcpkgs/libXxf86misc/template b/srcpkgs/libXxf86misc/template
deleted file mode 100644
index d30982b777c1..000000000000
--- a/srcpkgs/libXxf86misc/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libXxf86misc'
-pkgname=libXxf86misc
-version=1.0.4
-revision=1
-build_style=gnu-configure
-configure_args="--enable-malloc0returnsnull"
-hostmakedepends="pkg-config"
-makedepends="xorgproto libX11-devel libXext-devel"
-short_desc="Library for the XFree86-Misc X extension"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380
-
-post_install() {
-	vlicense COPYING
-}
-
-libXxf86misc-devel_package() {
-	depends="xorgproto libX11-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}

From fbe5752ced7fe73b1a694313dfde2fad5809294a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:28:41 +0200
Subject: [PATCH 0788/1853] qt6-base: remove libXevie-devel.

This is mentioned nowhere in the source code, what is it good for?
---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 26c3274641e5..c6d790e64226 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -26,7 +26,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  libmariadbclient-devel postgresql-libs-devel libatomic-devel
  unixodbc-devel cups-devel libproxy-devel brotli-devel
  sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel
- libXevie-devel xcb-util-cursor-devel"
+ xcb-util-cursor-devel"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"

From 475d9610366e4891605a2dda59dad4ce66c03cdf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:29:14 +0200
Subject: [PATCH 0789/1853] xset: rebuild without libXxf86misc-devel
 libXfontcache-devel.

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

diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template
index 9cfd80589a76..27395536b4c3 100644
--- a/srcpkgs/xset/template
+++ b/srcpkgs/xset/template
@@ -1,11 +1,11 @@
 # Template file for 'xset'
 pkgname=xset
 version=1.2.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xf86misc"
 hostmakedepends="pkg-config"
-makedepends="libXmu-devel libXext-devel libXxf86misc-devel libXfontcache-devel"
+makedepends="libXmu-devel libXext-devel"
 short_desc="X11 user preferences utility"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"

From 5bafcc6994b05bdd9f492cb30e70922ef72df928 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:30:22 +0200
Subject: [PATCH 0790/1853] light-locker: rebuild without libXxf86vm-devel.

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

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index d50c71480a33..6daca02ba357 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,11 +1,11 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel libXxf86vm-devel elogind-devel"
+ libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"

From fcad4cbcdc6c94205eb5e79e6feaf8d7b19fb9f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:30:51 +0200
Subject: [PATCH 0791/1853] cinnamon-screensaver: rebuild without
 libXxf86vm-devel.

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

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 36e3fc2edd85..2c29d7744e89 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,12 +1,12 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
 version=5.4.2
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel gobject-introspection
  pkg-config python3-devel"
-makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
+makedepends="cinnamon-desktop-devel dbus-glib-devel
  xdotool-devel gtk+3-devel libglib-devel dbus-devel libXinerama-devel
  libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject

From 49795f8e93be40713035d455b7bdccae65398ca3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:15 +0200
Subject: [PATCH 0792/1853] mate-settings-daemon: rebuild without
 libXxf86vm-devel.

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

diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 87b825cbe013..7b2d60a8138b 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,11 +1,11 @@
 # Template file for 'mate-settings-daemon'
 pkgname=mate-settings-daemon
 version=1.26.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
 hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit"
-makedepends="dbus-glib-devel libXt-devel libXxf86misc-devel libcanberra-devel
+makedepends="dbus-glib-devel libXt-devel libcanberra-devel
  libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel
  polkit-devel"
 short_desc="MATE Settings daemon (pulseaudio)"

From e84be2070789df4436028c9ca09b7d56f9ab7086 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:34 +0200
Subject: [PATCH 0793/1853] xdpyinfo: rebuild without libXxf86vm-devel.

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

diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 71bf9a858dc9..6232e3860ff2 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,12 +1,12 @@
 # Template file for 'xdpyinfo'
 pkgname=xdpyinfo
 version=1.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xf86misc"
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXtst-devel libXxf86vm-devel
- libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
+makedepends="libXext-devel libXtst-devel
+ libXrender-devel libXcomposite-devel libXinerama-devel"
 short_desc="Display information utility for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 08876c6b311bde044e0ff989fe5d004a2524b3be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:49 +0200
Subject: [PATCH 0794/1853] mate-control-center: rebuild without
 libXxf86vm-devel.

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

diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template
index 697e1dff2492..bcd986ab0c8f 100644
--- a/srcpkgs/mate-control-center/template
+++ b/srcpkgs/mate-control-center/template
@@ -1,12 +1,12 @@
 # Template file for 'mate-control-center'
 pkgname=mate-control-center
 version=1.26.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb"
 hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel intltool itstool pkg-config"
 makedepends="dbus-glib-devel desktop-file-utils libXScrnSaver-devel libXt-devel
- libXxf86misc-devel libcanberra-devel libgtop-devel libmarco-devel
+ libcanberra-devel libgtop-devel libmarco-devel
  libmatekbd-devel librsvg-devel mate-desktop-devel mate-menus-devel
  mate-settings-daemon-devel polkit-devel"
 depends="marco mate-icon-theme mate-settings-daemon"

From 7eb37641e9b33cfc86755748c17ee4335eca3b33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:03 +0200
Subject: [PATCH 0795/1853] cinnamon-control-center: rebuild without
 libXxf86vm-devel.

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

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index db1e4ea6d7ba..d7c330972a1a 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,14 +1,14 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
 version=5.4.7
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel
  gobject-introspection intltool libtool pkg-config libxslt"
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
- libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
+ libSM-devel libcanberra-devel libgnomekbd-devel
  libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4

From 30187651fd1280bdb192bc4d9c24df5c738c42a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:18 +0200
Subject: [PATCH 0796/1853] xsecurelock: rebuild without libXxf86vm-devel.

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

diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index 3494b298ad64..e32f1d71cdd3 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,7 +1,7 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
 version=1.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login
  --with-xscreensaver=/usr/libexec/xscreensaver
@@ -10,8 +10,7 @@ configure_args="--with-pam-service-name=system-local-login
  --with-htpasswd=/usr/bin/htpasswd"
 hostmakedepends="pkg-config automake"
 makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel
- libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel
- libXxf86misc-devel pam-devel"
+ libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel pam-devel"
 short_desc="X11 screen locker designed with the primary goal of security"
 maintainer="Sean R. Lang <srlang@ncsu.edu>"
 license="Apache-2.0"

From 80ad33ec3a013a324352fd408d2d56d9f7b30dbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:46 +0200
Subject: [PATCH 0797/1853] gnome-control-center: rebuild without
 libXxf86vm-devel.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 849763d23c1e..3c8a1fe43e96 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=43.2
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -9,7 +9,7 @@ hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
- libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel
+ libSM-devel libgnomekbd-devel libgtop-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel
  libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel

From f103033c37b13add4ffa1cc55c1a4cb35de6ced8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:05:38 +0200
Subject: [PATCH 0798/1853] libXfont: remove, obsoleted by libXfont2.

---
 common/shlibs             |  1 -
 srcpkgs/libXfont-devel    |  1 -
 srcpkgs/libXfont/template | 28 ----------------------------
 3 files changed, 30 deletions(-)
 delete mode 120000 srcpkgs/libXfont-devel
 delete mode 100644 srcpkgs/libXfont/template

diff --git a/common/shlibs b/common/shlibs
index 16bac9228706..494e99b89550 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -240,7 +240,6 @@ libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1
 liblvm2cmd.so.2.02 device-mapper-2.02.54_1
 libprop.so.0 proplib-0.1_1
 libfontenc.so.1 libfontenc-1.0.4_1
-libXfont.so.1 libXfont-1.4.0_1
 libx86.so.1 libx86-1.1_1
 libxcb-render.so.0 libxcb-1.2_1
 libxcb-glx.so.0 libxcb-1.2_1
diff --git a/srcpkgs/libXfont-devel b/srcpkgs/libXfont-devel
deleted file mode 120000
index 73e43fe94757..000000000000
--- a/srcpkgs/libXfont-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXfont
\ No newline at end of file
diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template
deleted file mode 100644
index bc1d63c92419..000000000000
--- a/srcpkgs/libXfont/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template build file for 'libXfont'.
-pkgname=libXfont
-version=1.5.4
-revision=2
-hostmakedepends="pkg-config"
-makedepends="xorgproto xtrans freetype-devel libfontenc-devel"
-build_style=gnu-configure
-short_desc="X font Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xorg.freedesktop.org/"
-license="MIT"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242
-
-post_install() {
-	vlicense COPYING
-}
-
-libXfont-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}

From 98d794f1e59ca5fce4760f62234f8ee5473c0abd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:06:06 +0200
Subject: [PATCH 0799/1853] xorg-server: build without libXfont-devel.

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

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index d7514f2735bf..3ae74c71b005 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=21.1.8
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -10,7 +10,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
  -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true"
 hostmakedepends="pkg-config xkbcomp flex"
-makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
+makedepends="MesaLib-devel libXaw-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel libxshmfence-devel pixman-devel xcb-util-image-devel

From 4d48d4d74a2b76676ecd11e6c3c5f48d7b37d1d4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:08:54 +0200
Subject: [PATCH 0800/1853] bdftopcf: build without libXfont-devel.

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

diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template
index d172987b7976..7e24036b03ed 100644
--- a/srcpkgs/bdftopcf/template
+++ b/srcpkgs/bdftopcf/template
@@ -1,10 +1,10 @@
 # Template build file for 'bdftopcf'.
 pkgname=bdftopcf
 version=1.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libXfont-devel"
+makedepends="xorgproto"
 short_desc="BDF to PCF font converter for X11"
 homepage="http://xorg.freedesktop.org"
 license="MIT"

From 013943f5f35d8c67b7fa646a1586dec93930873b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 14:08:00 +0200
Subject: [PATCH 0801/1853] font-bitstream-speedo: removed, upstream retired.

---
 srcpkgs/font-bitstream-speedo/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/font-bitstream-speedo/template

diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
deleted file mode 100644
index 387e883defb2..000000000000
--- a/srcpkgs/font-bitstream-speedo/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'font-bitstream-speedo'
-pkgname=font-bitstream-speedo
-version=1.0.2
-revision=5
-build_style=gnu-configure
-hostmakedepends="pkg-config bdftopcf mkfontscale"
-depends="font-util xbps-triggers"
-short_desc="Standard Speedo Bitstream PCF fonts"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/${pkgname}-${version}.tar.gz"
-checksum=aeea5f130480a3f05149bde13d240e668d8fb4b32c02b18914fcccd1182abe72
-
-font_dirs="/usr/share/fonts/X11/Speedo"
-
-post_install() {
-	rm -f ${DESTDIR}/${font_dirs}/fonts.*
-	vlicense COPYING
-}

From 8b74878c7329d8ef87fec13ef4e2da2d60264869 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 14:10:12 +0200
Subject: [PATCH 0802/1853] removed-packages: add retired X.org packages.

---
 srcpkgs/removed-packages/template | 40 ++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 20fce6e997ee..2e2535fa1cc3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230506
+version=0.1.20230516
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -109,6 +109,7 @@ replaces="
  flickcurl-devel<=1.26_4
  flickcurl-doc<=1.26_4
  flickcurl<=1.26_4
+ font-bitstream-speedo<=1.0.2_5
  fontmatrix<=0.6.0.20171228_2
  freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7
@@ -253,8 +254,8 @@ replaces="
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
  icecat<=78.6.1_1
- ilmbase<=2.4.2_2
  ilmbase-devel<=2.4.2_2
+ ilmbase<=2.4.2_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -266,34 +267,37 @@ replaces="
  keepassx<=0.4.4_2
  key-mon<=1.17_5
  laditools<=1.1.0_3
+ libXevie<=1.0.3_8
+ libXfontcache<=1.0.5_2
+ libXxf86misc<=1.0.4_1
  libantimicrox-devel<=3.1.3_1
  libantimicrox<=3.1.3_1
  libapp<=20140527_2
- libbitcoin-blockchain<=3.6.0_10
  libbitcoin-blockchain-devel<=3.6.0_10
- libbitcoin-client<=3.6.0_10
+ libbitcoin-blockchain<=3.6.0_10
  libbitcoin-client-devel<=3.6.0_10
- libbitcoin-consensus<=3.6.0_1
+ libbitcoin-client<=3.6.0_10
  libbitcoin-consensus-devel<=3.6.0_1
- libbitcoin-database<=3.6.0_10
+ libbitcoin-consensus<=3.6.0_1
  libbitcoin-database-devel<=3.6.0_10
- libbitcoin-explorer<=3.6.0_10
+ libbitcoin-database<=3.6.0_10
  libbitcoin-explorer-devel<=3.6.0_10
- libbitcoin-network<=3.6.0_10
+ libbitcoin-explorer<=3.6.0_10
  libbitcoin-network-devel<=3.6.0_10
- libbitcoin-node<=3.6.0_10
+ libbitcoin-network<=3.6.0_10
  libbitcoin-node-devel<=3.6.0_10
- libbitcoin-protocol<=3.6.0_10
+ libbitcoin-node<=3.6.0_10
  libbitcoin-protocol-devel<=3.6.0_10
- libbitcoin-server<=3.6.0_10
+ libbitcoin-protocol<=3.6.0_10
  libbitcoin-server-devel<=3.6.0_10
- libbitcoin-system<=3.6.0_10
+ libbitcoin-server<=3.6.0_10
  libbitcoin-system-devel<=3.6.0_10
+ libbitcoin-system<=3.6.0_10
  libco-devel<=20_1
  libco<=20_1
- libechonest-qt5<=2.3.1_2
- libechonest-qt5-devel<=2.3.1_2
  libdbusmenu-qt<=0.9.2_4
+ libechonest-qt5-devel<=2.3.1_2
+ libechonest-qt5<=2.3.1_2
  libfcitx-qt-devel<=4.2.9.8_1
  libfcitx-qt<=4.2.9.8_1
  libgksu<=2.0.12_5
@@ -327,9 +331,9 @@ replaces="
  libunique1-devel<=1.1.6_12
  libunique1<=1.1.6_12
  libunique<=3.0.2_11
- libvpx<=1.7.0_4
- libvpx5<=1.7.0_4
  libvpx5-devel<=1.7.0_4
+ libvpx5<=1.7.0_4
+ libvpx<=1.7.0_4
  libwebkit2gtk50-devel<=2.38.3_1
  libwebkit2gtk50<=2.38.3_1
  libwnck2-devel<=2.30.7_8
@@ -361,8 +365,8 @@ replaces="
  mozjs91-devel<=91.7.1_3
  mozjs91<=91.7.1_3
  mp3gain<=1.6.2_2
- mpir<=3.0.0_1
  mpir-devel<=3.0.0_1
+ mpir<=3.0.0_1
  mutagen<=1.43.0_3
  nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
@@ -574,6 +578,8 @@ replaces="
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  xnp2<=0.86_2
+ xsetmode<=1.0.0_5
+ xsetpointer<=1.0.1_4
  yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  ytop<=0.6.2_1

From 9a6f587c8f88646be49142676c3a5185c514602e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:08 +0200
Subject: [PATCH 0803/1853] attica: update to 5.107.0.

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

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 5d4cdf9951aa..e7f69e2841a3 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f1c4fcd74435f387a2a8cccd1ac7434292f3c65d221b84fab4b44e2373109b9
+checksum=fdcb3cca97c3705eef360e483d25eec887e1d42c43c77c815ad42a0972ee13f8
 
 do_check() {
 	cd build

From 7313c1ed1c7efef49c7b93c78127d4eda946e292 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:09 +0200
Subject: [PATCH 0804/1853] baloo5: update to 5.107.0.

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

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 91dbc65410a1..741228362328 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=8d3f7e1acabf6993d2e724b8318c270d66812f5295ae66047c19b3ec5ab1f4c5
+checksum=e2434e75afeabd260dea3b32b474f09bbc9dd91c215924f8fdd76b98fa777a44
 
 do_check() {
 	cd build

From fc6e9e9ec27cbdd32f41ef42039b185f34546547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:11 +0200
Subject: [PATCH 0805/1853] bluez-qt5: update to 5.107.0.

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

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7ec1ba655172..4c690e127e56 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args=" -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c6ed49324afd7a5c7c1668bfdf2b2accec748fdd867d8c893881b59ff413d583
+checksum=2f2ab08681e9014d7884fc345b72a91611d98e9b453df95c9be627aaf7b9ce71
 
 do_check() {
 	cd build

From 743576109d92a25789a7e0dc7e2fa59fa278e189 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:12 +0200
Subject: [PATCH 0806/1853] breeze-icons: update to 5.107.0.

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

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index b93357dee086..96f9f7622453 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2328b09ca0a9d4ca1efb13132995f837d3d30452b50646cbf5d91f6584d8a679
+checksum=67b25fefb3ba0864e6c1293397bda16c31d5a04aecc7332deaaf004d86bf103a
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 5fcb9c9a92d8e52b1921b5c1d2a2f79edbf72b89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:13 +0200
Subject: [PATCH 0807/1853] extra-cmake-modules: update to 5.107.0.

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

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 06f469951f25..2e6b7c717bf9 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bbf7ae5f8f2a3addb821c6d9962d3d0f0085f3ccd55f18128763d88e31365b
+checksum=3969aad56d1e6a5901e926aaf7a73510d98c4b363564ed3f1222d4135da633ed
 python_version=3
 
 do_check() {

From adf511b7155403718c0b7961f83729b1159ba0bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:15 +0200
Subject: [PATCH 0808/1853] frameworkintegration: update to 5.107.0.

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

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 3f7690be7e45..2279c47afcec 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253a7733505aa99db7dfa7accd3ed416582251b39aeead136a943945619aaf71
+checksum=f81816aa86002d9d7053040241faab153873278c89588032eab1954d2451aa48
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 967285c80face09a8c9a07846ce94ebd995f94b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:16 +0200
Subject: [PATCH 0809/1853] kactivities5-stats: update to 5.107.0.

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

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 5616f270ad2a..dabe263c5fc3 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=ce513abd4715c2dd3ed7da699c6596dddc9cfb46526aed54c6399505ecad420a
+checksum=678c424b2feb507908eb9b6e73dc5d8c6978dc22276d4169eabf4299eb64e1c2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From a6c53bf5f19a03d23877f4dcdf92102ba553d880 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:17 +0200
Subject: [PATCH 0810/1853] kactivities5: update to 5.107.0.

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

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index d541ea066791..7f0ac5a84e5a 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=8fd4033c288fd03953a39f43d7d3967024252d29265bc6803adfa9ac166cf0b2
+checksum=19b79539a72e5a8b13f7eb94789eb61a5d5945003a86aa121203017cf3139b29
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 5792dccdb43b5a59b3b4c3f4db896a41e8598696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:18 +0200
Subject: [PATCH 0811/1853] kapidox: update to 5.107.0.

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

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index f7e896122104..91c2d6dd789f 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68f1e1d617c9d9a661dd630bdf3f1659c4619e6f08c7e0afbbb37270fa52a125
+checksum=5729441f2d67870a814aad6d3edc75ab84b35bd97413fc6783e0436af6edbfbf
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From d31826844da1fe3de4d7b09bd29e3a04573bde04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:20 +0200
Subject: [PATCH 0812/1853] karchive: update to 5.107.0.

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

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 6891f1581d49..804ecfb4aa7b 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77ef95cf4c525fe74261c7dd817564a35e726e5c1c4d1e1479fdfec187da9749
+checksum=e88cb94b9af8a88f360e627b3ae7a2b99ccdfe3fe9e1961452056b2a00f04a7f
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 4b3158bccedb01c49ce0c193641bcba591dce48f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:21 +0200
Subject: [PATCH 0813/1853] kauth: update to 5.107.0.

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

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 26afcb83c4df..acd8b8d3c08c 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c660838a2ca9a226f180e0ab654fbb15eee2fc7140a7157e6a2209e9b6c2833
+checksum=06bd7f9b3b9c57ff8f169ba09ee0c160aef8dceb651caa28d154448883db8fff
 
 do_check() {
 	cd build

From b1a5acf339761a38f993417379012f114ec30d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:23 +0200
Subject: [PATCH 0814/1853] kbookmarks: update to 5.107.0.

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

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 2f3ed765bc68..6b44ee7aacd7 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb0f625bef48d139f4207c9e18327ad0a64cbba66d312798b291b1090430a183
+checksum=50d1fad05c98c14970ef7fd4b12103bda5bf9a477d99b97f2e7acfeb641ced99
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 56b69d504817758bb15f6b79da8bbf258065ee2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:24 +0200
Subject: [PATCH 0815/1853] kcalendarcore: update to 5.107.0.

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

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index a391d6f6e091..be95ea9456f5 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fed213d9b3243721cfdd8deca2036d478d3211268c6f8e26abfa37e2ef28abdc
+checksum=54d742bad1ccc5c4b03d0985c1b4b202714af3b0c92efe6631c4c671e8b25c47
 replaces="kcalcore>=0"
 
 do_check() {

From 7b435e8592cd1cc8975b34e52c3e7fba08e4cb59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:25 +0200
Subject: [PATCH 0816/1853] kcmutils: update to 5.107.0.

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

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index edd10c4a97a8..92d4e936ff98 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2e37e437e547a24beca24546aa2bf76f13b43f762e5f43960d0cd6f5d89b2929
+checksum=4698d6ccdbfb1a58103b5e23f330c0aa3cf265e78f5a1f0ba9c88dd8bf8850d5
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From a32bbf651d17b8fb8712ae4842f4f69323f7e88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:27 +0200
Subject: [PATCH 0817/1853] kcodecs: update to 5.107.0.

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

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index d9f47b8e3afa..36bed6de910e 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e3c65d4fbac9fa3d47aa382764066ff875de0e3d8ff2bb87cf567f4e50e572
+checksum=07b08563c0a4b29bbf08ea7a36c410d64936ab5e27cc772b8ca4f27a75a11221
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 00e08dff3be67f2e4eb56fd005cc6a81559956b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:28 +0200
Subject: [PATCH 0818/1853] kcompletion: update to 5.107.0.

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

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 6c87fe8def18..771278ab6e77 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6e76e822a8b4e49d3357958fd3880858a59ccf4defd45a0e248c57535788b981
+checksum=50ab6473d2092bf98fc6d0ed7000566e9bb490f1139e1a502dabc39dfe6449f5
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From 01da3b89648a71607dde0357de54271853639a3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:30 +0200
Subject: [PATCH 0819/1853] kconfig: update to 5.107.0.

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

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 10c98e2802f8..4824fe81fe4b 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3e95f516a1e939067550a243a46cc33961d1c9b116330913176e6ea55760e152
+checksum=9697d4bca5255e62df99f7e80b4d0f22d532317b4bff3d67e81c4f7641ee5b13
 
 do_check() {
 	cd build

From 387e870a86e953d890c5baa3f7fdcc013b7a8a24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:31 +0200
Subject: [PATCH 0820/1853] kconfigwidgets: update to 5.107.0.

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

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 4c50958906a1..b6bf594f6407 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=068f4d3810a07dcc7b69115584d7948e9252b4bb3fc381ec48b71798e2c4d94a
+checksum=f16d8578ab311b46bdbdac11beaeca6b70a19417622d70c7b07fb6d71545c068
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From f3bdd118c5581dbc32cab4459d6a59e08fe7928d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:32 +0200
Subject: [PATCH 0821/1853] kcontacts: update to 5.107.0.

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

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 8704720b6959..e173b89a1ee2 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6dedd11f5327ee0522edd3538045084050c9e680ad4df4bd1e17342550bab338
+checksum=3bcaccf93e6cd0d283398c789a5975f2a9fc24724a73e2f07865e31fdf5fb09d
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 789f4c7fe8ce6b4243fd5b677484e35b9f3870d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:34 +0200
Subject: [PATCH 0822/1853] kcoreaddons: update to 5.107.0.

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

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 92deb84ff859..b34ee6d24d71 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=915cd3ac5bb3963fe79a643d70f109a9aa198f97e6a2b5c72f09cd955238daa2
+checksum=64baee484852ab2798aba18cc4780a1caafb688a5e0a0524de3bc7eb2a1eaf84
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From d3b2a63393e6d85338b83a0e22d086af462d0a8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:35 +0200
Subject: [PATCH 0823/1853] kcrash: update to 5.107.0.

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

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 0bb79ada5c3b..bde970554302 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee087799922c9a74a7a8f523c75e8af61c27c3ded81b108c51e86faa2921e1c8
+checksum=5417cdd49ba0a54ef3e549eaf153c425d15158e2b91247c0ffddb6985f7df695
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 92dc491d27eaf2f5a22e2278db5a785f346a05ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:36 +0200
Subject: [PATCH 0824/1853] kdav: update to 5.107.0.

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

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 25af83b44494..754b41320e83 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3de27547f16a32074387e049c17da94b13d82b0f5f86fb6abf06100a828be335
+checksum=579da54db79d360e17c500c62a9ada81cdf5db84a40799f98f2f7cbac70a9b6f
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 05b4f720ebdaa7524fa54f272dcb9fff8fc3ec91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:38 +0200
Subject: [PATCH 0825/1853] kdbusaddons: update to 5.107.0.

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

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 9866507523a2..e715c97d2843 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a257b294d85ef3485dcf05a23d94769bf0d70a8689508e24cb209a8c25ffedd
+checksum=4e96e3c31eb254b6a48aad20b86c8fa4806a45f6c0644b672413a3ca88eb09b8
 
 do_check() {
 	cd build

From 0c04853d4c055ceef1b34c67f81d2ebaf35dd59b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:39 +0200
Subject: [PATCH 0826/1853] kdeclarative: update to 5.107.0.

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

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 1bfb390ac47a..d5cf8cbfa26c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44ce2dc69f9bc93f5a039cb14f3043e4a9d98fbed5e031bf8d6fd6778b958ae4
+checksum=df50ed868176fc2b138ac2a24148de7d73165ebe1cfd4f3740953069ce880855
 
 do_check() {
 	cd build

From 9107dc11903fd706d314e8893cb19a5bd6fe2fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:41 +0200
Subject: [PATCH 0827/1853] kded: update to 5.107.0.

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

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 3e77a6ee5580..b26a367461f5 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac588d6ee850ce60b5128043617c6986cd04122e792052b1d515c4343ed851fb
+checksum=cf2f08cfc411bb6b2a60906999fe94bddd8df4a9497e8d37cfb62399e6e8b73b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 021d4b5182c4eeedb58080ad3f170e54d332ef93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:42 +0200
Subject: [PATCH 0828/1853] kdelibs4support: update to 5.107.0.

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

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index e7de263131b4..6cbadf3535ac 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4d5051221c293aeec014ced6547df6fbfcaf0111dc732a48eadc55f72c8f87ed
+checksum=ef94568b687230734725d2a74108ff869c0beeb6d3476503265719e182660c8f
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From a4dbfdf151ef02d90172b9ba4d6e5d712bd122b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:43 +0200
Subject: [PATCH 0829/1853] kdesignerplugin: update to 5.107.0.

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

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 4fd0478bdaf3..5e6180c0b4ee 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e7482e698c2b2d8550ab8fb54b30f72ec363ff92e082f20a856e02b337d4aa66
+checksum=688dc43ec37de6a24848410593f17034e56be1659efe00c46fd31fedbc77be53
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools kgendesignerplugin kdoctools"

From 67558c9d4f6410eed6b902a5fc55164b12fe8ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:45 +0200
Subject: [PATCH 0830/1853] kdesu: update to 5.107.0.

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

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 6ba72c0f4251..ebbcb7eff5fd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=12a64ddb93c30ec299befd23e9c32eae340437ea3d97d18a21865778de078655
+checksum=7d1017e508561e66af1fd2df32b340696d64f48b86a98d085a2e47ac0352158a
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 9b43f5d60c3c9426c2cd009847848a61f58405d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:46 +0200
Subject: [PATCH 0831/1853] kdewebkit: update to 5.107.0.

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

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 065a1207b82d..c6062441f4a3 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=38760d18d7e1938d278d0f3bd5897602d1e673a1e93616d4ad9f9a96e6a4b698
+checksum=65502819b5cd0056cc0fe041b8fa7da3a703fc3222f8785f035f25613ad4b637
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From fe8e1a6c09125552d8620380f163f23b285e4ca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:47 +0200
Subject: [PATCH 0832/1853] kdnssd: update to 5.107.0.

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

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 02c5d9f875de..06905b3e5d72 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c565de37584666d0c786b9422efbf6134c6c43dd8940875d7dc3f3a1fc7828d4
+checksum=155cb54351d76299c295ef859695fb280d7b74fd4daa9ac0bfc9752f7a1bd0ca
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From e0c2fabbc23637a1a8e38cf4e21c9842344b4c42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:49 +0200
Subject: [PATCH 0833/1853] kdoctools: update to 5.107.0.

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

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 00f80fc02995..de12091ad810 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b4e4b71914c46684219ba84fb4f8364809aeb43d74cfbe8f18ad53c728b0922
+checksum=9d56a0493f5fe10e7419ff97be56e4afbbc011eb19c379a42f5a58a860711550
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From fa84e5878781b1de9ef8dfa3560e142bcbd115dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:50 +0200
Subject: [PATCH 0834/1853] kemoticons: update to 5.107.0.

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

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index b7e445ddeba5..93bf78bf08f8 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c028b73b2970cfaeef1c9fff2826eed92cd8dac1870f70d96e541f36dac54644
+checksum=56f8748232d08527e535cc678d30241033c20c14141a027b2915aee551953e4c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From a671a937b173b6da98186c91b0101c931f71dc32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:51 +0200
Subject: [PATCH 0835/1853] kfilemetadata5: update to 5.107.0.

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

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8980121fbc69..4b91cf19f298 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c64ef2bab192c779cafe471354a2125fff858ba8e8a65d2193965ee520b02e2b
+checksum=edb4f34d45b7c898bc349833dfde7e82cc9ba9f2d1af53a89d8b7ef0ebbc8aad
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 2059a35130c6f0ed2e83a8ccc6f241bf6d667020 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:53 +0200
Subject: [PATCH 0836/1853] kglobalaccel: update to 5.107.0.

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

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index bcc5b51fd28c..863bde13cfc0 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8b0f8d6857d86d47fa64ac9853b8d397e6c7bea39dda8b5d99a61cd5dfba494
+checksum=a874824335b811ce1ad7b08f37e0ae992e813ea2fad34de252ea8e9239349ed8
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From dc345f1737f133cfd45757b9b43e6e9c2bce37ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:55 +0200
Subject: [PATCH 0837/1853] kguiaddons: update to 5.107.0.

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

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 449d0583c308..9efb4aa02a34 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=66318ce05ce96fc69533adae525a8aa7e11ee675646fc395b46de30fafa31af1
+checksum=ad2f6e6ca7dd3c230de54bab357e33a9c21e85a2836f63565e3b77ebf79984c1
 
 build_options="wayland x11"
 build_options_default="wayland x11"

From 7923818d465c27cf4125bf50ab210f27c44f17e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:56 +0200
Subject: [PATCH 0838/1853] kholidays: update to 5.107.0.

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

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 578f4d1b3d84..17c20de78249 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ba80c218e3db9432a6625e9ae376ce4b4605a73e6081fd23211f07b47a28c0a
+checksum=ca5670e9d1d7e979c139d07936f00826e06cbe902ba93bf28fd342dcc4a2432c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From dad9807511ffc0d97b29f3e20249820835ad7891 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:57 +0200
Subject: [PATCH 0839/1853] khtml: update to 5.107.0.

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

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index d79eeaed735a..9c3e0275512b 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=14381ec7008fac941a4b37c8cc6a40e5faad961ced6a6aedf53be855bc12b920
+checksum=3b4597da6f28257cba8381283f8218ab7a83bbac1418a8926180597460d195fd
 
 khtml-devel_package() {
 	short_desc+=" - development"

From c776383204737403706b37c79e4df43a398780a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:59 +0200
Subject: [PATCH 0840/1853] ki18n: update to 5.107.0.

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

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 47f7d8625229..175b07bbafaa 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba26cd1fc188ab305293f8f1276ab7871f57f4ab1309bb8d2adf42fb20958f3a
+checksum=17dd8fe31b75367f6a8cfd73e1a8a9676031ff9acf86dcd9456fab46c25e8be0
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 28874eeb8c2aae4db98b96c5974cc21efe622347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:00 +0200
Subject: [PATCH 0841/1853] kiconthemes: update to 5.107.0.

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

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 86538e1a3a55..d716822dc201 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=15178a35da23f78cbbac1a9d40554c9ed46f4426f7669f463260061f463f23bf
+checksum=5d17db48bc9d54e0060cc48f77354b2732ec2fc553266a00907c16345426c42f
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 116fb06ead30a9d88fb99c3be6c012a80958a317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:01 +0200
Subject: [PATCH 0842/1853] kidletime: update to 5.107.0.

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

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 4548d31029a6..80c07919afb7 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8be6497cb52c6240f4d77d47457ec4f224fbc9aebf525330d7045981d033fb2e
+checksum=3b409a281b1212f01bd1ce99cf75b8a6a73397abe96c3a278a80f709c1a7772c
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From f5044b5dbb911539c1a4876b99666ca05754b112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:03 +0200
Subject: [PATCH 0843/1853] kimageformats: update to 5.107.0.

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 4e4a02383fd3..21dd21420fac 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.105.0
-revision=2
+version=5.107.0
+revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kimageformats-${version}.tar.xz"
-checksum=4ea6ead739f9e850aa8908e246ff2f45f505bbadba20205fb580667bab87d0fc
+checksum=97258ad36bf98cd1aaeeb29c49946031f5051d9984bda9f41fda5a35ccd4d1c1
 
 if [ "$XBPS_MACHINE" = i686 ]; then
 	# FIXME: some tests fail on i686.

From c127607f01387d0ce3ff4de52844f174c721212c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:04 +0200
Subject: [PATCH 0844/1853] kinit: update to 5.107.0.

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

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 7188dc8d7303..bdc9c3f5218c 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40dcd052f99cffc3588593495f971a6fb580e82804cbbdf43bf4bd9f2f9ed4ce
+checksum=cefe344456222c63bbc1738192a11f68e0eff7eac5e32f73e0edb9b8d9a848dc
 
 kinit-devel_package() {
 	short_desc+=" - development"

From e739c01aaa165f57a9e2ed2f15124ef842d231cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:06 +0200
Subject: [PATCH 0845/1853] kio: update to 5.107.0.

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

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 6d458b506368..341854f06482 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f971115d3cc488973f74222c9ae3722ac630fa8c02c00d4ba22eb03ceb8677d
+checksum=456a1856830c21e9a61181c22c0e14510ad6a4498da0684afc05761142ac48ae
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 4bb8ca2813f2519c55679392c43cc04eed549112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:07 +0200
Subject: [PATCH 0846/1853] kirigami2: update to 5.107.0.

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

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 9f86b7fff809..ec5a8dabcddd 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=36c2fe1662f4bdb82e2e709777aad82576724612dc35bfd1ecbb507d20f585dc
+checksum=f5c3d1363ddde13c977f6f6c747cb0b34ac6fb647134ef9e9c1c24474e0cb9c9
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From d9628747a383a07ccd33abe9d9c89b20a178857b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:09 +0200
Subject: [PATCH 0847/1853] kitemmodels: update to 5.107.0.

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

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 4da393bb9be5..5266053a4cc5 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d28798439e4f6a1de3388e1fa0b7aefa0002b1902b62841e70551fcba3791523
+checksum=b7f5aae6a5d0605f737ab3e993f9a195ba164f6f89672013e26b1276808a11af
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 5035df1eaf6769494a1069f8eebd4a3d3ed8ef81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:10 +0200
Subject: [PATCH 0848/1853] kitemviews: update to 5.107.0.

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

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 969bb97825f7..2b5b73c7988f 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=25dac0803149156e088b51db1fc717b2c95bf373becc2625b031d0aca06235cd
+checksum=d5460cee8e9b08c1c0472e88e07bbe04d33cf69da6faf45febd9680972a00b17
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From 2ea1799c77547dcf553e7b0590988583361b8f61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:12 +0200
Subject: [PATCH 0849/1853] kjobwidgets: update to 5.107.0.

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

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 56ee66e2901f..d3f5005d0dde 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b7edaccfa5d17b4bd9c6c4ebbb77cb951719fa405ca0b31da5af316acf7edee6
+checksum=26e1ab6bdec59890be9155841f74bb79d1fedddcafb674a8e6a257f8c2906b92
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 05e94c75a756eed85a4faba3d782681f154d3dd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:13 +0200
Subject: [PATCH 0850/1853] kjs: update to 5.107.0.

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

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index a7e4e495f392..95d70cde0d05 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=93f87d367ceb0038c622d6c41a54d8fec04014f2e8a76732174074dec77cd31c
+checksum=6a36b4e812681088cf1dd3d44f7e37352da3c01f510f8a0c906ee1bcf52a2835
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From afb076ab2d05bac6920da8f9496f03b4cf6f7074 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:15 +0200
Subject: [PATCH 0851/1853] kjsembed: update to 5.107.0.

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

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index c02cc4a02d40..1dcfd1d8338e 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8a8af23563345649c19adec044a86ee5f37d64c90444d51058cd1c271d1b23b5
+checksum=726e499a415d9967096c81584478a1114128152ca7a062359e2a2ae0976f31ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 635d06d171cf2ae834eb58fd76a09fca6b32b4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:16 +0200
Subject: [PATCH 0852/1853] kmediaplayer: update to 5.107.0.

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

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index f3bf76eaa836..d662e169c7f4 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7db3b021751f8d874c38de318ef7f20c3a44c66aa24d5c0d5205765decb55fd8
+checksum=b2e66ebfecc002a644edada997ccf79dd7bb911b36c779b71f43453cce8c11d4
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 8804cd9abf6a566e39b2827d1e0cdecc5c34baf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:17 +0200
Subject: [PATCH 0853/1853] knewstuff: update to 5.107.0.

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

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 0f2e989b8fb1..e7aeb28a4f53 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8758cbbae12cd0405614cb9a0ff57fa66899e31187fb7a027cfca91b48f5fc7e
+checksum=78d935ba41d525a803bc6335f9f5cbe7c2972000d3544e7621cb5771ab92f29b
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 47f5e48d551b07cf8f06be88c33b59a57d9849be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:18 +0200
Subject: [PATCH 0854/1853] knotifications: update to 5.107.0.

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

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 1999229aa387..f01266def0e1 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b24ed1f92be045c8f6d2c7c39c9f3c7948a8bcbdb35f7af6f61f076cd845535
+checksum=ee1d477046c54d03d7704bc76a7d583393e8ba316e5c622d39ca35fd98a92f76
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 4d89dcd5bc2c12bd39b80d7d82a86f466fbbe2a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:20 +0200
Subject: [PATCH 0855/1853] knotifyconfig: update to 5.107.0.

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

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 4789bbaac9c2..b113d8d1b9cd 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2ba0087bf8bb80c4d5d15da4b6f0519d643da5ac990e7bd757214118b9477c3
+checksum=e8f1568fca948ca4573c4e86b808aea18ce53f54b8b6282a3183f44a95efb279
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 1251ded261ee711287fa81782ee48f0d12c71066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:21 +0200
Subject: [PATCH 0856/1853] kpackage: update to 5.107.0.

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

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 8d2de04a9f04..cd1e7c9ffc25 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccae4d5556ddb6392b5c9f2423ef4b170adc7d2e5c4764a44b73a21b1c4a6765
+checksum=f0ae60c1556ab7156f39191609386b84d103d44cda3eccbd294e73a983c404b2
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From be27cab5358ce6065681ff6c100ba23a16084910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:22 +0200
Subject: [PATCH 0857/1853] kparts: update to 5.107.0.

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

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index a5e401478866..2a390a16bab0 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab0033760fcd76d0d156481e026de3b545191b9a3c6cc7e2316fa8c50d95b79c
+checksum=00b8558644928e4cc1f43de64a74696d038add33895522e085809c9c9a8fa9fb
 
 do_check() {
 	: # test can not find packages assets?!

From b55a90770dd5b7caa0e9f645350948283d52147f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:24 +0200
Subject: [PATCH 0858/1853] kpeople: update to 5.107.0.

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

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 71a80c6129c5..cdddd8b78826 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac098e548cdb9be91e035e15ad9b923bb7d0fe490562bbed16245a6cf40d4706
+checksum=925e6eb326846b01c31eb013be0858e1c48e590fdb4e4274e3f92d9c224b19a2
 
 do_check() {
 	cd build

From a8667e3a0f684827d65f280b7ef1ebaafb15c129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:25 +0200
Subject: [PATCH 0859/1853] kplotting: update to 5.107.0.

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

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index c53f74007e3d..0ed037b0b8db 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c9ce3514dfff5bc1432c26e5b9b0f9a4727edd18979a5745e8537a3c0edf100b
+checksum=4c6c3dba2242e2a0ed053db8083dd35fa7e5de2d31e5e142c0beda9f750ed33e
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From d5072033d5f962c232c13e908c7670d0dca2136c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:27 +0200
Subject: [PATCH 0860/1853] kpty: update to 5.107.0.

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

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 54ff29837d3a..a549a8e0cae2 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba2ceac1b9678b6e926119c3e040e2f9cf277dca8c9ecf0f9ca5f58fdfd0616a
+checksum=907ec5f4108d42fcfc7013c38e97c71ced2002dc14d311b589170e89ae4813f8
 
 kpty-devel_package() {
 	short_desc+=" - development"

From e44a78bd66b80eab96c2dc8a45d2409604a240d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:28 +0200
Subject: [PATCH 0861/1853] kquickcharts: update to 5.107.0.

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

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index f5508f9c0c1f..90d3e44608d4 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=8a24080bcbe3d74e65c4d64e3cf51255fc9d41d677ba78360e1a0f8684b2c903
+checksum=942c737225470787baa25dc9b3e231eebbcce373e3b65f82df3223d6fbb4b9f7
 
 do_check() {
 	cd build

From 0bcfe39809d61ec99babd8f4102875f9217c7a97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:29 +0200
Subject: [PATCH 0862/1853] kross: update to 5.107.0.

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

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 3b6f1e51aa1f..49bc5f603ed8 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e54b1ec87296d7cf4ecabe82124be33a1704de370545dbc103c47df9434337fa
+checksum=3f0eac7ceaf22fae6202efb66b73e192b781e5733566cbf3362d82be8e8cbe8e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 215bc9ac579f24839234ec3111e3d5fe9720125d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:30 +0200
Subject: [PATCH 0863/1853] krunner: update to 5.107.0.

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

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index d41b30fb065e..d1b69827c9f9 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=785b8ad02cb61452c6f82a1ff632539b492399c1832c153fa6eb1fd35b6daf08
+checksum=75c8e8022c131b339426c38a5fdfc7c33ddf30b211fae9cebe2e4a0cab3c221b
 
 do_check() {
 	cd build

From 7ca64eb3eaf2c44bb25a6900e197a1154ac5944d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:32 +0200
Subject: [PATCH 0864/1853] kservice: update to 5.107.0.

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

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index c7efcb99097a..8d2c986523d9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b1010940954040f4a0ed096901e7393f26f262d79b5e904da2247b2602e3c70c
+checksum=063f6d41921d797553204fe625c1c4720e1b7b1a71163c5d594eb210b614f92d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From cdace58c26fe9733c11ccef5fedf9c27a6926495 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:33 +0200
Subject: [PATCH 0865/1853] ksolid: update to 5.107.0.

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

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d021468e767d..b40cac513b34 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config flex extra-cmake-modules qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=fdcd5c0ee1060204f46ff88a0ab25403b6d83676d0d9f407209ce3bc6629aab5
+checksum=4245115d411b9890ca811835e3e8aba4b6e915acc04e3839fa9245d4a130abf0
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From caef0b889f4e1d879bf317a93487b7b296c18e8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:35 +0200
Subject: [PATCH 0866/1853] ktexteditor: update to 5.107.0.

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

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 914472ab602d..cd91891f2007 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96e9dec29a59a6f0fc939b4496dc36138b9d5221e8d1b6c3645ca3d93fd85106
+checksum=8f91c74da11b856b0a228d080c592e360ce80c9020cbe0d8673dd6b6cacebc98
 
 do_check() {
 	cd build

From 5edf9cdf6e5d8231d9d0ee44013f10a9c60b1087 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:36 +0200
Subject: [PATCH 0867/1853] ktextwidgets: update to 5.107.0.

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

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 2fa40573c0f6..0197e46f3f50 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e5fb51544ef0ec3435a855e870143359a57b6a7a9a1ee51c36a56dd576e68fd
+checksum=5e66b07f271a9aae03795ed1baef542460d77ede06987e312f56ebf2376da0fb
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 825171298eac884c4540f20bdfb9057fa558b8aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:38 +0200
Subject: [PATCH 0868/1853] kunitconversion: update to 5.107.0.

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

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 9136ac1e2325..f366205bf7a7 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f69545481bebf0dc69fcad43defb429e1b0306550380115edaf41a84086144e
+checksum=5cf5beed75848efbec729eedee337b340a273a660f38b2e6197ae303277e26f9
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From a42d8d948d8e79967adf1a550383565276b5522e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:39 +0200
Subject: [PATCH 0869/1853] kwallet: update to 5.107.0.

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

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index b3616992b278..129ebf405131 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0deb1f27398c41caef6ad56ff151d2c1a59740abc1d6c578b502d31522249ef9
+checksum=2e796a011f337ea3305a11bfe2c0e49b71720569207361c65d5bbe85f71b1d77
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 05daaf632b21add75f54b87af7117bcc130bb3ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:40 +0200
Subject: [PATCH 0870/1853] kwayland: update to 5.107.0.

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

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 090cf8a40d7e..8b144014c874 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=017de24dc140541690b80cbd4b34d5f4b14c9ff5a2b355a08d5657af1a52348e
+checksum=855c21176788ea418603500dfd0547c5b01340a79d86d68548b67bb1d3961049
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 11c9133cb9367ab0a673a01b01cb663cc83e850b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:42 +0200
Subject: [PATCH 0871/1853] kwidgetsaddons: update to 5.107.0.

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

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 781ea9772982..853fcc33bf8d 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adc8c9dedc790b9ee615295c18345efddc66ab0a69d6c0cbcc8bd5df9d6a7f1e
+checksum=0fa19b9933c3f5553d16bb38b0d9f6fe0a290d58b70e7debf45714102ce887c9
 
 do_check() {
 	cd build

From e59b58b3245304d3ae8957740e3c1ba571171c1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:43 +0200
Subject: [PATCH 0872/1853] kwindowsystem: update to 5.107.0.

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

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index ac0ad18ae374..1e007b0f2338 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40f8032edda348ce2a1ecb5dfe61a8493bec0f68ce93141c3721b72090a6f44a
+checksum=a3aa7c3c82f70f6d347c489af45e0e4277fb792fb1b1fc1dd9a6dbb73ec6931e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 942e4c7a10de3eb44225cfe142f4311914572bda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:45 +0200
Subject: [PATCH 0873/1853] kxmlgui: update to 5.107.0.

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

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 36db176096be..ce4021a8fc72 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c17b9abed247728399bf4f1be599e9d33c3aeda41ced9590ec0eab0e4d1b4f68
+checksum=4b4821804c3b3cd58dfe3cee474ee2999501d04f9936003a593bc64a3f1084e5
 
 do_check() {
 	cd build

From 4145165bbfc48481dab98fdebfcddd15e67fd633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:46 +0200
Subject: [PATCH 0874/1853] kxmlrpcclient: update to 5.107.0.

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

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index d0da6379f8e9..b4edbd191bae 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=578dde6eaf873b7c6f554a5a8de2ae04a8e577cdf5a09b0e2e1867877d9c2cd0
+checksum=0cb214266c5a715c78f9b676ae4ff0f4fa1e502bf04ee0b855dae5c5275ecb79
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 6e01bde1d2a82058a06e31a1cff808cf9d9450f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:47 +0200
Subject: [PATCH 0875/1853] modemmanager-qt5: update to 5.107.0.

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

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index e2c1b1fc0dcd..77163be6313f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=5cb26fad66b70216c5e3d406e98769d0c90704c1d9a36b2bceac6d0a6efe5ce4
+checksum=c1df6ec05e104a80c340fb4e4317725931a69bb48b8fb2666e5804cc09d6c439
 
 do_check() {
 	cd build

From c7f6830e3ce8c360ad4a9d8ee0c623306507e925 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:49 +0200
Subject: [PATCH 0876/1853] networkmanager-qt5: update to 5.107.0.

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

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index f51c54314992..a7cb965b1232 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=bdf74d4a3d945837696e639742cbdc8aefdea03c4ceb9b2fed4cf74685ca14c3
+checksum=695ffd3ef62023389f99363622320dc4af61e6d3e5606d006fbc5864f0d3197f
 
 do_check() {
 	cd build

From 4a6162663b83d270b748b2411e2cdae900f2d010 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:52 +0200
Subject: [PATCH 0877/1853] oxygen-icons5: update to 5.107.0.

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

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 90ea3f51085c..5d9b467d993e 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=82568b106969f4b1e79f24b97a201ddcb82f59fce685a16d56e1fbf97ac13b49
+checksum=3afd9a59b37dd558f45a92db64783adc49b2fab01c6f68f2bf9f0a8367a7cfd0
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 94d6756d87b48dda96a10a7befd276656aeb1919 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:54 +0200
Subject: [PATCH 0878/1853] plasma-framework: update to 5.107.0.

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

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 070eb153025c..c9fc4a584c5b 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5311778e9b3ea896a245d9a80554a94b30b5e1d130732d2f4a912c0f27243ca7
+checksum=6053a55a498ebefd4cd468365acc46e1287066bb17398ec9f3d68aaf2abf0f2a
 
 do_check() {
 	cd build

From 7b4be7e0cf19aee1bed1c2ff00234976a24572fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:55 +0200
Subject: [PATCH 0879/1853] prison: update to 5.107.0.

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

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 249e136c3b11..1520139c4d82 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,7 +1,7 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.105.0
-revision=2
+version=5.107.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
  qt5-declarative-devel qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=6e05ec6085df7a33e74e450286f596fe7368bbec6ef46e67efd1738966784261
+checksum=cc702edf7fd3f36b567ca2d1bfc315e80312e7e33fb6a0db49cc4a3b6fa64a9c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DBUILD_TESTING=ON"

From 69d5132f655c8c19521e39264d6979652e75cdd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:56 +0200
Subject: [PATCH 0880/1853] purpose: update to 5.107.0.

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

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 4565a81e4d2d..a17583b681b3 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b89fca5d4ea18b6c9323a90c0cacc85d7f2c95a5ef087de0d69154f698104f16
+checksum=99cdf31a52b606ff6ee25acec1ee030e52e0c004d3fd3a42b2bba838473f9d2c
 
 do_check() {
 	cd build

From fc8aa0a9d071ab378fe786f00fac0f839e146444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:58 +0200
Subject: [PATCH 0881/1853] qqc2-desktop-style: update to 5.107.0.

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

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 7e9a776380ec..49e3e012cbea 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=de8f6c8b6a9af2caecfea20f71d84a791e6f685b8b6048668ed22a0d25121a92
+checksum=5cb96c9799f0fb46b9bf3826121ae00e31955591b255e50e83f1437178f1f242
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9b3e8bb6fb6807ed03f3de1939821f7f1be1ac38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:59 +0200
Subject: [PATCH 0882/1853] sonnet: update to 5.107.0.

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

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 7077c72a2f73..52ca653bb4e5 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28ef6a2da7f2321975d902e123c616811e1c19ef7bddd8550c1ac7294900e08f
+checksum=aa3dca0a1cf58ae7914b75f67bb4a42202ba2ee4c5bf9df594a431da2496a747
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From e13cd29d75355947a505494c21f8875e767d9032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:26:01 +0200
Subject: [PATCH 0883/1853] syndication: update to 5.107.0.

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

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 2f75b920ac70..810687b9b36e 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=6b626f094569a3069856239933e3602c96652c03e3add04743bb7b793714c5e3
+checksum=254d38c51f77e3e98b78761490258d394151f07b5e5ad19113061ff5c9b0f84a
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 86663b900dd0ca986071686942b9e51202e7ead3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:26:02 +0200
Subject: [PATCH 0884/1853] syntax-highlighting: update to 5.107.0.

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

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index a8895c179d0a..70375ffe0b84 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f558b8203359911fef33701e9bebbfaa7eb7cddcd34440d4d886fb5709d0114c
+checksum=672ed1e9eebbf13d012f027e729b1b9820c351d4a4b2ca57ffd0be4a71ac59d9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 410893c136c95dac29e5e91e4ad6a3f3dd112428 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:26:03 +0200
Subject: [PATCH 0885/1853] threadweaver: update to 5.107.0.

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

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 667142e0db35..0866ac34926f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97c64a0bbdcc40cf9e374342db5062b657a18dbcf097976d94c2eb31955186e1
+checksum=c6c4faaf3c2b2197d43fddae39d752c4ad32febee039eb8048f8d705c1393af2
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 999d9f18c1b15ae891a197653d549cf0cdb49edc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 22:43:06 +0200
Subject: [PATCH 0886/1853] python: fix building _io.so

---
 srcpkgs/python/patches/fix-pr-21.patch | 17 +++++++++++++++++
 srcpkgs/python/template                |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python/patches/fix-pr-21.patch

diff --git a/srcpkgs/python/patches/fix-pr-21.patch b/srcpkgs/python/patches/fix-pr-21.patch
new file mode 100644
index 000000000000..e1e5b771e79a
--- /dev/null
+++ b/srcpkgs/python/patches/fix-pr-21.patch
@@ -0,0 +1,17 @@
+--- a/Include/pyport.h
++++ b/Include/pyport.h
+@@ -947,7 +947,6 @@
+ #define Py_ULL(x) Py_LL(x##U)
+ #endif
+ 
+-#ifdef Py_BUILD_CORE 
+ /*
+  * Macros to protect CRT calls against instant termination when passed an
+  * invalid parameter (issue23524).
+@@ -965,6 +964,5 @@
+ #define _Py_END_SUPPRESS_IPH
+ 
+ #endif /* _MSC_VER >= 1900 */
+-#endif /* Py_BUILD_CORE */
+ 
+ #endif /* Py_PYPORT_H */
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index db6977233517..21566f3e9733 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,7 +4,7 @@
 #
 pkgname=python
 version=2.7.18.7
-revision=1
+revision=2
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel

From 791cfc75e86cbe92ca30ba61c1319c941438fc86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:53:28 +0200
Subject: [PATCH 0887/1853] xorgproto: update to 2023.2.

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

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 02905d7aabb0..cc20b29fadaf 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
-version=2023.1
+version=2023.2
 revision=1
 build_style=meson
 configure_args="-Dlegacy=true"
@@ -8,9 +8,9 @@ hostmakedepends="xorg-util-macros"
 short_desc="Combined X.Org X11 Protocol headers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="https://xorg.freedesktop.org"
+homepage="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.xz"
-checksum=6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13
+checksum=b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c
 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
  dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
  printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0

From 16105e71bd2ab1c33d5809212a6b4018722a9671 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:54:18 +0200
Subject: [PATCH 0888/1853] fzf: update to 0.42.0.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 678f11097119..2236d90f5cd3 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.41.1
+version=0.42.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=982682eaac377c8a55ae8d7491fcd0e888d6c13915d01da9ebb6b7c434d7f4b5
+checksum=743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2
 
 post_install() {
 	cd ${wrksrc}

From e53d19340b713a37e005b0ea88fbce7632717d8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:56:15 +0200
Subject: [PATCH 0889/1853] open-iscsi: update to 2.1.9.

---
 srcpkgs/open-iscsi/patches/libressl.patch | 60 -----------------------
 srcpkgs/open-iscsi/template               |  8 +--
 2 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/open-iscsi/patches/libressl.patch

diff --git a/srcpkgs/open-iscsi/patches/libressl.patch b/srcpkgs/open-iscsi/patches/libressl.patch
deleted file mode 100644
index 5fce5bf341d4..000000000000
--- a/srcpkgs/open-iscsi/patches/libressl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/usr/auth.c
-+++ b/usr/auth.c
-@@ -182,9 +182,11 @@
- 	case AUTH_CHAP_ALG_SHA256:
- 		digest = EVP_sha256();
- 		break;
-+#if 0
- 	case AUTH_CHAP_ALG_SHA3_256:
- 		digest = EVP_sha3_256();
- 		break;
-+#endif
- 	}
- 
- 	if (*context == NULL)
-@@ -335,7 +337,7 @@
- acl_chk_chap_alg_optn(int chap_algorithm)
- {
- 	if (chap_algorithm == AUTH_OPTION_NONE ||
--	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
-+//	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_SHA256 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_SHA1 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_MD5)
-@@ -748,9 +750,11 @@
- 				case AUTH_CHAP_ALG_SHA256:
- 					client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
- 					break;
-+#if 0
- 				case AUTH_CHAP_ALG_SHA3_256:
- 					client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;
- 					break;
-+#endif
- 				}
- 				return;
- 			}
-@@ -899,7 +903,7 @@
- 			client->local_state = AUTH_LOCAL_STATE_ERROR;
- 			client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
- 			break;
--		} else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
-+		} else if (// (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {
-@@ -1849,6 +1853,7 @@
- 				            "SHA256 due to crypto lib configuration");
- 			}
- 			break;
-+#if 0
- 		case AUTH_CHAP_ALG_SHA3_256:
- 			if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
- 				value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
-@@ -1857,6 +1862,7 @@
- 				            "SHA3-256 due to crypto lib configuration");
- 			}
- 			break;
-+#endif
- 		case ~0:
- 			/* unset value in array, just ignore */
- 			break;
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..f3de701055fc 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,6 +1,6 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.1.8
+version=2.1.9
 revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
@@ -10,11 +10,11 @@ short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
+distfiles="https://github.com/open-iscsi/open-iscsi/archive/${version}.tar.gz"
+checksum=60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
+	*-musl) CFLAGS+=" -DGLOB_ONLYDIR=0 -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile

From 2edcfacb8b771c13202df65ec92214504e391175 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 17:01:38 +0200
Subject: [PATCH 0890/1853] libX11: update to 1.8.6.

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

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index c87251bc7f32..16c3e47ab1d9 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.8.5
+version=1.8.6
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libx11"
 distfiles="${XORG_SITE}/lib/libX11-${version}.tar.xz"
-checksum=e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561
+checksum=59535b7cc6989ba806a022f7e8533b28c4397b9d86e9d07b6df0c0703fa25cc9
 
 post_install() {
 	vlicense COPYING

From 5359e564109f18a8d924ab1ca1ea39f1859bfe80 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 17:36:42 +0200
Subject: [PATCH 0891/1853] opensmtpd: update to 7.3.0p0.

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

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index ab0b2e6a10ab..2878481668df 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=6.8.0p2
-revision=4
+version=7.3.0p0
+revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -22,18 +22,18 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=51bf05312fe56764748faab9e63170bfbb7c7d84a37c4117b62b2681eb3a4d17
+checksum=2dd7a5a8ca127be7eb491540405684acb3dd04d93ad23d7709accd2b0450cae6
 provides="smtp-forwarder-0_1 smtp-server-0_1"
 replaces="smtp-forwarder>=0 smtp-server>=0"
 system_accounts="_smtpd _smtpq"
 
 CFLAGS=-D_DEFAULT_SOURCE
 
-
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --with-libfts=${XBPS_CROSS_BASE}/usr"
-		makedepends+=" musl-fts-devel"
-		;;
+*-musl)
+	configure_args+=" --with-libfts=${XBPS_CROSS_BASE}/usr"
+	makedepends+=" musl-fts-devel"
+	;;
 esac
 
 pre_configure() {

From bbdf74f7496c5ab62ba4ea9a5d96123ceed82545 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 18:28:16 +0200
Subject: [PATCH 0892/1853] New package: bcachefs-tools-24

---
 srcpkgs/bcachefs-tools/patches/musl.patch | 40 +++++++++++++++++++++++
 srcpkgs/bcachefs-tools/template           | 19 +++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 srcpkgs/bcachefs-tools/patches/musl.patch
 create mode 100644 srcpkgs/bcachefs-tools/template

diff --git a/srcpkgs/bcachefs-tools/patches/musl.patch b/srcpkgs/bcachefs-tools/patches/musl.patch
new file mode 100644
index 000000000000..88761f3d2d44
--- /dev/null
+++ b/srcpkgs/bcachefs-tools/patches/musl.patch
@@ -0,0 +1,40 @@
+--- a/include/linux/log2.h
++++ b/include/linux/log2.h
+@@ -194,7 +194,7 @@
+ 	__rounddown_pow_of_two(n)		\
+  )
+ 
+-static inline __attribute_const__
++static inline __attribute__((const))
+ int __order_base_2(unsigned long n)
+ {
+ 	return n > 1 ? ilog2(n - 1) + 1 : 0;
+@@ -274,7 +274,7 @@
+  *
+  * The result is undefined if the size is 0.
+  */
+-static inline __attribute_const__ int get_order(unsigned long size)
++static inline __attribute__((const)) int get_order(unsigned long size)
+ {
+ 	if (__builtin_constant_p(size)) {
+ 		if (!size)
+--- a/libbcachefs/bcachefs_format.h
++++ b/libbcachefs/bcachefs_format.h
+@@ -72,6 +72,7 @@
+  * inode number, 64 bit offset, 96 bit version field, etc.) for negligible cost.
+  */
+ 
++#include <linux/compiler.h>
+ #include <asm/types.h>
+ #include <asm/byteorder.h>
+ #include <linux/kernel.h>
+--- a/libbcachefs/siphash.c
++++ b/libbcachefs/siphash.c
+@@ -44,6 +44,7 @@
+  * https://131002.net/siphash/
+  */
+ 
++#include <linux/compiler.h>
+ #include <asm/byteorder.h>
+ #include <asm/unaligned.h>
+ #include <linux/bitops.h>
diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template
new file mode 100644
index 000000000000..63ae509da080
--- /dev/null
+++ b/srcpkgs/bcachefs-tools/template
@@ -0,0 +1,19 @@
+# Template file for 'bcachefs-tools'
+pkgname=bcachefs-tools
+version=24
+revision=1
+build_style=gnu-makefile
+make_install_args="ROOT_SBINDIR=/usr/bin"
+make_use_env=yes
+hostmakedepends="pkg-config"
+makedepends="attr-devel keyutils-devel libaio-devel libblkid-devel
+ liblz4-devel libscrypt-devel libsodium-devel libudev-devel liburcu-devel
+ libuuid-devel libzstd-devel zlib-devel"
+short_desc="Userspace tools for bcachefs"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-only"
+homepage="https://bcachefs.org/"
+distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=4631f8ba752c562f0e7d74a8052bace39abefa98421e4a2989069d988892c264
+
+export VERSION=v${version}

From 6c0c1fdcebf883910be1ac6ef08f323d94b4b85a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 13:23:16 +0100
Subject: [PATCH 0893/1853] man-pages: update to 6.04.

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

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 6bfb953436e8..8bf17f8ec354 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,13 +1,13 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=6.03
+version=6.04
 revision=1
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/doc/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/man-pages-${version}.tar.xz"
-checksum=5f7f289d30b296b78116a08e7703df9375aa846b332b57dca47ddcbb7809fbbd
+checksum=c2c0b9329955df81af45ee80ebc84c47291f95df5157db1fab988199f9371af1
 
 do_install() {
 	make install prefix=/usr DESTDIR=${DESTDIR}

From 093a36d5e469be25b272e52b06a686ab5fa264a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 22:23:41 +0200
Subject: [PATCH 0894/1853] python-cffi: split python3-cffi to a new package

---
 srcpkgs/python-cffi/template  | 29 +++--------------------------
 srcpkgs/python3-cffi          |  1 -
 srcpkgs/python3-cffi/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 27 deletions(-)
 delete mode 120000 srcpkgs/python3-cffi
 create mode 100644 srcpkgs/python3-cffi/template

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 2d0c4c50832f..911adc8f8c85 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -2,11 +2,10 @@
 pkgname=python-cffi
 version=1.15.1
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libffi-devel"
-makedepends="python-devel python3-devel libffi-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools libffi-devel"
+makedepends="python-devel libffi-devel"
 depends="python-pycparser"
-checkdepends="python3-pytest python3-pycparser"
 short_desc="C foreign function interface for Python2"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
@@ -15,28 +14,6 @@ changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
 distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
 checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
 
-do_check() {
-	# glibc libm.so is a GNU ld script that isn't properly handled
-	# on dlopen; libm symbols required in these tests are missing
-	local excludes='not sin'
-	excludes+=' and not test_dlopen'
-	excludes+=' and not test_function_typedef'
-	excludes+=' and not test_wraps_from_stdlib'
-	excludes+=' and not test_stdcall_only_on_windows'
-
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest c/ testing/ -x -k "$excludes"
-}
-
 post_install() {
 	vlicense LICENSE
 }
-
-python3-cffi_package() {
-	depends="python3-pycparser"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cffi b/srcpkgs/python3-cffi
deleted file mode 120000
index 8d25d17c4b33..000000000000
--- a/srcpkgs/python3-cffi
+++ /dev/null
@@ -1 +0,0 @@
-python-cffi
\ No newline at end of file
diff --git a/srcpkgs/python3-cffi/template b/srcpkgs/python3-cffi/template
new file mode 100644
index 000000000000..9be8775ca6d5
--- /dev/null
+++ b/srcpkgs/python3-cffi/template
@@ -0,0 +1,33 @@
+# Template file for 'python3-cffi'
+pkgname=python3-cffi
+version=1.15.1
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools libffi-devel"
+makedepends="python3-devel libffi-devel"
+depends="python3-pycparser"
+checkdepends="python3-pytest ${depends}"
+short_desc="C foreign function interface for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://cffi.readthedocs.io/"
+changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
+distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
+checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
+
+do_check() {
+	# glibc libm.so is a GNU ld script that isn't properly handled
+	# on dlopen; libm symbols required in these tests are missing
+	local excludes='not sin'
+	excludes+=' and not test_dlopen'
+	excludes+=' and not test_function_typedef'
+	excludes+=' and not test_wraps_from_stdlib'
+	excludes+=' and not test_stdcall_only_on_windows'
+
+	PYTHONPATH="$(cd build/lib* && pwd)" \
+		python3 -m pytest c/ testing/ -x -k "$excludes"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From b95ffccfa8c9b580362872e8b1bb4dbac616f798 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Jun 2023 22:24:06 +0200
Subject: [PATCH 0895/1853] python-Cython: split python3-Cython to a new
 package

---
 srcpkgs/python-Cython/template  | 23 ++++++++---------------
 srcpkgs/python3-Cython          |  1 -
 srcpkgs/python3-Cython/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-Cython
 create mode 100644 srcpkgs/python3-Cython/template

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 5248a14c8bca..06d15eb26f45 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -2,11 +2,11 @@
 pkgname=python-Cython
 version=0.29.35
 revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 depends="python-setuptools"
-short_desc="C-Extensions for Python2"
+short_desc="C-Extensions for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://cython.org/"
@@ -21,15 +21,8 @@ alternatives="
  cython:cython:/usr/bin/cython2
  cython:cythonize:/usr/bin/cythonize2"
 
-python3-Cython_package() {
-	alternatives="
-	 cython:cygdb:/usr/bin/cygdb3
-	 cython:cython:/usr/bin/cython3
-	 cython:cythonize:/usr/bin/cythonize3"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-	}
+post_install() {
+	mv ${DESTDIR}/usr/bin/cygdb{,2}
+	mv ${DESTDIR}/usr/bin/cython{,2}
+	mv ${DESTDIR}/usr/bin/cythonize{,2}
 }
diff --git a/srcpkgs/python3-Cython b/srcpkgs/python3-Cython
deleted file mode 120000
index 61695ff83c3b..000000000000
--- a/srcpkgs/python3-Cython
+++ /dev/null
@@ -1 +0,0 @@
-python-Cython
\ No newline at end of file
diff --git a/srcpkgs/python3-Cython/template b/srcpkgs/python3-Cython/template
new file mode 100644
index 000000000000..8882f11729e4
--- /dev/null
+++ b/srcpkgs/python3-Cython/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-Cython'
+pkgname=python3-Cython
+version=0.29.35
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="C-Extensions for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://cython.org/"
+changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
+checksum=6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527
+# Tests are flaky
+make_check=no
+
+alternatives="
+ cython:cygdb:/usr/bin/cygdb3
+ cython:cython:/usr/bin/cython3
+ cython:cythonize:/usr/bin/cythonize3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/cygdb{,3}
+	mv ${DESTDIR}/usr/bin/cython{,3}
+	mv ${DESTDIR}/usr/bin/cythonize{,3}
+}

From f43f609d6fba0d93bb764da2d34238d9750fbf83 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 22:57:50 +0200
Subject: [PATCH 0896/1853] python-dateutil: split python3-dateutil to a new
 package

---
 srcpkgs/python-dateutil/template              | 15 ++----
 srcpkgs/python3-dateutil                      |  1 -
 .../python3-dateutil/patches/pytest8.patch    | 46 +++++++++++++++++++
 srcpkgs/python3-dateutil/template             | 18 ++++++++
 4 files changed, 67 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/python3-dateutil
 create mode 100644 srcpkgs/python3-dateutil/patches/pytest8.patch
 create mode 100644 srcpkgs/python3-dateutil/template

diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index 0cbcb25fe8ab..cf8ce771084d 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -2,14 +2,14 @@
 pkgname=python-dateutil
 version=2.8.2
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-six tzdata"
 short_desc="Extensions to the standard Python2 datetime module"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
 checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
 
 post_patch() {
@@ -19,12 +19,3 @@ post_patch() {
 post_install() {
 	vlicense LICENSE
 }
-
-python3-dateutil_package() {
-	depends="python3-six tzdata"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-dateutil b/srcpkgs/python3-dateutil
deleted file mode 120000
index 4ea05edb0982..000000000000
--- a/srcpkgs/python3-dateutil
+++ /dev/null
@@ -1 +0,0 @@
-python-dateutil
\ No newline at end of file
diff --git a/srcpkgs/python3-dateutil/patches/pytest8.patch b/srcpkgs/python3-dateutil/patches/pytest8.patch
new file mode 100644
index 000000000000..7372d568fd3a
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/pytest8.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ tests/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/test_internals.py b/tests/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@ code that may be difficult to reach through the standard API calls.
+ 
+ import sys
+ import pytest
++import warnings
+ 
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+     from dateutil.parser._parser import _timelex, _tzparser
+     from dateutil.parser._parser import _parsetz
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _tzparser()
+-        assert len(recorder) == 0
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _timelex('2014-03-03')
+ 
+-        assert len(recorder) == 0
+-
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _parsetz('+05:00')
+-        assert len(recorder) == 0
+ 
+ 
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..ace3398432f9
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="python3-pytest-cov python3-hypothesis python3-freezegun ${depends}"
+short_desc="Extensions to the standard Python3 datetime module"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/dateutil/dateutil"
+distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
+checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
+
+post_install() {
+	vlicense LICENSE
+}

From 12728106a4c21bffe357ed595f298307fa9d6696 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 22:24:08 +0200
Subject: [PATCH 0897/1853] python-constantly: split python3-constantly to a
 new package

---
 srcpkgs/python-constantly/template  | 15 ++-------------
 srcpkgs/python3-constantly          |  1 -
 srcpkgs/python3-constantly/template | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/python3-constantly
 create mode 100644 srcpkgs/python3-constantly/template

diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
index 386180075600..2baccb9c9c5e 100644
--- a/srcpkgs/python-constantly/template
+++ b/srcpkgs/python-constantly/template
@@ -2,27 +2,16 @@
 pkgname=python-constantly
 version=15.1.0
 revision=7
-build_style=python-module
-pycompile_module="constantly"
+build_style=python2-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Symbolic constants in Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/twisted/constantly"
 license="MIT"
+homepage="https://github.com/twisted/constantly"
 distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
 checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-constantly_package() {
-	depends="python3"
-	pycompile_module="constantly"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-constantly b/srcpkgs/python3-constantly
deleted file mode 120000
index 9f28e618569d..000000000000
--- a/srcpkgs/python3-constantly
+++ /dev/null
@@ -1 +0,0 @@
-python-constantly
\ No newline at end of file
diff --git a/srcpkgs/python3-constantly/template b/srcpkgs/python3-constantly/template
new file mode 100644
index 000000000000..c1cca160e7fb
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Symbolic constants in Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/twisted/constantly"
+distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
+checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
+
+post_install() {
+	vlicense LICENSE
+}

From 336964bf222c81725b4dcc74741655d28d80aefc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 21:53:18 +0200
Subject: [PATCH 0898/1853] python-automat: split python3-automat to a new
 package

---
 srcpkgs/python-automat/template  | 23 ++++-------------------
 srcpkgs/python3-automat          |  1 -
 srcpkgs/python3-automat/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-automat
 create mode 100644 srcpkgs/python3-automat/template

diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index bc9ea242cfe2..cf564d324fc9 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -2,10 +2,9 @@
 pkgname=python-automat
 version=22.10.0
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools python-attrs python-six"
-checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
 short_desc="Finite-state machines in Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -13,6 +12,7 @@ homepage="https://github.com/glyph/Automat"
 distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
 checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
 alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+make_check=no # python2
 
 pre_build() {
 	sed -i setup.py \
@@ -21,22 +21,7 @@ pre_build() {
 		-e "s/use_scm_version=True/version='${version}'/"
 }
 
-do_check() {
-	PYTHONPATH="$(cd build/lib* && pwd)" \
-		python3 -m pytest ${testjobs} automat/_test
-}
-
 post_install() {
+	mv ${DESTDIR}/usr/bin/automat-visualize{,2}
 	vlicense LICENSE
 }
-
-python3-automat_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools python3-attrs python3-six"
-	alternatives="automat:automat-visualize:/usr/bin/automat-visualize3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-automat b/srcpkgs/python3-automat
deleted file mode 120000
index 2df0fb5b1fc3..000000000000
--- a/srcpkgs/python3-automat
+++ /dev/null
@@ -1 +0,0 @@
-python-automat
\ No newline at end of file
diff --git a/srcpkgs/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..5d3f0b26d88a
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,32 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=22.10.0
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark python3-graphviz"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize3"
+
+pre_build() {
+	sed -i setup.py \
+		-e '/print(/d' \
+		-e '/setup_requires=/,+3d' \
+		-e "s/use_scm_version=True/version='${version}'/"
+}
+
+# do_check() {
+#     PYTHONPATH="$(cd build/lib* && pwd)" \
+#         python3 -m pytest ${testjobs} automat/_test
+# }
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/automat-visualize{,3}
+	vlicense LICENSE
+}

From 8b72d9c5eb3a2967100147c4b924d4a939290a97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 21:52:46 +0200
Subject: [PATCH 0899/1853] python-SQLAlchemy: split python3-SQLAlchemy to a
 new package

---
 srcpkgs/python-SQLAlchemy/template  | 15 +++------------
 srcpkgs/python3-SQLAlchemy          |  1 -
 srcpkgs/python3-SQLAlchemy/template | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/python3-SQLAlchemy
 create mode 100644 srcpkgs/python3-SQLAlchemy/template

diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 13f5afb75017..f377aa8bf5ac 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -2,9 +2,9 @@
 pkgname=python-SQLAlchemy
 version=1.3.18
 revision=5
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 short_desc="SQL Toolkit and Object Relational Mapper for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -17,12 +17,3 @@ make_check=no
 post_install() {
 	vlicense LICENSE
 }
-
-python3-SQLAlchemy_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-SQLAlchemy b/srcpkgs/python3-SQLAlchemy
deleted file mode 120000
index 7236787d1960..000000000000
--- a/srcpkgs/python3-SQLAlchemy
+++ /dev/null
@@ -1 +0,0 @@
-python-SQLAlchemy
\ No newline at end of file
diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
new file mode 100644
index 000000000000..11d3b30242c0
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=5
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="SQL Toolkit and Object Relational Mapper for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.sqlalchemy.org"
+distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
+checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no # FIXME
+
+post_install() {
+	vlicense LICENSE
+}

From 18178f2500fb62a5a585c8a21151fa63128dbbd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:29:31 +0200
Subject: [PATCH 0900/1853] python-hyperlink: split python3-hyperlink

---
 srcpkgs/python-hyperlink/template  | 20 +++-----------------
 srcpkgs/python3-hyperlink          |  1 -
 srcpkgs/python3-hyperlink/template | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 120000 srcpkgs/python3-hyperlink
 create mode 100644 srcpkgs/python3-hyperlink/template

diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index fb2741234530..933b23f91da7 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -2,31 +2,17 @@
 pkgname=python-hyperlink
 version=21.0.0
 revision=3
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-idna"
-checkdepends="python3-idna python3-pytest"
 short_desc="Pure-Python implementation of immutable URLs (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/python-hyper/hyperlink"
 distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
 checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-
-do_check() {
-	python3 -m pytest build-${py3_ver}
-	# python 2 tests fail
-}
+make_check=no # python2
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-hyperlink_package() {
-	depends="python3-idna"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-hyperlink b/srcpkgs/python3-hyperlink
deleted file mode 120000
index bd21bced19d0..000000000000
--- a/srcpkgs/python3-hyperlink
+++ /dev/null
@@ -1 +0,0 @@
-python-hyperlink
\ No newline at end of file
diff --git a/srcpkgs/python3-hyperlink/template b/srcpkgs/python3-hyperlink/template
new file mode 100644
index 000000000000..791b24f58444
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-idna"
+checkdepends="python3-pytest ${depends}"
+short_desc="Pure-Python implementation of immutable URLs (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/hyperlink"
+distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
+checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
+
+post_install() {
+	vlicense LICENSE
+}

From 36f7899b1a634c5396643d627a490781f41b049b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:29:47 +0200
Subject: [PATCH 0901/1853] python-incremental: split python3-incremental

---
 srcpkgs/python-incremental/template  | 13 ++-----------
 srcpkgs/python3-incremental          |  1 -
 srcpkgs/python3-incremental/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-incremental
 create mode 100644 srcpkgs/python3-incremental/template

diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
index 1af94a6b6b76..0b50d35cfd15 100644
--- a/srcpkgs/python-incremental/template
+++ b/srcpkgs/python-incremental/template
@@ -2,8 +2,8 @@
 pkgname=python-incremental
 version=21.3.0
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Small library that versions your Python projects (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,3 @@ checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
 post_install() {
 	vlicense LICENSE
 }
-
-python3-incremental_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-incremental b/srcpkgs/python3-incremental
deleted file mode 120000
index ce274896aad5..000000000000
--- a/srcpkgs/python3-incremental
+++ /dev/null
@@ -1 +0,0 @@
-python-incremental
\ No newline at end of file
diff --git a/srcpkgs/python3-incremental/template b/srcpkgs/python3-incremental/template
new file mode 100644
index 000000000000..03b946e93742
--- /dev/null
+++ b/srcpkgs/python3-incremental/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-incremental'
+pkgname=python3-incremental
+version=21.3.0
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-Twisted python3-click"
+short_desc="Small library that versions your Python projects (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/twisted/incremental"
+changelog="https://raw.githubusercontent.com/twisted/incremental/trunk/NEWS.rst"
+distfiles="${PYPI_SITE}/i/incremental/incremental-${version}.tar.gz"
+checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
+
+post_install() {
+	vlicense LICENSE
+}

From e50b44860a06923269f9be1b52fba0e308017f19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:30:09 +0200
Subject: [PATCH 0902/1853] python-pbr: split python3-pbr

---
 srcpkgs/python-pbr/template  | 13 +++----------
 srcpkgs/python3-pbr          |  1 -
 srcpkgs/python3-pbr/template | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/python3-pbr
 create mode 100644 srcpkgs/python3-pbr/template

diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
index b9d91f99c13c..b49a0fe67b8f 100644
--- a/srcpkgs/python-pbr/template
+++ b/srcpkgs/python-pbr/template
@@ -2,7 +2,7 @@
 pkgname=python-pbr
 version=5.6.0
 revision=2
-build_style=python-module
+build_style=python2-module
 pycompile_module="pbr"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
@@ -14,13 +14,6 @@ distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
 checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
 alternatives="pbr:pbr:/usr/bin/pbr2"
 
-python3-pbr_package() {
-	depends="python3"
-	pycompile_module="pbr"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pbr:pbr:/usr/bin/pbr3"
-	pkg_install() {
-		vmove usr/bin/pbr3
-		vmove usr/lib/python3*
-	}
+post_install() {
+	mv ${DESTDIR}/usr/bin/pbr{,2}
 }
diff --git a/srcpkgs/python3-pbr b/srcpkgs/python3-pbr
deleted file mode 120000
index 7d5e74920c1c..000000000000
--- a/srcpkgs/python3-pbr
+++ /dev/null
@@ -1 +0,0 @@
-python-pbr
\ No newline at end of file
diff --git a/srcpkgs/python3-pbr/template b/srcpkgs/python3-pbr/template
new file mode 100644
index 000000000000..328011387cfa
--- /dev/null
+++ b/srcpkgs/python3-pbr/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pbr'
+pkgname=python3-pbr
+version=5.6.0
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 build reasonableness"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://docs.openstack.org/developer/pbr/"
+distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
+checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
+alternatives="pbr:pbr:/usr/bin/pbr3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/pbr{,3}
+}

From 77a082e1ae8ea894809bacf494929ea49b21ba86 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:33:41 +0200
Subject: [PATCH 0903/1853] python-ply: split python3-ply

---
 srcpkgs/python-ply/template  | 13 ++-----------
 srcpkgs/python3-ply          |  1 -
 srcpkgs/python3-ply/template | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-ply
 create mode 100644 srcpkgs/python3-ply/template

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
index 99d5927d9756..06e791516692 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python-ply/template
@@ -2,8 +2,8 @@
 pkgname=python-ply
 version=3.11
 revision=7
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Lex and Yacc for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,3 @@ post_install() {
 	sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
 	vlicense LICENSE
 }
-
-python3-ply_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-ply b/srcpkgs/python3-ply
deleted file mode 120000
index 805861f2f7af..000000000000
--- a/srcpkgs/python3-ply
+++ /dev/null
@@ -1 +0,0 @@
-python-ply
\ No newline at end of file
diff --git a/srcpkgs/python3-ply/template b/srcpkgs/python3-ply/template
new file mode 100644
index 000000000000..5f633447984d
--- /dev/null
+++ b/srcpkgs/python3-ply/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-ply'
+pkgname=python3-ply
+version=3.11
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Lex and Yacc for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://www.dabeaz.com/ply/"
+distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
+checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
+
+post_install() {
+	sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
+	vlicense LICENSE
+}

From 9c807c17acb0669e68edda42da6f9fd98c30a362 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:38:39 +0200
Subject: [PATCH 0904/1853] python-pyasn1-modules: split python3-pyasn1-modules

---
 srcpkgs/python-pyasn1-modules/template  | 17 +++--------------
 srcpkgs/python3-pyasn1-modules          |  1 -
 srcpkgs/python3-pyasn1-modules/template | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 120000 srcpkgs/python3-pyasn1-modules
 create mode 100644 srcpkgs/python3-pyasn1-modules/template

diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
index b4de2ca5f5e3..fde6b7aa8ae8 100644
--- a/srcpkgs/python-pyasn1-modules/template
+++ b/srcpkgs/python-pyasn1-modules/template
@@ -2,11 +2,11 @@
 pkgname=python-pyasn1-modules
 version=0.2.8
 revision=6
-build_style=python-module
+build_style=python2-module
 pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-pyasn1"
-checkdepends="python-pyasn1 python3-pyasn1"
+checkdepends="python-pyasn1"
 short_desc="Collection of ASN.1-based protocols modules (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -16,19 +16,8 @@ checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
 
 do_check() {
 	python setup.py test
-	python3 setup.py test
 }
 
 post_install() {
 	vlicense LICENSE.txt
 }
-
-python3-pyasn1-modules_package() {
-	depends="python3-pyasn1"
-	pycompile_module="pyasn1_modules"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-pyasn1-modules b/srcpkgs/python3-pyasn1-modules
deleted file mode 120000
index 582f164b8afc..000000000000
--- a/srcpkgs/python3-pyasn1-modules
+++ /dev/null
@@ -1 +0,0 @@
-python-pyasn1-modules
\ No newline at end of file
diff --git a/srcpkgs/python3-pyasn1-modules/template b/srcpkgs/python3-pyasn1-modules/template
new file mode 100644
index 000000000000..645ef9d4bbe5
--- /dev/null
+++ b/srcpkgs/python3-pyasn1-modules/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyasn1-modules'
+pkgname=python3-pyasn1-modules
+version=0.2.8
+revision=6
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pyasn1"
+checkdepends="python3-pytest ${depends}"
+short_desc="Collection of ASN.1-based protocols modules (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/etingof/pyasn1-modules"
+distfiles="https://github.com/etingof/pyasn1-modules/archive/v${version}.tar.gz"
+checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
+
+post_install() {
+	vlicense LICENSE.txt
+}

From ba728a4bfbea119f24353873ec9727814b44f7d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:43:42 +0200
Subject: [PATCH 0905/1853] python-pyasn1: split python3-pyasn1

---
 srcpkgs/python-pyasn1/template  | 13 ++-----------
 srcpkgs/python3-pyasn1          |  1 -
 srcpkgs/python3-pyasn1/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-pyasn1
 create mode 100644 srcpkgs/python3-pyasn1/template

diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
index f2c422dfdf5f..e211f6c26ae2 100644
--- a/srcpkgs/python-pyasn1/template
+++ b/srcpkgs/python-pyasn1/template
@@ -2,8 +2,8 @@
 pkgname=python-pyasn1
 version=0.4.8
 revision=5
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="ASN.1 library for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,3 @@ checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
 post_install() {
 	vlicense LICENSE.rst
 }
-
-python3-pyasn1_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-pyasn1 b/srcpkgs/python3-pyasn1
deleted file mode 120000
index 4e5965485530..000000000000
--- a/srcpkgs/python3-pyasn1
+++ /dev/null
@@ -1 +0,0 @@
-python-pyasn1
\ No newline at end of file
diff --git a/srcpkgs/python3-pyasn1/template b/srcpkgs/python3-pyasn1/template
new file mode 100644
index 000000000000..dafa225912cc
--- /dev/null
+++ b/srcpkgs/python3-pyasn1/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyasn1'
+pkgname=python3-pyasn1
+version=0.4.8
+revision=5
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="ASN.1 library for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/etingof/pyasn1"
+changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
+checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 23fcaeaee772adf92a24eb54100ced4d817820a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:24:21 +0200
Subject: [PATCH 0906/1853] python-pycparser: split python3-pycparser

---
 srcpkgs/python-pycparser/template  | 25 ++++---------------------
 srcpkgs/python3-pycparser          |  1 -
 srcpkgs/python3-pycparser/template | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/python3-pycparser
 create mode 100644 srcpkgs/python3-pycparser/template

diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
index 41049836c9f8..9986b23c06f4 100644
--- a/srcpkgs/python-pycparser/template
+++ b/srcpkgs/python-pycparser/template
@@ -2,10 +2,9 @@
 pkgname=python-pycparser
 version=2.21
 revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-ply"
-checkdepends="python3-ply python3-pytest"
 short_desc="Complete C99 parser in pure Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://github.com/eliben/pycparser"
@@ -13,24 +12,8 @@ license="BSD-3-Clause"
 distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
 checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
 
-do_check() {
-	python3 -m pytest
-}
-
 post_install() {
-	# replace bundled copy of ply
-	for pyver in $py2_ver $py3_ver; do
-		rm -rf ${DESTDIR}/usr/lib/python${pyver}/site-packages/pycparser/ply
-		ln -sf ../ply ${DESTDIR}/usr/lib/python${pyver}/site-packages/pycparser/ply
-	done
+	rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
+	ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
 	vlicense LICENSE
 }
-
-python3-pycparser_package() {
-	depends="python3-ply"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pycparser b/srcpkgs/python3-pycparser
deleted file mode 120000
index 00a864b2cf51..000000000000
--- a/srcpkgs/python3-pycparser
+++ /dev/null
@@ -1 +0,0 @@
-python-pycparser
\ No newline at end of file
diff --git a/srcpkgs/python3-pycparser/template b/srcpkgs/python3-pycparser/template
new file mode 100644
index 000000000000..6bd85a552b3f
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.21
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ply"
+checkdepends="python3-pytest ${depends}"
+short_desc="Complete C99 parser in pure Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/eliben/pycparser"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
+checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
+
+post_install() {
+	rm -rf ${DESTDIR}/${py3_sitelib}/pycparser/ply
+	ln -sf ../ply ${DESTDIR}/${py3_sitelib}/pycparser/ply
+	vlicense LICENSE
+}

From 7877eb3dd3557d2c4f72d5dea212056b8cd4a5b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:32:55 +0200
Subject: [PATCH 0907/1853] python-pyserial: split python3-pyserial

---
 srcpkgs/python-pyserial/template  | 20 ++++----------------
 srcpkgs/python3-pyserial          |  1 -
 srcpkgs/python3-pyserial/template | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 120000 srcpkgs/python3-pyserial
 create mode 100644 srcpkgs/python3-pyserial/template

diff --git a/srcpkgs/python-pyserial/template b/srcpkgs/python-pyserial/template
index 235ad01c9cdb..198d118b255c 100644
--- a/srcpkgs/python-pyserial/template
+++ b/srcpkgs/python-pyserial/template
@@ -2,30 +2,18 @@
 pkgname=python-pyserial
 version=3.4
 revision=7
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
-pycompile_module="serial"
 short_desc="Python2 module providing access for the serial port"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="https://github.com/pyserial/pyserial"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/p/pyserial/pyserial-${version}.tar.gz"
 checksum=6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627
 alternatives="pyserial:miniterm:/usr/bin/miniterm.py2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/miniterm.py{,2}
 	vlicense LICENSE.txt LICENSE
 }
-
-python3-pyserial_package() {
-	depends="python3"
-	pycompile_module="serial"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pyserial:miniterm:/usr/bin/miniterm.py3"
-	pkg_install() {
-		vmove usr/bin/miniterm.py3
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pyserial b/srcpkgs/python3-pyserial
deleted file mode 120000
index b32b82bb9660..000000000000
--- a/srcpkgs/python3-pyserial
+++ /dev/null
@@ -1 +0,0 @@
-python-pyserial
\ No newline at end of file
diff --git a/srcpkgs/python3-pyserial/template b/srcpkgs/python3-pyserial/template
new file mode 100644
index 000000000000..d90fedaba5ad
--- /dev/null
+++ b/srcpkgs/python3-pyserial/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyserial'
+pkgname=python3-pyserial
+version=3.4
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python3 module providing access for the serial port"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/pyserial/pyserial"
+distfiles="${PYPI_SITE}/p/pyserial/pyserial-${version}.tar.gz"
+checksum=6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627
+alternatives="pyserial:miniterm:/usr/bin/miniterm.py3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/miniterm.py{,3}
+	vlicense LICENSE.txt LICENSE
+}

From 984c0914498aba3e6f686a5738c156d0f963063e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:38:13 +0200
Subject: [PATCH 0908/1853] python-service_identity: split
 python3-service_identity

---
 srcpkgs/python-service_identity/template  | 14 ++------------
 srcpkgs/python3-service_identity          |  1 -
 srcpkgs/python3-service_identity/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/python3-service_identity
 create mode 100644 srcpkgs/python3-service_identity/template

diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
index 4e574ed3443a..87e64c770307 100644
--- a/srcpkgs/python-service_identity/template
+++ b/srcpkgs/python-service_identity/template
@@ -2,9 +2,9 @@
 pkgname=python-service_identity
 version=18.1.0
 revision=7
-build_style=python-module
+build_style=python2-module
 pycompile_module="service_identity"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
 short_desc="Service identity verification for Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -17,13 +17,3 @@ checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
 post_install() {
 	vlicense LICENSE
 }
-
-python3-service_identity_package() {
-	depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six"
-	pycompile_module="service_identity"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-service_identity b/srcpkgs/python3-service_identity
deleted file mode 120000
index d6ce3b6c55a3..000000000000
--- a/srcpkgs/python3-service_identity
+++ /dev/null
@@ -1 +0,0 @@
-python-service_identity
\ No newline at end of file
diff --git a/srcpkgs/python3-service_identity/template b/srcpkgs/python3-service_identity/template
new file mode 100644
index 000000000000..a37cbbde67c5
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six"
+checkdepends="${depends}"
+short_desc="Service identity verification for Python (Python3)"
+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
+
+post_install() {
+	vlicense LICENSE
+}

From dbde986046fc5a270a13ee1f1c428d7b2664d394 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:50:18 +0200
Subject: [PATCH 0909/1853] python-six: split python3-six

---
 srcpkgs/python-six/template  | 18 ++----------------
 srcpkgs/python3-six          |  1 -
 srcpkgs/python3-six/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 120000 srcpkgs/python3-six
 create mode 100644 srcpkgs/python3-six/template

diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index 9c02f224a866..dbf1e2280b1e 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -2,10 +2,9 @@
 pkgname=python-six
 version=1.16.0
 revision=3
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
-checkdepends="python3-pytest"
 short_desc="Python 2 and 3 compatibility utilities (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -17,16 +16,3 @@ checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
 post_install() {
 	vlicense LICENSE
 }
-
-do_check() {
-	python3 -m pytest
-}
-
-python3-six_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-six b/srcpkgs/python3-six
deleted file mode 120000
index 70747adc77ed..000000000000
--- a/srcpkgs/python3-six
+++ /dev/null
@@ -1 +0,0 @@
-python-six
\ No newline at end of file
diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template
new file mode 100644
index 000000000000..2a9f67cbf510
--- /dev/null
+++ b/srcpkgs/python3-six/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-six'
+pkgname=python3-six
+version=1.16.0
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python 2 and 3 compatibility utilities (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/benjaminp/six"
+changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
+distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
+checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+
+post_install() {
+	vlicense LICENSE
+}

From f92af62d8e0a30374718da766b1e197c66b7f0a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:50:44 +0200
Subject: [PATCH 0910/1853] python-sqlalchemy-migrate: split
 python3-sqlachemy-migrate

---
 srcpkgs/python-sqlalchemy-migrate/template  | 25 +++++---------------
 srcpkgs/python3-sqlalchemy-migrate          |  1 -
 srcpkgs/python3-sqlalchemy-migrate/template | 26 +++++++++++++++++++++
 3 files changed, 32 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-sqlalchemy-migrate
 create mode 100644 srcpkgs/python3-sqlalchemy-migrate/template

diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
index 79f58e86ffed..72b6da7f2b5e 100644
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ b/srcpkgs/python-sqlalchemy-migrate/template
@@ -2,10 +2,10 @@
 pkgname=python-sqlalchemy-migrate
 version=0.12.0
 revision=6
-build_style=python-module
-pycompile_module="migrate"
-hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six python-sqlparse python-tempita"
+build_style=python2-module
+hostmakedepends="python-setuptools python-pbr"
+depends="python-pbr python-SQLAlchemy python-decorator python-six
+ python-sqlparse python-tempita"
 short_desc="Database schema migration for SQLAlchemy (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -18,20 +18,7 @@ alternatives="
  migrate:migrate:/usr/bin/migrate2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/migrate-repository{,2}
+	mv ${DESTDIR}/usr/bin/migrate{,2}
 	vlicense COPYING LICENSE
 }
-
-python3-sqlalchemy-migrate_package() {
-	alternatives="
-	 migrate:migrate-repository:/usr/bin/migrate-repository3
-	 migrate:migrate:/usr/bin/migrate3"
-	depends="python3-pbr python3-SQLAlchemy python3-decorator python3-six
-	 python3-sqlparse python3-tempita"
-	pycompile_module="migrate"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense COPYING LICENSE
-	}
-}
diff --git a/srcpkgs/python3-sqlalchemy-migrate b/srcpkgs/python3-sqlalchemy-migrate
deleted file mode 120000
index b984188f6331..000000000000
--- a/srcpkgs/python3-sqlalchemy-migrate
+++ /dev/null
@@ -1 +0,0 @@
-python-sqlalchemy-migrate
\ No newline at end of file
diff --git a/srcpkgs/python3-sqlalchemy-migrate/template b/srcpkgs/python3-sqlalchemy-migrate/template
new file mode 100644
index 000000000000..aba3c5e56f00
--- /dev/null
+++ b/srcpkgs/python3-sqlalchemy-migrate/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-sqlalchemy-migrate'
+pkgname=python3-sqlalchemy-migrate
+version=0.12.0
+revision=6
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-pbr"
+depends="python3-pbr python3-SQLAlchemy python3-decorator python3-six
+ python3-sqlparse python3-tempita"
+checkdepends="python3-pytest python3-testtools ${depends}"
+short_desc="Database schema migration for SQLAlchemy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/stackforge/sqlalchemy-migrate"
+distfiles="${PYPI_SITE}/s/sqlalchemy-migrate/sqlalchemy-migrate-${version}.tar.gz"
+checksum=8cfada30bbcf79a83b3a2d1bcd637de7e1f43e390d54de33e4f3249fd9aacfae
+make_check=no # tests need a specific version of testtools
+
+alternatives="
+ migrate:migrate-repository:/usr/bin/migrate-repository3
+ migrate:migrate:/usr/bin/migrate3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/migrate-repository{,3}
+	mv ${DESTDIR}/usr/bin/migrate{,3}
+	vlicense COPYING LICENSE
+}

From 815f78d6bc01c41938f2e6653270ce4730dbd24f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:14:08 +0200
Subject: [PATCH 0911/1853] python-sqlparse: split python3-sqlparse

---
 srcpkgs/python-sqlparse/template  | 18 +++---------------
 srcpkgs/python3-sqlparse          |  1 -
 srcpkgs/python3-sqlparse/template | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-sqlparse
 create mode 100644 srcpkgs/python3-sqlparse/template

diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
index 791f925cac92..1690e9f65171 100644
--- a/srcpkgs/python-sqlparse/template
+++ b/srcpkgs/python-sqlparse/template
@@ -2,9 +2,8 @@
 pkgname=python-sqlparse
 version=0.3.0
 revision=6
-build_style=python-module
-pycompile_module="sqlparse"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools"
 short_desc="Non-validating SQL parser for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,17 +14,6 @@ checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
 alternatives="sqlparse:sqlformat:/usr/bin/sqlformat2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/sqlformat{,2}
 	vlicense LICENSE
 }
-
-python3-sqlparse_package() {
-	depends="python3-setuptools"
-	pycompile_module="sqlparse"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3"
-	pkg_install() {
-		vmove usr/bin/sqlformat3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-sqlparse b/srcpkgs/python3-sqlparse
deleted file mode 120000
index c99cce656dc2..000000000000
--- a/srcpkgs/python3-sqlparse
+++ /dev/null
@@ -1 +0,0 @@
-python-sqlparse
\ No newline at end of file
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..268097f90641
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-sqlparse'
+pkgname=python3-sqlparse
+version=0.3.0
+revision=6
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Non-validating SQL parser for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andialbrecht/sqlparse"
+distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz"
+checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
+alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3"
+# sys.stdout.encoding = 'utf-8' AttributeError: readonly attribute
+# will be fixed in 0.4.0
+make_check=no
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/sqlformat{,3}
+	vlicense LICENSE
+}

From 6eeb30f6dda2efdad7e34dfe5fca264dde8f67e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:14:27 +0200
Subject: [PATCH 0912/1853] python-tempita: split python3-tempita

---
 srcpkgs/python-tempita/template  | 33 ++++----------------------------
 srcpkgs/python3-tempita          |  1 -
 srcpkgs/python3-tempita/template | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 120000 srcpkgs/python3-tempita
 create mode 100644 srcpkgs/python3-tempita/template

diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
index d40ef79a5c66..28a57ed123a4 100644
--- a/srcpkgs/python-tempita/template
+++ b/srcpkgs/python-tempita/template
@@ -2,37 +2,12 @@
 pkgname=python-tempita
 version=0.5.2
 revision=8
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="${hostmakedepends}"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
-pycompile_module="tempita"
-short_desc="A small text templating language for text substitution (Python2)"
+short_desc="Small text templating language for text substitution (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://pythonpaste.org/tempita/"
 license="MIT"
+homepage="http://pythonpaste.org/tempita/"
 distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
 checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
-
-post_patch() {
-	# setuptools no longer supports use_2to3
-	vsed -i setup.py -e '/use_2to3/d'
-}
-
-do_build() {
-	# This is pure python, no need for cross antics
-	python2.7 setup.py build --build-base=build-2.7
-
-	# Convert py2 syntax to py3 since setuptools no longer does it
-	2to3-${py3_ver} -w tempita
-	python3 setup.py build --build-base=build-${py3_ver}
-}
-
-python3-tempita_package() {
-	depends="python3"
-	pycompile_module="tempita"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-tempita b/srcpkgs/python3-tempita
deleted file mode 120000
index 63636314d977..000000000000
--- a/srcpkgs/python3-tempita
+++ /dev/null
@@ -1 +0,0 @@
-python-tempita
\ No newline at end of file
diff --git a/srcpkgs/python3-tempita/template b/srcpkgs/python3-tempita/template
new file mode 100644
index 000000000000..dc8219438ee0
--- /dev/null
+++ b/srcpkgs/python3-tempita/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-tempita'
+pkgname=python3-tempita
+version=0.5.2
+revision=8
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-nose"
+short_desc="A small text templating language for text substitution (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://pythonpaste.org/tempita/"
+license="MIT"
+distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
+checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
+make_check=no # FIXME
+
+post_patch() {
+	# setuptools no longer supports use_2to3
+	vsed -i setup.py -e '/use_2to3/d'
+}

From cc9231424e3273568176c196721d9ef8a6a956be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:15:00 +0200
Subject: [PATCH 0913/1853] python-zope.interface: split python3-zope.interface

---
 srcpkgs/python-zope.interface/template  | 19 ++++---------------
 srcpkgs/python3-zope.interface          |  1 -
 srcpkgs/python3-zope.interface/template | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-zope.interface
 create mode 100644 srcpkgs/python3-zope.interface/template

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 35f87781a1d8..64cae0e63031 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -2,9 +2,9 @@
 pkgname=python-zope.interface
 version=5.5.2
 revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 depends="python-setuptools"
 short_desc="Zope interfaces for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,17 +18,6 @@ make_check=no
 
 post_install() {
 	# zope.interface provides the zope namespace
-	for py_sitelib in $py2_sitelib $py3_sitelib; do
-		vinstall src/zope/__init__.py 644 ${py_sitelib}/zope
-	done
+	vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
 	vlicense LICENSE.txt LICENSE
 }
-
-python3-zope.interface_package() {
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-zope.interface b/srcpkgs/python3-zope.interface
deleted file mode 120000
index 48f8d4c160ef..000000000000
--- a/srcpkgs/python3-zope.interface
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.interface
\ No newline at end of file
diff --git a/srcpkgs/python3-zope.interface/template b/srcpkgs/python3-zope.interface/template
new file mode 100644
index 000000000000..2e98dba5ba4a
--- /dev/null
+++ b/srcpkgs/python3-zope.interface/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-zope.interface'
+pkgname=python3-zope.interface
+version=5.5.2
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Zope interfaces for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ZPL-2.1"
+homepage="https://github.com/zopefoundation/zope.interface"
+changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
+checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
+# Tests can't find the package they test
+make_check=no
+
+post_install() {
+	vinstall src/zope/__init__.py 644 ${py3_sitelib}/zope
+	vlicense LICENSE.txt LICENSE
+}

From 8a5f4cca547aae49e532efa51c0e536b33aba591 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:14 -0400
Subject: [PATCH 0914/1853] New package: php8.0-mongodb-1.15.3

---
 srcpkgs/php8.0-mongodb/INSTALL.msg |  3 +++
 srcpkgs/php8.0-mongodb/template    | 24 ++++++++++++++++++++++++
 srcpkgs/php8.0-mongodb/update      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/php8.0-mongodb/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-mongodb/template
 create mode 100644 srcpkgs/php8.0-mongodb/update

diff --git a/srcpkgs/php8.0-mongodb/INSTALL.msg b/srcpkgs/php8.0-mongodb/INSTALL.msg
new file mode 100644
index 000000000000..a8d869ad7b0f
--- /dev/null
+++ b/srcpkgs/php8.0-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+	extension=mongodb.so
diff --git a/srcpkgs/php8.0-mongodb/template b/srcpkgs/php8.0-mongodb/template
new file mode 100644
index 000000000000..b3dbbfe89af1
--- /dev/null
+++ b/srcpkgs/php8.0-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.0-mongodb'
+pkgname=php8.0-mongodb
+version=1.15.3
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="php8.0-devel autoconf pkg-config"
+makedepends="php8.0-devel pcre2-devel openssl-devel"
+depends="php8.0"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=4f2c4e417fb606b462e870ec03656f3a97ba0b399dc24a6d9d153e9846134388
+
+pre_configure() {
+	phpize8.0
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.0-mongodb/update b/srcpkgs/php8.0-mongodb/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.0-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 4b7d8ad61b9cb43e9a792e83591e4dadb1367e55 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:17 -0400
Subject: [PATCH 0915/1853] New package: php8.1-mongodb-1.15.3

---
 srcpkgs/php8.1-mongodb/INSTALL.msg |  3 +++
 srcpkgs/php8.1-mongodb/template    | 24 ++++++++++++++++++++++++
 srcpkgs/php8.1-mongodb/update      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/php8.1-mongodb/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-mongodb/template
 create mode 100644 srcpkgs/php8.1-mongodb/update

diff --git a/srcpkgs/php8.1-mongodb/INSTALL.msg b/srcpkgs/php8.1-mongodb/INSTALL.msg
new file mode 100644
index 000000000000..a8d869ad7b0f
--- /dev/null
+++ b/srcpkgs/php8.1-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+	extension=mongodb.so
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
new file mode 100644
index 000000000000..83c45d1b8374
--- /dev/null
+++ b/srcpkgs/php8.1-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.1-mongodb'
+pkgname=php8.1-mongodb
+version=1.15.3
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="php8.1-devel autoconf pkg-config"
+makedepends="php8.1-devel pcre2-devel openssl-devel"
+depends="php8.1"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=4f2c4e417fb606b462e870ec03656f3a97ba0b399dc24a6d9d153e9846134388
+
+pre_configure() {
+	phpize8.1
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.1-mongodb/update b/srcpkgs/php8.1-mongodb/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.1-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From e283936cac215ce10c9943ca417b458a61b5bb99 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:19 -0400
Subject: [PATCH 0916/1853] New package: php8.2-mongodb-1.15.3

---
 srcpkgs/php8.2-mongodb/INSTALL.msg |  3 +++
 srcpkgs/php8.2-mongodb/template    | 24 ++++++++++++++++++++++++
 srcpkgs/php8.2-mongodb/update      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/php8.2-mongodb/INSTALL.msg
 create mode 100644 srcpkgs/php8.2-mongodb/template
 create mode 100644 srcpkgs/php8.2-mongodb/update

diff --git a/srcpkgs/php8.2-mongodb/INSTALL.msg b/srcpkgs/php8.2-mongodb/INSTALL.msg
new file mode 100644
index 000000000000..a8d869ad7b0f
--- /dev/null
+++ b/srcpkgs/php8.2-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+	extension=mongodb.so
diff --git a/srcpkgs/php8.2-mongodb/template b/srcpkgs/php8.2-mongodb/template
new file mode 100644
index 000000000000..ee5afd8458fe
--- /dev/null
+++ b/srcpkgs/php8.2-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.2-mongodb'
+pkgname=php8.2-mongodb
+version=1.15.3
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.2"
+hostmakedepends="php8.2-devel autoconf pkg-config"
+makedepends="php8.2-devel pcre2-devel openssl-devel"
+depends="php8.2"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=4f2c4e417fb606b462e870ec03656f3a97ba0b399dc24a6d9d153e9846134388
+
+pre_configure() {
+	phpize8.2
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.2-mongodb/update b/srcpkgs/php8.2-mongodb/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.2-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 796216c4e6e9eb23ef63437dff0d57a1eba58dd7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:23 -0400
Subject: [PATCH 0917/1853] php: add php-mongodb meta package.

---
 srcpkgs/php-mongodb  | 1 +
 srcpkgs/php/template | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/php-mongodb

diff --git a/srcpkgs/php-mongodb b/srcpkgs/php-mongodb
new file mode 120000
index 000000000000..fa557ad95d0a
--- /dev/null
+++ b/srcpkgs/php-mongodb
@@ -0,0 +1 @@
+php
\ No newline at end of file
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index ec485a5a6d42..9fd1e27be27c 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=8.2
-revision=1
+revision=2
 build_style=meta
 depends="php${version}"
 short_desc="Meta package for PHP"
@@ -155,6 +155,12 @@ php-imagick_package() {
 	short_desc="PHP ImageMagick library wrapper meta package"
 }
 
+php-mongodb_package() {
+	depends="php${version}-mongodb"
+	build_style=meta
+	short_desc="PHP MongoDB driver meta package"
+}
+
 xdebug_package() {
 	depends="xdebug${version}"
 	build_style=meta

From a6a6e3024e9fe2d6c589411c4bebf61dc42c3444 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:54:30 -0400
Subject: [PATCH 0918/1853] php8.1: update to 8.1.19.

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

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..90be03c44a5d 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.17
-revision=2
+version=8.1.19
+revision=1
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=ef270156291d90a80ce83d68eee812f301cf5e48836a0ff6fd2931913f8e25c5
+checksum=0ebb6b0ecf5d8e355c2f1362807f9b73c6e803d496c5ad3e4fb00be989988372
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From 9f5183c8f09e848a50d352b1e181524a3ccc2b7f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:54:31 -0400
Subject: [PATCH 0919/1853] php8.2: update to 8.2.6.

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

diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..c73b5f8c010c 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
-version=8.2.4
-revision=2
+version=8.2.6
+revision=1
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=cee7748015a2ddef1739d448b980b095dccd09ed589cf1b6c6ee2d16f5e73c50
+checksum=1b8463df1f180ed39475cfcded1ff106242ccb823f99c9fc1a407c0b76afa2c8
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From 45070afd9324fb05de7b7e996ff55721e40ef49f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:57:22 -0400
Subject: [PATCH 0920/1853] composer8.0: update to 2.5.7.

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

diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template
index a816ecad7feb..4e3823643f99 100644
--- a/srcpkgs/composer8.0/template
+++ b/srcpkgs/composer8.0/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.0'
 pkgname=composer8.0
-version=2.5.5
+version=2.5.7
 revision=1
 build_style=fetch
 depends="php8.0"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="566a6d1cf4be1cc3ac882d2a2a13817ffae54e60f5aa7c9137434810a5809ffc
+checksum="9256c4c1c803b9d0cb7a66a1ab6c737e48c43cc6df7b8ec9ec2497a724bf44de
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.0"
 

From 3f943382552c2d2df8ac1f744bf8feebd676348d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:57:23 -0400
Subject: [PATCH 0921/1853] composer8.1: update to 2.5.7.

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

diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
index b0e23089ce78..3c5b6dc6f8a2 100644
--- a/srcpkgs/composer8.1/template
+++ b/srcpkgs/composer8.1/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.1'
 pkgname=composer8.1
-version=2.5.5
+version=2.5.7
 revision=1
 build_style=fetch
 depends="php8.1"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="566a6d1cf4be1cc3ac882d2a2a13817ffae54e60f5aa7c9137434810a5809ffc
+checksum="9256c4c1c803b9d0cb7a66a1ab6c737e48c43cc6df7b8ec9ec2497a724bf44de
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.1"
 

From 659783a25d2b132e8347825d1cab685964468632 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:57:25 -0400
Subject: [PATCH 0922/1853] composer8.2: update to 2.5.7.

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

diff --git a/srcpkgs/composer8.2/template b/srcpkgs/composer8.2/template
index 59bcb095fee2..e97d4880da76 100644
--- a/srcpkgs/composer8.2/template
+++ b/srcpkgs/composer8.2/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.2'
 pkgname=composer8.2
-version=2.5.5
+version=2.5.7
 revision=1
 build_style=fetch
 depends="php8.2"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="566a6d1cf4be1cc3ac882d2a2a13817ffae54e60f5aa7c9137434810a5809ffc
+checksum="9256c4c1c803b9d0cb7a66a1ab6c737e48c43cc6df7b8ec9ec2497a724bf44de
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.2"
 

From 6b2c7864748c0f068dfbf7410782896abb496ba5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 17 Jun 2023 20:46:15 -0500
Subject: [PATCH 0923/1853] python3-ytmusicapi: update to 1.1.0.

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

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 78e59051e530..6cd02fa6be08 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${PYPI_SITE}/y/ytmusicapi/ytmusicapi-${version}.tar.gz"
-checksum=f798bfedd49738bece82aac15b2d97f04578ccb1572f347a350cb704df4d0e10
+checksum=3286de79e94a914e4a14814fffe372d24b734e784acd7f9fa734ee383adf8c6d
 
 post_install() {
 	vlicense LICENSE

From 4eee0206fa7c4a7c03f10c3cb2da031c89f7a383 Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sun, 18 Jun 2023 06:21:06 +0000
Subject: [PATCH 0924/1853] PrismLauncher: update to 7.1.

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

diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8d4..14813d2b7ac9 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,10 +1,10 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools
  qt5-qmake scdoc"
 makedepends="qt5-devel"
 depends="virtual?java-runtime qt5-svg qt5-imageformats"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

From f9f216c4ac83b6613d6ef81abc8b9ddebb6aaa52 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:41:48 -0400
Subject: [PATCH 0925/1853] nvidia: update to 535.54.03.

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 633aea354dbc..6b7b86af94d2 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=525.116.04
+version=535.54.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=8610ec82447cff72cb5f18b3657ee9a634a5151662b8ad901eb81f4c4fb617fe
+checksum=454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082
 # 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}
@@ -117,7 +117,7 @@ do_install() {
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
 
 	# firmware
-	for fw in gsp_tu10x.bin gsp_ad10x.bin; do
+	for fw in gsp_ga10x.bin gsp_tu10x.bin; do
 		vinstall "firmware/${fw}" 644 "usr/lib/firmware/nvidia/${version}"
 	done
 
@@ -129,8 +129,8 @@ do_install() {
 		${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1
 
 	# Wayland/GBM
-	vinstall libnvidia-egl-wayland.so.1.1.10 755 usr/lib
-	ln -sf libnvidia-egl-wayland.so.1.1.10 \
+	vinstall libnvidia-egl-wayland.so.1.1.11 755 usr/lib
+	ln -sf libnvidia-egl-wayland.so.1.1.11 \
 		${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1
 	vinstall libnvidia-egl-gbm.so.1.1.0 755 usr/lib
 	ln -sf libnvidia-egl-gbm.so.1.1.0 \
@@ -207,8 +207,6 @@ do_install() {
 	vinstall nvidia.icd 644 etc/OpenCL/vendors
 	vinstall nvidia_layers.json 644 usr/share/vulkan/implicit_layer.d
 
-	vinstall libnvidia-compiler.so.${version} 755 usr/lib
-
 	vinstall libnvidia-opencl.so.${version} 755 usr/lib
 	ln -sf libnvidia-opencl.so.${version} \
 		${DESTDIR}/usr/lib/libnvidia-opencl.so
@@ -239,6 +237,7 @@ do_install() {
 	vinstall nvngx.dll 755 usr/lib/nvidia/wine
 
 	# optix ray racing engine
+	vinstall nvoptix.bin 755 usr/share/nvidia
 	vinstall libnvoptix.so.${version} 755 usr/lib
 	ln -sf libnvoptix.so.${version} ${DESTDIR}/usr/lib/libnvoptix.so
 	ln -sf libnvoptix.so.${version} ${DESTDIR}/usr/lib/libnvoptix.so.1
@@ -326,7 +325,6 @@ nvidia-opencl_package() {
 	depends="ocl-icd"
 	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
-		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"
 		vmove etc/OpenCL
 	}

From af5d025cbc0ee6c6e8103740144f46f54492c298 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 6 Apr 2023 15:42:36 -0400
Subject: [PATCH 0926/1853] gnome-secrets: update to 7.3

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

diff --git a/srcpkgs/gnome-secrets/template b/srcpkgs/gnome-secrets/template
index 2ab5db37f438..bf508316477f 100644
--- a/srcpkgs/gnome-secrets/template
+++ b/srcpkgs/gnome-secrets/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-secrets'
 pkgname=gnome-secrets
-version=7.2
+version=7.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext gobject-introspection python3-pykeepass
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/secrets"
 distfiles="https://gitlab.gnome.org/World/secrets/-/archive/${version}/secrets-${version}.tar.gz"
-checksum=e029e72f8765bb8862463beec46851794b3fb7ad5214b08a63e12a2cc8d23da7
+checksum=e1464220d58673cbe6e222519b331d4846084c6ec471f8b8d293cc898a63aa4e
 
 gnome-passwordsafe_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bdb7de96cdbdf499597ca4cd5e954c1f9559ee6e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 16:18:31 -0700
Subject: [PATCH 0927/1853] gnome-software: update to 44.2.

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

diff --git a/srcpkgs/gnome-software/template b/srcpkgs/gnome-software/template
index 357bc1e8ffae..64774c54dd5b 100644
--- a/srcpkgs/gnome-software/template
+++ b/srcpkgs/gnome-software/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-software'
 pkgname=gnome-software
-version=43.3
+version=44.2
 revision=1
 build_style=meson
 configure_args="-Dpackagekit=false -Dfwupd=false
@@ -16,8 +16,9 @@ short_desc="GNOME Software Center (flatpak only)"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-software"
+changelog="https://gitlab.gnome.org/GNOME/gnome-software/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/GNOME/gnome-software/-/archive/${version}/gnome-software-${version}.tar.gz"
-checksum=9fbdf888ec61cd6f261dbf9e94939a5ff95ba43993ef58946b02b4f92866819c
+checksum=bedfe8652d2ceaf17eccc57d6befe6d95f09d15e486a58f0bb7a9a868d0bacc0
 make_check=no # FIXME
 
 build_options="gtk_doc"

From 3f2dd922001ac9c4427e7d0c06469656d49c40d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 18 Jun 2023 17:25:37 +0200
Subject: [PATCH 0928/1853] dool: update to 1.2.0.

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

diff --git a/srcpkgs/dool/template b/srcpkgs/dool/template
index 4c81a8a39cd2..82c3f28167d0 100644
--- a/srcpkgs/dool/template
+++ b/srcpkgs/dool/template
@@ -1,6 +1,6 @@
 # Template file for 'dool'
 pkgname=dool
-version=1.1.0
+version=1.2.0
 revision=1
 makedepends="python3"
 short_desc="Versatile tool for generating system resource statistics"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/scottchiefbaker/dool"
 distfiles="https://github.com/scottchiefbaker/dool/archive/refs/tags/v${version}.tar.gz"
-checksum=e5e4008ffe5bc566d5580ea2c66b0f7a7de68e27f25930abed9f7ebbd398dec3
+checksum=a626ec796a2508443625314e464adec885cb22543157794a6255570b19f68a7d
 python_version="3"
 
 do_install() {

From 272fbf158b92aa03d0f3e18f18db0c4230eead57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 18 Jun 2023 17:31:51 +0200
Subject: [PATCH 0929/1853] gnuplot: update to 5.4.8.

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

diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index 18760f006715..f5112e1f8525 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnuplot'
 pkgname=gnuplot
-version=5.4.5
+version=5.4.8
 revision=1
 configure_args="--with-readline=builtin"
 hostmakedepends="pkg-config lua52"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="http://www.gnuplot.info/"
 license="gnuplot"
 distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
-checksum=66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478
+checksum=931279c7caad1aff7d46cb4766f1ff41c26d9be9daf0bcf0c79deeee3d91f5cf
 
 subpackages="gnuplot-common"
 if [ -z "$CROSS_BUILD" ]; then

From a1a83a7e44f79ec875c9c5453abed0b57f138168 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 0930/1853] gnome-desktop: update to 44.0.

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=43
+version=44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
-checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
 
 build_options="gir"
 build_options_default="gir"

From c994b488f166fef9104b075798592859b2d392fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 0931/1853] gnome-session: update to 44.0.

---
 srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
 srcpkgs/gnome-session/template                     |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch

diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
- 
-   # Check for systemd
-   if enable_systemd
--    systemd_dep = dependency('systemd', version: '>= 242', required: true)
--    systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
--                                                             define_variable: ['prefix', prefix])
--
-+    systemd_userunitdir = '/tmp'
-     libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
-     session_bin_deps += libsystemd_dep
- 
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=43.0
+version=44.0
 revision=1
 build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="glib-devel gettext pkg-config xmlto"
 makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel
  libglib-devel libICE-devel libSM-devel xtrans"
@@ -15,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6

From f659b3cd17712b5cde8b4650b12acddfde2c571c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 0932/1853] mutter: update to 44.2.

---
 common/shlibs                          |  8 ++---
 srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
 srcpkgs/mutter/template                | 25 +++++++-------
 3 files changed, 17 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch

diff --git a/common/shlibs b/common/shlibs
index 494e99b89550..c293ac460c08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2987,10 +2987,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-11.so.0 mutter-43.2_1
-libmutter-clutter-11.so.0 mutter-43.2_1
-libmutter-cogl-11.so.0 mutter-43.2_1
-libmutter-cogl-pango-11.so.0 mutter-43.2_1
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub-0.6.so.0 libgepub-0.6.0_4
 libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
-   if (x11_display->focused_by_us &&
-       event->xany.serial > x11_display->focus_serial &&
-       display->focus_window &&
-+      display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
-       !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
-       meta_display_windows_are_interactable (display))
-     {
--- 
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..01d00e8a94c2 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=43.3
-revision=2
+version=44.2
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
  xorg-server-xwayland"
 makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
  wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
 short_desc="Wayland display server, X11 window manager and compositor library"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ pre_build() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
 }
 
 mutter-devel_package() {
-	depends="gtk+3-devel graphene-devel clutter-devel
+	depends="gtk4-devel graphene-devel clutter-devel
 	 libX11-devel libXtst-devel mutter-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-11/*.gir"
+		vmove "usr/lib/mutter-12/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 712a5ff7d0bd3ed5e9b8654a5a10d23080a76b68 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 0933/1853] gnome-shell: update to 44.2.

---
 ...2e61a9882edc722ac64da80804e75f832155.patch | 32 -------------------
 .../patches/no-exe-introspection.patch        | 25 +++++++++++++++
 srcpkgs/gnome-shell/template                  |  7 ++--
 3 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
 create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch

diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
deleted file mode 100644
index 328ecbefb3c4..000000000000
--- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 3 Mar 2023 17:50:10 +0900
-Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal
-
-require-surrounding-text signal has been added since IBus 1.5.28.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405
----
- js/misc/inputMethod.js | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
-index e008e6411..aa610b3bf 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({
- 
-         this._context.set_client_commit_preedit(true);
-         this._context.connect('commit-text', this._onCommitText.bind(this));
--        this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+        try {
-+            // Require ibus 1.5.28 or later.
-+            this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+        } catch (e) {
-+        }
-         this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
-         this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this));
-         this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Sun Mar 19 19:11:00 2023 +0100
+
+    Disable 9bc89b821cf09195418f20225bbec39c0567d263
+    
+    Even if we manually define _DYNAMIC, it does not work (segfaults
+    somewhere in musl, coming from g_strsplit) and is pretty useless
+    for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+ 
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..3fc7eb89d17d 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=43.3
+version=44.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6011c24f0b4bff51dfff7a5ccddd872c24986912 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 0934/1853] gdm: update to 44.1.

---
 srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
 srcpkgs/gdm/template                         |  7 ++++---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
-   libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+   libwrap_dep = cc.find_library('wrap')
  endif
  # systemd
 -systemd_dep = dependency('systemd')
  libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
--  systemd_multiseat_x = find_program('systemd-multi-seat-x',
--    required: false,
--    dirs: [
--      systemd_dep.get_pkgconfig_variable('systemdutildir'),
--      '/lib/systemd',
--      '/usr/lib/systemd',
--    ])
--else
--  systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+-  required: false,
+-  dirs: [
+-    systemd_dep.get_pkgconfig_variable('systemdutildir'),
+-    '/lib/systemd',
+-    '/usr/lib/systemd',
+-  ])
 +systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
  systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
  # Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..5cdcf618cb83 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=43.0
+version=44.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -23,9 +23,10 @@ short_desc="GNOME Display Manager"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d
 
 conf_files="
 	/etc/gdm/custom.conf

From de21bf170fcf1f82c6d0785001f0dd47698bfa38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 0935/1853] gnome-shell-extensions: update to 44.0.

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

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
 depends="gnome-shell>=${version} nautilus unzip"
 short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab

From 9296c1eb04bbd86b5a8073c4a2773ad59be81882 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 0936/1853] gsettings-desktop-schemas: update to 44.0.

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

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=43.0
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
 
 # Package build options
 build_options="gir"

From 5588f1b157c03c7ac52a691fc584e2de5320bbd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 0937/1853] gnome-settings-daemon: update to 44.1.

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 3d3cf393f960..a5886956cda9 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.1
+revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 5b96f36fc891dfc79360571885f7732a5f5fdaa7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 0938/1853] gnome-control-center: update to 44.0.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 3c8a1fe43e96..33f2d653add5 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=43.2
-revision=3
+version=44.2
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
-changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c
 make_check=no # needs X11 and requires altered filesystem
 
 pre_build() {

From 15208876a2f32e3ca7e47ff08b5a8afb233dfe19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 0939/1853] gnome-backgrounds: update to 44.0.

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

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=43
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e

From b6c950bae3d7e59f19f9f8db4ac39b4d6beb8a47 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 0940/1853] gnome-user-docs: update to 44.1.

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

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..350bfa523daf 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=43.0
+version=44.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
-checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
+checksum=93f3294d43fd22f9962ccf6bd17ff64eae78a6ca063fe6c1e9bc58d00f34e3a8

From ef19a292ec1a99faad84a15770ec5021694dcc42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 0941/1853] xdg-desktop-portal-gnome: update to 44.1.

---
 srcpkgs/xdg-desktop-portal-gnome/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..884baccf764b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal-gnome'
 pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.1
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
 makedepends="gtk4-devel libadwaita-devel libglib-devel
  gnome-desktop-devel gsettings-desktop-schemas-devel
  xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
 #changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=3682c546c81922a5ba69d62d86f69c0c26b17c9096823f58149d0b55bbf0eedb

From 94dba9ef45321aa33137b838269f18c5f0066362 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 0942/1853] gnome-online-accounts: update to 3.48.0.

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

diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
 
 build_options="gir"
 build_options_default="gir"

From 8fa43124d9c6c0ea020439383dd5f6069fc6fb75 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 0943/1853] gvfs: update to 1.50.4.

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

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.50.2
+version=1.50.4
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From e9966104dc909b49fdaf5e28327d6d55b8a6fb2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 0944/1853] zenity: update to 3.44.1.

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

diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..03b5ea4ce7c7 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
 # Template file for 'zenity'
 pkgname=zenity
-version=3.43.0
+version=3.44.1
 revision=1
 build_style=meson
 configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
 makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
 short_desc="Display GNOME dialogs from the command line"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://help.gnome.org/users/zenity/"
-changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/zenity-3-44/NEWS"
 distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=d65400aec965411f4c0b3d8e0e0dac54be55d807a29279697537da2dfee93eaa
 
 build_options="webkit"
 build_options_default="webkit"

From 81f805b35b7f579a19a210f7447bc616f8914e84 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 0945/1853] gnome-core: update to 44.0.

---
 srcpkgs/gnome-core/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=43.0
+version=44.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
  folks>=0.15.5
  font-adobe-source-code-pro>=2.030R
  gcr>=3.41.0
  gdm>=${version}
  geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
  gmime>=3.2.7
  gnome-backgrounds>=${version}
  gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
  gnome-desktop>=${version}
  gnome-initial-setup>=${version}
  gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
  gnome-session>=${version}
  gnome-settings-daemon>=${version}
  gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
  mutter>=${version}
  nautilus>=${version}
  sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
  xdg-desktop-portal-gnome>=${version}
  zenity>=3.${version}"

From ab441b1c06fc2a0c10e042c90c289f6fd07cbb76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 0946/1853] gnome: update to 44.0.

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..e3c61d304a1e 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=43.0
-revision=2
+version=44.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
 depends="
  gnome-core>=${version}
  baobab>=${version}
- cheese>=${version}
+ cheese>=43
  eog>=${version}
  evince>=${version}
- file-roller>=${version}
+ file-roller>=43
  gnome-calculator>=${version}
  gnome-calendar>=${version}
  gnome-characters>=${version}
@@ -23,26 +23,27 @@ depends="
  gnome-disk-utility>=${version}
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
  gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
  gnome-console>=${version}
  gnome-text-editor>=${version}
  gnome-tweaks>=42.beta
  gnome-weather>=${version}
  gsound>=1.0.3
  gspell>=1.11.0
- mousetweaks>=3.32.0
+ iio-sensor-proxy>=3.0
  orca>=${version}
+ power-profiles-daemon>=0.12
  phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
 
 _apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
  bijiben>=40.1
  dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
  epiphany>=${version}
  evolution>=3.44.0
  ghex>=${version}
@@ -58,14 +59,15 @@ _apps_depends="
  gnome-disk-utility>=${version}
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
  gnome-nettool>=42
  gnome-photos>=${version}
  gnome-screenshot>=41.0
  gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
  gnome-console>=${version}
  gnome-text-editor>=${version}
+ gnome-tour>=${version}
  gnote>=${version}
  polari>=3.38.0
  rygel>=0.40.2
@@ -78,7 +80,7 @@ _games_collection_depends="
  five-or-more>=3.32.2
  four-in-a-row>=3.38.1
  gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
  gnome-klotski>=3.38.2
  gnome-mahjongg>=3.38.3
  gnome-mines>=40.0

From aeab0f917aabf17f84222d1c6130b04338fc939d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 0947/1853] budgie-desktop: rebuild for mutter 44

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

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 48c4dd2b55c9..80da2a8a367a 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.7.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false -Duse-old-zenity=true"

From 7821093d43fb85a73c47618a423f7984dd2ef64a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 0948/1853] GPaste: update to 44.0.

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

diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
 # Template file for 'GPaste'
 pkgname=GPaste
-version=43.0
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,15 +11,15 @@ hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
  desktop-file-utils"
 makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
  libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-devel"
 short_desc="Clipboard management system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.imagination-land.org/tags/GPaste.html"
-#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
 changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
 distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
 
 build_options="gnome_shell"
 desc_option_gnome_shell="Build GNOME Shell integration and extension"

From fe64bb0a8c3b7db5ef6272d099679bf90cc2e5b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 19:33:10 -0700
Subject: [PATCH 0949/1853] gnome-tour: update to 44.0.

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

diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
index 56b8466925b1..e8eb54f1bf7c 100644
--- a/srcpkgs/gnome-tour/template
+++ b/srcpkgs/gnome-tour/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tour'
 pkgname=gnome-tour
-version=43.0
+version=44.0
 revision=1
 build_style=meson
 build_helper=rust
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
 changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-tour/${version%.*}/gnome-tour-${version}.tar.xz"
-checksum=1351e419627fbd7c771932a6ef1ad80c0bf2e6828c4948a062068984ddb3cc88
+checksum=06de7677dd1c590d0ea33a032c9ccf4c37c62bc56215b823c879e42ee630c2b6
 
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0

From ea28be1023737df3febd3bbfdba7488a7173416d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:20:54 +0200
Subject: [PATCH 0950/1853] common: remove unused python-module build style

python-module build style is now unused, all projects that want to have
a python2 and a python3 package should be split to two templates
---
 Manual.md                                     |  8 +-
 common/build-style/python-module.sh           | 96 -------------------
 .../environment/build-style/python-module.sh  |  2 -
 3 files changed, 3 insertions(+), 103 deletions(-)
 delete mode 100644 common/build-style/python-module.sh
 delete mode 100644 common/environment/build-style/python-module.sh

diff --git a/Manual.md b/Manual.md
index 0b6b5ab645fc..1670863cbe54 100644
--- a/Manual.md
+++ b/Manual.md
@@ -995,13 +995,11 @@ system. Additional arguments may be passed to the `zig build` invocation using
 For packages that use the Python module build method (`setup.py` or
 [PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
 
-- `python-module` to build *both* Python 2.x and 3.x modules
+- `python2-module` to build Python 2.x modules
 
-- `python2-module` to build Python 2.x only modules
+- `python3-module` to build Python 3.x modules
 
-- `python3-module` to build Python 3.x only modules
-
-- `python3-pep517` to build Python 3.x only modules that provide a PEP 517 build description without
+- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
 a `setup.py` script
 
 Environment variables for a specific `build_style` can be declared in a filename
diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh
deleted file mode 100644
index b80801a67247..000000000000
--- a/common/build-style/python-module.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# This helper is for templates installing python modules.
-#
-
-do_build() {
-	: ${python_versions:="2.7 $py3_ver"}
-	local pyver= tmp_cflags="$CFLAGS" tmp_ldflags="$LDFLAGS"
-
-	for pyver in $python_versions; do
-		if [ -n "$CROSS_BUILD" ]; then
-			CFLAGS="$tmp_cflags"
-			LDFLAGS="$tmp_ldflags"
-			ADDENV=
-
-			PYPREFIX="$XBPS_CROSS_BASE"
-			CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
-			LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
-			CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
-			LDSHARED="${CC} -shared $LDFLAGS"
-			case $pyver in
-			3.*)
-				for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
-					f=${f##*/}
-					_PYTHON_SYSCONFIGDATA_NAME=${f%.py}
-				done
-				ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}"
-				ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME""
-			esac
-			env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \
-				PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-				LDFLAGS="$LDFLAGS" python${pyver} setup.py \
-					build --build-base=build-${pyver} ${make_build_args}
-		else
-			python${pyver} setup.py build --build-base=build-${pyver} ${make_build_args}
-		fi
-	done
-}
-
-do_check() {
-	: ${python_versions:="2.7 $py3_ver"}
-
-	for pyver in $python_versions; do
-		ln -s build-${pyver} build
-		if [ -z "$make_check_target" ]; then
-			if ! python${pyver} setup.py --help test >/dev/null 2>&1; then
-				msg_warn "No command 'test' defined by setup.py for python${pyver}.\n"
-				rm build
-				return 0
-			fi
-		fi
-
-		${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
-		rm build
-	done
-}
-
-do_install() {
-	: ${python_versions:="2.7 $py3_ver"}
-	local pyver=
-
-	for pyver in $python_versions; do
-		if [ -n "$CROSS_BUILD" ]; then
-			ADDENV=
-			PYPREFIX="$XBPS_CROSS_BASE"
-			CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
-			LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
-			CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
-			LDSHARED="${CC} -shared $LDFLAGS"
-			case $pyver in
-			3.*)
-				for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
-					f=${f##*/}
-					_PYTHON_SYSCONFIGDATA_NAME=${f%.py}
-				done
-				ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}"
-				ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME""
-			esac
-			env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \
-				PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-				LDFLAGS="$LDFLAGS" python${pyver} setup.py \
-					build --build-base=build-${pyver} \
-					install --prefix=/usr --root=${DESTDIR} ${make_install_args}
-		else
-			python${pyver} setup.py build --build-base=build-${pyver} \
-				install --prefix=/usr --root=${DESTDIR} ${make_install_args}
-		fi
-
-		# Rename unversioned scripts to avoid name conflicts.
-		if [ -d ${DESTDIR}/usr/bin ]; then
-			find ${DESTDIR}/usr/bin -type f ! -name "*[[:digit:]]" | while IFS= read -r f _; do
-				mv "${f}" "${f}${pyver%.*}"
-				echo "[python-module] Unversioned script renamed to '${f#$DESTDIR}${pyver%.*}'"
-			done
-		fi
-	done
-}
diff --git a/common/environment/build-style/python-module.sh b/common/environment/build-style/python-module.sh
deleted file mode 100644
index d6b6502e44fd..000000000000
--- a/common/environment/build-style/python-module.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-lib32disabled=yes
-makedepends+=" python python3"

From 6f988e97c879f20078b86424e8c4cbab11b05cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Jun 2023 10:37:09 +0200
Subject: [PATCH 0951/1853] tectonic: update to 0.14.1.

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

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index e07f8841815b..ef293da34228 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.14.0
+version=0.14.1
 revision=1
 build_style=cargo
 configure_args="--features=external-harfbuzz"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=2191e3599b7e34f01d24a8d0ed873d8a8696e5ed4af05e9ce30685a053e9b57a
+checksum=3703a4fc768b3c7be6a4560857b17b2671f19023faee414aa7b6befd24ec9d25
 
 post_install() {
 	vlicense LICENSE

From 49019b80b30e98392076e4bfce02e2c27cd58695 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 17:48:52 +0100
Subject: [PATCH 0952/1853] libheif: move thumbnailer to tools subpackage.

The thumbnailer uses the `heif-thumbnailer` binary, which is in
libheif-tools.
---
 srcpkgs/libheif/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 2056a8d8d491..63e4e4fb5313 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.16.2
-revision=1
+revision=2
 build_style=cmake
 makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
  libaom-devel"
@@ -28,5 +28,6 @@ libheif-tools_package() {
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/share/man
+		vmove usr/share/thumbnailers
 	}
 }

From c5b81434c49bfc59243faf68f185fa8866ae9ca4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 11:35:34 +0530
Subject: [PATCH 0953/1853] python3-codespell: update to 2.2.5.

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

diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
index da6beaf53eb2..a78c2caf727b 100644
--- a/srcpkgs/python3-codespell/template
+++ b/srcpkgs/python3-codespell/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-codespell'
 pkgname=python3-codespell
-version=2.2.4
-revision=2
+version=2.2.5
+revision=1
 build_style=python3-pep517
 make_check_args="--deselect codespell_lib/tests/test_basic.py::test_command
  --deselect codespell_lib/tests/test_basic.py::test_permission_error"
@@ -13,7 +13,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-2.0-only"
 homepage="https://github.com/codespell-project/codespell"
 distfiles="${PYPI_SITE}/c/codespell/codespell-${version}.tar.gz"
-checksum=0b4620473c257d9cde1ff8998b26b2bb209a35c2b7489f5dc3436024298ce83a
+checksum=6d9faddf6eedb692bf80c9a94ec13ab4f5fb585aabae5f3750727148d7b5be56
 conflicts="python-codespell>=0"
 
 pre_check() {

From 549c78f28b330080bdc92ec1536940d2782f6990 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 18 Jun 2023 12:06:56 +0530
Subject: [PATCH 0954/1853] python3-platformdirs: update to 3.6.0.

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

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index dc60d45ecfa4..c9f34973027b 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.5.3
+version=3.6.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e
+checksum=57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From 55136842f42d73aafb471f62dfeaaf4d36501b77 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 14 Jun 2023 02:17:29 -0400
Subject: [PATCH 0955/1853] ircdog: update to 0.5.1.

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

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index 4eac96514502..e4988efb392a 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,6 +1,6 @@
 # Template file for 'ircdog'
 pkgname=ircdog
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
@@ -10,7 +10,7 @@ license="ISC"
 homepage="https://github.com/ergochat/ircdog"
 changelog="https://raw.githubusercontent.com/ergochat/ircdog/master/CHANGELOG.md"
 distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
-checksum=d999c8e25eca99e7464e97bb61bc213d66fbef3e925a099f90d4be8c6f021d24
+checksum=04d41168329523b44fe77a28d0aca83c60cdee913e8ee9abf5901de5fed4aa4a
 
 post_install() {
 	vlicense LICENSE

From 3aaeb71c4e71bedbb87275b6627a687ee7cee693 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 17 Jun 2023 13:39:44 +0300
Subject: [PATCH 0956/1853] tiff: update to 4.5.1.

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

diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index d3269060df2f..3ef8a5701b1f 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -1,6 +1,6 @@
 # Template file for 'tiff'
 pkgname=tiff
-version=4.5.0
+version=4.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="libtiff"
 homepage="http://www.simplesystems.org/libtiff/"
 distfiles="https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
-checksum=c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464
+checksum=d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" --enable-tests"

From 54e541569481307a02680b67c89c43aa0f1ae9fb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 14 Jun 2023 17:49:22 +0200
Subject: [PATCH 0957/1853] terraform: update to 1.5.0.

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

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 6083dfe51de3..a81f0fd86028 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.4.6
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=6c3e538f8c2ebaf1d5ac1f929753c4fabddb8b3af638829212df494c569a8d02
+checksum=c53c97dcaa4bf705a3755aa552581c20f525d8204e41b704a0aa9d8890603469

From a798a97a73fa901f78e38132f2cb253714f7921c Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:47:47 +0200
Subject: [PATCH 0958/1853] yoshimi: update to 2.3.0.2.

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

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 0b72467a8d57..c474217dfd31 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=2.3.0
+version=2.3.0.2
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=167c3f300a3513407f5ed61b1104a79552bfc574f4a6dbf5bb713f2456a834f9
+checksum=2710c0fdea108b1aad2d60aef3694f0655b1420ff8e99739358f3d0c37f4c6ca
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From 953933f0c917948e42cf61b66805cdf8f887fe34 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:50:07 +0200
Subject: [PATCH 0959/1853] terragrunt: update to 0.47.0.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8be2655d6368..85dee0d2ef20 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.46.3
+version=0.47.0
 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=7ccb057317d5c7073a3c510ab9670cdb429dde87e5c6b18597a3118a6b0107dc
+checksum=ddc0171d1be0f603b4c2fe8cf51b4a2084477f4c0ebc13499d6ce92c492bce6b
 
 post_install() {
 	vlicense LICENSE.txt

From b9ece5362e1b96d1f0c60e5889c3588c41b84acb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:51:39 +0200
Subject: [PATCH 0960/1853] kubernetes: update to 1.27.3.

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

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index cd21779f27d9..d6843cc80220 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.27.2
+version=1.27.3
 revision=1
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=c6fcfddd38f877ce49c49318973496f9a16672e83a29874a921242950cd1c5d2
+checksum=8ef07217229e1c0dab21cc014ee05f79dffd31d3bf13a8ff3c730e031973f3e8
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From f08992b53f4a0c0a1cfc8681c7ae80817f24ea2e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:54:52 +0200
Subject: [PATCH 0961/1853] hopper: update to 5.11.1.

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

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 2bc7952d22d3..96fb20d992f0 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=5.11.0
+version=5.11.1
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=c14843755669369df54222a54ab0d2069edb30b2fbcdb33abc8da6575bfde6d3
+checksum=c7c8f9e220714061b33270084c4de5ffd6da62645a35f4fc692161de7afeeeee
 
 archs="x86_64"
 restricted=yes

From 8c6796034809eda05b6ed1fb4912df27d9ab9c5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 19 Jun 2023 10:29:29 -0400
Subject: [PATCH 0962/1853] python3-Cython: ignore preview releases

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

diff --git a/srcpkgs/python3-Cython/update b/srcpkgs/python3-Cython/update
new file mode 100644
index 000000000000..6267ade562c3
--- /dev/null
+++ b/srcpkgs/python3-Cython/update
@@ -0,0 +1 @@
+ignore="*[A-Za-z]*"

From d880ecb4cabd25f59bd5b38178e8f2d3ef46050f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 19 Jun 2023 11:41:11 -0500
Subject: [PATCH 0963/1853] QMPlay2: update to 23.06.17.

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

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 17879a25093d..850df9d418b9 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=23.06.04
+version=23.06.17
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=9173b9b8ae26b9e97092239f40451172e9fe8d5d7ac1cbf0aa88ab8a73db7d1a
+checksum=dc57afc6e3299701508e5dbffa486d7956d6764420dcc0f22a0da8f7d07a2137
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 526fc3c80afbca336666df5ae6518b0b35e4b498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20Wa=C5=82kuski?= <contact@tomekw.com>
Date: Mon, 19 Jun 2023 10:08:46 +0200
Subject: [PATCH 0964/1853] slack-desktop: update to 4.32.127

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index e5e00568ce52..d8708a089c7b 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.32.122
+version=4.32.127
 revision=1
 archs="x86_64"
 depends="xdg-utils"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=5622471bbb3bc6a9dab4d3acb3999f6bb1aaaa51db06b2c61c1cd3aaaa3b5bfc
+checksum=8e0216aba77798b6252902a0bd6fe2286325fdf246916f5ed4cabed3e7527521
 restricted=yes
 repository="nonfree"
 nopie=yes

From f795b2672c997d7b097292e80714625a9eb8b083 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 18 Jun 2023 20:38:24 +0200
Subject: [PATCH 0965/1853] typioca: update to 2.4.2.

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

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index 139447ffd424..ccb0af3051a6 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,6 +1,6 @@
 # Template file for 'typioca'
 pkgname=typioca
-version=2.3.1
+version=2.4.2
 revision=1
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bloznelis/typioca"
 distfiles="https://github.com/bloznelis/typioca/archive/refs/tags/${version}.tar.gz"
-checksum=19713300a9f2feb6f28c689bfd298e6b0f7fdfe05439f538d11d62701b13d304
+checksum=57246b9f13b8f4f34a93eed7b2ac3efa871dd49714f44b9b85bbc82c4700b9a2
 
 post_install() {
 	vlicense LICENSE

From 3f44df17983f6c782ce085d7544d4804778c928a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 19 Jun 2023 11:22:54 +0200
Subject: [PATCH 0966/1853] shfmt: update to 3.7.0.

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

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 28556341f6cd..61667a1862e5 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 changelog="https://raw.githubusercontent.com/mvdan/sh/master/CHANGELOG.md"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=4fe5a7b0aab5fba437696b68c5424e49ba9f793de2f534647e1d814108ebad23
+checksum=89eafc8790df93305dfa42233e262fb25e1c96726a3db420a7555abadf3111ed
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 080742f38abc5971e71c54155f5dfee5480d8d56 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 19 Jun 2023 21:15:18 +0300
Subject: [PATCH 0967/1853] spotify: update to 1.2.13.

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

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 4dc3395617cd..c02185fd643e 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.2.11
+version=1.2.13
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
-distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.916.geb595a67_amd64.deb"
-checksum=472bf841451c219320f1ca038915f52bd4afdf7a1c979571d6ed541ca5e26d51
+distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.661.ga588f749_amd64.deb"
+checksum=fcbae7530d09e729b3bbb762a3127ad2cb841646615839125b58d811bcf4c928
 repository=nonfree
 restricted=yes
 nostrip=yes

From 28db16922007e9225a16de250f0cf2af25363f38 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Jun 2023 14:14:10 +0530
Subject: [PATCH 0968/1853] wego: update to 2.2.

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

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index ea3111ac800c..077d3968bf34 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,15 +1,16 @@
 # Template file for 'wego'
 pkgname=wego
-version=2.1
-revision=2
+version=2.2
+revision=1
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/schachmat/wego"
-distfiles=${homepage}/archive/${version}.tar.gz
-checksum=cebfa622789aa8e7045657d81754cb502ba189f4b4bebd1a95192528e06969a6
+changelog="https://github.com/schachmat/wego/releases"
+distfiles="https://github.com/schachmat/wego/archive/refs/tags/${version}.tar.gz"
+checksum=e7a6d40cb44f4408aedceebbed5854b3b992936cc762df6b76f5a9dca7909321
 
 post_install() {
 	vlicense LICENSE

From b4a9088e318f1f0c8d0556af4988447658b23e06 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 13 Jun 2023 01:06:34 +0530
Subject: [PATCH 0969/1853] strongswan: update to 5.9.11.

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

diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index 64b061b18cde..f9421150163e 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,7 +1,7 @@
 # Template file for 'strongswan'
 pkgname=strongswan
-version=5.9.10
-revision=2
+version=5.9.11
+revision=1
 build_style=gnu-configure
 # tpm support waits on libtss2
 configure_args="--disable-static --enable-blowfish --enable-curl --enable-md4
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 changelog="https://raw.githubusercontent.com/strongswan/strongswan/master/NEWS"
 distfiles="https://download.strongswan.org/strongswan-${version}.tar.bz2"
-checksum=3b72789e243c9fa6f0a01ccaf4f83766eba96a5e5b1e071d36e997572cf34654
+checksum=ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d
 make_dirs="/etc/ipsec.d/ 0755 root root
  /etc/ipsec.d/aacerts 0755 root root
  /etc/ipsec.d/acerts 0755 root root

From 1f4666d8d1849b4300086ddb5d9f487649dae8d4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Jun 2023 19:53:36 +0530
Subject: [PATCH 0970/1853] fonttools: update to 4.40.0.

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

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index 6d2160272853..9611cf4e8163 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,9 +1,10 @@
 # Template file for 'fonttools'
 pkgname=fonttools
-version=4.39.4
+version=4.40.0
 revision=1
 build_style=python3-module
 make_check_args="--deselect Tests/otlLib/optimize_test.py::test_main
+ --deselect Tests/ttx/ttx_test.py::test_ttcompile_timestamp_calcs
  --ignore Tests/misc/plistlib_test.py --ignore Tests/pens --ignore Tests/ufoLib"
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -14,7 +15,7 @@ license="MIT, OFL-1.1, BSD-3-Clause"
 homepage="https://github.com/fonttools/fonttools"
 changelog="https://raw.githubusercontent.com/fonttools/fonttools/main/NEWS.rst"
 distfiles="https://github.com/fonttools/fonttools/archive/refs/tags/${version}.tar.gz"
-checksum=9fab7f15ad7a0b5cd040331090b726c81d8b0d7b043bb348c7dc242d901b4ee5
+checksum=f03f5a5414587fed31d11e007e680ea522a918ea27a793a5931641ef5915bcd2
 replaces="python-fonttools>=0 python3-fonttools>=0"
 provides="python-fonttools-${version}_${revision} python3-fonttools-${version}_${revision}"
 

From 8bf5c0817506a702674688216f3f32b789e82dec Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Fri, 16 Jun 2023 22:20:40 +0200
Subject: [PATCH 0971/1853] hcloud: update to 1.35.0.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index fcdc3c3963fc..da0f7d134550 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.34.1
+version=1.35.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=00ec9466bedca9fbe3ab5151a79df4db6a8997b263bcc6bffb50f25ccc191c80
+checksum=3dad20aa8b4592c65046a0587ded4cccc87aeba308bf1f5f07cde0bb864e6717
 
 post_install() {
 	vlicense LICENSE

From 5bd02e665f42b600aba5f02bd40a18bc05953c6d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 11:24:10 +0100
Subject: [PATCH 0972/1853] libdrm: update to 2.4.115.

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

diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 929d3c11ba0f..5c7578cef745 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
 # Template file for 'libdrm'
 pkgname=libdrm
-version=2.4.114
+version=2.4.115
 revision=1
 build_style=meson
 configure_args="-Dudev=true -Dvalgrind=disabled -Dinstall-test-programs=true"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://dri.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=919ccacc5d9211840b9433d16ee825b1bc7108e7d63e05557969a17c3532d764
+checksum=fd8b7c6e4e40d13c32ab67ace2cb6c71e08c9ca53124ff33ccadd74f604117e3
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) configure_args+=" -Dvc4=enabled";;

From b0ce274afa0cc1bb3279b478e7a00b7af9b016ab Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 11:32:27 +0530
Subject: [PATCH 0973/1853] qsv: update to 0.107.0.

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

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index 30448b946128..068d261bbd0f 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.106.0
+version=0.107.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,4 +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=ce7c3eac35d495188ceda49536ce1997a78a319a42d715d3b0b1712b57c3267c
+checksum=628b18a3ea9ebd0b5e82e3fd9db05348c0c6aa32b43b32bdd12c0217443d88be

From 2c491ae46619aa6180af6747cdcd95805ca9c979 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 12:09:20 +0530
Subject: [PATCH 0974/1853] StyLua: update to 0.18.0.

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

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index 55f097c41a00..cb582ecbc6d4 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.17.1
+version=0.18.0
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if lua53 '--features lua53')
@@ -11,7 +11,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/main/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/refs/tags/v${version}.tar.gz"
-checksum=94d421033a41d7030bfec5cafafd16e52951b08685f4a908087cbcbb8fea4073
+checksum=198e54433b866b8d3a8934be3d1a0f4b40ac934621231be43d4aa2056cb66018
 
 build_options="lua52 lua53 lua54 luau"
 build_options_default="lua52 lua53 lua54 luau"

From 52f2e7a888cdb9598fb69a628e7785489b0e1c38 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 11:54:41 +0530
Subject: [PATCH 0975/1853] hatchling: update to 1.18.0.

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

diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
index bb221be3e722..75c668d88f3c 100644
--- a/srcpkgs/hatchling/template
+++ b/srcpkgs/hatchling/template
@@ -1,6 +1,6 @@
 # Template file for 'hatchling'
 pkgname=hatchling
-version=1.17.0
+version=1.18.0
 revision=1
 build_style=python3-pep517
 _deps="python3-editables python3-packaging python3-pathspec python3-pluggy
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://hatch.pypa.io/latest/"
 changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history/hatchling.md"
 distfiles="${PYPI_SITE}/h/hatchling/hatchling-${version}.tar.gz"
-checksum=b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930
+checksum=50e99c3110ce0afc3f7bdbadff1c71c17758e476731c27607940cfa6686489ca
 
 post_install() {
 	vlicense LICENSE.txt

From 54667d0b7e88fe23515c48271d8674b2c9c8e49c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 18 Jun 2023 15:06:17 +0200
Subject: [PATCH 0976/1853] rosegarden: update to 23.06

---
 .../patches/fix-use-after-free-lilypad.patch         | 12 ------------
 srcpkgs/rosegarden/template                          |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch

diff --git a/srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch b/srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch
deleted file mode 100644
index 7d84b7376556..000000000000
--- a/srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/document/io/LilyPondExporter.cpp
-+++ b/src/document/io/LilyPondExporter.cpp
-@@ -462,7 +462,8 @@ LilyPondExporter::handleStartingPostEven
-                             }
- 
-                             // Duration
--                            const char * d = restsDuration.toStdString().data();
-+                            std::string tmp = restsDuration.toStdString();
-+                            const char * d = tmp.data();
- 
-                             // Indication
-                             const char * in =
diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index ba6498262438..1262053be213 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
 # Template file for 'rosegarden'
 pkgname=rosegarden
-version=22.12.1
+version=23.06
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config shared-mime-info"
@@ -12,8 +12,8 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://rosegardenmusic.com/"
 changelog="https://raw.githubusercontent.com/tedfelix/rosegarden-official/master/CHANGELOG"
-distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=7ea7a27f7ee5c49781708f9c615a51919b892264a599e64edf2cd23733d99206
+distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.xz"
+checksum=1f34578bf47bac364faf1c6c14daaedaa387a4f3b19704f5ba868f4ecd2d72cc
 
 if [ -n "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"

From ffe7affb6f366193d12470275e4a6d7eda132f44 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 19:14:37 +0530
Subject: [PATCH 0977/1853] geeqie: update to 2.1.

---
 srcpkgs/geeqie/patches/fix-musl.patch | 22 ++++++++++++++++++++++
 srcpkgs/geeqie/template               |  6 +++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/geeqie/patches/fix-musl.patch

diff --git a/srcpkgs/geeqie/patches/fix-musl.patch b/srcpkgs/geeqie/patches/fix-musl.patch
new file mode 100644
index 000000000000..9a21dd6334f6
--- /dev/null
+++ b/srcpkgs/geeqie/patches/fix-musl.patch
@@ -0,0 +1,22 @@
+From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz@gatalith.at>
+Date: Sat, 17 Jun 2023 18:47:28 +0200
+Subject: [PATCH] Add missing header for setlocale().
+
+---
+ src/misc.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/misc.cc b/src/misc.cc
+index 9942605c..a2ad3eb6 100644
+--- a/src/misc.cc
++++ b/src/misc.cc
+@@ -18,6 +18,8 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include <locale.h>
++
+ #include "main.h"
+ #include "misc.h"
+ 
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 0f199ffb7c38..b5f958f854c1 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # Template file for 'geeqie'
 pkgname=geeqie
-version=2.0.1
-revision=2
+version=2.1
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext xxd gdk-pixbuf-devel glib-devel"
 makedepends="gtk+3-devel glib-devel lcms2-devel exiv2-devel libheif-devel
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.geeqie.org"
 changelog="https://raw.githubusercontent.com/BestImageViewer/geeqie/master/NEWS"
 distfiles="https://github.com/BestImageViewer/geeqie/archive/refs/tags/v${version}.tar.gz"
-checksum=6d87004a21b91afb7ea9eac3624fc37f5ccf1818fd40f567f8c7d1b5cbc2a6c7
+checksum=61edff10540bcee01af7ff0dbc3658c99c2e27854a7dc2915b44624ec39b8744

From 5e336225b0df90bea90f6b0664285d4c0c2ede7b Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 16 Jun 2023 00:11:21 +0200
Subject: [PATCH 0978/1853] limine: update to 4.20230615.0.

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

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index 25e23c5cd630..f986e43f675c 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230606.0
+version=4.20230615.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=8a6fdb8b520a030928ab4e11756126a7b80790889a5567d0c92b907a1b131759
+checksum=f17b816aa7b88ab0e66a32e45afad55accee41cd336aba372c2a3eca7e0a41ad
 
 post_install() {
 	vlicense LICENSE

From c1bcf79aaecd6c2a06b308071d76b5eb1c740852 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 16 Jun 2023 10:30:48 +0200
Subject: [PATCH 0979/1853] vscode: update to 1.79.2

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index d7de2feef325..a7d418f5696f 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.79.0
+version=1.79.2
 revision=1
 _electronver=24.2.0
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=37a5182d77fbe670be180d1e19907ef5a0b970afda0ba57626a1d2c3d715ce28
+checksum=2719ccbb573f5b7c174bd5bbcad97d3fe4d917e16327a6b72162ff7014c17c9b
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 3504ef91485e55071c4f80df6023315b2a43cb12 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 16 Jun 2023 11:53:52 +0200
Subject: [PATCH 0980/1853] pyradio: update to 0.9.2.10.

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

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 65c463fe6539..2ee62bff7306 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.7
+version=0.9.2.10
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=3694b423aa7b3302f90db9a620aa8155ee05501493d748544522f70f50a50d81
+checksum=c3ab4773d0bdfd28015ef621a86ba103764f36708f8e07cbd0d1b908bcc8e032
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From aa6ef1ad2946bb5fdcb5c58178e66905c2d7941d Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Thu, 15 Jun 2023 16:09:38 -0400
Subject: [PATCH 0981/1853] hackrf: update to 2023.01.1.

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

diff --git a/srcpkgs/hackrf/template b/srcpkgs/hackrf/template
index 962cc7f4e856..189ab5b1f00a 100644
--- a/srcpkgs/hackrf/template
+++ b/srcpkgs/hackrf/template
@@ -1,6 +1,6 @@
 # Template file for 'hackrf'
 pkgname=hackrf
-version=2022.09.1
+version=2023.01.1
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://greatscottgadgets.com/hackrf/"
 distfiles="https://github.com/greatscottgadgets/hackrf/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e
+checksum=32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11
 
 post_install() {
 	for f in ../firmware-bin/*.{bin,dfu}; do

From dc1253dd0133b322c4379973a72a8fedaa47bf58 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 15 Jun 2023 01:05:10 +0300
Subject: [PATCH 0982/1853] putty: update to 0.78

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

diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index 023abf4f18ae..9f70a820a725 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.77
+version=0.78
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config perl"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="https://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=419a76f45238fd45f2c76b42438993056e74fa78374f136052aaa843085beae5
+checksum=274e01bcac6bd155dfd647b2f18f791b4b17ff313753aa919fcae2e32d34614f
 
 CFLAGS="-Wno-error -UNDEBUG"
 

From 0000b826d0493322fffa33b34f707c110168756a Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 15:11:12 -0500
Subject: [PATCH 0983/1853] python3-sphinx-copybutton: update to 0.5.2.

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

diff --git a/srcpkgs/python3-sphinx-copybutton/template b/srcpkgs/python3-sphinx-copybutton/template
index f5b5a14d296b..3074116956dd 100644
--- a/srcpkgs/python3-sphinx-copybutton/template
+++ b/srcpkgs/python3-sphinx-copybutton/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sphinx-copybutton'
 pkgname=python3-sphinx-copybutton
-version=0.5.1
+version=0.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://sphinx-copybutton.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/executablebooks/sphinx-copybutton/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/sphinx-copybutton/sphinx-copybutton-${version}.tar.gz"
-checksum=366251e28a6f6041514bfb5439425210418d6c750e98d3a695b73e56866a677a
+checksum=4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd
 make_check=no # package provides no tests
 
 post_install() {

From bc1b9326fd766a4d4580f1356f90d073a320170b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:42:23 -0500
Subject: [PATCH 0984/1853] perl-Devel-CheckLib: update to 1.16.

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

diff --git a/srcpkgs/perl-Devel-CheckLib/template b/srcpkgs/perl-Devel-CheckLib/template
index aa813ab62019..7c53a6e02f37 100644
--- a/srcpkgs/perl-Devel-CheckLib/template
+++ b/srcpkgs/perl-Devel-CheckLib/template
@@ -1,14 +1,15 @@
 # Template file for 'perl-Devel-CheckLib'
 pkgname=perl-Devel-CheckLib
-version=1.14
-revision=2
+version=1.16
+revision=1
 build_style=perl-module
 hostmakedepends="perl-IO-CaptureOutput"
 makedepends="${hostmakedepends}"
 depends="perl"
+checkdepends="perl-Capture-Tiny"
 short_desc="Module to check for other perl modules"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Devel-CheckLib"
 distfiles="${CPAN_SITE}/Devel/Devel-CheckLib-${version}.tar.gz"
-checksum=f21c5e299ad3ce0fdc0cb0f41378dca85a70e8d6c9a7599f0e56a957200ec294
+checksum=869d38c258e646dcef676609f0dd7ca90f085f56cf6fd7001b019a5d5b831fca

From 10f7415e95089b2c1cfe1b354c6389315dd2f57f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 13 Jun 2023 21:19:12 -0400
Subject: [PATCH 0985/1853] cherrytree: update to 0.99.55

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

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index ef8bdd30ce22..3b6fa46f175b 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,6 +1,6 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.51
+version=0.99.55
 revision=1
 build_style=cmake
 # Tests are built during the normal build process and require access to X server
@@ -16,5 +16,5 @@ license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
 changelog="https://raw.githubusercontent.com/giuspen/cherrytree/master/changelog.txt"
 distfiles="https://github.com/giuspen/cherrytree/archive/refs/tags/${version}.tar.gz"
-checksum=5c88bd8d709226006819cc7bba8445bab7bc5d2795364110d9ce59ecb69c7bcb
+checksum=c7e6393af6a7e82e02692faf06e62b3214c147818de1c3bbe809fa4113854215
 make_check=no  # Tests are run during build step

From ce586672e63e608c28bbafb375223a5f9404714b Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Tue, 13 Jun 2023 15:03:55 +0200
Subject: [PATCH 0986/1853] ack: update to 3.7.0

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

diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template
index 25e08e33ac21..b14cb3987ee8 100644
--- a/srcpkgs/ack/template
+++ b/srcpkgs/ack/template
@@ -1,6 +1,6 @@
 # Template file for 'ack'
 pkgname=ack
-version=3.6.0
+version=3.7.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-File-Next"
@@ -10,4 +10,4 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="Artistic-2.0"
 homepage="https://beyondgrep.com/"
 distfiles="${CPAN_SITE}/App/ack-v${version}.tar.gz"
-checksum=03144d1070649e92f6a1b7d20bdc535e2bb1ac258daabe482e9aa8277b48f005
+checksum=ea7caa14f757de083310ed2cba298661ddcca5dee06ec8f18043ea625a79df20

From 0119fab846efa9c6072ee56874b7a29aa23c0877 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 4 Jun 2023 11:47:02 -0400
Subject: [PATCH 0987/1853] shotcut: update to 23.05.14.

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

diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 99ebf2e8a5af..7d2af7b0470b 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,20 +1,20 @@
 # Template file for 'shotcut'
 pkgname=shotcut
-version=22.12.21
+version=23.05.14
 revision=1
 build_style=cmake
 configure_args="-DSHOTCUT_VERSION=${version}"
-hostmakedepends="pkg-config qt5-tools-devel"
-makedepends="mlt7-devel qt5-declarative-devel qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
-depends="ffmpeg frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
+hostmakedepends="pkg-config qt6-tools-devel"
+makedepends="mlt7-devel qt6-declarative-devel qt6-multimedia-devel
+ qt6-websockets-devel qt6-plugin-mysql qt6-plugin-odbc
+ qt6-plugin-pgsql qt6-plugin-sqlite"
+depends="ffmpeg frei0r-plugins qt6-declarative"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.shotcut.org"
 changelog="https://github.com/mltframework/shotcut/releases"
 distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=1b9a4f87b16a9751f9cb41588f22af4c00f085105d82cf21d095d9f3c280bc86
+checksum=94632bd69cc8f3b2cba0668b9e8d051493efa5a9c9554c02822c346fe64c1ce0
 
 CXXFLAGS="-DHAVE_LOCALE_H=1 -DSHOTCUT_NOUPGRADE"

From 7bbf2e017ce4aad0b05a2c4e4c3a618c979bdaa9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sat, 20 May 2023 13:04:15 +0200
Subject: [PATCH 0988/1853] openttd: update to 13.1.

---
 .../openttd/patches/regression_tests.patch    | 12 +++
 srcpkgs/openttd/template                      | 73 ++++++++++---------
 2 files changed, 52 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/openttd/patches/regression_tests.patch

diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
new file mode 100644
index 000000000000..2afc07eb4204
--- /dev/null
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -0,0 +1,12 @@
+Fix regression tests on musl libc
+index 19fece83f5..641e1e6de2 100644
+--- a/openttd-13.1/cmake/scripts/Regression.cmake
++++ b/openttd-13.1/cmake/scripts/Regression.cmake
+@@ -53,6 +53,7 @@ endif()
+ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
++string(REPLACE "(null : 0x0)" "(null : 0x00000000)" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ 
+ # Remove timestamps if any
+ string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..3649699062df 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,64 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=1.10.3
-revision=6
-_gfxver=0.6.0
-_sfxver=0.2.3
+version=13.1
+revision=1
+_gfxver=7.1
+_sfxver=1.0.3
+_msxver=0.4.2
 create_wrksrc=yes
 build_wrksrc=openttd-$version
-build_style=gnu-configure
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_BINDIR=bin
+ -DCMAKE_INSTALL_DATADIR=/usr/share
+ -DCMAKE_INSTALL_DOCDIR=share/doc/openttd
+"
+
 hostmakedepends="pkg-config unzip tar"
-makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel
- libxdg-basedir-devel"
-depends="hicolor-icon-theme"
+makedepends="SDL2-devel libcurl-devel freetype-devel fontconfig-devel
+ harfbuzz-devel icu-devel libpng-devel liblzma-devel fluidsynth-devel"
+depends="hicolor-icon-theme fluidsynth soundfont-fluid"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
-distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
+distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
- https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip"
-checksum="c11601ef547eb1f6d4f9a035bd19e0a760b47872ce7d9b4117aaa45ac377b53b
- d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774
- 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02"
-
+ https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
+ https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
+checksum="5edf22d37035238285ef672a97d59e64280bebab23e584780834ccd6be0a58bb
+ 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
+ e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
+ 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
 
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 post_extract() {
-	cd $wrksrc
 	bsdtar xf opengfx-${_gfxver}.tar
+	bsdtar xf opensfx-${_sfxver}.tar
+	bsdtar xf openmsx-${_msxver}.tar
 	rm opengfx-${_gfxver}.tar
+	rm opensfx-${_sfxver}.tar
+	rm openmsx-${_msxver}.tar
 }
 
-do_configure() {
-	./configure --prefix-dir=/usr \
-		--cc-build=gcc \
-		--cxx-build=g++ \
-		--binary-dir=bin \
-		--data-dir=share/openttd \
-		--doc-dir=share/doc/openttd \
-		--with-lzo2=${XBPS_CROSS_BASE}/usr/lib \
-		--binary-name=openttd \
-		--install-dir=${DESTDIR} \
-		--menu-name=OpenTTD \
-		--with-xdg-basedir
+post_build() {
+	cp ../opengfx-${_gfxver}/*.grf build/baseset
+	cp ../opengfx-${_gfxver}/opengfx.obg build/baseset
+	cp ../opensfx-${_sfxver}/opensfx.* build/baseset
+	cp -r ../openmsx-${_msxver} build/baseset
 }
 
 post_install() {
-	vmkdir usr/share/openttd/data
-	vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data
-	vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data
-	vcopy ../opensfx-${_sfxver}/opensfx.* usr/share/openttd/data
 	vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx
 	vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx
+	vlicense ../openmsx-${_msxver}/license.txt LICENSE-msx
 	vdoc ../opengfx-${_gfxver}/readme.txt README-gfx
 	vdoc ../opensfx-${_sfxver}/readme.txt README-sfx
+	vdoc ../openmsx-${_msxver}/readme.txt README-msx
 }

From 8ac7801413a82a15b26439acfbd009d53fb4cb12 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 19 Jun 2023 20:58:03 -0500
Subject: [PATCH 0989/1853] hugo: update to 0.114.0.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d5c4cfeca19a..bbc39aac0122 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.113.0
+version=0.114.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=0bea01f37d7d04e6262844ff3070b76e5fb9f5fe2330a1367bd1c35c77098161
+checksum=485a0f8346ef74a89ab075613590bd94c86d322208cb7b567ceada758459e3b3
 
 post_install() {
 	vdoc README.md

From 788b8a28d4902edec32151a114204e89b272cb8e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 19 Jun 2023 19:51:32 -0700
Subject: [PATCH 0990/1853] kdenlive: depend on mediainfo-cli instead of
 mediainfo-gui

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

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 429126ef3c3b..89c0dcfb8577 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,7 +1,7 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="
  extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config python3
@@ -11,7 +11,7 @@ makedepends="
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols
- kirigami2 mediainfo"
+ kirigami2 mediainfo-cli"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e412b992828c11edea8c0aaaf6c5dee366904c84 Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Tue, 4 Apr 2023 01:55:22 -0300
Subject: [PATCH 0991/1853] New package: stc-1.4

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

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
new file mode 100644
index 000000000000..ff2964d169e1
--- /dev/null
+++ b/srcpkgs/stc/template
@@ -0,0 +1,12 @@
+# Template file for 'stc'
+pkgname=stc
+version=1.4
+revision=1
+build_style=go
+go_import_path=github.com/tenox7/stc
+short_desc="Syncthing CLI Tool"
+maintainer="LucasTavaresA <tavares.lassuncao@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/tenox7/stc"
+distfiles="https://github.com/tenox7/stc/archive/refs/tags/${version}.tar.gz"
+checksum=5bae51e0fa34311c1ec9e2798badc6fb8b6333485d295beb8631936faeaeb1dc

From 25f57340339707fd81f736281214160d7b304756 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Jun 2023 09:46:33 -0500
Subject: [PATCH 0992/1853] google-chrome: update to 114.0.5735.133.

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 58e12a821110..ffef308cdec8 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=113.0.5672.126
+version=114.0.5735.133
 revision=1
 _channel=stable
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:chrome"
 homepage="https://www.google.com/chrome/"
 distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb"
-checksum=6a624904d7a7ee2ec27e637164ddddd102cc799ffa9c14a05f88762363200bf1
+checksum=6f700ff90db3a0f72ed9fb7ccbce31bd2f937366ed9b80d3ee0dafab7ba0693e
 _license_checksum=8023b18fb5118ef65d586363e53909861bd1a9676e5eb83c20fd3ac6e33ea0be
 
 skiprdeps="/opt/google/chrome/libqt5_shim.so"

From 98741883d8570cc35f81c84eb6deb1e6343fa0f7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 20 Jun 2023 15:50:53 +0300
Subject: [PATCH 0993/1853] nemo: update to 5.8.2.

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

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index e0b4f2247e3c..e54d98c677e5 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=5.6.5
+version=5.8.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 changelog="https://raw.githubusercontent.com/linuxmint/nemo/master/debian/changelog"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=7e9e6c58222e07c40bc0ebd2c930b599ec781b7678721e01c6a75dfdc995ec94
+checksum=6a53fb8cec225f08a364e551b442a3e4cfbbad8812ef4bd77494a0236544f387
 python_version=3
 # Requires xvfb-run and dbus-run-session
 make_check=no # can't be run inside chroot due to fusermount3

From 29793064f6bdb0f54511d03de360c7c0ed225011 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 20 Jun 2023 10:12:42 +0200
Subject: [PATCH 0994/1853] proj: update to 9.2.1.

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

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index f69c53e4ac8c..50fd8fc17b99 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,6 +1,6 @@
 # Template file for 'proj'
 pkgname=proj
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -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=dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e
+checksum=15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1
 
 post_install() {
 	vlicense COPYING

From da7a68d8b2832cd635f6e34e1acf6ead845edf61 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 20 Jun 2023 14:33:42 +0300
Subject: [PATCH 0995/1853] pmbootstrap: update to 1.53.0.

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

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index c8f908232a36..c9f735af9234 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.52.0
+version=1.53.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,5 +11,5 @@ license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 changelog="https://git.sr.ht/~postmarketos/pmbootstrap/refs"
 distfiles="https://git.sr.ht/~postmarketos/pmbootstrap/archive/${version}.tar.gz"
-checksum=a05fef2bb495a2e0d8e0369e4a8a1038baf50b7514ec89582b5ec785f9bfa7cb
+checksum=524a7ef43bc254bdb0973926312befc6f76b0c14b03cecdfc6407388c97cbec7
 make_check=no # tests require chroot

From f5826d3b9df9bf0f5667ccb53592c67b6e658200 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 0996/1853] libglibutil: update to 1.0.70.

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

diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..0f435b6bb18a 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
 # Template file for 'libglibutil'
 pkgname=libglibutil
-version=1.0.67
+version=1.0.70
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -14,8 +14,9 @@ short_desc="Library of glib utilities"
 maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/sailfishos/libglibutil"
+changelog="https://raw.githubusercontent.com/sailfishos/libglibutil/master/debian/changelog"
 distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=dd89b91627b991c2be5c68b3cca61475bad6f9de626536faac0107d23be444ef
 
 post_install() {
 	vlicense LICENSE

From 8404b6da1b299f3d56ff96577e5763f26e12ff1a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 20 Jun 2023 09:41:35 +0200
Subject: [PATCH 0997/1853] golangci-lint: update to 1.53.3.

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

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 7b2aa25aa7a9..173632a02ff4 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.53.2
+version=1.53.3
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=fc3e94b5574cdbe0faf37c8cbc1764c4ed07852a9e9dc146216ee69a20b3f97c
+checksum=a11540d116fa6b015423afc1bfe57c4b22ec3c3165189442cdb7ff8fda729370
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From ca9c732dc95add5ce49f4832430e7da9916c58cd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 19 Jun 2023 21:16:48 -0400
Subject: [PATCH 0998/1853] gitui: update to 0.23.0

---
 srcpkgs/gitui/patches/bump-git2.patch | 13 -------------
 srcpkgs/gitui/template                | 10 +++-------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/gitui/patches/bump-git2.patch

diff --git a/srcpkgs/gitui/patches/bump-git2.patch b/srcpkgs/gitui/patches/bump-git2.patch
deleted file mode 100644
index e4b5dfc1fad5..000000000000
--- a/srcpkgs/gitui/patches/bump-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
-index 5ab4da1..f17fbbe 100644
---- a/asyncgit/Cargo.toml
-+++ b/asyncgit/Cargo.toml
-@@ -14,7 +14,7 @@ keywords = ["git"]
- [dependencies]
- crossbeam-channel = "0.5"
- easy-cast = "0.5"
--git2 = "0.15"
-+git2 = "0.17"
- log = "0.4"
- # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
- # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 14a6deb5ba43..2df97ebfc1e1 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.22.1
-revision=2
+version=0.23.0
+revision=1
 build_style=cargo
 make_check_args="-- --skip  components::textinput::tests::test_visualize_newline"
 hostmakedepends="pkg-config python3"
@@ -12,11 +12,7 @@ license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=285e86c136ee7f410fdd52c5284ccf0d19011cc5f7709e5e10bb02f439a218ea
-
-post_patch() {
-	cargo update --package git2@0.15.0 --precise 0.17.2
-}
+checksum=5180d5d8fd2fe6400148d6078b4b318c7530ca6c27ea8d8c0882f2e4d9064a80
 
 post_install() {
 	vlicense LICENSE.md

From 8150d8f9d92b226498b2146207b3e07dccaffc19 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 18 Jun 2023 22:32:23 -0400
Subject: [PATCH 0999/1853] wmctrl: update defunct sources. closes #44513

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

diff --git a/srcpkgs/wmctrl/template b/srcpkgs/wmctrl/template
index 774c4ca6f200..495ef14ef948 100644
--- a/srcpkgs/wmctrl/template
+++ b/srcpkgs/wmctrl/template
@@ -1,13 +1,13 @@
 # Template file for 'wmctrl'
 pkgname=wmctrl
 version=1.07
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXmu-devel glib-devel"
 short_desc="CLI tool to interact with EWMH compliant WMs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
-homepage="https://sites.google.com/site/tstyblo/wmctrl/"
-distfiles="https://sites.google.com/site/tstyblo/wmctrl/wmctrl-${version}.tar.gz"
+homepage="https://packages.debian.org/sid/source/wmctrl"
+distfiles="http://deb.debian.org/debian/pool/main/w/wmctrl/wmctrl_${version}.orig.tar.gz"
 checksum=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9

From f93849f1acd2fc3b1110f4d19d7e621318c3f8ca Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 21 Jun 2023 00:11:47 +0200
Subject: [PATCH 1000/1853] luakit: update to 2.3.3.

Closes: #41734
---
 srcpkgs/luakit/patches/glib-pcre2.patch | 39 -------------------------
 srcpkgs/luakit/template                 |  6 ++--
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch

diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch
deleted file mode 100644
index f79c38ff5273..000000000000
--- a/srcpkgs/luakit/patches/glib-pcre2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
-From: Tao Nelson <taobert@gmail.com>
-Date: Fri, 23 Sep 2022 19:17:47 +1000
-Subject: [PATCH] Accommodate glib now using pcre2
-
----
- common/clib/regex.c | 2 +-
- common/util.c       | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/clib/regex.c b/common/clib/regex.c
-index c4f42317c..e87156cf8 100644
---- a/common/clib/regex.c
-+++ b/common/clib/regex.c
-@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex)
- 
-     GError *error = NULL;
-     regex->reg = g_regex_new(regex->pattern,
--            G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error);
-+            G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error);
-     if (error) {
-         lua_pushstring(L, error->message);
-         g_error_free(error);
-diff --git a/common/util.c b/common/util.c
-index 4b44d8515..738e1e5cb 100644
---- a/common/util.c
-+++ b/common/util.c
-@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in)
-     static GRegex *reg;
- 
-     if (!reg) {
--        const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-+        const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-         GError *err = NULL;
--        reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-+        reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-         g_assert_no_error(err);
-     }
- 
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 8f82764e3da8..4f317377dccd 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,8 +1,8 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.3.1
-revision=2
+version=2.3.3
+revision=1
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
 makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e
+checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5
 
 CFLAGS="-fcommon"
 

From 99ced54fd44e54575716339632da31bba8a3521e Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 21 Jun 2023 00:16:25 +0200
Subject: [PATCH 1001/1853] Revert "luakit: update to 2.3.3."

This reverts commit abf8348d9dd9321129a5b1b61212242204317964.
---
 srcpkgs/luakit/patches/glib-pcre2.patch | 39 +++++++++++++++++++++++++
 srcpkgs/luakit/template                 |  6 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch

diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch
new file mode 100644
index 000000000000..f79c38ff5273
--- /dev/null
+++ b/srcpkgs/luakit/patches/glib-pcre2.patch
@@ -0,0 +1,39 @@
+From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
+From: Tao Nelson <taobert@gmail.com>
+Date: Fri, 23 Sep 2022 19:17:47 +1000
+Subject: [PATCH] Accommodate glib now using pcre2
+
+---
+ common/clib/regex.c | 2 +-
+ common/util.c       | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/clib/regex.c b/common/clib/regex.c
+index c4f42317c..e87156cf8 100644
+--- a/common/clib/regex.c
++++ b/common/clib/regex.c
+@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex)
+ 
+     GError *error = NULL;
+     regex->reg = g_regex_new(regex->pattern,
+-            G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error);
++            G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error);
+     if (error) {
+         lua_pushstring(L, error->message);
+         g_error_free(error);
+diff --git a/common/util.c b/common/util.c
+index 4b44d8515..738e1e5cb 100644
+--- a/common/util.c
++++ b/common/util.c
+@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in)
+     static GRegex *reg;
+ 
+     if (!reg) {
+-        const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
++        const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
+         GError *err = NULL;
+-        reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
++        reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
+         g_assert_no_error(err);
+     }
+ 
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 4f317377dccd..8f82764e3da8 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,8 +1,8 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.3.3
-revision=1
+version=2.3.1
+revision=2
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
 makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5
+checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e
 
 CFLAGS="-fcommon"
 

From 56ce5ac61cb589ff69b96a2362ab3f966ae7bbd5 Mon Sep 17 00:00:00 2001
From: Mugr Rex <mugr@disroot.org>
Date: Thu, 19 Jan 2023 01:07:00 +0000
Subject: [PATCH 1002/1853] luakit: update to 2.3.3

Closes: #41734 [via git-merge-pr]
---
 srcpkgs/luakit/patches/glib-pcre2.patch | 39 -------------------------
 srcpkgs/luakit/template                 |  6 ++--
 srcpkgs/luakit/update                   |  1 -
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch
 delete mode 100644 srcpkgs/luakit/update

diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch
deleted file mode 100644
index f79c38ff5273..000000000000
--- a/srcpkgs/luakit/patches/glib-pcre2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
-From: Tao Nelson <taobert@gmail.com>
-Date: Fri, 23 Sep 2022 19:17:47 +1000
-Subject: [PATCH] Accommodate glib now using pcre2
-
----
- common/clib/regex.c | 2 +-
- common/util.c       | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/clib/regex.c b/common/clib/regex.c
-index c4f42317c..e87156cf8 100644
---- a/common/clib/regex.c
-+++ b/common/clib/regex.c
-@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex)
- 
-     GError *error = NULL;
-     regex->reg = g_regex_new(regex->pattern,
--            G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error);
-+            G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error);
-     if (error) {
-         lua_pushstring(L, error->message);
-         g_error_free(error);
-diff --git a/common/util.c b/common/util.c
-index 4b44d8515..738e1e5cb 100644
---- a/common/util.c
-+++ b/common/util.c
-@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in)
-     static GRegex *reg;
- 
-     if (!reg) {
--        const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-+        const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-         GError *err = NULL;
--        reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-+        reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-         g_assert_no_error(err);
-     }
- 
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 8f82764e3da8..4f317377dccd 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,8 +1,8 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.3.1
-revision=2
+version=2.3.3
+revision=1
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
 makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e
+checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/luakit/update b/srcpkgs/luakit/update
deleted file mode 100644
index fab90a9fdea2..000000000000
--- a/srcpkgs/luakit/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[12][0-9][0-9][0-9].[01][0-9].[0-3][0-9]"

From bc4882979a985d1aad080317d70ce18427d18434 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Jun 2023 17:25:55 -0500
Subject: [PATCH 1003/1853] Amass: update to 3.23.3.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 285fdfb6dd08..7e391d034df9 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.23.2
+version=3.23.3
 revision=1
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/owasp-amass/amass/archive/v${version}.tar.gz"
-checksum=a308036757d8505cf5cb420b4bfebdc8f57f35ee247e6b01aa9192e9eae8d342
+checksum=be1be397f77a095472e277a48a1439719ae6e19387712f58dc01305915bfadd0

From 3929a7a1b13abab2c0dc312791003b65b8be132a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Jun 2023 17:25:59 -0500
Subject: [PATCH 1004/1853] mongo-c-driver: update to 1.24.0.

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

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 1785e796bd79..f8ee1fa80f47 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.23.5
+version=1.24.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=260dc2207881ccbe7b79b1fa6b3ba84ab9be94eb93d4beefbbe8a6cb562947ed
+checksum=c37d8965f1e22236241e9474190110cfeeededbe9aa7c630ce8a9c379e97fc47
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 358ca2ee2d62ff84a65c12fea0689e7ddfef6af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 21 Jun 2023 16:47:35 +0700
Subject: [PATCH 1005/1853] linux6.3: update to 6.3.8.

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

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 135f88fab13f..d2c7b7a3cf48 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.6
+version=6.3.8
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- 0bceca759d8c1531197b369668a8aa800b3733fcbe87cc0ecf8f014389c16fd8"
+ 927ba93d3da556c8e30b2640aa3f19c3c3cda66c655754e0798024020e2981b4"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 99a07f9bbae516bc302baf4f9a124d9382bd2fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 30 May 2023 13:51:06 +0700
Subject: [PATCH 1006/1853] dkms: force dkms install

Whenever the installing step is failing, for some reasons,
all subsequent installing step will run into failure,
except when --force is passed.
---
 srcpkgs/dkms/files/kernel.d/dkms.postinst | 2 +-
 srcpkgs/dkms/template                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index 6b345bef9050..66d22981b517 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -87,7 +87,7 @@ while [ $# -gt 1 ]; do
 	if [ $(echo "$status"|grep -c ": built") -eq 1 ] &&
 	   [ $(echo "$status"|grep -c ": installed") -eq 0 ]; then
 		echo -n "Installing DKMS module: ${module}-${modulever}... "
-		/usr/bin/dkms install -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
+		/usr/bin/dkms install --force -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
 		rval=$?
 		# If the module failed installation, go to the next module.
 		if [ $rval -eq 0 ]; then
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 5da51b101a8c..34ee6c4afabb 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=3.0.10
-revision=1
+revision=2
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1"
 short_desc="Dynamic Kernel Module Support"

From a9e5e07c876c69ccf5c4e43eb50a5f6f85a61ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 30 May 2023 13:52:08 +0700
Subject: [PATCH 1007/1853] xbps-triggers: update to 0.125.

`dkms install` with `--force`, for some reasons, my initial installing
of some dkms modules was failing, the subsequent installing run into
failure too, except when `--force` has been passed in. `--force` seems
to be the correct flags for all invocation of `dkms` because it will be
invoked either by `xbps-install` (`--force` is harmless there),
or `xbps-install -yff` or `xbps-reconfigure`,
which obviously need `--force`.

While we're at it, invoke `dkms` in quiet mode because we will dump dkms
into /dev/null anyway.
---
 srcpkgs/xbps-triggers/files/dkms | 4 ++--
 srcpkgs/xbps-triggers/template   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 6b285c576b53..ae87f3bff838 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -89,7 +89,7 @@ add_modules() {
 		set -- ${dkms_modules}
 		while [ $# -gt 0 ]; do
 			echo -n "Building DKMS module '$1-$2' for kernel-${_kver}... "
-			$DKMS build -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
+			$DKMS build -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
@@ -99,7 +99,7 @@ add_modules() {
 				shift 2; continue
 			fi
 			echo -n "Installing DKMS module '$1-$2' for kernel-${_kver}... "
-			$DKMS install -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
+			$DKMS install --force -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index aa62e0902528..89cc9398c8c4 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.124
+version=0.125
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

From 8dfc8d4aaa6c9d2bfe899ab2fa55745f28a0f7e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 21 Jun 2023 16:57:44 +0700
Subject: [PATCH 1008/1853] linux6.1: update to 6.1.34.

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

diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 632c671f13b7..36c411cfd693 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.31
+version=6.1.34
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 2d5754525d09d6696e190bca06d9a466ba3f502976ce89f4f2c5f618e8a288f6"
+ d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1cee326a064a64808568cd02e7e937dc2d0256e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 19 Jun 2023 17:36:14 +0200
Subject: [PATCH 1009/1853] amdvlk: update to 2023.Q2.3.

---
 .../patches/pal-define-ACCESSPERMS.patch      | 12 ++++++
 srcpkgs/amdvlk/template                       | 38 +++++++++----------
 2 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch

diff --git a/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch b/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch
new file mode 100644
index 000000000000..d61ba4ba09cb
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch
@@ -0,0 +1,12 @@
+diff --git a/pal/src/util/lnx/lnxSysUtil.cpp b/pal/src/util/lnx/lnxSysUtil.cpp
+index 3105084b..e61c438a 100644
+--- a/pal/src/util/lnx/lnxSysUtil.cpp
++++ b/pal/src/util/lnx/lnxSysUtil.cpp
+@@ -1207,6 +1207,7 @@ bool IsDebuggerAttached()
+ Result SetRwxFilePermissions(
+     const char* pFileName)
+ {
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX)
+     Result result = Result::Success;
+     struct stat info;
+     int ret = stat(pFileName, &info);
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 76d066d5a0e9..3bfefd83e071 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,14 +1,15 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2022.Q4.4
+version=2023.Q2.3
 revision=1
-_xgl_commit=8aa0e76a110fa264608ee1b4e412aa8fb40286d3
-_pal_commit=287ef684bc36a86af55d4ed1c4c4f4c35577e21e
-_llpc_commit=37dcb2e5cedb00bb025c84238d816f19c93b3060
-_gpurt_commit=1f0c4f7e9cea22452e5e20a6cdfc4a84a2bf5bac
-_llvm_project_commit=42a4d92d3c68995d04f1ed580613d162054f5795
+_xgl_commit=6288905587fafc221b60045bceba73cf26e433ad
+_pal_commit=f01505f7fe4b38b573a41cb4d9d66d00e0c256f0
+_llpc_commit=f44e737f5e13eca803f465fc86532c24608c4daf
+_gpurt_commit=a1103572dfcc29c7baee04e2ececedca8fda86d7
+_llvm_project_commit=02394516f587d6bdb606b068fe604284f5c6a007
 _MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
 _CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
+_llvm_dialects_commit=e7464fe6373553fa1b1c1398417d7bb76d7931ef
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
@@ -31,15 +32,17 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm-project/archive/${_llvm_project_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
- https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="19e1b4344b76aa52429f06bf083ba90070c2415bda90f0991dddebf846e84752
- d3b465c84bdff774d2b2916121d7e9d6b31cb8467eb08fa8e1de9a5136dfe7be
- b992d8f4b4093793de87375a3f7b0ded71a1a2443c620fbc017776588861421d
- 9a2d41a49dd69a9634ab7aa30e750dfdc255c4f2e0c4c739028ac8a52c1bb5a6
- 11c31d5da5a846476825b2af2c67fd2025c892b6133b1b0a97c3548d691e5584
- 2b154a73681aa0424446b09737263fb35ae842fc92ee60fed999bad5fe15a7f9
+ https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/llvm-dialects/archive/${_llvm_dialects_commit}.tar.gz"
+checksum="0fd70d472200c98dabdf86b58a0cf7a1af1a46dd32d02d165676faa8dedf16f7
+ 42bf8f0410e48f3e33ad4f728416f769e59d26089dfc259441a0d3f96a1e081a
+ 629778956dcab9afe42450f3048e189c24b4c22862c90524df1de3910a5bbb86
+ 53d5dbcbeae08809a5d7a0c109be07a24bb97bef1ff5099de0666dd72f57ccfb
+ 75ec3380afa1cc3baf55897f72573c84849b70c0e97c36b311761bb2aa9fcb58
+ a2054e610ef420b083f0ca071f62a9f51db29e3c246ba3de2f5d0437b722e611
  141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
- 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484"
+ 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
+ 6c1c0e9f7dae4848bf5106d4b89f310e4c269a575b74daced547933abd14c7ee"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
@@ -47,11 +50,6 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*) nodebug=yes;;
 esac
 
-pre_build() {
-	pwd
-	ninja -C build GpuRtGenerateShaders
-}
-
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl
@@ -62,6 +60,8 @@ post_extract() {
 	mkdir ${wrksrc}/third_party
 	mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/third_party/metrohash
 	mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/third_party/cwpack
+	rmdir ${wrksrc}/llpc/imported/llvm-dialects/
+	mv ${wrksrc}/llvm-dialects-${_llvm_dialects_commit}/ ${wrksrc}/llpc/imported/llvm-dialects/
 }
 
 pre_configure() {

From a92bfa8f1a5f425eb8d81b51a4223738f9c3e8a2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 21 Jun 2023 10:00:16 +0200
Subject: [PATCH 1010/1853] github-cli: update to 2.31.0

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index f70306706384..89ffc67e39fe 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.30.0
+version=2.31.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=5e66be97f51559dcea3621c8cc3cf2f67bf47bf2e1902014b3ec5689ab4e8add
+checksum=9a9896fa80ecfec640cf5d93da830713150f4b44e0db142c958bfa36d09d2c03
 
 pre_build() {
 	local _date

From 9f89c847f736ab7d782b68579a4423d862e33748 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 21 Jun 2023 18:40:11 +0200
Subject: [PATCH 1011/1853] openfortivpn: update to 1.20.4.

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

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 6d916b48b31b..b8500f0f2546 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.20.3
+version=1.20.4
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=e54331098dc2c009cf98524f0ade027e337739506c5a60b65e2c2bf5f9c1d7e1
+checksum=af4b729baa60897a566c920bf34c9ed927eefe14909d13a980a25c8ae91f144f
 
 conf_files="/etc/openfortivpn/config"
 

From 8cef31b8b8106b944620d760945e94dcb71b7e03 Mon Sep 17 00:00:00 2001
From: Aicaya Maro <aicaya@posteo.net>
Date: Fri, 19 May 2023 15:34:57 -0400
Subject: [PATCH 1012/1853] New package: gargoyle-2023.1

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

diff --git a/srcpkgs/gargoyle/template b/srcpkgs/gargoyle/template
new file mode 100644
index 000000000000..e153c0841e6f
--- /dev/null
+++ b/srcpkgs/gargoyle/template
@@ -0,0 +1,24 @@
+# Template file for 'gargoyle'
+pkgname=gargoyle
+version=2023.1
+revision=1
+build_style=cmake
+configure_args="-DWITH_TTS=on -DWITH_QT6=false"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+makedepends="SDL2-devel SDL2_mixer-devel qt5-devel fmt-devel fontconfig-devel
+ freetype-devel libjpeg-turbo-devel libpng-devel speech-dispatcher-devel
+ zlib-devel"
+short_desc="Interactive fiction player that supports all the major IF formats"
+maintainer="Aicaya Maro <aicaya@posteo.net>"
+license="Artistic-2.0, BSD-2-Clause, BSD-3-Clause, GPL-2.0-only, MIT, OFL-1.1"
+homepage="https://ccxvii.net/gargoyle/"
+changelog="https://raw.githubusercontent.com/garglk/garglk/master/NEWS"
+distfiles="https://github.com/garglk/garglk/archive/refs/tags/${version}.tar.gz"
+checksum=f766186558f8db24243cede878f38b8a2026bf2ebed5d9d4f0e690916d56827a
+
+post_install() {
+	vconf garglk/garglk.ini
+	vlicense licenses/BSD-2-Clause.txt
+	vlicense 'licenses/Go Mono.txt' Go-Mono-BSD-3-Clause.txt
+	vlicense 'licenses/MIT License.txt' MIT.txt
+}

From 903980a8240f61dbadf9487b515cdf5386dee1c9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 1013/1853] libgbinder: update to 1.1.34.

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

diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..13a2e9a6f684 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
 # Template file for 'libgbinder'
 pkgname=libgbinder
-version=1.1.31
+version=1.1.34
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/mer-hybris/libgbinder"
 changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
 distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=f9150de954a3f15c863e7b60816dacf68147ae510b3ca0e49dbb24ba4b9e35dc
 
 post_install() {
 	vlicense LICENSE

From 9229c0814e82ec36040f582ceb9283b2fc5c59dc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 00:52:40 -0400
Subject: [PATCH 1014/1853] gwenview: depend on qt5-imageformats

without qt5-imageformats, some image formats fail to load (like TIFF)
---
 srcpkgs/gwenview/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 4ab9a1c9ab0a..0f1f582dc87a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenview'
 pkgname=gwenview
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,6 +14,7 @@ makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-dev
  kparts-devel kcoreaddons-devel kconfig-devel kservice-devel kcompletion-devel
  kitemviews-devel kxmlgui-devel kconfigwidgets-devel kauth-devel kcodecs-devel
  sonnet-devel"
+depends="qt5-imageformats"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"

From 3fa6fc17811befd35bcd089a61aa99c0c0fb3121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 9 Jun 2021 00:44:37 +0200
Subject: [PATCH 1015/1853] New package: highway-1.0.4

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

diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template
new file mode 100644
index 000000000000..47c51ec1d616
--- /dev/null
+++ b/srcpkgs/highway/template
@@ -0,0 +1,19 @@
+# Template file for 'highway'
+pkgname=highway
+version=1.0.4
+revision=1
+build_style=cmake
+configure_args="-DHWY_SYSTEM_GTEST=ON -DHWY_ENABLE_EXAMPLES=OFF"
+makedepends="libatomic-devel"
+checkdepends="gtest-devel"
+short_desc="C++ library providing portable SIMD/vector intrinsics"
+maintainer="Joshua Krämer <joshua@kraemer.link>"
+license="Apache-2.0"
+homepage="https://github.com/google/highway"
+changelog="https://raw.githubusercontent.com/google/highway/master/debian/changelog"
+distfiles="https://github.com/google/highway/archive/${version}.tar.gz"
+checksum=faccd343935c9e98afd1016e9d20e0b8b89d908508d1af958496f8c2d3004ac2
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi

From 35d8fbf54c93007d5dee95987e9b47cade3f914d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 9 Jun 2021 01:52:29 +0200
Subject: [PATCH 1016/1853] New package: libjxl-0.8.2

---
 common/shlibs           |  3 ++
 srcpkgs/libjxl-devel    |  1 +
 srcpkgs/libjxl-plugins  |  1 +
 srcpkgs/libjxl-tools    |  1 +
 srcpkgs/libjxl/template | 75 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 81 insertions(+)
 create mode 120000 srcpkgs/libjxl-devel
 create mode 120000 srcpkgs/libjxl-plugins
 create mode 120000 srcpkgs/libjxl-tools
 create mode 100644 srcpkgs/libjxl/template

diff --git a/common/shlibs b/common/shlibs
index c293ac460c08..b34887a091f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,6 @@ libplayerctl.so.2 playerctl-2.4.1_1
 libwireplumber-0.4.so.0 wireplumber-0.4.14_1
 libjodycode.so.2 libjodycode-2.0.1_1
 libgsoapssl++-2.8.124.so gsoap-2.8.124_1
+libjxl.so.0.8 libjxl-0.8.2_1
+libjxl_dec.so.0.8 libjxl-0.8.2_1
+libjxl_threads.so.0.8 libjxl-0.8.2_1
diff --git a/srcpkgs/libjxl-devel b/srcpkgs/libjxl-devel
new file mode 120000
index 000000000000..ddc1abf827d9
--- /dev/null
+++ b/srcpkgs/libjxl-devel
@@ -0,0 +1 @@
+libjxl
\ No newline at end of file
diff --git a/srcpkgs/libjxl-plugins b/srcpkgs/libjxl-plugins
new file mode 120000
index 000000000000..ddc1abf827d9
--- /dev/null
+++ b/srcpkgs/libjxl-plugins
@@ -0,0 +1 @@
+libjxl
\ No newline at end of file
diff --git a/srcpkgs/libjxl-tools b/srcpkgs/libjxl-tools
new file mode 120000
index 000000000000..ddc1abf827d9
--- /dev/null
+++ b/srcpkgs/libjxl-tools
@@ -0,0 +1 @@
+libjxl
\ No newline at end of file
diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
new file mode 100644
index 000000000000..8aa7c970accb
--- /dev/null
+++ b/srcpkgs/libjxl/template
@@ -0,0 +1,75 @@
+# Template file for 'libjxl'
+pkgname=libjxl
+version=0.8.2
+revision=1
+_testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
+_skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
+build_style=cmake
+build_wrksrc="libjxl-${version}"
+configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF
+ -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_PLUGINS=ON -DJPEGXL_VERSION=${version}"
+hostmakedepends="tar pkg-config asciidoc"
+makedepends="brotli-devel highway libpng-devel giflib-devel libjpeg-turbo-devel
+ libopenexr-devel libwebp-devel gdk-pixbuf-devel gimp-devel"
+checkdepends="gtest-devel xdg-utils"
+short_desc="JPEG XL image format reference implementation"
+maintainer="Joshua Krämer <joshua@kraemer.link>"
+license="BSD-3-Clause, custom:Patent grant"
+homepage="https://jpeg.org/jpegxl/"
+changelog="https://raw.githubusercontent.com/libjxl/libjxl/main/CHANGELOG.md"
+distfiles="https://github.com/libjxl/libjxl/archive/v${version}.tar.gz
+ https://github.com/libjxl/testdata/archive/${_testdata_hash}.tar.gz>testdata-${_testdata_hash}.tar.gz
+ https://skia.googlesource.com/skcms/+archive/${_skcms_hash}.tar.gz>skcms-${_skcms_hash}.tar.gz"
+checksum="c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420
+ 64658d3341bff2976899cb8b140242ffa4de1cd41aed507dfec4aa9e7e05ca24
+ @8feb1e33c38ca13f91a0d5bd8ce25f976eb239edf38f49e6db8895ae9f1e833c"
+skip_extraction="skcms-${_skcms_hash}.tar.gz"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LIBS="-latomic"
+fi
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
+
+post_extract() {
+	mv "testdata-${_testdata_hash}"/* "${build_wrksrc}/testdata/"
+	bsdtar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/skcms-${_skcms_hash}.tar.gz" -C "${build_wrksrc}/third_party/skcms"
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense PATENTS
+}
+
+libjxl-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} highway brotli-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libjxl-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+	}
+}
+
+libjxl-plugins_package() {
+	short_desc+=" - plugins"
+	depends="desktop-file-utils"
+	pkg_install() {
+		vmove usr/lib/gdk-pixbuf-2.0
+		vmove usr/lib/gimp
+		vmove usr/share/mime
+		vmove usr/share/thumbnailers
+	}
+}

From 1c03e685cc81519668f62858da7cfd15bf23709f Mon Sep 17 00:00:00 2001
From: Joshua <joshua@kraemer.link>
Date: Wed, 30 Mar 2022 21:23:16 +0200
Subject: [PATCH 1017/1853] kimageformats: enable JPEG XL support

---
 srcpkgs/kimageformats/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 21dd21420fac..364ad440219e 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,13 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.107.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
  pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-devel"
+makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-devel
+ libjxl-devel"
 short_desc="KDE Plugins to allow QImage to support extra file formats"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
@@ -14,7 +15,7 @@ homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kimageformats-${version}.tar.xz"
 checksum=97258ad36bf98cd1aaeeb29c49946031f5051d9984bda9f41fda5a35ccd4d1c1
 
-if [ "$XBPS_MACHINE" = i686 ]; then
-	# FIXME: some tests fail on i686.
-	make_check=no
-fi
+# FIXME: some tests fail on i686.
+# FIXME: 1 test fails on all archs, solved by
+# https://invent.kde.org/frameworks/kimageformats/-/commit/41f0411b62d10d602a4def0c0d12975e77a16028
+make_check=no

From 6049eb55097e43e823dd7702307413b651410f5a Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Wed, 21 Jun 2023 01:56:57 +0200
Subject: [PATCH 1018/1853] limine: update to 5.20230620.0.

---
 srcpkgs/limine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index f986e43f675c..e89d2ba08339 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230615.0
+version=5.20230620.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=f17b816aa7b88ab0e66a32e45afad55accee41cd336aba372c2a3eca7e0a41ad
+checksum=347ce98e56ada7ca7ce00e430f5b82f57dc49f4b363f33c98c8bc4cba02b73d6
 
 post_install() {
 	vlicense LICENSE

From e1c9f362fe5550e6a7e98343ff4a7327880f15a0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 20 Jun 2023 21:10:34 +0200
Subject: [PATCH 1019/1853] leftwm: update to 0.4.2

---
 srcpkgs/leftwm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leftwm/template b/srcpkgs/leftwm/template
index f872956e22c1..2b744bdb4dd4 100644
--- a/srcpkgs/leftwm/template
+++ b/srcpkgs/leftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'leftwm'
 pkgname=leftwm
-version=0.4.1
+version=0.4.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features --features lefthk,sys-log"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/leftwm/leftwm"
 changelog="https://raw.githubusercontent.com/leftwm/leftwm/main/CHANGELOG"
 distfiles="https://github.com/leftwm/leftwm/archive/refs/tags/${version}.tar.gz"
-checksum=fe10c6ef9f458a889ff0020d348e0185eeba8c606e2fb8ac04a78ac214ce40bc
+checksum=97a86b2966d20fd56237905fd90692a873e979759831f6030da2db9d5dc11f2b
 
 do_install() {
 	vdoc README.md

From aca232963ece8673fc81af8324295a844f4093fd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 20 Jun 2023 00:37:48 +0530
Subject: [PATCH 1020/1853] rust-analyzer: update to 2023.06.19.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index ec58fe55835a..6c417b01509d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.06.05
+version=2023.06.19
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=ae616d81e31df1f97342d2f55c0fe1b82fe88f4773a98bb6cb04e9303bf3d612
+checksum=3365b6a8de1929a73af198520f3169f146ab882b47b41146045ea8217fcdcd61
 # tests require Rust source code
 make_check=no
 

From e669204ee7ebc94b6de1153f515c71b6235febb4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Jun 2023 23:30:59 +0530
Subject: [PATCH 1021/1853] cargo-outdated: update to 0.13.1.

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index fc5ea5a43561..82e4996327a1 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
-version=0.11.2
+version=0.13.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config zlib-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/kbknapp/cargo-outdated"
 changelog="https://raw.githubusercontent.com/kbknapp/cargo-outdated/master/CHANGELOG.md"
 distfiles="https://github.com/kbknapp/cargo-outdated/archive/refs/tags/v${version}.tar.gz"
-checksum=7e82d1507594d86cb1c2007d58e329a9780a22bdb0f38d5e71d2692a7f1727d9
+checksum=571910b0c44f0bcf0b6e5c24184247e4603f474c7bde5f0eaa1203ce802b4a4a
 
 post_install() {
 	vlicense LICENSE-MIT

From e14280f1fc7bad8e176798b2b2e7482e93732e80 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:13:23 -0400
Subject: [PATCH 1022/1853] python3-saml2: update to 7.4.2.

---
 srcpkgs/python3-saml2/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 9583564c1008..dfc944b67c7e 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=7.4.1
+version=7.4.2
 revision=1
 build_style=python3-pep517
 make_check_args="--ignore=tests/test_36_mdbcache.py \
@@ -17,9 +17,4 @@ license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=33afba452544662887f6eb8c6405aeebfa4017dc7762e414ab4318f2f9d9bb6d
-make_check_pre="env PYTHONPATH=src"
-
-pre_check() {
-	unzip ${make_install_target} "*.dist-info/*"
-}
+checksum=dfeaa53854467cdcdae1b0fb2c76a3610f8b179dca8176757d245db7fa7ad806

From 524c5b30db54ffd21282315b2ef1ebffc4e8a958 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:13:35 -0400
Subject: [PATCH 1023/1853] python3-phonenumbers: update to 8.13.14.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index e0fd2119165f..4e85b29c598e 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.13.13
+version=8.13.14
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=4bdf8c989aff0cdb105aef170ad2c21f14b4537bcb32cf349f1f710df992a40a
+checksum=5fa952b4abf9fccdaf1f130d96114a520c48890d4091b50a064e22c0fdc12dec

From 842497ad712cd7c142b9b2447d24dd9e03caf654 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:15:09 -0400
Subject: [PATCH 1024/1853] python3-ijson: update to 3.2.1.

---
 srcpkgs/python3-ijson/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template
index b2656c5eb283..41914046d28b 100644
--- a/srcpkgs/python3-ijson/template
+++ b/srcpkgs/python3-ijson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ijson'
 pkgname=python3-ijson
-version=3.2.0.post0
+version=3.2.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -11,8 +11,9 @@ short_desc="Iterative JSON parser with Pythonic interfaces"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/ICRAR/ijson"
+changelog="https://raw.githubusercontent.com/ICRAR/ijson/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/ijson/ijson-${version}.tar.gz"
-checksum=80a5bd7e9923cab200701f67ad2372104328b99ddf249dbbe8834102c852d316
+checksum=8574bf19f31fab870488769ad919a80f130825236ac8bde9a733f69c2961d7a7
 
 post_install() {
 	vlicense LICENSE.txt

From dfa1e54dba27e7016b9fda5f8875157b32b56e99 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:15:52 -0400
Subject: [PATCH 1025/1853] synapse: update to 1.86.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 81f887e451ff..f0a91c560e6d 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.85.2
+version=1.86.0
 revision=1
 build_style=python3-pep517
 build_helper=rust
@@ -24,7 +24,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=a227c7347996eae008e0f8f0f2e9290c70e1d96e7687293b2ebd1533766ad43b
+checksum=891cef42dcf71f7f01e6db22c25c1724d2a137f8347c5ba89c62a439ec623842
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 6215eaed3950945ef0c5b6c764d70a71a9db91cf Mon Sep 17 00:00:00 2001
From: Massimo Manzato <massimo.manzato@gmail.com>
Date: Wed, 3 May 2023 23:37:38 +0200
Subject: [PATCH 1026/1853] New package: a4-0.2.1

---
 srcpkgs/a4/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/a4/template

diff --git a/srcpkgs/a4/template b/srcpkgs/a4/template
new file mode 100644
index 000000000000..42c3ee99ade7
--- /dev/null
+++ b/srcpkgs/a4/template
@@ -0,0 +1,16 @@
+# Template file for 'a4'
+pkgname=a4
+version=0.2.1
+revision=1
+build_style=gnu-makefile
+makedepends="libvterm-devel libtickit-devel"
+short_desc="Dynamic terminal manager and multiplexer"
+maintainer="Massimo Manzato <massimo.manzato@gmail.com>"
+license="MIT"
+homepage="https://a4term.com/"
+distfiles="https://github.com/rpmohn/a4/archive/v${version}.tar.gz"
+checksum=52e16e58ac52b9157933a3fd1063bc79e8dfa2f72ea2b4f03e77327bbec2c59e
+
+post_install() {
+	vlicense LICENSE
+}

From 3ad94315261878ea9c9c9ade62dbb9fb27605227 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Jun 2023 01:19:58 +0530
Subject: [PATCH 1027/1853] jrnl: update to 4.0.1.

---
 srcpkgs/jrnl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index a1936a09ea5c..63ac0518d956 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=4.0
+version=4.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=ea690cb141cbd39f491eca6c56605491facbaa9397cfa8f9fcae5b926efd522d
+checksum=f3b17c4b040af44fde053ae501832eb313f2373d1b3b1a82564a8214d223ede8
 # Tarball provides no tests
 make_check=no

From 11e006522439e30778b79ac9343fa5cc596ce93f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 15 Jun 2023 22:00:12 +0530
Subject: [PATCH 1028/1853] himalaya: update to 0.8.1.

---
 srcpkgs/himalaya/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index a115d4e5562c..6143999a060d 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,6 +1,6 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.8.0
+version=0.8.1
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -12,7 +12,11 @@ license="MIT"
 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=c9bf62c802b05d3c98e105513042eafbbcbed4c5ed61aec7addae185accc5b40
+checksum=0a4d6325f541e0eb1b23c2f9b6b47eb01feaf78a0eb3fd5a29624990d9ca0e23
+
+post_patch() {
+	cargo update --package crossbeam-channel@0.5.6 --precise 0.5.8
+}
 
 post_install() {
 	vlicense LICENSE

From 41638c02681535ff1765cee6e522710832b3340d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 16 Jun 2023 19:40:01 +0530
Subject: [PATCH 1029/1853] fselect: update to 0.8.4.

---
 srcpkgs/fselect/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 9a9fe4371235..2aa8aa8bf435 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,7 +1,7 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.8.3
-revision=2
+version=0.8.4
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libzstd-devel"
@@ -11,7 +11,7 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/jhspetersson/fselect"
 changelog="https://github.com/jhspetersson/fselect/releases"
 distfiles="https://github.com/jhspetersson/fselect/archive/refs/tags/${version}.tar.gz"
-checksum=2b8e8b40ef490663239f3a24f9383fd5b832530e96513d58755b688b507d876e
+checksum=db720310ff265012f283f9fdfb4ac99188bb4a3cbfe5550171c7e2ab55a36420
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) ;;
@@ -23,10 +23,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	XBPS_CROSS_RUSTFLAGS+=" -latomic"
 fi
 
-post_patch() {
-	cargo update --package mp4parse@0.12.0 --precise 0.12.1
-}
-
 post_install() {
 	vlicense LICENSE-MIT
 	vman docs/fselect.1

From 486726ac30878dec2072e0f699b74ef70e335b8b Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 15 Jun 2023 20:32:55 +0200
Subject: [PATCH 1030/1853] qmidiarp: update to 0.7.0

---
 srcpkgs/qmidiarp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qmidiarp/template b/srcpkgs/qmidiarp/template
index 964024906a6f..72ed7bb6bf8f 100644
--- a/srcpkgs/qmidiarp/template
+++ b/srcpkgs/qmidiarp/template
@@ -1,6 +1,6 @@
 # Template file for 'qmidiarp'
 pkgname=qmidiarp
-version=0.6.7
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="http://qmidiarp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/project/qmidiarp/qmidiarp/${version}/qmidiarp-${version}.tar.bz2"
-checksum=1bc73896e33da0aa52e90f16f393acb437594b0a9ad8fc97d73b39e028589c2c
+checksum=b4296a67febbd2930058075cd7de021663f12586699d39d851c5e6e36dc92828
 CXXFLAGS="-D_GNU_SOURCE"
 
 pre_configure() {

From b451eed41e4839b5328d938355f7b7ae9305d5cb Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 15 Jun 2023 18:33:05 +0200
Subject: [PATCH 1031/1853] mkvtoolnix: update to 77.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 3a7c0cd37a3f..c974ebabbdd3 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=76.0
+version=77.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6ace661b61a49d1026b1a97336051d7aa85d56fb34527f2ca97d8933f7efe90d
+checksum=5f0cb2b7afe39226d0d41bd7ba098db669981da8c4b455862faffae04ca8e57a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 60500c2308e402f55de30d4f17a1d064d9bfe765 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 18:11:21 +0100
Subject: [PATCH 1032/1853] libde265: update to 1.0.12.

---
 srcpkgs/libde265/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libde265/template b/srcpkgs/libde265/template
index a9c70c63a41c..1e3048f509b4 100644
--- a/srcpkgs/libde265/template
+++ b/srcpkgs/libde265/template
@@ -1,6 +1,6 @@
 # Template file for 'libde265'
 pkgname=libde265
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,12 @@ license="LGPL-3.0-or-later"
 homepage="https://www.libde265.org"
 changelog="https://github.com/strukturag/libde265/releases"
 distfiles="https://github.com/strukturag/libde265/releases/download/v${version}/libde265-${version}.tar.gz"
-checksum=2f8f12cabbdb15e53532b7c1eb964d4e15d444db1be802505e6ac97a25035bab
+checksum=62185ea2182e68cf68bba20cc6eb4c287407b509cf0a827d7ddb75614db77b5c
+
+post_install() {
+	# Why is this installed anyway?
+	rm -f ${DESTDIR}/bin/tests
+}
 
 libde265-devel_package() {
 	short_desc+=" - development files"

From 85c7edcdfbaa7f0f098b8e7c84293d50cd30b3c0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 16 Jun 2023 05:56:45 +0200
Subject: [PATCH 1033/1853] tuxedo-keyboard: update to 3.2.6

---
 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 79d6181124b5..35b92c83debc 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.5
+version=3.2.6
 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=ec8f4608018d7702a8b89734b1c91152b597984bf37242924d8f76d270a74580
+checksum=154d5bcda595aa20941d7d98d5baae882d02a7ee26e9c014f6f99b9ae8a19274
 
 dkms_modules="tuxedo-keyboard ${version}"
 

From 2bf4adf261743d0cc81656f52a19b59a3996eb2f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 17:37:30 +0100
Subject: [PATCH 1034/1853] libevent: fix update-checka and do small cleanup.

---
 srcpkgs/libevent/template | 6 +++---
 srcpkgs/libevent/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index c0503e2760e3..de59faa1e760 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -7,7 +7,7 @@ makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://libevent.org/"
+homepage="https://libevent.org/"
 distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"
 checksum=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 python_version=3
@@ -23,7 +23,7 @@ libevent-devel_package() {
 		vmove usr/bin
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/libevent/update b/srcpkgs/libevent/update
index 5ef6a1abbe65..0c24f7209946 100644
--- a/srcpkgs/libevent/update
+++ b/srcpkgs/libevent/update
@@ -1 +1 @@
-pattern="release-\K[\d.]+"
+pattern="release-\K[\d.]+(?=-stable)"

From 68f265605e62799c15d30d0c429b6e5c1559115c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 17:29:08 +0100
Subject: [PATCH 1035/1853] libgusb: update to 0.4.6.

---
 srcpkgs/libgusb/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 80663c38a5ff..8cf0579cc9a5 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.4.5
+version=0.4.6
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,13 +15,19 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
 distfiles="https://github.com/hughsie/libgusb/releases/download/${version}/libgusb-${version}.tar.xz"
-checksum=bc8c6328289f057c8f73b07c1ba6251de96029787309f2672ca252ca90ace1b2
+checksum=1b0422bdcd72183272ac42eec9398c5a0bc48a02f618fa3242c468cbbd003049
 # requires access to USB devices, not available on CI
 make_check=ci-skip
 
 build_options="gir vala"
 build_options_default="gir vala"
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=true"
+else
+	configure_args+=" -Dtests=false"
+fi
+
 libgusb-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 97c9f279123b631c5c3a078b6e5a81bcb5e193d8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 16:51:15 +0100
Subject: [PATCH 1036/1853] python3-txtorcon: update to 23.5.0.

---
 srcpkgs/python3-txtorcon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
index 07e5fedce66b..4e6d5a3b7b07 100644
--- a/srcpkgs/python3-txtorcon/template
+++ b/srcpkgs/python3-txtorcon/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-txtorcon'
 pkgname=python3-txtorcon
-version=22.0.0
+version=23.5.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://txtorcon.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/meejah/txtorcon/main/docs/releases.rst"
 distfiles="https://github.com/meejah/txtorcon/archive/v${version}.tar.gz"
-checksum=195c2e3d1ed4ad564570d20af54812163ca1de9e9ee034f0c8276fd4410759e7
+checksum=01a98243caf49035a0e823f6633fb2c4ea9613aa123dda063845bf7ee5c920de
 make_check=ci-skip # Can not open ports in CI
 
 post_install() {

From 81d4aa314ae0f702bf830d2a246718eacbc469ad Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 15 Jun 2023 21:09:58 +0100
Subject: [PATCH 1037/1853] android-udev-rules: update to 20230614.

---
 srcpkgs/android-udev-rules/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/android-udev-rules/template b/srcpkgs/android-udev-rules/template
index c4e475a1d68d..a26e4998cd30 100644
--- a/srcpkgs/android-udev-rules/template
+++ b/srcpkgs/android-udev-rules/template
@@ -1,13 +1,14 @@
 # Template file for 'android-udev-rules'
 pkgname=android-udev-rules
-version=20230303
+version=20230614
 revision=1
 short_desc="Android udev rules list aimed to be the most comprehensive on the net"
 maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/M0Rf30/android-udev-rules"
+changelog="https://github.com/M0Rf30/android-udev-rules/releases"
 distfiles="https://github.com/M0Rf30/android-udev-rules/archive/${version}.tar.gz"
-checksum=be0ef595f1ff1262696ac63fa2fc16998da02c170b49be461cfc712cd4317a9f
+checksum=563b8f3194110b7173dfaad61e74da2842b28c4f2409dedce04d5572ef2f056f
 system_groups="adbusers"
 
 do_install() {

From aa8a2a22a51999c79bd88c02db0e2cb63aa3eff1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 18:42:20 +0100
Subject: [PATCH 1038/1853] xkeyboard-config: update to 2.39.

---
 srcpkgs/xkeyboard-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 863789a22775..53165fd127af 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,6 +1,6 @@
 # Template file for 'xkeyboard-config'
 pkgname=xkeyboard-config
-version=2.38
+version=2.39
 revision=1
 build_style=meson
 configure_args="-Dxorg-rules-symlinks=true -Dcompat-rules=true"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 changelog="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/raw/master/NEWS"
 distfiles="${XORG_SITE}/data/xkeyboard-config/xkeyboard-config-${version}.tar.xz"
-checksum=0690a91bab86b18868f3eee6d41e9ec4ce6894f655443d490a2184bfac56c872
+checksum=5ac5f533eff7b0c116805fe254fd79b2c9882700a4f9f2c070f8c4eae5aaa682
 
 post_install() {
 	vlicense COPYING

From 3454fc6f4bfe64df9115d09762367853dafad6e2 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Tue, 13 Jun 2023 10:21:50 -0700
Subject: [PATCH 1039/1853] tintin: update to 2.02.31.

---
 srcpkgs/tintin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index 40027cacd809..c5c338dea1a2 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.02.20
+version=2.02.31
 revision=1
 build_wrksrc=src
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Michael Taboada <voidpkgs@forwardme.email>"
 license="GPL-2.0-or-later"
 homepage="https://tintin.mudhalla.net/"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=331673e6ee3c945cf27e1c0d71cec1225c9d992588ed73b2a707c4c49523e8d2
+checksum=0c94fbbbbac4e96b25898f32c147dfdab6f4ee77ea72ba77700086e2c966ee4b
 
 post_install() {
 	for i in FAQ SCRIPTS README; do

From b70918802abc4e996b382835f66a43aeaf7ddfb1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 15:42:35 +0100
Subject: [PATCH 1040/1853] iproute2: update to 6.3.0.

---
 srcpkgs/iproute2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 413c49151c02..6d188731ec1f 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/iproute2/iproute2-${version}.tar.xz"
-checksum=4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62
+checksum=dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732
 # Requires unshare, which is not provided by chroot-util-linux.
 make_check=no
 

From b783eca0166112b53465797ef3cd69be7510ba3e Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Tue, 13 Jun 2023 11:31:00 -0300
Subject: [PATCH 1041/1853] nextcloud-client: update to 3.9.0

---
 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 8d667180293f..6ad1a0619f4d 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.2
+version=3.9.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_UPDATER=NO -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=6186aaa70b82b06b4531cff2e55e0dd38a0d817de7ef039a81293d82cb05e8c0
+checksum=867d0d1f1d950ce224ea78d3009a89e7bedc3317bb9dc45a9f9ff961e4913201
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 

From 68ecce94423fea8bca0e1c2b11841a3caf719380 Mon Sep 17 00:00:00 2001
From: 0cool-f <ravnos@duck.com>
Date: Tue, 13 Jun 2023 15:31:06 +0200
Subject: [PATCH 1042/1853] pnpm: update to 8.6.2

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index f3e52bc62974..09d40e5b7124 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=8.6.1
+version=8.6.2
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=5380612e01e0a3029991d3f329f07429313f4825de47b885b4bb3d1aec9e44e1
+checksum=c6da9e00697e334b6193c034a5d1508e4c8605b12f249736b13f31139f4f0d73
 python_version=3
 
 do_install() {

From 5204d76015f608fd9aaf2a328f4641d4a06cad1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 22 Jun 2023 12:56:35 +0200
Subject: [PATCH 1043/1853] ostree: update to 2023.4.

---
 srcpkgs/ostree/patches/missing-off-t.patch | 14 ++++++++++
 srcpkgs/ostree/patches/musl-fixes.patch    | 31 ----------------------
 srcpkgs/ostree/template                    |  4 +--
 3 files changed, 16 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/ostree/patches/missing-off-t.patch
 delete mode 100644 srcpkgs/ostree/patches/musl-fixes.patch

diff --git a/srcpkgs/ostree/patches/missing-off-t.patch b/srcpkgs/ostree/patches/missing-off-t.patch
new file mode 100644
index 000000000000..67864dc55c93
--- /dev/null
+++ b/srcpkgs/ostree/patches/missing-off-t.patch
@@ -0,0 +1,14 @@
+From https://git.alpinelinux.org/aports/tree/community/ostree/missing-off-t.patch
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 8fcd5e8..2454a58 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint
+ /* This is a roundabout but more trustworthy way of doing a space check than
+  * relying on statvfs's f_bfree when you know the size of the objects. */
+ static gboolean
+-dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error)
++dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error)
+ {
+   /* If the requested size is 0 then return early. Passing a 0 len to
+    * fallocate results in EINVAL */
diff --git a/srcpkgs/ostree/patches/musl-fixes.patch b/srcpkgs/ostree/patches/musl-fixes.patch
deleted file mode 100644
index e9a578a3e666..000000000000
--- a/srcpkgs/ostree/patches/musl-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/config.h.in
-+++ b/config.h.in
-@@ -1,5 +1,15 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Define if we are building with asan and ubsan */
- #undef BUILDOPT_ASAN
- 
---- a/src/libostree/ostree-repo-checkout.c
-+++ b/src/libostree/ostree-repo-checkout.c
-@@ -37,6 +37,10 @@
- 
- #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh."
- 
-+#ifndef ALLPERMS
-+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+#endif
-+
- /* Per-checkout call state/caching */
- typedef struct {
-   GString *path_buf; /* buffer for real path if filtering enabled */
diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template
index 4eab7462e297..3d30742c6b8e 100644
--- a/srcpkgs/ostree/template
+++ b/srcpkgs/ostree/template
@@ -1,6 +1,6 @@
 # Template file for 'ostree'
 pkgname=ostree
-version=2023.3
+version=2023.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -20,7 +20,7 @@ license="LGPL-2.0-or-later"
 homepage="https://ostree.readthedocs.io/en/latest/"
 changelog="https://github.com/ostreedev/ostree/releases"
 distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=9c575a094da2c307769f0aee15de95470c3b5550cbff211fbbc4f6fc75f333b1
+checksum=7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1
 
 build_options="gir"
 build_options_default="gir"

From f639d5c79485849c9ad7e282325b7246afb397bf Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:34:02 +0200
Subject: [PATCH 1044/1853] lua54: update to 5.4.6, adopt.

---
 srcpkgs/lua54/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template
index b37cc47e6159..85c728209672 100644
--- a/srcpkgs/lua54/template
+++ b/srcpkgs/lua54/template
@@ -1,14 +1,14 @@
 # Template file for 'lua54'
 pkgname=lua54
-version=5.4.4
+version=5.4.6
 revision=1
 makedepends="readline-devel"
 short_desc="Powerful, fast, lightweight, embeddable scripting language (5.4.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://www.lua.org"
 distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
-checksum=164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61
+checksum=7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88
 
 alternatives="
  lua:lua:/usr/bin/lua5.4

From 968b362349329dcb4ac2706d50ceded4b2a4ba3e Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 26 May 2023 18:24:32 +0200
Subject: [PATCH 1045/1853] gogglesmm: update to 1.2.3

---
 srcpkgs/gogglesmm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 4a1339bb3fcd..459e26041c51 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,13 +1,13 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
-version=1.2.2
-revision=2
+version=1.2.3
+revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
  libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
- faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
+ faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel libxml2-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gogglesmm.github.io/"
 changelog="https://raw.githubusercontent.com/gogglesmm/gogglesmm/master/ChangeLog"
 distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
-checksum=e9d576584ea48346cd3b577967ccb40bf67113b91e8252d62052be3725b9d9fa
+checksum=4315ea4d9894fa2c7f160c73e5464b91b7a00f22964910adb77e1e9b94273006
 nocross="Tries to execute compiled code"
 
 case "$XBPS_TARGET_MACHINE" in

From 4b299c3b109ee0aa09e4a4145d9d6466faca3407 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 13 Jun 2023 13:23:20 -0400
Subject: [PATCH 1046/1853] bottom: update to 0.9.2

---
 srcpkgs/bottom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index d706fd7dffb4..14ba5d3219cc 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 changelog="https://raw.githubusercontent.com/ClementTsang/bottom/master/CHANGELOG.md"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=15136784ba4783c994bbfc1fe978ccf47360b2f2aa14ce37f8d5f93871ec9d57
+checksum=c6b1f6eefa814607cbc6f1ebf6358a070293413d09583963970d650b724a3b3a
 
 pre_build() {
 	export BTM_GENERATE=true

From 8d066513528617995dbf720ac3e5fbe3c426af47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 17 Jun 2023 09:40:18 -0400
Subject: [PATCH 1047/1853] qownnotes: update to 23.6.5

---
 srcpkgs/qownnotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index d79035baacce..9d8192e6e502 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=23.2.3
+version=23.6.5
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/qownnotes/src/qownnotes-${version}.tar.xz"
-checksum=a7e76c8ed93c2c708a9707b68db88c19b56d3d20006bc1d0e343fd06a091fdb8
+checksum=1531a9b69e9159525874b5ed0c8e5cca6b756cdafed321e4d302c23ae4dbc651
 
 pre_build() {
 	vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri

From 02faab4dc402a1929f95aba6124607c2d315dd57 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 02:07:46 +0300
Subject: [PATCH 1048/1853] python3-graphviz: update to 0.20.1

---
 srcpkgs/python3-graphviz/template | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-graphviz/template b/srcpkgs/python3-graphviz/template
index 045a3782f743..399f873fa1cb 100644
--- a/srcpkgs/python3-graphviz/template
+++ b/srcpkgs/python3-graphviz/template
@@ -1,18 +1,25 @@
 # Template file for 'python3-graphviz'
 pkgname=python3-graphviz
-version=0.13.2
-revision=4
+version=0.20.1
+revision=1
 build_style=python3-module
-pycompile_module="graphviz"
 hostmakedepends="python3-setuptools"
 depends="graphviz python3"
+checkdepends="python3-pytest-mock ${depends}"
 short_desc="Simple Python3 interface for Graphviz"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xflr6/graphviz"
 changelog="https://github.com/xflr6/graphviz/blob/master/CHANGES.txt"
 distfiles="https://github.com/xflr6/graphviz/archive/${version}.tar.gz"
-checksum=bb932d6833e7c62ac6b53624b6d55bfd81f40e861f55642e1221ac4f4d8421b4
+checksum=815346b8c2fcd8ccede29623a67bfc30abdbb75749e96128b9d414573d6d8f04
+
+post_extract() {
+	# do not run python3-coverage in unittests :/
+	vsed -i setup.cfg -e 's/--cov --cov-report=term --cov-report=html//'
+	# don't add pointless dependency on python3-pytest-mock needed on python 3.5
+	vsed -i setup.cfg -e '/mock_use_standalone_module/d'
+}
 
 post_install() {
 	vlicense LICENSE.txt

From 33d3b99b5fc86fe1c1c4a976590293519ce13a55 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 01:33:24 +0300
Subject: [PATCH 1049/1853] python3-Markdown: update to 3.4.3

---
 srcpkgs/python3-Markdown/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index 417db04401d2..2974a088eff5 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -1,19 +1,23 @@
 # Template file for 'python3-Markdown'
 pkgname=python3-Markdown
-version=3.3.4
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+version=3.4.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3"
 checkdepends="python3-yaml"
 short_desc="Python3 implementation of John Gruber's Markdown"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Python-Markdown/markdown"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
-checksum=31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49
+checksum=8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520
 conflicts="python-Markdown>=0"
 
+do_check() {
+	python3 -m unittest discover tests
+}
+
 post_install() {
 	vlicense LICENSE.md LICENSE
 }

From 6a3f02e917f3a9db98591a9825b1523090e98163 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 20 Apr 2023 14:13:10 +0530
Subject: [PATCH 1050/1853] python3-virtualenv: update to 20.23.1.

---
 srcpkgs/python3-virtualenv/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 83d61a5f619b..a9673a38307c 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,8 +1,10 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.21.0
+version=20.23.1
 revision=1
 build_style=python3-pep517
+make_check_args="--ignore tests/unit/seed/wheels/test_periodic_update.py
+ --deselect tests/unit/seed/wheels/test_acquire.py::test_get_wheel_download_cached"
 hostmakedepends="hatchling hatch-vcs"
 depends="python3-platformdirs python3-distlib python3-filelock"
 checkdepends="${depends} python3-pytest-mock python3-flaky python3-devel
@@ -13,16 +15,9 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=f50e3e60f990a0757c9b68333c9fdaa72d7188caa417f96af9e52407831a3b68
+checksum=8ff19a38c1021c742148edc4f81cb43d7f8c6816d2ede2ab72af5b84c749ade1
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
-do_check() {
-	local testdir="tmp/$(date +%s)"
-	python3 -m installer --destdir ${testdir} dist/virtualenv-${version}-*-*-*.whl
-	_skip="test_periodic_update or test_get_wheel_download_cached or test_py_pyc_missing or test_py_info_setuptools"
-	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" pytest3 -k "not(${_skip})"
-}
-
 post_install() {
 	mv $DESTDIR/usr/bin/virtualenv $DESTDIR/usr/bin/virtualenv3
 	vlicense LICENSE

From 8a730d27b8532ff5eaf20a1e19821a837b109106 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 22 Jun 2023 13:07:47 +0200
Subject: [PATCH 1051/1853] libxml2: update to 2.11.4.

---
 srcpkgs/libxml2/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c262fd43f2ee..5041c99e5819 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2'
 pkgname=libxml2
-version=2.11.2
-revision=2
+version=2.11.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu
  --with-legacy --with-ftp --with-xptr-locs --enable-static"
@@ -13,10 +13,16 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.gnome.org/GNOME/libxml2"
 distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz"
-checksum=ac11e8b66176d49514bd4fa17c3fbdb3414aef64518ff9db536862e4682e2a64
+checksum=737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
 python_version=3
 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
+post_extract() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm -f test/ebcdic_566012.xml
+	fi
+}
+
 post_install() {
 	vlicense Copyright
 }

From 6df12b6dfb4e5dbedd69655308315dc0a4179c08 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Jun 2023 15:35:00 +0200
Subject: [PATCH 1052/1853] zellij: update to 0.37.2

---
 srcpkgs/zellij/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 74eaf1a73da7..e2fa8282d770 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.36.0
+version=0.37.2
 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=df64fa143c10f3c7c3e53befeb6ab3b8f08c220f3cf6331cfc6faa2aa779b6b1
+checksum=1f22223f251dbd352479d4671c0c742ffa225420667e20711d5515be2eb2a256
 make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
 
 post_install() {

From fc9c27d0fe3d2cdb36ed58356a7db0e164309f00 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 02:22:37 +0300
Subject: [PATCH 1053/1853] rygel: update to 0.42.3

---
 srcpkgs/rygel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 475b5a35a3d3..5239aa389ffa 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,6 +1,6 @@
 # Template file for 'rygel'
 pkgname=rygel
-version=0.42.0
+version=0.42.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Rygel"
 distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=006da78677df28caee287c44c29fcd9edcb1b2162423bc7f2dd2dc856b8e2bbb
+checksum=0fdec2128537e8b55c3c540d0a80dc7c249ab29153f4be0197a5f31025a5a5a0
 
 conf_files="/etc/rygel.conf"
 

From 8fcf09158614965d41f545323041e1a1d1cdeeb6 Mon Sep 17 00:00:00 2001
From: oliver-cfc <oliver.hemming@lumen.com>
Date: Thu, 25 May 2023 14:32:09 -0400
Subject: [PATCH 1054/1853] datamash: update to 1.8.

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: https://github.com/void-linux/void-packages/pull/44080
---
 srcpkgs/datamash/patches/musl-tests.patch | 11 +++++++++++
 srcpkgs/datamash/template                 | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/datamash/patches/musl-tests.patch

diff --git a/srcpkgs/datamash/patches/musl-tests.patch b/srcpkgs/datamash/patches/musl-tests.patch
new file mode 100644
index 000000000000..7666b0560a8e
--- /dev/null
+++ b/srcpkgs/datamash/patches/musl-tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/decorate-errors.pl
++++ b/tests/decorate-errors.pl
+@@ -149,7 +149,7 @@
+     {ERR=>"$prog: invalid dot-decimal IPv4 address 'FOO'\n" .
+           "$prog: conversion failed in line 1\n" }],
+   ['c4', '--decorate -k1,1:ipv4inet' , {IN_PIPE=>"FOO\n"}, {OUT => " "},
+-    {EXIT=>2},
++    {EXIT=>2}, {ERR_SUBST=>'s/: Invalid argument//'},
+     {ERR=>"$prog: invalid IPv4 address 'FOO'\n" .
+           "$prog: conversion failed in line 1\n" }],
+   ['c5', '--decorate -k1,1:ipv6' , {IN_PIPE=>"FOO\n"}, {OUT => " "}, {EXIT=>2},
diff --git a/srcpkgs/datamash/template b/srcpkgs/datamash/template
index 56495d251e80..b483a1709509 100644
--- a/srcpkgs/datamash/template
+++ b/srcpkgs/datamash/template
@@ -1,11 +1,19 @@
 # Template file for 'datamash'
 pkgname=datamash
-version=1.7
+version=1.8
 revision=1
 build_style=gnu-configure
+hostmakedepends="texinfo"
+checkdepends="which"
 short_desc="Command-line program that performs simple calculations on input files"
-maintainer="oliver JH <ohemming@gmail.com>"
+maintainer="oliver <void@bertmacho.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/datamash/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=574a592bb90c5ae702ffaed1b59498d5e3e7466a8abf8530c5f2f3f11fa4adb3
+distfiles="${GNU_SITE}/datamash/datamash-${version}.tar.gz"
+checksum=7ad97e8c7ef616dd03aa5bd67ae24c488272db3e7d1f5774161c18b75f29f6fd
+
+post_extract() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -e '/datamash-i18n-de\.pl/d' -i Makefile.in
+	fi
+}

From efe1c02b98fb74d43da4beaecab7789abb578900 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 22 Jun 2023 07:17:41 -0500
Subject: [PATCH 1055/1853] jc: update to 1.23.3.

---
 srcpkgs/jc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index b5b6f1e819f5..1d3278dd5ca8 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.23.2
+version=1.23.3
 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=d3df831ccaebb17800a7f1feb918daf5e9cf7fd81a12cced1670305aafe8a55e
+checksum=03b746dfa8b393bf96107d71e595597002b255892ff3cf98e36040d54c469abf
 
 post_install() {
 	vman man/jc.1

From dde767213875611432276727e11a9d2a782ef9e5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 22 Jun 2023 07:21:04 -0500
Subject: [PATCH 1056/1853] mongo-c-driver: update to 1.24.1.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index f8ee1fa80f47..85ba5144be96 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.24.0
+version=1.24.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=c37d8965f1e22236241e9474190110cfeeededbe9aa7c630ce8a9c379e97fc47
+checksum=f9bdf71f24c6621c12535bad07f4654a218d84f16b85a68aca3abf6cd36d1859
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 65ddd9ce2bd4ff628e28b495051453541cf44c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 22 Jun 2023 11:44:03 +0200
Subject: [PATCH 1057/1853] homebank: update to 5.6.5.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 0f2226d38d81..9ff1b5a35f27 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.6.4
+version=5.6.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 changelog="http://homebank.free.fr/ChangeLog"
 distfiles="http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"
-checksum=81e1ff4186cf1fa90b48978272011887fa7c0b7b066438bd494f4a0f80ff95b9
+checksum=b5494dfcf87d7a8572696a2afa2a04496ba79e3857cd3e3b18ac03bd1b6d2ca8
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 4bdff042e974198e90c68d5ba502efe1dc97c53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 22 Jun 2023 11:36:31 +0200
Subject: [PATCH 1058/1853] ncpamixer: update to 1.3.3.4.

---
 srcpkgs/ncpamixer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncpamixer/template b/srcpkgs/ncpamixer/template
index 418126589a83..2adac2d5f703 100644
--- a/srcpkgs/ncpamixer/template
+++ b/srcpkgs/ncpamixer/template
@@ -1,6 +1,6 @@
 # Template file for 'ncpamixer'
 pkgname=ncpamixer
-version=1.3.3.3
+version=1.3.3.4
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/fulhax/ncpamixer"
 distfiles="https://github.com/fulhax/ncpamixer/archive/${version}.tar.gz"
-checksum=396099897460bcde2db72134e6652fe9717375fa45300ba2251d284658d3044a
+checksum=78be1b229c0325d58d34efd50cec3d2b0a1cb04fd2b34e4914e6ad29c7c17658
 
 post_install() {
 	vlicense ../LICENSE

From e9905266ea47843c8194d92f02805c5367f26866 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:09:34 +0200
Subject: [PATCH 1059/1853] prose: update to 0.4.2.

---
 srcpkgs/prose/patches/clap.patch | 56 --------------------------------
 srcpkgs/prose/template           |  6 ++--
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/prose/patches/clap.patch

diff --git a/srcpkgs/prose/patches/clap.patch b/srcpkgs/prose/patches/clap.patch
deleted file mode 100644
index 4f1d495a62b5..000000000000
--- a/srcpkgs/prose/patches/clap.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 037bf5b8e14fc0b8b25e00e2e076515148860825 Mon Sep 17 00:00:00 2001
-From: Joshua Davey <josh@joshuadavey.com>
-Date: Sat, 10 Dec 2022 16:28:29 -0500
-Subject: [PATCH] Use usize parser from clap
-
----
- src/main.rs | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/main.rs b/src/main.rs
-index efb0420..fb0e8ad 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -29,16 +29,14 @@ fn process_paragraphs<R: BufRead + ?Sized>(io: &mut R, opts: FormatOpts) -> io::
- 
- fn matches_to_format_opts(matches: &clap::ArgMatches) -> FormatOpts {
-     let width: usize = matches
--        .get_one::<&str>("width")
--        .unwrap()
--        .parse()
-+        .get_one::<usize>("width")
-+        .cloned()
-         .expect("Choose a positive number for width");
-     let last_line = matches.get_flag("last line");
-     let reduce_jaggedness = matches.get_flag("better fit");
-     let tab_width: usize = matches
--        .get_one::<&str>("tab width")
--        .unwrap()
--        .parse()
-+        .get_one::<usize>("tab width")
-+        .cloned()
-         .expect("Choose a positive number for tab width");
-     let format_mode = if matches.get_flag("markdown") {
-         FormatMode::Markdown
-@@ -71,6 +69,7 @@ fn main() {
-              .short('w')
-              .long("width")
-              .value_name("WIDTH")
-+             .value_parser(clap::value_parser!(usize))
-              .default_value("72")
-              .help("Sets the maximum width for a line"))
-         .arg(Arg::new("last line")
-@@ -86,11 +85,13 @@ fn main() {
-         .arg(Arg::new("tab width")
-              .short('t')
-              .long("tab-width")
-+             .value_parser(clap::value_parser!(usize))
-              .default_value("4")
-              .help("Number of spaces to expand tab characters to"))
-         .arg(Arg::new("markdown")
-              .short('m')
-              .long("markdown")
-+             .conflicts_with("code comments")
-              .help("Parse as markdown rather than plain text")
-              .action(ArgAction::SetTrue))
-         .arg(Arg::new("FILE")
diff --git a/srcpkgs/prose/template b/srcpkgs/prose/template
index 5292df719c23..c78a6c20df28 100644
--- a/srcpkgs/prose/template
+++ b/srcpkgs/prose/template
@@ -1,14 +1,14 @@
 # Template file for 'prose'
 pkgname=prose
-version=0.4.0
-revision=2
+version=0.4.2
+revision=1
 build_style=cargo
 short_desc="Reformat text pleasantly"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/jgdavey/prose/"
 distfiles="https://github.com/jgdavey/prose/archive/v${version}.tar.gz"
-checksum=ab6409b1ad1cb6b19b5f2dba5c4d3c8bc3cbe8923c8dfb64a790ac93d3e86c36
+checksum=84dbec8a1616096e8ccf1b9a8669943465f680656de0dd99c47c7ff2088ed243
 
 post_install() {
 	vlicense LICENSE-MIT

From 2f7e2a9fae88f5c0a02cdbeb39a3248cd14ef909 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:13:56 +0200
Subject: [PATCH 1060/1853] uftrace: update to 0.14.

---
 srcpkgs/uftrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index 71eea668110c..8f703e0a812f 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'uftrace'
 pkgname=uftrace
-version=0.13.1
+version=0.14
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/namhyung/uftrace"
 distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
-checksum=88b59923fdd9804fd29da8a784cd1b39837b1b735fc3be4165b3932eca3661ad
+checksum=b81255bc288e79e96a5b158d4875fa6425ad51c85f4c4c8523c1defb9366ad12
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;

From 375ca729b7294072a7182cf80848f4ca44f4476e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:15:59 +0200
Subject: [PATCH 1061/1853] bmake: update to 20230601.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index a0bb5be099ba..b0bb26e6daf0 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20230522
+version=20230601
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=dfe556df70e1555b70eccf4e6d367aa8b91aa076d5e9b55e36b5ce3e721f9050
+checksum=8d0b2e593946539065530a241040b0b0525ebb2b924ed67fc497ad17845a5a09
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From 8b874db17add18077f126976476ea02b506d522f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:17:35 +0200
Subject: [PATCH 1062/1853] janet: update to 1.29.1.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 87ae7384c7f7..5a0c893b5dfb 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.28.0
+version=1.29.1
 revision=1
 build_style=meson
 configure_args="-Db_lto=false --libdir=/usr/lib"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=d78a4c367f1b2c9f95897fa13fc788b36ce49cfcc18083b0810e86b2dd1285bb
+checksum=2ac3f69842f3e805a8d072a9e36f207f6287f063654c51cb3cd2b6e73b1cadf6
 
 post_install() {
 	vlicense LICENSE

From 1fa0ea4f00edd87b56837bc958073738a2c8254f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:18:19 +0200
Subject: [PATCH 1063/1853] minify: update to 2.12.7.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 3d71f543e395..8c39fdcae1a4 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=c5ab7bc5f71e2b9686db73d46013bc2ad15e97824acf477508ae5a39bae920d2
+checksum=91b262713dc4a3ce817cf71a414856089476c8b400da2cfce07f7519e14dea68
 
 post_install() {
 	vlicense LICENSE

From 95bd73b635132f4fdc2fa4631c6112ee77fec999 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:19:59 +0200
Subject: [PATCH 1064/1853] nickle: update to 2.92.

---
 srcpkgs/nickle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nickle/template b/srcpkgs/nickle/template
index 2c3e900f9915..097510213317 100644
--- a/srcpkgs/nickle/template
+++ b/srcpkgs/nickle/template
@@ -1,6 +1,6 @@
 # Template file for 'nickle'
 pkgname=nickle
-version=2.91
+version=2.92
 revision=1
 build_style=gnu-configure
 makedepends="readline-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://nickle.org/"
 distfiles="https://nickle.org/release/${pkgname}-${version}.tar.gz"
-checksum=4fff8c9b0245b9c32ff8fd43054b739325f3a7a52c4e3fc2d6e25e19b852964d
+checksum=d7ebe2e23806a3690a75c6f380f06fd815dfd92334c6143aed95f7111bf08efe
 
 pre_build() {
 	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \

From 4b13e2c4aa4f67bcec5b9cc4895b021c55b60e2d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:28:25 +0200
Subject: [PATCH 1065/1853] New package: perl-HTTP-CookieJar-0.014

---
 srcpkgs/perl-HTTP-CookieJar/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/perl-HTTP-CookieJar/template

diff --git a/srcpkgs/perl-HTTP-CookieJar/template b/srcpkgs/perl-HTTP-CookieJar/template
new file mode 100644
index 000000000000..d98fe59679f6
--- /dev/null
+++ b/srcpkgs/perl-HTTP-CookieJar/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-HTTP-CookieJar'
+pkgname=perl-HTTP-CookieJar
+version=0.014
+revision=1
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="${hostmakedepends}"
+depends="${makedepends}"
+checkdepends="perl-Test-Deep perl-Test-Requires"
+short_desc="HTTP-CookieJar - A minimalist HTTP user agent cookie jar"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/dist/HTTP-CookieJar"
+distfiles="${CPAN_SITE}/HTTP/HTTP-CookieJar-${version}.tar.gz"
+checksum=7094ea5c91f536d263b85e83ab4e9a963e11c4408ce08ecae553fa9c0cc47e73

From 46174917e83eda0b3ca4eb0095ae149f738b023f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:29:55 +0200
Subject: [PATCH 1066/1853] perl-LWP: update to 6.71.

---
 srcpkgs/perl-LWP/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index 2e5396a2a8a5..cfb75e85fca2 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.68
+version=6.71
 revision=1
 build_style=perl-module
 hostmakedepends="
  perl perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message
  perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP
- perl-HTTP-Cookies perl-WWW-RobotRules perl-Try-Tiny"
+ perl-HTTP-Cookies perl-HTTP-CookieJar perl-WWW-RobotRules perl-Try-Tiny"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 checkdepends="perl-Test-RequiresInternet perl-Test-Fatal perl-Test-Needs
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=42784a5869855ee08522dfb1d30fccf98ca4ddefa8c6c1bcb0d68a0adceb7f01
+checksum=9d852d92c1f087d838adcb4107c4ff69887e7e5bdb742f984639c4c18dddb6e7

From adee75102acac8d928eef54844a036eb05467e5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Jun 2023 17:16:26 +0200
Subject: [PATCH 1067/1853] dune: update to 3.8.2.

---
 srcpkgs/dune/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 1d38c2419cab..da572e1b0574 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,6 +1,6 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.8.0
+version=3.8.2
 revision=1
 makedepends="ocaml"
 depends="ocaml"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://dune.build/"
 changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md"
 distfiles="https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"
-checksum=f7e2970bfab99c7766ff1a05deff5ad7f82cb2471abca6f72449572293f5f6b4
+checksum=5a6ec790128616b6b46616427fa9c8f2ba0d6ef5a405bf8fdbc6f82dc0d935fd
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-build-info dune-configurator

From 27c71288a534a0766b35fd039bec5a6a68d51281 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 22 Jun 2023 19:56:49 +0200
Subject: [PATCH 1068/1853] etr: update to 0.8.3.

---
 srcpkgs/etr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/etr/template b/srcpkgs/etr/template
index 5d5ee815a140..615f2d754d83 100644
--- a/srcpkgs/etr/template
+++ b/srcpkgs/etr/template
@@ -1,6 +1,6 @@
 # Template file for 'etr'
 pkgname=etr
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,5 +10,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/extremetuxracer/"
 distfiles="${SOURCEFORGE_SITE}/extremetuxracer/${pkgname}-${version}.tar.xz"
-checksum=1c874965e9e249533bf15c08dabc61e60c05bb3fd578917880117ff8a910cd4e
+checksum=2ee42f3f5fc2f8d49aa75056eb116f6cab84d6564120e6961ae5927367245113
 replaces="etr-data>=0"

From 34f45a7157a3fbd913a1379d0d2a0b4a87324d99 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 22 Jun 2023 20:16:30 +0200
Subject: [PATCH 1069/1853] linux4.19: update to 4.19.287.

---
 srcpkgs/linux4.19/files/arm-dotconfig   | 16 +++++-----------
 srcpkgs/linux4.19/files/arm64-dotconfig | 19 ++++++-------------
 srcpkgs/linux4.19/template              |  4 ++--
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux4.19/files/arm-dotconfig b/srcpkgs/linux4.19/files/arm-dotconfig
index 5939bec1c6ee..76157f822fb3 100644
--- a/srcpkgs/linux4.19/files/arm-dotconfig
+++ b/srcpkgs/linux4.19/files/arm-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.268 Kernel Configuration
+# Linux/arm 4.19.287 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (GCC) 10.2.1 20201203
+# Compiler: arm-linux-gnueabihf-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -574,13 +574,8 @@ CONFIG_REFCOUNT_FULL=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -1233,7 +1228,6 @@ CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1305,7 +1299,6 @@ CONFIG_NET_SCH_INGRESS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -1944,6 +1937,7 @@ CONFIG_SCSI_3W_SAS=m
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_ESAS2R is not set
diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index 956120f2b637..d7fb03ced161 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.268 Kernel Configuration
+# Linux/arm64 4.19.287 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203
+# Compiler: aarch64-linux-gnu-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -765,13 +765,8 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -1503,7 +1498,6 @@ CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 CONFIG_ATALK=m
@@ -1575,7 +1569,6 @@ CONFIG_NET_SCH_PLUG=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2257,6 +2250,7 @@ CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
@@ -2654,6 +2648,7 @@ CONFIG_IXGBE_DCB=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 # CONFIG_I40E_DCB is not set
+CONFIG_IAVF=m
 CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
@@ -5371,8 +5366,6 @@ CONFIG_HISI_KIRIN_DW_DSI=m
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_DRM_ZTE is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 # CONFIG_DRM_TINYDRM is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 3128f4bd1480..52000a3f1f46 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.284
+version=4.19.287
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 1ddfab2ee12c010d3291716d0d03f485d50b8c69e0afb0111bec16acdc9d4be2"
+ 6b36e15b50116dc414473a3fec4e012139e622ef99d5b7128935e28f787245eb"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 3c3a5f7a25dbe40132f173545c50ebd4ab4c9296 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 22 Jun 2023 20:37:21 +0200
Subject: [PATCH 1070/1853] linux5.4: update to 5.4.248.

---
 srcpkgs/linux5.4/files/arm-dotconfig   | 21 ++++++++-------------
 srcpkgs/linux5.4/files/arm64-dotconfig | 21 ++++++++++-----------
 srcpkgs/linux5.4/template              |  4 ++--
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm-dotconfig b/srcpkgs/linux5.4/files/arm-dotconfig
index 5669743b34b9..6832ad8ebbce 100644
--- a/srcpkgs/linux5.4/files/arm-dotconfig
+++ b/srcpkgs/linux5.4/files/arm-dotconfig
@@ -1,16 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.226 Kernel Configuration
+# Linux/arm 5.4.248 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (GCC) 10.2.1 20201203
+# Compiler: arm-linux-gnueabihf-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -559,12 +561,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1220,7 +1218,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1293,7 +1290,6 @@ CONFIG_NET_SCH_INGRESS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2080,6 +2076,7 @@ CONFIG_SCSI_3W_SAS=m
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_ESAS2R is not set
@@ -6720,11 +6717,9 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT=y
 CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_STACK_ALL is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 4fab5ae7ca41..71a85d17b2bc 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,16 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.226 Kernel Configuration
+# Linux/arm64 5.4.248 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203
+# Compiler: aarch64-linux-gnu-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -74,8 +76,6 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
-CONFIG_CONTEXT_TRACKING=y
-# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
@@ -87,8 +87,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 #
 # CPU/Task time and stats accounting
 #
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_BSD_PROCESS_ACCT=y
@@ -799,9 +798,8 @@ CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1564,7 +1562,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1637,7 +1634,6 @@ CONFIG_NET_SCH_PLUG=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2636,6 +2632,7 @@ CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
+# CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
@@ -9971,6 +9968,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT=y
 CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_STACK_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
@@ -10437,6 +10435,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_KASAN_SW_TAGS=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
 # end of Memory Debugging
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index a48fbde924c7..8bd845cec228 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.245
+version=5.4.248
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- 8e0a8911bccb734a55b319687ee7050259b1c9d64324ef04448d9bea7c8a02be"
+ 0d919e129bdd21bdd25f6f358b8da04a48b598de7baba067ce3e3489b5b4fadf"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From 0a77895285373f1ad74d6c57b5c116c52de31382 Mon Sep 17 00:00:00 2001
From: oliverwiegers <oliver.wiegers@gmail.com>
Date: Tue, 20 Jun 2023 08:09:53 +0200
Subject: [PATCH 1071/1853] nyxt: update to 3.2.0

- Updated 002-webkit2gtk.init.lisp patch. The patch itself is the same,
  but the structure of the source file to be patched changed.
- Included "pkg-config" into hostmakedepends.
---
 srcpkgs/nyxt/patches/002-webkit2gtk.patch | 20 ++++++++++----------
 srcpkgs/nyxt/template                     | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
index 5a0fe2e923d3..dd4808382c1d 100644
--- a/srcpkgs/nyxt/patches/002-webkit2gtk.patch
+++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
@@ -1,14 +1,14 @@
---- a/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-01-14 03:22:05.000000000 -0700
-+++ b/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-02-27 09:59:29.175938024 -0700
-@@ -18,9 +18,9 @@
-               "libwebkit2gtk-4.0.37.dylib"
+--- a/_build/cl-webkit/webkit2/webkit2.init.lisp    2023-06-19 18:14:54.899937994 +0200
++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp    2023-06-19 18:15:45.707030674 +0200
+@@ -19,9 +19,9 @@
                "libwebkit2gtk-4.0.dylib"))
-     (:unix (:or "libwebkit2gtk-4.1.so"
--                "libwebkit2gtk-4.0.so"
-                 ;; Fedora only has this one?
--                "libwebkit2gtk-4.0.so.37")))
-+                "libwebkit2gtk-4.0.so.37"
-+                "libwebkit2gtk-4.0.so")))
+     (:unix (:or
+             "libwebkit2gtk-4.1.so"
+-            "libwebkit2gtk-4.0.so"
+             ;; Fedora only has this one?
+-            "libwebkit2gtk-4.0.so.37")))
++            "libwebkit2gtk-4.0.so.37"
++            "libwebkit2gtk-4.0.so")))
    (use-foreign-library libwebkit2))
  
  (defcfun "webkit_get_major_version" :int)
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index d3d1c20fe9cd..d0f7ddf489cd 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,19 +1,19 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=2.2.4
-revision=3
+version=3.2.0
+revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
-hostmakedepends="sbcl git"
+hostmakedepends="sbcl git pkg-config"
 makedepends="webkit2gtk libfixposix-devel libgirepository"
 depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=04f740f8405044cc89920d41d340d6d137e1d4f7be098d4813d1523f73d725a9
+checksum=3e7a2812563ea3f2fe0c039db0d693a4de99d22cef1b0dec09173d1b7fbaf691
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From aa8ed8bae3830c358639e7192dfabb992eea67b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:01:03 -0400
Subject: [PATCH 1072/1853] vivaldi: update to 6.1.3035.100.

---
 srcpkgs/vivaldi/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 13a1769c7d81..dd123eb8f684 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
 # Permission to redistribute is granted.
 # see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.1.3035.75
+version=6.1.3035.100
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ 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=f8acb92f5346ec0a7b4086b2f6709d1b1430ace9f0a27c1439443ecf6afdc96a
+	checksum=0cff2e18ef765490322eec672a8d84e171cef8d20c6264a95409ad138607c029
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=fe1063fa6ccb14a4f1e6edbea47c0631334d6ea3f49daf319a0bf40eaab053c6
+	checksum=babac4870118227e5016e1d21794b3ac0ead356c1a7a0ac0fb1ee681a45c5ba9
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=f3af5b7cc192db0d69080b3c4348bc83cca3a39bd31f2beb29cf4e5c7bb119e9
+	checksum=611be9b2bc1045afb4bc14e9b3a381b86919d2de17e0441adf991d30fcd0d4d3
 	;;
 *)
 	broken="No distfiles available for this target"

From fd99f376ee300ffe67b274389850934c48d95a88 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:01:15 -0400
Subject: [PATCH 1073/1853] liquid-dsp: update to 1.6.0.

---
 .../liquid-dsp/patches/fix-make-install.patch | 22 -------------------
 srcpkgs/liquid-dsp/template                   |  9 ++++++--
 2 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/liquid-dsp/patches/fix-make-install.patch

diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
deleted file mode 100644
index 6029886906c4..000000000000
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: makefile.in
-===================================================================
---- a/makefile.in
-+++ b/makefile.in
-@@ -1287,7 +1287,7 @@
- 	@echo ""
- 	mkdir -p $(DESTDIR)$(prefix)/include/liquid
- 	mkdir -p $(DESTDIR)$(libdir)
--	install -m 644 -p libliquid.${AR_LIB} $(DESTDIR)$(libdir)/libliquid.${AR_LIB}.${VERSION}
-+	install -m 644 -p libliquid.${AR_LIB} $(DESTDIR)$(libdir)/libliquid.${AR_LIB}
- 	install -m 644 -p libliquid.${SH_LIB} $(DESTDIR)$(libdir)/libliquid.${SH_LIB}.${VERSION}
- 	install -m 644 -p include/liquid.h $(DESTDIR)$(prefix)/include/liquid/liquid.h
- 	ln -sf libliquid.${SH_LIB}.${VERSION} $(DESTDIR)$(libdir)/libliquid.${SH_LIB}
-@@ -1300,7 +1300,7 @@ install: all
- 	@echo "  libraries by running 'ldconfig' to make the shared"
- 	@echo "  object available.  You might also need to modify your"
- 	@echo "  LD_LIBRARY_PATH environment variable to include the"
--	@echo "  directory $(DESTDIR)$(exec_prefix)"
-+	@echo "  directory $(DESTDIR)"
- 	@echo ""
- 	@echo "  Please report bugs to $(BUGREPORT)"
- 	@echo "---------------------------------------------------------"
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 0276e85aa0a9..94d2e6ac17d3 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,6 +1,6 @@
 # Template file for 'liquid-dsp'
 pkgname=liquid-dsp
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-simdoverride"
@@ -10,8 +10,13 @@ short_desc="Signal processing library for software-defined radios (SDR)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="http://liquidsdr.org/"
+changelog="https://raw.githubusercontent.com/jgaeddert/liquid-dsp/v1.6.0/HISTORY"
 distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=93003edb6e74090b41009b1fae6f273a3e711dc4c8c56a0cca3e89167b765953
+checksum=6ee6a5dfb48e047b118cf613c0b9f43e34356a5667a77a72a55371d2c8c53bf5
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) make_check=no # FAILED 46 / 487206 CHECKS (   0.01%)
+esac
 
 pre_configure() {
 	autoreconf -fi

From 2f89224b5fd5cb7e82ad89419b95440ef6af76dd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:04:10 -0400
Subject: [PATCH 1074/1853] chezmoi: update to 2.34.2.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 346c8f4ae203..4e8b46f9b709 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.34.1
+version=2.34.2
 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=d81bb3a9f4632ab27422c05bb243692f1d55e33cae2c55c691f7f0b9248f46cf
+checksum=fc47d6e4cbe1b8f4762c204be28e30d9e9f3bcfa8c51ac276cbd1864804b2dc8
 
 pre_build() {
 	local _date

From bc4dcf8ced1991d8a34644867291b8e7254e496b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:05:17 -0400
Subject: [PATCH 1075/1853] pyright: update to 1.1.315.

---
 srcpkgs/pyright/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index 28b0db32be36..f8bb5adf6691 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.313
+version=1.1.315
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=3bdd9dbd026fb2dc580178753bcea113907797caa0971561aa3b8e00fe30112a
+checksum=6c3d404815527b8143b9eab0e3978b3126a95d9e8502177ebb4f1b23a437896e
 
 do_configure() {
 	cd "$wrksrc"

From c6d4ef55852a176ca142ab1118d2421d677c04f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:09:16 -0400
Subject: [PATCH 1076/1853] typst-lsp: update to 0.7.1.

---
 srcpkgs/typst-lsp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 6d4f0cef0ae2..1fb2b5d01f8e 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'typst-lsp'
 pkgname=typst-lsp
-version=0.5.1
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Language server for Typst"
@@ -8,7 +8,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
-checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
+checksum=d88eb4c4d45250efa18e2c5e3fe09e322f96cca35fb14e4d116d6a92d76d18fb
 
 post_install() {
 	vlicense LICENSE-MIT.txt

From d375f002d73f5f54acffb748b8c864c279f2ef86 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:51:56 -0400
Subject: [PATCH 1077/1853] linux: update to 6.3.

closes #44526
---
 srcpkgs/linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 2f0ae7d62704..16471ed4b9cb 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,6 +1,6 @@
 # Template file for 'linux'
 pkgname=linux
-version=6.1
+version=6.3
 revision=1
 build_style=meta
 depends="linux${version} linux-base"

From eca4c6f6940f8ec0b17c2b03fd14263b133cb420 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 22 Jun 2023 18:32:28 +0200
Subject: [PATCH 1078/1853] bird: update to 2.13.1

Security update, changes:
  o BGP: Fix role check when no capability option is present
  o Filter: Fixed segfault when a case option had an empty block
---
 srcpkgs/bird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 822ad73cf48a..4df92f652571 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,6 +1,6 @@
 # Template file for 'bird'
 pkgname=bird
-version=2.13
+version=2.13.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://bird.network.cz"
 changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
 distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
-checksum=8d895e3e311880e9efb888b4386cbec2f7e18bfb8334e8d4c8ca7c4341092638
+checksum=97bb8d57be9bc5083e2b566416d27e314162856a12ca7c77e202e467d20d4080
 
 conf_files="/etc/bird.conf"
 system_accounts="_bird"

From 003e40035953328cc03450ee377a711b1b8b7f26 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 22 Jun 2023 19:49:29 +0200
Subject: [PATCH 1079/1853] yt-dlp: update to 2023.06.22

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index a13631631169..fbad7395bf14 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2023.03.04
+version=2023.06.22
 revision=1
 build_style=python3-module
 make_check_args="-k not(download)"
@@ -13,4 +13,4 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=771d2abefcd5f1e6f3ab6d6d18cdae98be4ab73538d1174e7e7236640418e150
+checksum=5291eb8e077ee1bc2585f4f522d75f1e4f9fd4c3374bace1572cf59b97bdd9c3

From 8cfa2470684f525a9fa64bd486d334a4c335046c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 19:49:38 +0200
Subject: [PATCH 1080/1853] miniflux: update to 2.0.45.

---
 srcpkgs/miniflux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 1e22a1146957..30313c3979c1 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.44
+version=2.0.45
 revision=1
 build_style=go
 go_import_path="miniflux.app"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/main/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=9b3d873c21dde5eafc947be5394cd1bdd6d4f49ba62e5d796a526176647d9404
+checksum=beef96a42e670344eae9096dc13ceb759a6b7eb085d77b96000731ae1569ca4f
 system_accounts="_miniflux"
 
 post_install() {

From f0facfeb9ecdb58214f97f5959d9d7fcfc09d000 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 22 Jun 2023 20:12:54 +0200
Subject: [PATCH 1081/1853] gopls: update to 0.12.3

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c786fc23aeb6..d766a2bba3e6 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.12.2
+version=0.12.3
 revision=1
 build_wrksrc=gopls
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/golang/tools/tree/master/gopls"
 distfiles="https://github.com/golang/tools/archive/refs/tags/gopls/v${version}.tar.gz"
-checksum=f185a44f46fe39688493008d47debfe63ea7cd26464f522df292c62539b8ca8d
+checksum=77fa296b58ea38d9727b3f564d28bf816eb05ffaa587a2830ef405e479dab060
 
 post_install() {
 	vlicense ../LICENSE

From 6fb2fb5b80745ff5344e09011a96fedd609621c5 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 20:05:16 +0200
Subject: [PATCH 1082/1853] qpwgraph: update to 0.4.4.

---
 srcpkgs/qpwgraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index 7cd13f3e9a83..c4abe3d04baa 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.4.1
+version=0.4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=ac37d00c1d1adbdb517c558483dec11105ff9e2d3ac7c4f87744d08a552e75ea
+checksum=8bfd561dcd921dd14577f7a49a25a4bb481a61ff4b504943f1606f0ce549ac38

From a4208111da5ac4b5cf280fd610a1abdc07392e5a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 20:28:34 +0200
Subject: [PATCH 1083/1853] yq-go: update to 4.34.1.

---
 srcpkgs/yq-go/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 9ea9325498d7..ad7830305bbd 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.33.1
-revision=2
+version=4.34.1
+revision=1
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/refs/tags/v${version}.tar.gz"
-checksum=c38b8210fb5a80ac88314fa346ea31f3dc9324cae9fe93cb334cacf909e09bc3
+checksum=69ff6f8bbb5f9eff5ccb537597740d24200db201b2709e442ae5effdbcb8ff9d
 
 do_check() {
 	go test -v

From 5fd0eed70ae1a647a02efd2e56688dffeb6e8f5e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 21 Jun 2023 00:57:13 +0530
Subject: [PATCH 1084/1853] python3-importlib_metadata: update to 6.7.0.

---
 srcpkgs/python3-importlib_metadata/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template
index 82f5db1b125b..29c19546984e 100644
--- a/srcpkgs/python3-importlib_metadata/template
+++ b/srcpkgs/python3-importlib_metadata/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-importlib_metadata'
 pkgname=python3-importlib_metadata
-version=6.6.0
+version=6.7.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -9,6 +9,6 @@ short_desc="Read metadata from python3 packages"
 maintainer="icp <pangolin@vivaldi.net>"
 license="Apache-2.0"
 homepage="https://pypi.org/project/importlib-metadata/"
-changelog="https://raw.githubusercontent.com/python/importlib_metadata/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/python/importlib_metadata/main/NEWS.rst"
 distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705
+checksum=1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4

From 30de085344e05467f40b32bd72e28fe5467182bf Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 21 Jun 2023 00:58:05 +0530
Subject: [PATCH 1085/1853] python3-keyring: update to 24.0.1.

---
 srcpkgs/python3-keyring/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 306cab402c8c..24eb8790ee38 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=23.13.1
+version=24.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -11,9 +11,14 @@ short_desc="Python interface to the system keyring service"
 maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://pypi.org/project/keyring/"
-changelog="https://raw.githubusercontent.com/jaraco/keyring/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/keyring/main/NEWS.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678
+checksum=f77da625a448baa77906b099be9feaa29aa90979547506ac1ec422926085cee0
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+pre_check() {
+	vsed -e '/addopts/d' -i pytest.ini
+}
 
 post_install() {
 	vlicense LICENSE

From a2778fda57973c6f3be44132125c8446f3ebda5f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 20:50:58 +0200
Subject: [PATCH 1086/1853] remmina: update to 1.4.31.

---
 srcpkgs/remmina/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index a27d96914755..657e392d1f01 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.4.29
-revision=2
+version=1.4.31
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_USE_PTHREADS_INIT=ON"
 hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://gitlab.com/Remmina/Remmina/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/Remmina/Remmina/-/archive/v${version}/Remmina-v${version}.tar.bz2"
-checksum=94d11d00602d12ed033b1018e42171dfd1b1a42081530c229e4a3988c4f3a3d9
+checksum=cfe9d4a6f2951d35533e5b2235f76640573c91f1be3bd8118637fbf68234500a
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 1d9047e9d2603d3e9448ab2c5000530dc1e52a6f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 22:38:11 +0200
Subject: [PATCH 1087/1853] kubetail: update to 1.6.18.

---
 srcpkgs/kubetail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubetail/template b/srcpkgs/kubetail/template
index aefd029568e5..07584a9fa24b 100644
--- a/srcpkgs/kubetail/template
+++ b/srcpkgs/kubetail/template
@@ -1,6 +1,6 @@
 # Template file for 'kubetail'
 pkgname=kubetail
-version=1.6.17
+version=1.6.18
 revision=1
 depends="bash"
 short_desc="Bash script to tail Kubernetes logs from multiple pods at the same time"
@@ -8,7 +8,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/johanhaleby/kubetail"
 distfiles="https://github.com/johanhaleby/kubetail/archive/${version}.tar.gz"
-checksum=9dee9fbc4c472cf73666ee77e8f430e3aaea2ee3ca2f34dda15a4da9a6bad69a
+checksum=62ba29b3a869bba5b2ddf8c0fbbd307330dfe8cf8f3d47ae459c327b66afbb93
 
 do_install() {
 	vbin kubetail

From 3bde863527bc595c337a96de7c2b192821fa9d9d Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Thu, 22 Jun 2023 18:20:36 -0300
Subject: [PATCH 1088/1853] xonotic: update to 0.8.6

---
 srcpkgs/xonotic-data/template | 4 ++--
 srcpkgs/xonotic/template      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index 4b51d3de5477..d2f483f4b3fe 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -1,6 +1,6 @@
 # Template file for 'xonotic-data'
 pkgname=xonotic-data
-version=0.8.5
+version=0.8.6
 revision=1
 hostmakedepends="unzip"
 short_desc="Xonotic's data files"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xonotic.org"
 distfiles="https://dl.xonotic.org/xonotic-${version}.zip"
-checksum=0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5
+checksum=50850f8d800e7499722f6ea61e478e96464a375494b5a24da93aa0598cbe964d
 
 do_install() {
 	vmkdir usr/share/xonotic
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index c9fc95bbdc66..b4f51efcf1e6 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,6 +1,6 @@
 # Template file for 'xonotic'
 pkgname=xonotic
-version=0.8.5
+version=0.8.6
 revision=1
 hostmakedepends="unzip automake libtool"
 makedepends="gmp-devel MesaLib-devel SDL2-devel libcurl-devel alsa-lib-devel
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="http://xonotic.org"
 distfiles="https://dl.xonotic.org/xonotic-${version}-source.zip"
-checksum=a1a81ba55ab151bf09758e7f59614b2e5150e84224753e77950bcd07a282ea5d
+checksum=8b92ac781cff4ae89c121a23eacd7dec05a2aabedaccc23a19d1a0958b4012a8
 nocross=yes
 
 do_build() {

From 692482ffc81b0375f41998d34fe8e6a2d868b306 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 23:12:34 +0200
Subject: [PATCH 1089/1853] xterm: update to 382.

---
 srcpkgs/xterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 12256b08ea84..802e29b4a6e7 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=379
+version=382
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT, X11"
 homepage="https://invisible-island.net/xterm/"
 changelog="https://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=a7ddf274ee84b97fb1283675009d53ca2d02a0ffd5ce5a5118dafc3623ebb310
+checksum=0cd0bcf3d0aa746a840ea3f1366ea29a74263694d535b5c777f27eb65d7fceed
 
 CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700"
 

From 602ed063092280f82f144f7f6ea6f93ab4641f64 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 22 Jun 2023 21:50:36 -0400
Subject: [PATCH 1090/1853] iwd: update to 2.6

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 25f42b7d02c3..c0cd5e42447f 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=2.5
+version=2.6
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=3441effed58297b63779e706c74884234acb874b07872f8b55e0da28729fda32
+checksum=f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 1f5c4044352475d5bb6a6334635234edddc87a37 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:20:28 +0200
Subject: [PATCH 1091/1853] mtools: update to 4.0.43.

---
 srcpkgs/mtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index c063430d56fc..e8f06f4a1c44 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -1,6 +1,6 @@
 # Template file for 'mtools'
 pkgname=mtools
-version=4.0.42
+version=4.0.43
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/mtools"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=64bfdfde4d82af6b22f3c1c72c3e231cbb618f4c2309cc46f54d16d5502ccf15
+checksum=541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339
 conf_files="/etc/mtools.conf"
 
 post_extract() {

From 5d086072ce8eadacd293857b4ae4250289808553 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 07:28:49 -0500
Subject: [PATCH 1092/1853] xml2rfc: update to 3.17.4.

---
 srcpkgs/xml2rfc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 8d5be28f449a..69ccd32cde71 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
 # Template file for 'xml2rfc'
 pkgname=xml2rfc
-version=3.17.3
+version=3.17.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ietf-tools.github.io/xml2rfc/"
 distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=535b7f701a5d87be8fb8ecdefcef486b11fa454bf0be236c6378c20ca57f28c5
+checksum=7b7e91e7b46db56d0c9ea07e0d7c0d1aa79e2117f028a3134fef4b31fb96ce3a
 make_check=no # too many dependencies
 
 post_install() {

From 92109804a469b464cd24d3eae9987c153e8c5d39 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 07:29:43 -0500
Subject: [PATCH 1093/1853] autorandr: update to 1.14.

---
 srcpkgs/autorandr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template
index 4c1ed42c6a06..df0b1a50b957 100644
--- a/srcpkgs/autorandr/template
+++ b/srcpkgs/autorandr/template
@@ -1,6 +1,6 @@
 # Template file for 'autorandr'
 pkgname=autorandr
-version=1.13.3
+version=1.14
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config desktop-file-utils"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/phillipberndt/autorandr"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=512538d230bb46bf64f5f4203df841872867cb06e0afc0b25a2552529f5b286d
+checksum=d7d4f2e57c14c0e032ddfde24da2b22e5831cc792dca2c6bad3622502e634c60
 
 post_install() {
 	make install TARGETS='pmutils udev autostart_config bash_completion' \

From 12dcd1ce370d0bcd1fedab4cd49a4ee000616f29 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Fri, 23 Jun 2023 18:26:25 +1000
Subject: [PATCH 1094/1853] saml2aws: update to 2.36.9

---
 srcpkgs/saml2aws/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index f921faf8712b..8962d3780d09 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.36.0
-revision=2
+version=2.36.9
+revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
@@ -12,7 +12,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=7ccf328c1ef8a6dec950e8474803539b5dfd1632587073edb850b7dd15122f0b
+checksum=a2ccc55d2ee9e572b46f6b508dc6f474550ae103d20961994c6cf58cdcba5006
 
 post_install() {
 	vlicense LICENSE.md

From 52b86290c862dff313d9c576c40b2396ad8590ba Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Wed, 21 Jun 2023 23:45:33 +0200
Subject: [PATCH 1095/1853] pyradio: update to 0.9.2.11.

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 2ee62bff7306..8b9ad44e1f18 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.10
+version=0.9.2.11
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=c3ab4773d0bdfd28015ef621a86ba103764f36708f8e07cbd0d1b908bcc8e032
+checksum=fe715119a7341e4f940e3edd854ef2e41285773a9086c6bff611be821e452bcd
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 33bb94480c5787dc0edfad30110e5d042647b0cf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 22 Jun 2023 21:45:40 -0400
Subject: [PATCH 1096/1853] libjodycode: update to 3.0.1

---
 common/shlibs                | 2 +-
 srcpkgs/libjodycode/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b34887a091f0..3e91bf520622 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4270,7 +4270,7 @@ 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
-libjodycode.so.2 libjodycode-2.0.1_1
+libjodycode.so.3 libjodycode-3.0.1_1
 libgsoapssl++-2.8.124.so gsoap-2.8.124_1
 libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
index 645266101089..92f5ed05e736 100644
--- a/srcpkgs/libjodycode/template
+++ b/srcpkgs/libjodycode/template
@@ -1,6 +1,6 @@
 # Template file for 'libjodycode'
 pkgname=libjodycode
-version=2.0.1
+version=3.0.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -8,12 +8,12 @@ short_desc="Shared code used by several utilities written by Jody Bruchon"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/libjodycode"
-changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
-checksum=1fdd106ab4d90aa1c0a2546299144f62d18b90acada2d6ee25370c4907048927
+checksum=e02aa4b96577fb5b6ca26018759cdaf71e3768dac321c07a84f2fb93ca4871bf
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }
 
 libjodycode-devel_package() {

From d8e01b8c1e38f027d9eeaf542ba1192bd28cc0d4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 22 Jun 2023 21:46:03 -0400
Subject: [PATCH 1097/1853] jdupes: update to 1.25.2

---
 srcpkgs/jdupes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 3124ed79ffea..28914083a92a 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.24.0
+version=1.25.2
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -10,12 +10,12 @@ short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
-changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
+changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=76ee1ffcf958958c3e093bbe9674c9410d4b1d730081b50f6d1e2dc342b230dd
+checksum=c137d07a70bcf70e15e92365df6b69bd210bb7856b6f10a860529aa7afc324a7
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }
 
 do_check() {

From b9dbb73e7ab2c40dd2de8189c8b2ea877b86855b Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 21 Jun 2023 21:39:40 -0500
Subject: [PATCH 1098/1853] Signal-Desktop: update to 6.22.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 6bd0160a886c..992612267835 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.21.0
+version=6.22.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=fea24e57de48cf60f42f40764429176cd236a0a765bb18e1815e2d56511923f7
+checksum=b895314710284bb7b5caac67eb514d8b83e933ace2c0801bc690a9c621cbed94
 nostrip_files="signal-desktop"
 
 post_extract() {

From ec1b5601c9f58b825de7309af0b25ea239dba2c6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 15:02:31 +0200
Subject: [PATCH 1099/1853] grim: update to 1.4.1, orphan

---
 srcpkgs/grim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index c320d2e38504..fe64688edcf0 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,6 +1,6 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=meson
 configure_args="-Djpeg=enabled -Dwerror=false"
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wayland-devel wayland-protocols pixman-devel libjpeg-turbo-devel
  libpng-devel"
 short_desc="Grab images from a Wayland compositor"
-maintainer="Derriick <derriick.ensiie@yahoo.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.emersion.fr/grim/"
 distfiles="https://git.sr.ht/~emersion/grim/archive/v${version}.tar.gz"
-checksum=66729ae654546404f50ed163055310dd23ed52cc5a881d39752c0cd076e3d7aa
+checksum=5ed8e70fcd83a7e203e92d34dbb82a1342d3f13ad98a6b0310cc97e1a9342ded
 
 post_install() {
 	vlicense LICENSE

From 0b8e425ff2988e38d47588cb42ad7fcee81e6a56 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:56:44 +0200
Subject: [PATCH 1100/1853] cups: update to 2.4.6.

---
 srcpkgs/cups/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index f1dc66f098d0..584a12d0ebf0 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.4.2
-revision=4
+version=2.4.6
+revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908
+checksum=58e970cf1955e1cc87d0847c32526d9c2ccee335e5f0e3882b283138ba0e7262
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="

From c1c46b3ad589f6376646159a55a2ba2173bb11b4 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Tue, 20 Jun 2023 14:36:14 +0200
Subject: [PATCH 1101/1853] python3-plotly: update to 5.15.0.

---
 srcpkgs/python3-plotly/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index 3ceb2053a2d5..412b25bad368 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,18 +1,17 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
-version=4.14.3
-revision=3
+version=5.15.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat"
+depends="python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat python3-tenacity"
 short_desc="Python plotting library for collaborative, interactive graphs"
 maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://plot.ly/python/"
 changelog="https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-checksum=7d8aaeed392e82fb8e0e48899f2d3d957b12327f9d38cdd5802bc574a8a39d91
-conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json"
+checksum=822eabe53997d5ebf23c77e1d1fcbf3bb6aa745eb05d532afd4b6f9a2e2ab02f
 
 do_check() {
 	: no test is shipped

From 902af60983a74bdbd1ee09de915043cf2a04f398 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Jun 2023 01:44:55 +0530
Subject: [PATCH 1102/1853] python3-tzlocal: update to 5.0.1.

---
 srcpkgs/python3-tzlocal/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tzlocal/template b/srcpkgs/python3-tzlocal/template
index 7c19b075620a..0882e496e606 100644
--- a/srcpkgs/python3-tzlocal/template
+++ b/srcpkgs/python3-tzlocal/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-tzlocal'
 pkgname=python3-tzlocal
-version=4.3
+version=5.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
-depends="python3-pytz_deprecation_shim"
+depends="python3"
 checkdepends="${depends} python3-pytest-mock python3-pytest-xdist"
 short_desc="Return the tzinfo object for the local timezone (Python 3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/regebro/tzlocal"
 changelog="https://raw.githubusercontent.com/regebro/tzlocal/master/CHANGES.txt"
 distfiles="https://github.com/regebro/tzlocal/archive/refs/tags/${version}.tar.gz"
-checksum=3c27e0fd8d6dbc403d0622d3f2e8804503e3099adf432fdbb91c676cf1f3f884
+checksum=ff80678a1741828fc4c64baba988da084f86676ae8c7b21474d6fb794069a4c1
 
 post_install() {
 	vlicense LICENSE.txt

From 6520ec3bcf5353123dc4372d2ae9602be4c513c7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 16 Jan 2023 02:01:43 +0200
Subject: [PATCH 1103/1853] waydroid: update to 1.4.1.

D-Bus is now used for IPC but disable D-Bus activation for Waydroid
container because there's no way to supervise (or stop) it properly
under runit.
---
 srcpkgs/waydroid/INSTALL                      |  8 ++++----
 srcpkgs/waydroid/files/README.voidlinux       |  7 ++++---
 srcpkgs/waydroid/files/waydroid-container/run |  1 +
 srcpkgs/waydroid/template                     | 11 ++++++-----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/waydroid/INSTALL b/srcpkgs/waydroid/INSTALL
index b6ca3e4ef5ab..34fa67f8c09e 100644
--- a/srcpkgs/waydroid/INSTALL
+++ b/srcpkgs/waydroid/INSTALL
@@ -1,8 +1,8 @@
 case "$ACTION" in
 post)
-	if [ ! -f ./var/lib/waydroid/waydroid.cfg ]; then return 0; fi
-	if [ ! -f ./var/lib/waydroid/waydroid_base.prop ]; then return 0; fi
-	echo "Regenerating Waydroid configs..."
-	waydroid upgrade --offline || exit 0
+	if [ -f /var/lib/waydroid/waydroid_base.prop ]; then
+		echo "Regenerating Waydroid configs..."
+		waydroid upgrade --offline || :
+	fi
 	;;
 esac
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..5653c569b66e 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -4,8 +4,9 @@ To finish Waydroid installation run:
 	# waydroid init
 
 Additionally ensure /proc/pressure/cpu exists, otherwise add 'psi=1' to your
-kernel cmdline; without this /system/bin/lmkd will keep crashing and the LXC
-container won't finish booting.
+kernel cmdline; without this under memory pressure e.g. even the OS bootup or
+gaming *may* cause the /dev/binder session manager to die due to
+/system/bin/lmkd crashing.
 For more details on kernel command line arguments and their configuration see
 https://docs.voidlinux.org/config/kernel.html#cmdline
 
@@ -15,7 +16,7 @@ also works).
 Optionally clipboard syncing between the container and host Wayland compositor
 can be enabled with:
 
-	# xbps-install python3-pyclip wl-clipboard
+	# xbps-install -S python3-pyclip wl-clipboard
 
 When running under X11 in a nested Wayland compositor you'll also need xclip.
 
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
index 3e44af632958..8de4fd3df6d2 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 exec 2>&1
+sv check dbus >/dev/null || exit 1
 exec waydroid -w container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index af8f78ff64c8..70e07b3e5c9a 100644
--- a/srcpkgs/waydroid/template
+++ b/srcpkgs/waydroid/template
@@ -1,19 +1,20 @@
 # Template file for 'waydroid'
 pkgname=waydroid
-version=1.3.4
-revision=2
+version=1.4.1
+revision=1
 # https://developer.android.com/ndk/guides/abis#sa
 archs="aarch64* armv7* i686* x86_64*"
 build_style=gnu-makefile
-make_install_args="USE_NFTABLES=1"
-depends="python3 gbinder-python python3-gobject gtk+3 lxc dnsmasq nftables"
+make_install_args="USE_NFTABLES=1 USE_DBUS_ACTIVATION=0"
+depends="gbinder-python python3-gobject python3-dbus gtk+3 polkit dnsmasq
+ nftables lxc"
 short_desc="Container-based approach to boot a full Android system"
 maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://waydro.id"
 changelog="https://raw.githubusercontent.com/waydroid/waydroid/main/debian/changelog"
 distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
-checksum=32e30e6c7384a514649daeac68b1326e2781362692ae143927628ff2f1387c4e
+checksum=6c9a87bf61efb72c19d96f442b710bd8b4dd5b5be093e10e2d0b1d1782376207
 
 python_version=3
 pycompile_dirs="usr/lib/waydroid"

From af556952ac3a25207251feb7bea30c4ac01cd7ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 23 Jun 2023 18:08:49 +0200
Subject: [PATCH 1104/1853] ostree: revert to 2023.3, 2023.4 breaks flatpak
 install.

---
 srcpkgs/ostree/patches/missing-off-t.patch | 14 --------------
 srcpkgs/ostree/template                    |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/ostree/patches/missing-off-t.patch

diff --git a/srcpkgs/ostree/patches/missing-off-t.patch b/srcpkgs/ostree/patches/missing-off-t.patch
deleted file mode 100644
index 67864dc55c93..000000000000
--- a/srcpkgs/ostree/patches/missing-off-t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From https://git.alpinelinux.org/aports/tree/community/ostree/missing-off-t.patch
-diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index 8fcd5e8..2454a58 100644
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint
- /* This is a roundabout but more trustworthy way of doing a space check than
-  * relying on statvfs's f_bfree when you know the size of the objects. */
- static gboolean
--dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error)
-+dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error)
- {
-   /* If the requested size is 0 then return early. Passing a 0 len to
-    * fallocate results in EINVAL */
diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template
index 3d30742c6b8e..e5c08263b5ad 100644
--- a/srcpkgs/ostree/template
+++ b/srcpkgs/ostree/template
@@ -1,7 +1,8 @@
 # Template file for 'ostree'
 pkgname=ostree
-version=2023.4
-revision=1
+reverts="2023.4_1"
+version=2023.3
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="
@@ -20,7 +21,7 @@ license="LGPL-2.0-or-later"
 homepage="https://ostree.readthedocs.io/en/latest/"
 changelog="https://github.com/ostreedev/ostree/releases"
 distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1
+checksum=9c575a094da2c307769f0aee15de95470c3b5550cbff211fbbc4f6fc75f333b1
 
 build_options="gir"
 build_options_default="gir"

From ca3240132623d01485d6626e8c8f06c7ddfd51f6 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@tuta.io>
Date: Mon, 5 Jun 2023 10:20:46 +0200
Subject: [PATCH 1105/1853] dunst: update to 1.9.2.

---
 srcpkgs/dunst/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index f1f57f153040..ab41433cfe4e 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.9.0
+version=1.9.2
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -13,12 +13,12 @@ makedepends="gdk-pixbuf-devel libXScrnSaver-devel libXinerama-devel libXrandr-de
 checkdepends="dbus"
 conf_files="/etc/dunst/dunstrc"
 short_desc="Lightweight and customizable notification daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
 license="BSD-3-Clause"
 homepage="https://dunst-project.org"
 changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=b7b8d7d6560bb241b1e4d37eba770cdf19b9d5dbfc1d4d47572ad676f3f7c98a
+checksum=fa6ce45c0af4bae188b0d679a5ba92f8f9b7e4301bb1bb476e82df26bce9e71a
 
 build_options="wayland"
 build_options_default="wayland"

From d8f81de90c69b3ee1d4242bde877acdbfc0cc4cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 22 Jun 2023 09:59:02 -0400
Subject: [PATCH 1106/1853] python3-bokeh: update to 3.2.0.

---
 srcpkgs/python3-bokeh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index 54a98e016096..f7a155c3e677 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=3.1.1
+version=3.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-colorama"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=ba0fc6bae4352d307541293256dee930a42d0acf92e760c72dc0e7397c3a28e9
+checksum=cdb3a8c3109d8d91a2814f4cddea045c14d049021f7fb6ce2a6b2c15e224bb17
 # Tests have unpackaged dependencies and require fetching data; skipping
 make_check=no
 

From 6a711a96840fb1fbeacdf12ef689f3bb0f475ebe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 22 Jun 2023 09:59:41 -0400
Subject: [PATCH 1107/1853] python3-h5py: update to 3.9.0.

---
 srcpkgs/python3-h5py/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-h5py/template b/srcpkgs/python3-h5py/template
index 72b004c74781..d491f5cc3aca 100644
--- a/srcpkgs/python3-h5py/template
+++ b/srcpkgs/python3-h5py/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-h5py'
 pkgname=python3-h5py
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=python3-module
 build_helper="numpy"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="http://www.h5py.org/"
 distfiles="${PYPI_SITE}/h/h5py/h5py-${version}.tar.gz"
-checksum=6fead82f0c4000cf38d53f9c030780d81bfa0220218aee13b90b7701c937d95f
+checksum=e604db6521c1e367c6bd7fad239c847f53cc46646f2d2651372d05ae5e95f817
 # Tests require unpackaged pytest-mpi
 make_check=no
 

From 6a1d83d2257af2a9fb521076e27fbc6dafc80c2a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 22 Jun 2023 10:01:26 -0400
Subject: [PATCH 1108/1853] python3-hypothesis: update to 6.79.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 21f3e940e2d3..6848376206d9 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.78.0
+version=6.79.0
 revision=1
 build_wrksrc=hypothesis-python
 build_style=python3-pep517
@@ -24,7 +24,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=d0d9059f9f87da798802a6cc92e55b15bb3c16e4df824618e6d6f9d508cdbae6
+checksum=d6a7a8d7282804f7b7fefe293e21a84a7edb6fd7f34b7b60c7bdd4b71582b5af
 
 if [ "$XBPS_CHECK_PKGS" != full ]; then
 	# Skip "full" tests unless explicitly requested"

From 845dc251cfad0d1d6658db41f5f494481b71e57b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:50:04 -0400
Subject: [PATCH 1109/1853] python3-parsing: update to 3.1.0.

---
 srcpkgs/python3-parsing/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-parsing/template b/srcpkgs/python3-parsing/template
index 053098f8ab52..daf9fcf3392a 100644
--- a/srcpkgs/python3-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,23 +1,26 @@
 # Template file for 'python3-parsing'
 pkgname=python3-parsing
-version=3.0.9
-revision=2
+version=3.1.0
+revision=1
 # This package is used by the python3-pep517 build style; using that style here
 # would create a build cycle
 build_style=python3-module
 # disable tests that need `python3-railroad` (not in repo)
-make_check_args="-k not(testEmptyExpressionsAreHandledProperly)"
-make_check_target="--ignore=tests/test_diagram.py"
+make_check_args="
+ -k not(testEmptyExpressionsAreHandledProperly)
+ --ignore=tests/test_diagram.py
+ --deselect=tests/test_examples.py::TestExamples::test_range_check
+"
 hostmakedepends="python3-flit_core python3-installer"
 depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-xdist"
 short_desc="Python parsing module"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/pyparsing/pyparsing"
 changelog="https://github.com/pyparsing/pyparsing/raw/master/CHANGES"
-distfiles="https://github.com/pyparsing/pyparsing/archive/pyparsing_${version}.tar.gz"
-checksum=7e8ce1684c517f57f945698fd3bbf86b36a2e60cd223f74886d3af04deb06306
+distfiles="${PYPI_SITE}/p/pyparsing/pyparsing-${version}.tar.gz"
+checksum=edb662d6fe322d6e990b1594b5feaeadf806803359e3d4d42f11e295e588f0ea
 
 do_build() {
 	python3 -m flit_core.wheel

From b2dbbb8e8556683c129cc1e6ef53b15ee656f10e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:53:08 -0400
Subject: [PATCH 1110/1853] python3-pytools: update to 2023.1.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index db6e41820cde..a68d9cc96631 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.14
+version=2023.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=41017371610bb2a03685597c5285205e6597c7f177383d95c8b871244b12c14e
+checksum=f10e425220aefa1ff925342b658ff02dc33597c21fb88d7a63f9441bf2e7a50e
 
 post_install() {
 	vlicense LICENSE

From 402934ef3b4a70911393abc9eeffd728c2f76fe8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:53:17 -0400
Subject: [PATCH 1111/1853] python3-setuptools: update to 68.0.0.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 77bf9caa877e..b23f61bb633d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=67.8.0
+version=68.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102
+checksum=baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 94d4dc0837f78db54491b688f69c3b82672fba34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:55:29 -0400
Subject: [PATCH 1112/1853] xpra: update to 4.4.6.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index ee8ce4ec78a9..0a63fdb6c743 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.4.5
+version=4.4.6
 revision=1
 build_style=python3-module
 make_build_args="--without-cuda_kernels --without-cuda_rebuild"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=591bd39953cebbfba1a4543bab280b7c1065c3179318f37a41539e954d0709a2
+checksum=7fec998cf9816df3f0fa5ded01903b07211b0c36a7316c9e9bf6db8b80fb477a
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 # Tests don't run properly without package installed
 make_check=no

From a4adade9ba6331d538527311901c464397eacae0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 23 Jun 2023 14:03:38 -0400
Subject: [PATCH 1113/1853] discord-ptb: update to 0.0.43.

---
 srcpkgs/discord-ptb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 1ff2e7729a50..4cd2473ffec6 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,6 +1,6 @@
 # Template file for 'discord-ptb'
 pkgname=discord-ptb
-version=0.0.42
+version=0.0.43
 revision=1
 archs="x86_64"
 depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
@@ -10,7 +10,7 @@ maintainer="0x5c <dev@0x5c.io>"
 license="custom:Proprietary"
 homepage="https://discord.com/"
 distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=64033202ac8510125e4d4a90cebe702be04e146511aa1a072fcc36849bcbd2f2
+checksum=b46f9047ad8970162bbc94ba294ea801649f405765ebc00c714f04f596a1cb60
 nopie=yes
 restricted=yes
 repository=nonfree

From 69755f5d452503ffae30fb38a6fa574ac96283ff Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 18 Jun 2023 21:53:26 -0400
Subject: [PATCH 1114/1853] tio: update to 2.6.

---
 srcpkgs/tio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tio/template b/srcpkgs/tio/template
index ab3e267c9029..99cd54b76419 100644
--- a/srcpkgs/tio/template
+++ b/srcpkgs/tio/template
@@ -1,6 +1,6 @@
 # Template file for 'tio'
 pkgname=tio
-version=2.5
+version=2.6
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/tio/tio"
 changelog="https://github.com/tio/tio/raw/master/NEWS"
 distfiles="https://github.com/tio/tio/archive/refs/tags/v${version}.tar.gz"
-checksum=5a35796c9fb3e155e9dc5af478c3ce8cf8ca6bb5f6aaff3761173564bd33f1a0
+checksum=9b8a69124662cda8aee0faf74c71cdcd482530a46368f784015b579759e5d485
 
 post_install() {
 	vcompletion "build/src/bash-completion/tio" bash tio

From 09780d703ca74e805a8a08eb9ee59897d1b13770 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Jun 2023 01:24:12 +0530
Subject: [PATCH 1115/1853] Clightd: update to 5.8.

Adopt.
---
 srcpkgs/Clightd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index ee4d81225cc2..fa429ef619c7 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,6 +1,6 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=5.7
+version=5.8
 revision=1
 build_style=cmake
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
@@ -10,12 +10,12 @@ makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel
  wayland-devel libdrm-devel libusb-devel"
 depends="ddcutil"
 short_desc="API to read webcam brightness & alter screen brightness/temperature"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clightd"
 changelog="https://github.com/FedeDP/Clightd/releases"
 distfiles="https://github.com/FedeDP/Clightd/archive/refs/tags/${version}.tar.gz"
-checksum=75a01ee5f314866291efd66f2639516e3a7aa06da6ec5ea33f81211dc1082efa
+checksum=89f0906bc2c1dd4f9bd62194499fd156197c211760c4bb1adcb149650f852684
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From 4658920a556c2b076f13a2fe11ab137b4459a722 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Jun 2023 01:24:45 +0530
Subject: [PATCH 1116/1853] Clight: update to 4.10.

Adopt.
---
 srcpkgs/Clight/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 73649cc5788a..11065b4cda75 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.9
+version=4.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -8,12 +8,12 @@ makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
  dbus-devel libmodule-devel"
 depends="Clightd>=5.0"
 short_desc="Use your webcam as a light sensor to adjust screen backlight"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clight"
 changelog="https://github.com/FedeDP/Clight/releases"
 distfiles="https://github.com/FedeDP/Clight/archive/refs/tags/${version}.tar.gz"
-checksum=638696ee22a3a3340659db37d4e3c6fc2763eee9c8c2f7f227190ad9db7742db
+checksum=fa385472d3b055f94875930873fafbb225d4874793755bd3ec2bba6ef1b85871
 
 post_install() {
 	vcompletion Extra/completions/_clight zsh

From 5db8d544f74784a590118297ac924b6dee4d8657 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Wed, 14 Jun 2023 17:39:33 -0300
Subject: [PATCH 1117/1853] papirus-icon-theme: update to 20230601.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 9cf57757b240..75cf92f850b0 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20230301
+version=20230601
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=9e56bd9b04768b7aa415c82f430f5e76e854c63ba4eeba59a39b9a0ad9d000c1
+checksum=92d2e487cd3572e90c8cd28ada407cf0d28a81a4f4cb16cb537d1b92f7269486
 
 do_install() {
 	vmkdir usr/share/icons

From fa564c3eb878d543102e3e5f5530bbeca2c134ab Mon Sep 17 00:00:00 2001
From: aadi58002 <aadi58002gmail.com>
Date: Tue, 20 Jun 2023 10:59:24 +0530
Subject: [PATCH 1118/1853] podman-compose: update to 1.0.6

---
 srcpkgs/podman-compose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 310027c1a045..205691f08dcb 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
-version=1.0.3
-revision=2
+version=1.0.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="podman python3-yaml python3-dotenv"
@@ -10,6 +10,6 @@ maintainer="juan <juan@horlux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"
-checksum=b28e5792a50feee987e7864e0df1b6e8929c923c010e1f65493fe29b4c2aedcf
+checksum=0b9ee7cc000ef5d0ce7f81ce2e306be56d1edb0f494a883ca25c4d163469b12b
 # Source distribution does not script unit tests
 make_check=no

From 1e9106478d0224fcb6986884fcc7f466cc933c79 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 30 May 2023 17:48:30 +0100
Subject: [PATCH 1119/1853] eudev: update to 3.2.12.

---
 ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 ------------------
 srcpkgs/eudev/template                        | 21 +++++++++----------
 2 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch

diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
deleted file mode 100644
index b36b84f75496..000000000000
--- a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001
-From: oreo639 <31916379+Oreo639@users.noreply.github.com>
-Date: Sat, 9 Apr 2022 05:39:56 -0700
-Subject: [PATCH] udev: add udev_dir as synonym of udevdir
-
----
- src/udev/udev.pc.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
-index 4a9d867b8..cccebb245 100644
---- a/src/udev/udev.pc.in
-+++ b/src/udev/udev.pc.in
-@@ -3,4 +3,5 @@ Description: eudev
- Version: @UDEV_VERSION@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--udevdir=@udevlibexecdir@
-+udev_dir=@udevlibexecdir@
-+udevdir=${udev_dir}
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 1639a17d3448..27c652e974ea 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -3,33 +3,32 @@
 _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
-version=3.2.11
+version=3.2.12
 revision=1
 build_style=gnu-configure
-configure_args="--enable-hwdb --enable-manpages --disable-introspection"
+configure_args="--enable-hwdb --enable-manpages"
 hostmakedepends="pkg-config gperf"
 makedepends="libblkid-devel libkmod-devel"
 checkdepends="xz tar perl"
 short_desc="Fork of systemd-udev (enhanced userland device daemon)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/eudev-project"
+homepage="https://github.com/eudev-project/eudev"
+changelog="https://github.com/eudev-project/eudev/releases"
 distfiles="https://github.com/eudev-project/eudev/releases/download/v${version}/eudev-${version}.tar.gz"
-checksum=19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b
+checksum=ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8
 conf_files="/etc/udev/udev.conf"
 
+if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+	# requires unshare(2) which is not available in chroot
+	make_check=no
+fi
+
 post_install() {
 	mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev"
 	vsv udevd
 }
 
-do_check() {
-	# requires unshare(2) which is not available in chroot
-	if [ ! "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
-		make check
-	fi
-}
-
 eudev-libudev-devel_package() {
 	provides="libudev-devel-${_UDEV_VERSION}_${revision}"
 	depends="eudev-libudev>=${version}_${revision}"

From 7cb405ee2a799faa1e6fb6da771fcdc09282b40a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 19:26:50 +0100
Subject: [PATCH 1120/1853] base-files: add 'sgx' group.

---
 srcpkgs/base-files/files/group | 1 +
 srcpkgs/base-files/template    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
index dfad1019792b..455c937b1aef 100644
--- a/srcpkgs/base-files/files/group
+++ b/srcpkgs/base-files/files/group
@@ -24,6 +24,7 @@ kvm:x:24:
 input:x:25:
 plugdev:x:26:
 usbmon:x:27:
+sgx:x:28:
 nogroup:x:99:
 users:x:100:
 xbuilder:x:101:
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index b96d09351a08..5594c5a0efb4 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -29,7 +29,7 @@ conf_files="
 
 replaces="base-directories>=0"
 # New system groups
-system_groups="kvm:24 plugdev:26 usbmon:27"
+system_groups="kvm:24 plugdev:26 usbmon:27 sgx:28"
 
 do_install() {
 	# Create bin and lib dirs and symlinks.

From f2bdc3269a32a58266594ff42414ee393fe78dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Jun 2023 21:33:41 +0200
Subject: [PATCH 1121/1853] python3-pypdf: update to 3.11.0.

---
 srcpkgs/python3-pypdf/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pypdf/template b/srcpkgs/python3-pypdf/template
index 0de5f7c99f0f..1ee44b488b17 100644
--- a/srcpkgs/python3-pypdf/template
+++ b/srcpkgs/python3-pypdf/template
@@ -1,13 +1,15 @@
 # Template file for 'python3-pypdf'
 pkgname=python3-pypdf
-version=3.7.1
+version=3.11.0
 revision=1
-_sample_files_gitrev=d89d531f4bed7c5e692e4c094645133baf50a044
+_sample_files_gitrev=69b31cff6b183a42f9081709ef9bee4047976f56
 build_wrksrc="pypdf-${version}"
 build_style=python3-pep517
+# requires unpackaged fpdf2
+make_check_args="-k not(test_compression)"
 hostmakedepends="python3-flit_core"
 depends="python3-Pillow"
-checkdepends="python3-pytest python3-pycryptodome ${depends}"
+checkdepends="python3-pytest python3-pytest-timeout python3-pycryptodome ${depends}"
 short_desc="PDF library for splitting, merging, cropping, and transforming pages"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-3-Clause"
@@ -15,8 +17,8 @@ homepage="https://pypdf.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/py-pdf/pypdf/main/CHANGELOG.md"
 distfiles="https://github.com/py-pdf/pypdf/archive/refs/tags/${version}.tar.gz
  https://github.com/py-pdf/sample-files/archive/${_sample_files_gitrev}.tar.gz"
-checksum="c9d28daa1d8acedd4a63570df1ea5548da3022eb9c066c080e607dcae82e6bfa
- 4e5a055c0b6f8b7f37730456e4c376aa62afba44c439698cc6135c3906489c8e"
+checksum="bde551e6951ae65e9df119d261e4ce2d1c7aa5acfd3a24b33d5d797a8d65c03a
+ 0167f2e32e27fe6ad9c27ea7378f82f47fb53df3f5ccf63a9fde5c5924e49053"
 
 post_extract() {
 	rmdir ${build_wrksrc}/sample-files

From 052e2561e4e33e78104f018ae7d942862334c6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Jun 2023 21:33:42 +0200
Subject: [PATCH 1122/1853] diffoscope: update to 242.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 72c3abe3deb2..392bb4f42170 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=240
+version=242
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,4 +15,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/-/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=79e30534e348a95caf2f4d7138403ba4a44e64a0777a98b71b7d8873635ce302
+checksum=d858c591d2c8d42b2b29eb6d229408607b1cd8a4e7ade72d0cd002db6d1c2a6e

From 9b5d93fcc5c364867e022c586dff4327d8f69924 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 14 May 2023 22:32:07 +0200
Subject: [PATCH 1123/1853] gtk-layer-shell: update to 0.8.1.

---
 srcpkgs/gtk-layer-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk-layer-shell/template b/srcpkgs/gtk-layer-shell/template
index 4a5fc2b89b0d..48f9c985620e 100644
--- a/srcpkgs/gtk-layer-shell/template
+++ b/srcpkgs/gtk-layer-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk-layer-shell'
 pkgname=gtk-layer-shell
-version=0.6.0
+version=0.8.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="LGPL-3.0-or-later, MIT"
 homepage="https://github.com/wmww/gtk-layer-shell"
 distfiles="https://github.com/wmww/gtk-layer-shell/archive/v${version}.tar.gz"
-checksum=9a0ba72cea90e092d6b10ba47e627cd873271d287d9af80a6f66ab131fb34cac
+checksum=c329fac878a1731cb23ad7365f2f2a35e4ab26e72b4e69458e06afd825baad48
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"

From 52892a2aac28cbc57ad73a51fd489b7e4253b058 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 15 Apr 2023 22:40:37 +0100
Subject: [PATCH 1124/1853] xmlsec1: update to 1.3.1.

---
 srcpkgs/xmlsec1/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index d57bd4b9f645..9cd74e808365 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,9 +1,9 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
-version=1.2.37
+version=1.3.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config gnutls-devel"
+hostmakedepends="pkg-config"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
  nspr-devel nss-devel"
 short_desc="XML Security Library is a C library based on LibXML2"
@@ -12,11 +12,7 @@ license="MIT"
 homepage="https://www.aleksey.com/xmlsec/"
 changelog="https://www.aleksey.com/xmlsec/news.html"
 distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"
-checksum=5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
-
-pre_configure() {
-	autoreconf -if
-}
+checksum=10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then

From f1b3cd3444aa3c34757276647d752dbb2a83f225 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emruemru1@gmail.com>
Date: Fri, 31 Mar 2023 10:16:49 +0200
Subject: [PATCH 1125/1853] transmission: update to 4.0.2.

---
 .../patches/add-missing-files.patch           | 2462 -----------------
 .../transmission/patches/fix-makefiles.patch  |   62 -
 srcpkgs/transmission/template                 |   25 +-
 3 files changed, 9 insertions(+), 2540 deletions(-)
 delete mode 100644 srcpkgs/transmission/patches/add-missing-files.patch
 delete mode 100644 srcpkgs/transmission/patches/fix-makefiles.patch

diff --git a/srcpkgs/transmission/patches/add-missing-files.patch b/srcpkgs/transmission/patches/add-missing-files.patch
deleted file mode 100644
index 0bdfda34d1fa..000000000000
--- a/srcpkgs/transmission/patches/add-missing-files.patch
+++ /dev/null
@@ -1,2462 +0,0 @@
-diff --git a/libtransmission/subprocess-test.cmd b/libtransmission/subprocess-test.cmd
-new file mode 100644
-index 0000000..4d08d06
---- /dev/null
-+++ b/libtransmission/subprocess-test.cmd
-@@ -0,0 +1,48 @@
-+@echo off
-+setlocal EnableExtensions EnableDelayedExpansion
-+
-+set __argc=0
-+for %%i in (%*) do (
-+    set /a __argc+=1
-+    set "__argv[!__argc!]=%%~i"
-+)
-+
-+set "result_path=!__argv[1]!"
-+set "test_action=!__argv[2]!"
-+
-+set "temp_result_path=%result_path%.tmp"
-+>"%temp_result_path%" <nul set /p=
-+
-+if "%test_action%" == "--dump-args" goto dump_args
-+if "%test_action%" == "--dump-env" goto dump_env
-+if "%test_action%" == "--dump-cwd" goto dump_cwd
-+
-+exit /b 1
-+
-+:dump_args
-+    for /l %%i in (3,1,%__argc%) do (
-+        >>"%temp_result_path%" echo.!__argv[%%i]!
-+    )
-+    goto finish
-+
-+:dump_env
-+    for /l %%i in (3,1,%__argc%) do (
-+        >>"%temp_result_path%" call :dump_env_var "!__argv[%%i]!"
-+    )
-+    goto finish
-+
-+:dump_env_var
-+    if defined %~1 (
-+        echo.!%~1!
-+    ) else (
-+        echo.^<null^>
-+    )
-+    exit /b 0
-+
-+:dump_cwd
-+    >>"%temp_result_path%" echo.%CD%
-+    goto finish
-+
-+:finish
-+    >nul move /y "%temp_result_path%" "%result_path%"
-+    exit /b 0
-diff --git a/po/pt_PT.po b/po/pt_PT.po
-new file mode 100644
-index 0000000..d9346f8
---- /dev/null
-+++ b/po/pt_PT.po
-@@ -0,0 +1,2402 @@
-+# SOME DESCRIPTIVE TITLE.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
-+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+#
-+# Translators:
-+# Gonçalo Matos , 2017
-+# String YM <inactive+StringYM@transifex.com>, 2017
-+# Rui <xymarior@yandex.com>, 2019
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2020-05-14 18:55+0300\n"
-+"PO-Revision-Date: 2017-01-26 19:47+0000\n"
-+"Last-Translator: Rui <xymarior@yandex.com>, 2019\n"
-+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/transmissionbt/teams/33778/pt_PT/)\n"
-+"Language: pt_PT\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+
-+#: ../cli/cli.c:114 ../gtk/util.c:92 ../libtransmission/utils.c:1694
-+msgid "None"
-+msgstr "Nenhum"
-+
-+#: ../gtk/actions.c:31
-+msgid "Sort by _Activity"
-+msgstr "Ordernar por: _Atividade"
-+
-+#: ../gtk/actions.c:32
-+msgid "Sort by _Name"
-+msgstr "Ordenar por: _Nome"
-+
-+#: ../gtk/actions.c:33
-+msgid "Sort by _Progress"
-+msgstr "Ordenar por: _Progresso"
-+
-+#: ../gtk/actions.c:34
-+msgid "Sort by _Queue"
-+msgstr "Ordenar por: _Data"
-+
-+#: ../gtk/actions.c:35
-+msgid "Sort by Rati_o"
-+msgstr "Ordenar por: Percent_agem"
-+
-+#: ../gtk/actions.c:36
-+msgid "Sort by Stat_e"
-+msgstr "Ordenar por: _Estado"
-+
-+#: ../gtk/actions.c:37
-+msgid "Sort by A_ge"
-+msgstr "Ordenar por: A_ge"
-+
-+#: ../gtk/actions.c:38
-+msgid "Sort by Time _Left"
-+msgstr "Ordenar por: Time_Left"
-+
-+#: ../gtk/actions.c:39
-+msgid "Sort by Si_ze"
-+msgstr "Ordenar por: Si:ze"
-+
-+#: ../gtk/actions.c:53
-+msgid "_Show Transmission"
-+msgstr "_Mostrar o Transmission"
-+
-+#: ../gtk/actions.c:54
-+msgid "Message _Log"
-+msgstr "_Registo de Mensagens"
-+
-+#: ../gtk/actions.c:67
-+msgid "Enable Alternative Speed _Limits"
-+msgstr "Ativar _Limites de Velocidade Alternativos"
-+
-+#: ../gtk/actions.c:68
-+msgid "_Compact View"
-+msgstr "Vista _Compacta"
-+
-+#: ../gtk/actions.c:69
-+msgid "Re_verse Sort Order"
-+msgstr "In_verter Ordenação"
-+
-+#: ../gtk/actions.c:70
-+msgid "_Filterbar"
-+msgstr "Barra de _Filtros"
-+
-+#: ../gtk/actions.c:71
-+msgid "_Statusbar"
-+msgstr "Barra de E_stado"
-+
-+#: ../gtk/actions.c:72
-+msgid "_Toolbar"
-+msgstr "Barra de Ferramen_tas"
-+
-+#: ../gtk/actions.c:77
-+msgid "_File"
-+msgstr "_Ficheiro"
-+
-+#: ../gtk/actions.c:78
-+msgid "_Torrent"
-+msgstr "_Torrent"
-+
-+#: ../gtk/actions.c:79
-+msgid "_View"
-+msgstr "_Vista"
-+
-+#: ../gtk/actions.c:80
-+msgid "_Sort Torrents By"
-+msgstr "_Ordenar Torrents por:"
-+
-+#: ../gtk/actions.c:81
-+msgid "_Queue"
-+msgstr "F_ila"
-+
-+#: ../gtk/actions.c:82 ../gtk/details.c:2839
-+msgid "_Edit"
-+msgstr "_Editar"
-+
-+#: ../gtk/actions.c:83
-+msgid "_Help"
-+msgstr "_Ajuda"
-+
-+#: ../gtk/actions.c:84
-+msgid "Copy _Magnet Link to Clipboard"
-+msgstr "Copiar Link _Magnético"
-+
-+#: ../gtk/actions.c:85
-+msgid "Open URL…"
-+msgstr "Abrir URL…"
-+
-+#: ../gtk/actions.c:85
-+msgid "Open _URL…"
-+msgstr "Abrir _URL…"
-+
-+#: ../gtk/actions.c:86 ../gtk/actions.c:87
-+msgid "Open a torrent"
-+msgstr "Abrir um torrent"
-+
-+#: ../gtk/actions.c:88
-+msgid "Start torrent"
-+msgstr "_Iniciar Torrent"
-+
-+#: ../gtk/actions.c:88
-+msgid "_Start"
-+msgstr "_Iniciar"
-+
-+#: ../gtk/actions.c:89
-+msgid "Start _Now"
-+msgstr "Iniciar _Agora"
-+
-+#: ../gtk/actions.c:89
-+msgid "Start torrent now"
-+msgstr "Iniciar o torrent agora"
-+
-+#: ../gtk/actions.c:91
-+msgid "_Statistics"
-+msgstr "E_statísticas"
-+
-+#: ../gtk/actions.c:92
-+msgid "_Donate"
-+msgstr "_Doar"
-+
-+#: ../gtk/actions.c:93
-+msgid "_Verify Local Data"
-+msgstr "_Verificar Dados Locais"
-+
-+#: ../gtk/actions.c:94
-+msgid "Pause torrent"
-+msgstr "Pausar o Torrent"
-+
-+#: ../gtk/actions.c:94
-+msgid "_Pause"
-+msgstr "_Pausar"
-+
-+#: ../gtk/actions.c:95
-+msgid "Pause all torrents"
-+msgstr "Pausar todos os torrents"
-+
-+#: ../gtk/actions.c:95
-+msgid "_Pause All"
-+msgstr "Pausar tudo"
-+
-+#: ../gtk/actions.c:96
-+msgid "Start all torrents"
-+msgstr "Iniciar todos os Torrents"
-+
-+#: ../gtk/actions.c:96
-+msgid "_Start All"
-+msgstr "_Iniciar tudo"
-+
-+#: ../gtk/actions.c:97
-+msgid "Set _Location…"
-+msgstr "Definir _Localização…"
-+
-+#: ../gtk/actions.c:98
-+msgid "Remove torrent"
-+msgstr "Remover torrent"
-+
-+#: ../gtk/actions.c:99
-+msgid "_Delete Files and Remove"
-+msgstr "_Eliminar Ficheiros e Remover"
-+
-+#: ../gtk/actions.c:100
-+msgid "Create a torrent"
-+msgstr "Criar torrent"
-+
-+#: ../gtk/actions.c:100
-+msgid "_New…"
-+msgstr "_Novo"
-+
-+#: ../gtk/actions.c:101
-+msgid "_Quit"
-+msgstr "_Sair"
-+
-+#: ../gtk/actions.c:102
-+msgid "Select _All"
-+msgstr "Selecion_ar Tudo"
-+
-+#: ../gtk/actions.c:103
-+msgid "Dese_lect All"
-+msgstr "Desce_lecionar Tudo"
-+
-+#: ../gtk/actions.c:105
-+msgid "Torrent properties"
-+msgstr "Propriedades do torrent"
-+
-+#: ../gtk/actions.c:106
-+msgid "Open Fold_er"
-+msgstr "Abrir _Pasta"
-+
-+#: ../gtk/actions.c:108
-+msgid "_Contents"
-+msgstr "_Conteúdos"
-+
-+#: ../gtk/actions.c:109
-+msgid "Ask Tracker for _More Peers"
-+msgstr "Pedir ao rastreador _mais pares"
-+
-+#: ../gtk/actions.c:110
-+msgid "Move to _Top"
-+msgstr "Mover para o _Topo"
-+
-+#: ../gtk/actions.c:111
-+msgid "Move _Up"
-+msgstr "Mover para _Cima"
-+
-+#: ../gtk/actions.c:112
-+msgid "Move _Down"
-+msgstr "Mover para _Baixo"
-+
-+#: ../gtk/actions.c:113
-+msgid "Move to _Bottom"
-+msgstr "Mover para o _Fundo"
-+
-+#: ../gtk/actions.c:114
-+msgid "Present Main Window"
-+msgstr "Mostrar janela principal"
-+
-+#: ../gtk/details.c:486 ../gtk/details.c:497
-+msgid "Use global settings"
-+msgstr "Usar definições globais"
-+
-+#: ../gtk/details.c:487
-+msgid "Seed regardless of ratio"
-+msgstr "Semear independentemente do rácio"
-+
-+#: ../gtk/details.c:488
-+msgid "Stop seeding at ratio:"
-+msgstr "Parar de semear no rácio:"
-+
-+#: ../gtk/details.c:498
-+msgid "Seed regardless of activity"
-+msgstr "Semear independentemente da atividade"
-+
-+#: ../gtk/details.c:499
-+msgid "Stop seeding if idle for N minutes:"
-+msgstr "Parar de semear se inativo por N minutos:"
-+
-+#: ../gtk/details.c:517 ../gtk/tr-prefs.c:1253
-+msgid "Speed"
-+msgstr "Velocidade"
-+
-+#: ../gtk/details.c:519
-+msgid "Honor global _limits"
-+msgstr "Respeitar _limites globais"
-+
-+#: ../gtk/details.c:524
-+#, c-format
-+msgid "Limit _download speed (%s):"
-+msgstr "Limitar velocidade de _descarregamento (%s):"
-+
-+#: ../gtk/details.c:537
-+#, c-format
-+msgid "Limit _upload speed (%s):"
-+msgstr "Limitar velocidade de _envio (%s):"
-+
-+#: ../gtk/details.c:550 ../gtk/open-dialog.c:368
-+msgid "Torrent _priority:"
-+msgstr "_Prioridade do torrent:"
-+
-+#: ../gtk/details.c:554
-+msgid "Seeding Limits"
-+msgstr "Limites de Velocidade"
-+
-+#: ../gtk/details.c:564
-+msgid "_Ratio:"
-+msgstr "_Rácio:"
-+
-+#: ../gtk/details.c:573
-+msgid "_Idle:"
-+msgstr "_Inativo:"
-+
-+#: ../gtk/details.c:576
-+msgid "Peer Connections"
-+msgstr "Ligações a pares"
-+
-+#: ../gtk/details.c:579
-+msgid "_Maximum peers:"
-+msgstr "_Máximo de pares:"
-+
-+#: ../gtk/details.c:598 ../gtk/torrent-cell-renderer.c:195 ../libtransmission/verify.c:272
-+msgid "Queued for verification"
-+msgstr "Na fila para verificação"
-+
-+#: ../gtk/details.c:601
-+msgid "Verifying local data"
-+msgstr "A verificar dados locais"
-+
-+#: ../gtk/details.c:604 ../gtk/torrent-cell-renderer.c:199
-+msgid "Queued for download"
-+msgstr "Na fila para descarregar"
-+
-+#: ../gtk/details.c:607 ../gtk/filter.c:586
-+msgctxt "Verb"
-+msgid "Downloading"
-+msgstr "A descarregar"
-+
-+#: ../gtk/details.c:610 ../gtk/torrent-cell-renderer.c:203
-+msgid "Queued for seeding"
-+msgstr "Na fila para semear"
-+
-+#: ../gtk/details.c:613 ../gtk/filter.c:587
-+msgctxt "Verb"
-+msgid "Seeding"
-+msgstr "A semear"
-+
-+#: ../gtk/details.c:616 ../gtk/filter.c:589 ../gtk/torrent-cell-renderer.c:191
-+msgid "Finished"
-+msgstr "Terminado"
-+
-+#: ../gtk/details.c:616 ../gtk/filter.c:588 ../gtk/torrent-cell-renderer.c:191
-+msgid "Paused"
-+msgstr "Pausado"
-+
-+#: ../gtk/details.c:653 ../gtk/details.c:733
-+msgid "N/A"
-+msgstr "N/A"
-+
-+#: ../gtk/details.c:664 ../gtk/file-list.c:636
-+msgid "Mixed"
-+msgstr "Misturado"
-+
-+#: ../gtk/details.c:665
-+msgid "No Torrents Selected"
-+msgstr "Sem Torrents Selecionados"
-+
-+#: ../gtk/details.c:695
-+msgid "Private to this tracker -- DHT and PEX disabled"
-+msgstr "Privado para este rastreador - DHT e PEX desativados"
-+
-+#: ../gtk/details.c:695
-+msgid "Public torrent"
-+msgstr "Torrent público"
-+
-+#: ../gtk/details.c:739
-+#, c-format
-+msgid "Created by %1$s"
-+msgstr "Criado por %1$s"
-+
-+#: ../gtk/details.c:743
-+#, c-format
-+msgid "Created on %1$s"
-+msgstr "Criado em %1$s"
-+
-+#: ../gtk/details.c:747
-+#, c-format
-+msgid "Created by %1$s on %2$s"
-+msgstr "Criado por %1$s em %2$s"
-+
-+#: ../gtk/details.c:877
-+msgid "Unknown"
-+msgstr "Desconhecido"
-+
-+#: ../gtk/details.c:919
-+#, c-format
-+msgid "%1$s (%2$'d piece @ %3$s)"
-+msgid_plural "%1$s (%2$'d pieces @ %3$s)"
-+msgstr[0] "%1$s (%2$'d pedaço @ %3$s)"
-+msgstr[1] "%1$s (%2$'d pedaços @ %3$s)"
-+
-+#: ../gtk/details.c:925
-+#, c-format
-+msgid "%1$s (%2$'d piece)"
-+msgid_plural "%1$s (%2$'d pieces)"
-+msgstr[0] "%1$s (%2$'d pedaço)"
-+msgstr[1] "%1$s (%2$'d pedaços)"
-+
-+#: ../gtk/details.c:969
-+#, c-format
-+msgid "%1$s (%2$s%%)"
-+msgstr "%1$s (%2$s%%)"
-+
-+#: ../gtk/details.c:973
-+#, c-format
-+msgid "%1$s (%2$s%% of %3$s%% Available)"
-+msgstr "%1$s (%2$s%% de %3$s%% Disponível)"
-+
-+#: ../gtk/details.c:977
-+#, c-format
-+msgid "%1$s (%2$s%% of %3$s%% Available); %4$s Unverified"
-+msgstr "%1$s (%2$s%% de %3$s%% Disponível); %4$s Por verificar"
-+
-+#: ../gtk/details.c:1010
-+#, c-format
-+msgid "%1$s (+%2$s corrupt)"
-+msgstr "%1$s (+%2$s corrompido)"
-+
-+#: ../gtk/details.c:1042
-+#, c-format
-+msgid "%s (Ratio: %s)"
-+msgstr "%s (Rácio: %s)"
-+
-+#: ../gtk/details.c:1084
-+msgid "No errors"
-+msgstr "Sem erros"
-+
-+#: ../gtk/details.c:1108
-+msgid "Never"
-+msgstr "Nunca"
-+
-+#: ../gtk/details.c:1116
-+msgid "Active now"
-+msgstr "Ativo agora"
-+
-+#: ../gtk/details.c:1122
-+#, c-format
-+msgid "%1$s ago"
-+msgstr "%1$s atrás"
-+
-+#: ../gtk/details.c:1145
-+msgid "Activity"
-+msgstr "Atividade"
-+
-+#: ../gtk/details.c:1150
-+msgid "Torrent size:"
-+msgstr "Tamanho do torrent:"
-+
-+#: ../gtk/details.c:1155
-+msgid "Have:"
-+msgstr "Tenho:"
-+
-+#: ../gtk/details.c:1160 ../gtk/stats.c:133 ../gtk/stats.c:158
-+msgid "Uploaded:"
-+msgstr "Enviado:"
-+
-+#: ../gtk/details.c:1165 ../gtk/stats.c:137 ../gtk/stats.c:162
-+msgid "Downloaded:"
-+msgstr "Descarregado:"
-+
-+#: ../gtk/details.c:1170
-+msgid "State:"
-+msgstr "Estado:"
-+
-+#: ../gtk/details.c:1175
-+msgid "Running time:"
-+msgstr "Tempo em execução:"
-+
-+#: ../gtk/details.c:1180
-+msgid "Remaining time:"
-+msgstr "Tempo restante:"
-+
-+#: ../gtk/details.c:1185
-+msgid "Last activity:"
-+msgstr "Última atividade:"
-+
-+#: ../gtk/details.c:1189
-+msgid "Error:"
-+msgstr "Erro:"
-+
-+#: ../gtk/details.c:1193
-+msgid "Details"
-+msgstr "Detalhes"
-+
-+#: ../gtk/details.c:1197
-+msgid "Location:"
-+msgstr "Localização:"
-+
-+#: ../gtk/details.c:1202
-+msgid "Hash:"
-+msgstr "Hash:"
-+
-+#: ../gtk/details.c:1208
-+msgid "Privacy:"
-+msgstr "Privacidade:"
-+
-+#: ../gtk/details.c:1213
-+msgid "Origin:"
-+msgstr "Origem:"
-+
-+#: ../gtk/details.c:1228
-+msgid "Comment:"
-+msgstr "Comentário:"
-+
-+#: ../gtk/details.c:1256
-+msgid "Web Seeds"
-+msgstr "Semeares da web"
-+
-+#: ../gtk/details.c:1260 ../gtk/details.c:1316
-+msgid "Down"
-+msgstr "Baixo"
-+
-+#: ../gtk/details.c:1312
-+msgid "Address"
-+msgstr "Endereço"
-+
-+#: ../gtk/details.c:1320
-+msgid "Up"
-+msgstr "Cima"
-+
-+#: ../gtk/details.c:1323
-+msgid "Client"
-+msgstr "Cliente"
-+
-+#: ../gtk/details.c:1326
-+msgid "%"
-+msgstr "%"
-+
-+#: ../gtk/details.c:1330
-+msgid "Up Reqs"
-+msgstr "Pedid. Env."
-+
-+#: ../gtk/details.c:1334
-+msgid "Dn Reqs"
-+msgstr "Pedid. Receb."
-+
-+#: ../gtk/details.c:1338
-+msgid "Dn Blocks"
-+msgstr "Blocos Receb."
-+
-+#: ../gtk/details.c:1342
-+msgid "Up Blocks"
-+msgstr "Blocos Env."
-+
-+#: ../gtk/details.c:1346
-+msgid "We Cancelled"
-+msgstr "Nós Concelamos"
-+
-+#: ../gtk/details.c:1350
-+msgid "They Cancelled"
-+msgstr "Eles Cancelaram"
-+
-+#: ../gtk/details.c:1353
-+msgid "Flags"
-+msgstr "Bandeiras"
-+
-+#: ../gtk/details.c:1770
-+msgid "Optimistic unchoke"
-+msgstr "Desestrangulamento otimista"
-+
-+#: ../gtk/details.c:1774
-+msgid "Downloading from this peer"
-+msgstr "A descarregar deste par"
-+
-+#: ../gtk/details.c:1778
-+msgid "We would download from this peer if they would let us"
-+msgstr "Descarregaríamos deste pare se ele permitisse"
-+
-+#: ../gtk/details.c:1782
-+msgid "Uploading to peer"
-+msgstr "A enviar para o par"
-+
-+#: ../gtk/details.c:1786
-+msgid "We would upload to this peer if they asked"
-+msgstr "Enviaríamos para este par se ele pedisse"
-+
-+#: ../gtk/details.c:1790
-+msgid "Peer has unchoked us, but we're not interested"
-+msgstr "O par destrangulou-nos, mas não estamos interessados"
-+
-+#: ../gtk/details.c:1794
-+msgid "We unchoked this peer, but they're not interested"
-+msgstr "Desestrangulamos este par, mas ele não está interessado"
-+
-+#: ../gtk/details.c:1798
-+msgid "Encrypted connection"
-+msgstr "Ligação encriptada"
-+
-+#: ../gtk/details.c:1802
-+msgid "Peer was found through Peer Exchange (PEX)"
-+msgstr "O par foi descoberto através da Trocar de Pares (PEX)"
-+
-+#: ../gtk/details.c:1806
-+msgid "Peer was found through DHT"
-+msgstr "O par foi encontrado através da Tabela Hash Distribuída (DHT)"
-+
-+#: ../gtk/details.c:1810
-+msgid "Peer is an incoming connection"
-+msgstr "O par é uma ligação a dar entrada"
-+
-+#: ../gtk/details.c:1814
-+msgid "Peer is connected over µTP"
-+msgstr "O par está ligado através de µTP"
-+
-+#: ../gtk/details.c:2082 ../gtk/details.c:2854
-+msgid "Show _more details"
-+msgstr "Mostrar _mais detalhes"
-+
-+#: ../gtk/details.c:2156
-+#, c-format
-+msgid "Got a list of %1$s%2$'d peers%3$s %4$s ago"
-+msgstr "Obtida uma lista de %1$s%2$'d pares%3$s %4$s atrás"
-+
-+#: ../gtk/details.c:2161
-+#, c-format
-+msgid "Peer list request %1$stimed out%2$s %3$s ago; will retry"
-+msgstr "O pedido de lista de pares %1$sexcedeu o tempo limite%2$s %3$s atrás; a tentar novamente"
-+
-+#: ../gtk/details.c:2166
-+#, c-format
-+msgid "Got an error %1$s\"%2$s\"%3$s %4$s ago"
-+msgstr "Obtido um erro %1$s\"%2$s\"%3$s %4$s atrás"
-+
-+#: ../gtk/details.c:2175
-+msgid "No updates scheduled"
-+msgstr "Não há atualizações programadas"
-+
-+#: ../gtk/details.c:2181
-+#, c-format
-+msgid "Asking for more peers in %s"
-+msgstr "A pedir mais pares em %s"
-+
-+#: ../gtk/details.c:2186
-+msgid "Queued to ask for more peers"
-+msgstr "Na fila para pedir por mais pares"
-+
-+#: ../gtk/details.c:2192
-+#, c-format
-+msgid "Asking for more peers now… <small>%s</small>"
-+msgstr "A pedir agora por mais pares… <small>%s</small>"
-+
-+#: ../gtk/details.c:2205
-+#, c-format
-+msgid "Tracker had %s%'d seeders and %'d leechers%s %s ago"
-+msgstr "O rastreador teve %s%'d semeadores e %'d sanguesugas%s %s atrás"
-+
-+#: ../gtk/details.c:2210
-+#, c-format
-+msgid "Got a scrape error \"%s%s%s\" %s ago"
-+msgstr "Obtido um erro scrape \"%s%s%s\" %s atrás"
-+
-+#: ../gtk/details.c:2223
-+#, c-format
-+msgid "Asking for peer counts in %s"
-+msgstr "A pedir a contagem de pares em %s"
-+
-+#: ../gtk/details.c:2228
-+msgid "Queued to ask for peer counts"
-+msgstr "Na fila para pedir a contagem de pares"
-+
-+#: ../gtk/details.c:2234
-+#, c-format
-+msgid "Asking for peer counts now… <small>%s</small>"
-+msgstr "A pedir agora a contagem de pares… <small>%s</small>"
-+
-+#: ../gtk/details.c:2537
-+msgid "List contains invalid URLs"
-+msgstr "A lista contém URLs inválidos"
-+
-+#: ../gtk/details.c:2541 ../gtk/file-list.c:847
-+msgid "Please correct the errors and try again."
-+msgstr "Por favor corrija os erros e tente novamente."
-+
-+#: ../gtk/details.c:2603
-+#, c-format
-+msgid "%s - Edit Trackers"
-+msgstr "%s - Editar Rastreadores"
-+
-+#: ../gtk/details.c:2610
-+msgid "Tracker Announce URLs"
-+msgstr "URLs de anúncios do rastreador"
-+
-+#: ../gtk/details.c:2613 ../gtk/makemeta-ui.c:493
-+msgid ""
-+"To add a backup URL, add it on the line after the primary URL.\n"
-+"To add another primary URL, add it after a blank line."
-+msgstr ""
-+"Para adicionar um URL de cópia de segurança, aadicione-o à linha após o  URL principal.\n"
-+"Para adicionar outro URL principal, adicione-o após uma linha vazia."
-+
-+#: ../gtk/details.c:2713
-+#, c-format
-+msgid "%s - Add Tracker"
-+msgstr "%s - Adicionar Rastreador"
-+
-+#: ../gtk/details.c:2720
-+msgid "Tracker"
-+msgstr "Rastreador"
-+
-+#: ../gtk/details.c:2726
-+msgid "_Announce URL:"
-+msgstr "URL de _anúncios:"
-+
-+#: ../gtk/details.c:2810 ../gtk/details.c:2967
-+msgid "Trackers"
-+msgstr "Rastreadores"
-+
-+#: ../gtk/details.c:2834
-+msgid "_Add"
-+msgstr "_Adicionar"
-+
-+#: ../gtk/details.c:2845
-+msgid "_Remove"
-+msgstr "_Remover"
-+
-+#: ../gtk/details.c:2861
-+msgid "Show _backup trackers"
-+msgstr "Mostrar rastreadores na cópia de segurança"
-+
-+#: ../gtk/details.c:2959 ../gtk/msgwin.c:431
-+msgid "Information"
-+msgstr "Informação"
-+
-+#: ../gtk/details.c:2963
-+msgid "Peers"
-+msgstr "Pares"
-+
-+#: ../gtk/details.c:2972
-+msgid "File listing not available for combined torrent properties"
-+msgstr "Listagem de ficheiros não disponível para propriedades de torrents combinadas"
-+
-+#: ../gtk/details.c:2976 ../gtk/makemeta-ui.c:442
-+msgid "Files"
-+msgstr "Ficheiros"
-+
-+#: ../gtk/details.c:2980 ../gtk/tr-prefs.c:1164 ../gtk/tr-window.c:646
-+msgid "Options"
-+msgstr "Opções"
-+
-+#: ../gtk/details.c:3002
-+#, c-format
-+msgid "%s Properties"
-+msgstr "%s Propriedades"
-+
-+#: ../gtk/details.c:3013
-+#, c-format
-+msgid "%'d Torrent Properties"
-+msgstr "%'d Propriedades do Torrent"
-+
-+#: ../gtk/dialogs.c:100
-+#, c-format
-+msgid "Remove torrent?"
-+msgid_plural "Remove %d torrents?"
-+msgstr[0] "Remover torrent?"
-+msgstr[1] "Remover %d torrents?"
-+
-+#: ../gtk/dialogs.c:104
-+#, c-format
-+msgid "Delete this torrent's downloaded files?"
-+msgid_plural "Delete these %d torrents' downloaded files?"
-+msgstr[0] "Eliminar este ficheiro torrent descarregado?"
-+msgstr[1] "Eliminar estes %d ficheiros torrent descarregados?"
-+
-+#: ../gtk/dialogs.c:113
-+msgid "Once removed, continuing the transfer will require the torrent file or magnet link."
-+msgid_plural "Once removed, continuing the transfers will require the torrent files or magnet links."
-+msgstr[0] "Após sere eliminado, para continuar o descarregamento será necessário o ficheiro torrent ou o link magnético."
-+msgstr[1] "Após serem eliminados, para continuar o descarregamento serão necessários os ficheiros torrent ou os links magnéticos."
-+
-+#: ../gtk/dialogs.c:118
-+msgid "This torrent has not finished downloading."
-+msgid_plural "These torrents have not finished downloading."
-+msgstr[0] "O descarregamento deste torrent ainda não terminou."
-+msgstr[1] "O descarregamento destes torrents ainda não terminou."
-+
-+#: ../gtk/dialogs.c:123
-+msgid "This torrent is connected to peers."
-+msgid_plural "These torrents are connected to peers."
-+msgstr[0] "Este torrent está conectado aos outros pares."
-+msgstr[1] "Estes torrents estão conectados aos outros pares."
-+
-+#: ../gtk/dialogs.c:130
-+msgid "One of these torrents is connected to peers."
-+msgid_plural "Some of these torrents are connected to peers."
-+msgstr[0] "Um destes torrents está conectado a outros pares."
-+msgstr[1] "Alguns destes torrents estão conectados a outros pares."
-+
-+#: ../gtk/dialogs.c:141
-+msgid "One of these torrents has not finished downloading."
-+msgid_plural "Some of these torrents have not finished downloading."
-+msgstr[0] "Um destes torrents ainda não terminou."
-+msgstr[1] "Alguns destes torrents ainda não terminaram."
-+
-+#: ../gtk/file-list.c:624 ../gtk/util.c:520
-+msgid "High"
-+msgstr "Alta"
-+
-+#: ../gtk/file-list.c:628 ../gtk/util.c:521
-+msgid "Normal"
-+msgstr "Normal"
-+
-+#: ../gtk/file-list.c:632 ../gtk/util.c:522
-+msgid "Low"
-+msgstr "Baixa"
-+
-+#: ../gtk/file-list.c:845
-+#, c-format
-+msgid "Unable to rename file as \"%s\": %s"
-+msgstr "Não foi possível alterar o nome do ficheiro para \"%s\": %s"
-+
-+#. add file column
-+#: ../gtk/file-list.c:957 ../gtk/msgwin.c:289
-+msgid "Name"
-+msgstr "Nome"
-+
-+#. add "size" column
-+#: ../gtk/file-list.c:973
-+msgid "Size"
-+msgstr "Tamanho"
-+
-+#. add "progress" column
-+#: ../gtk/file-list.c:984
-+msgid "Have"
-+msgstr "Tenho"
-+
-+#. add "enabled" column
-+#: ../gtk/file-list.c:997
-+msgid "Download"
-+msgstr "Descarregar"
-+
-+#. add priority column
-+#: ../gtk/file-list.c:1012
-+msgid "Priority"
-+msgstr "Prioridade"
-+
-+#: ../gtk/filter.c:299 ../gtk/filter.c:583
-+msgid "All"
-+msgstr "Tudo"
-+
-+#: ../gtk/filter.c:585
-+msgid "Active"
-+msgstr "Ativo"
-+
-+#: ../gtk/filter.c:590
-+msgctxt "Verb"
-+msgid "Verifying"
-+msgstr "A verificar"
-+
-+#: ../gtk/filter.c:591 ../gtk/msgwin.c:430 ../gtk/util.c:717
-+msgid "Error"
-+msgstr "Erro"
-+
-+#: ../gtk/filter.c:880
-+msgid "_Show:"
-+msgstr "_Mostrar:"
-+
-+#: ../gtk/filter.c:884
-+#, c-format
-+msgid "_Show %'d of:"
-+msgstr "_Mostrar %'d de:"
-+
-+#: ../gtk/main.c:314
-+#, c-format
-+msgid "Error registering Transmission as a %s handler: %s"
-+msgstr "Erro ao registar o Transmission como um manipulador de %s: %s"
-+
-+#: ../gtk/main.c:480
-+#, c-format
-+msgid "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck."
-+msgstr "Foi obtido o sinal de %d; a tentar desligar corretamente. Faça-o de novo caso fique bloqueado."
-+
-+#: ../gtk/main.c:616
-+msgid "Where to look for configuration files"
-+msgstr "Onde procurar por ficheiros de configuração"
-+
-+#: ../gtk/main.c:617
-+msgid "Start with all torrents paused"
-+msgstr "Iniciar com todos os torrents em pausa"
-+
-+#: ../gtk/main.c:618
-+msgid "Start minimized in notification area"
-+msgstr "Iniciar minimizado na área de notificações"
-+
-+#: ../gtk/main.c:619
-+msgid "Show version number and exit"
-+msgstr "Mostrar número da versão e sair"
-+
-+#: ../gtk/main.c:637 ../gtk/transmission-gtk.appdata.xml.in:11 ../gtk/transmission-gtk.desktop.in:3
-+msgid "Transmission"
-+msgstr "Transmission"
-+
-+#. parse the command line
-+#: ../gtk/main.c:640
-+msgid "[torrent files or urls]"
-+msgstr "[ficheiros torrent ou urls]"
-+
-+#: ../gtk/main.c:647
-+#, c-format
-+msgid ""
-+"%s\n"
-+"Run '%s --help' to see a full list of available command line options.\n"
-+msgstr ""
-+"%s\n"
-+"Execute '%s --help' para ver uma lista completa de opções de linha de comandos disponíveis.\n"
-+
-+#: ../gtk/main.c:746
-+msgid "Transmission is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility."
-+msgstr "O Transmission é um programa de partilha de ficheiros. Quando abre um torrent, os dados deste serão partilhados com outros utilizadores. Qualquer conteúdo que partilhe será de sua inteira responsabilidade."
-+
-+#: ../gtk/main.c:749
-+msgid "I _Agree"
-+msgstr "Eu _Concordo"
-+
-+#: ../gtk/main.c:980
-+msgid "<b>Closing Connections</b>"
-+msgstr "<b>A fechar ligações</b>"
-+
-+#: ../gtk/main.c:984
-+msgid "Sending upload/download totals to tracker…"
-+msgstr "A enviar o total de enviado/descarregado ao rastreador…"
-+
-+#: ../gtk/main.c:988
-+msgid "_Quit Now"
-+msgstr "_Sair Agora"
-+
-+#: ../gtk/main.c:1038
-+msgid "Couldn't add corrupt torrent"
-+msgid_plural "Couldn't add corrupt torrents"
-+msgstr[0] "Não foi possível adicionar o torrent corrompido"
-+msgstr[1] "Não foi possível adicionar torrents corrompidos"
-+
-+#: ../gtk/main.c:1044
-+msgid "Couldn't add duplicate torrent"
-+msgid_plural "Couldn't add duplicate torrents"
-+msgstr[0] "Não foi possível adicionar o torrent duplicado"
-+msgstr[1] "Não foi possível adicionar torrents duplicados"
-+
-+#: ../gtk/main.c:1363
-+msgid "A fast and easy BitTorrent client"
-+msgstr "Um cliente BitTorrent rápido e fácil de usar"
-+
-+#: ../gtk/main.c:1364
-+msgid "Copyright (c) The Transmission Project"
-+msgstr "Direitos de Autor (c) The Transmission Project"
-+
-+#. Translators: translate "translator-credits" as your name
-+#. to have it appear in the credits in the "About"
-+#. dialog
-+#: ../gtk/main.c:1370
-+msgid "translator-credits"
-+msgstr ""
-+"Gonçalo Matos (goncalomatos);\n"
-+"Rui (xendez);\n"
-+"StringYM;"
-+
-+#: ../gtk/makemeta-ui.c:70
-+#, c-format
-+msgid "Creating \"%s\""
-+msgstr "A criar \"%s\""
-+
-+#: ../gtk/makemeta-ui.c:74
-+#, c-format
-+msgid "Created \"%s\"!"
-+msgstr "Criado \"%s\"!"
-+
-+#: ../gtk/makemeta-ui.c:78
-+#, c-format
-+msgid "Error: invalid announce URL \"%s\""
-+msgstr "Erro: URL de anúncio inválido \"%s\""
-+
-+#: ../gtk/makemeta-ui.c:82
-+msgid "Cancelled"
-+msgstr "Cancelado"
-+
-+#: ../gtk/makemeta-ui.c:86
-+#, c-format
-+msgid "Error reading \"%s\": %s"
-+msgstr "Erro ao ler \"%s\": %s"
-+
-+#: ../gtk/makemeta-ui.c:90
-+#, c-format
-+msgid "Error writing \"%s\": %s"
-+msgstr "Erro ao gravar \"%s\": %s"
-+
-+#. how much data we've scanned through to generate checksums
-+#: ../gtk/makemeta-ui.c:113
-+#, c-format
-+msgid "Scanned %s"
-+msgstr "%s processado"
-+
-+#: ../gtk/makemeta-ui.c:183 ../gtk/makemeta-ui.c:434
-+msgid "New Torrent"
-+msgstr "Novo Torrent"
-+
-+#: ../gtk/makemeta-ui.c:194
-+msgid "Creating torrent…"
-+msgstr "A criar o torrent…"
-+
-+#: ../gtk/makemeta-ui.c:304
-+msgid "No source selected"
-+msgstr "Nenhuma fonte selecionada"
-+
-+#: ../gtk/makemeta-ui.c:310
-+#, c-format
-+msgid "%1$s; %2$'d File"
-+msgid_plural "%1$s; %2$'d Files"
-+msgstr[0] "%1$s; %2$'d Ficheiro"
-+msgstr[1] "%1$s; %2$'d Ficheiros"
-+
-+#: ../gtk/makemeta-ui.c:315
-+#, c-format
-+msgid "%1$'d Piece @ %2$s"
-+msgid_plural "%1$'d Pieces @ %2$s"
-+msgstr[0] "%1$'d Peça @ %2$s"
-+msgstr[1] "%1$'d Peças @ %2$s"
-+
-+#: ../gtk/makemeta-ui.c:444
-+msgid "Sa_ve to:"
-+msgstr "Gra_var para:"
-+
-+#: ../gtk/makemeta-ui.c:450
-+msgid "Source F_older:"
-+msgstr "Pasta da f_onte:"
-+
-+#: ../gtk/makemeta-ui.c:462
-+msgid "Source _File:"
-+msgstr "_Ficheiro da fonte:"
-+
-+#: ../gtk/makemeta-ui.c:474
-+msgid "<i>No source selected</i>"
-+msgstr "<i>Nenhuma fonte selecionada</i>"
-+
-+#: ../gtk/makemeta-ui.c:478
-+msgid "Properties"
-+msgstr "Propriedades"
-+
-+#: ../gtk/makemeta-ui.c:480
-+msgid "_Trackers:"
-+msgstr "_Rastreadores:"
-+
-+#: ../gtk/makemeta-ui.c:500
-+msgid "Co_mment:"
-+msgstr "Co_mentário:"
-+
-+#: ../gtk/makemeta-ui.c:509
-+msgid "_Private torrent"
-+msgstr "Torrent _privado"
-+
-+#: ../gtk/msgwin.c:146
-+#, c-format
-+msgid "Couldn't save \"%s\""
-+msgstr "Não foi possível gravar \"%s\""
-+
-+#: ../gtk/msgwin.c:209
-+msgid "Save Log"
-+msgstr "Gravar registo"
-+
-+#: ../gtk/msgwin.c:284
-+msgid "Time"
-+msgstr "Hora"
-+
-+#: ../gtk/msgwin.c:294
-+msgid "Message"
-+msgstr "Mensagem"
-+
-+#: ../gtk/msgwin.c:432
-+msgid "Debug"
-+msgstr "Depuração de erros"
-+
-+#: ../gtk/msgwin.c:457
-+msgid "Message Log"
-+msgstr "Registo de mensagens"
-+
-+#: ../gtk/msgwin.c:491
-+msgid "Level"
-+msgstr "Nível"
-+
-+#: ../gtk/notify.c:207
-+msgid "Open File"
-+msgstr "Abrir ficheiro"
-+
-+#: ../gtk/notify.c:212
-+msgid "Open Folder"
-+msgstr "Abrir pasta"
-+
-+#: ../gtk/notify.c:217
-+msgid "Torrent Complete"
-+msgstr "Torrent terminado"
-+
-+#: ../gtk/notify.c:233
-+msgid "Torrent Added"
-+msgstr "Torrent adicionado"
-+
-+#: ../gtk/open-dialog.c:256
-+msgid "Torrent files"
-+msgstr "Ficheiros de torrents"
-+
-+#: ../gtk/open-dialog.c:261
-+msgid "All files"
-+msgstr "Todos os ficheiros"
-+
-+#. make the dialog
-+#: ../gtk/open-dialog.c:284
-+msgid "Torrent Options"
-+msgstr "Opções de torrents"
-+
-+#: ../gtk/open-dialog.c:301 ../gtk/tr-prefs.c:275
-+msgid "Mo_ve .torrent file to the trash"
-+msgstr "Mo_ver o ficheiro .torrent para o lixo"
-+
-+#: ../gtk/open-dialog.c:303
-+msgid "_Start when added"
-+msgstr "_Começar logo ao adicionar"
-+
-+#. "torrent file" row
-+#: ../gtk/open-dialog.c:318
-+msgid "_Torrent file:"
-+msgstr "Ficheiro _torrent:"
-+
-+#: ../gtk/open-dialog.c:321
-+msgid "Select Source File"
-+msgstr "Selecionar ficheiro da fonte"
-+
-+#: ../gtk/open-dialog.c:331
-+msgid "_Destination folder:"
-+msgstr "Pasta de _destino:"
-+
-+#: ../gtk/open-dialog.c:334
-+msgid "Select Destination Folder"
-+msgstr "Selecione a pasta de destino"
-+
-+#: ../gtk/open-dialog.c:455
-+msgid "Open a Torrent"
-+msgstr "Abrir um torrent"
-+
-+#: ../gtk/open-dialog.c:466
-+msgid "Show _options dialog"
-+msgstr "Mostrar janela de _opções"
-+
-+#: ../gtk/open-dialog.c:518
-+msgid "Open URL"
-+msgstr "Abrir URL"
-+
-+#: ../gtk/open-dialog.c:524
-+msgid "Open torrent from URL"
-+msgstr "Abrir um torrent por URL"
-+
-+#: ../gtk/open-dialog.c:529
-+msgid "_URL"
-+msgstr "_URL"
-+
-+#: ../gtk/relocate.c:60
-+#, c-format
-+msgid "Moving \"%s\""
-+msgstr "A mover \"1%s\""
-+
-+#: ../gtk/relocate.c:76
-+msgid "Couldn't move torrent"
-+msgstr "Não foi possível mover o torrent"
-+
-+#: ../gtk/relocate.c:111
-+msgid "This may take a moment…"
-+msgstr "Isto pode demorar um pouco…"
-+
-+#: ../gtk/relocate.c:139 ../gtk/relocate.c:153
-+msgid "Set Torrent Location"
-+msgstr "Definir a localização do torrent"
-+
-+#: ../gtk/relocate.c:146
-+msgid "Location"
-+msgstr "Localização"
-+
-+#: ../gtk/relocate.c:156
-+msgid "Torrent _location:"
-+msgstr "_Localização do torrent:"
-+
-+#: ../gtk/relocate.c:157
-+msgid "_Move from the current folder"
-+msgstr "_Mover da pasta atual"
-+
-+#: ../gtk/relocate.c:160
-+msgid "Local data is _already there"
-+msgstr "Os d_ados locais já estão lá"
-+
-+#: ../gtk/stats.c:69 ../gtk/stats.c:150
-+#, c-format
-+msgid "Started %'d time"
-+msgid_plural "Started %'d times"
-+msgstr[0] "Iniciado %'d vez"
-+msgstr[1] "Iniciado %'d vezess"
-+
-+#: ../gtk/stats.c:91
-+msgid "Reset your statistics?"
-+msgstr "Limpar as suas estatísticas?"
-+
-+#: ../gtk/stats.c:92
-+msgid "These statistics are for your information only. Resetting them doesn't affect the statistics logged by your BitTorrent trackers."
-+msgstr "Estas estatísticas existem apenas para informação. Se as limpar isso não afetará as estatísticas registadas pelos rastreadores BitTorrent."
-+
-+#: ../gtk/stats.c:96 ../gtk/stats.c:123
-+msgid "_Reset"
-+msgstr "_Limpar"
-+
-+#: ../gtk/stats.c:123 ../gtk/tr-window.c:687
-+msgid "Statistics"
-+msgstr "Estatísticas"
-+
-+#: ../gtk/stats.c:129
-+msgid "Current Session"
-+msgstr "Sessão Atual"
-+
-+#: ../gtk/stats.c:141 ../gtk/stats.c:166
-+msgid "Ratio:"
-+msgstr "Rácio:"
-+
-+#: ../gtk/stats.c:145 ../gtk/stats.c:170
-+msgid "Duration:"
-+msgstr "Duração:"
-+
-+#: ../gtk/stats.c:149
-+msgid "Total"
-+msgstr "Total"
-+
-+#. %1$s is how much we've got,
-+#. %2$s is how much we'll have when done,
-+#. %3$s%% is a percentage of the two
-+#: ../gtk/torrent-cell-renderer.c:59
-+#, c-format
-+msgid "%1$s of %2$s (%3$s%%)"
-+msgstr "%1$s de %2$s (%3$s%%)"
-+
-+#. %1$s is how much we've got,
-+#. %2$s is the torrent's total size,
-+#. %3$s%% is a percentage of the two,
-+#. %4$s is how much we've uploaded,
-+#. %5$s is our upload-to-download ratio,
-+#. %6$s is the ratio we want to reach before we stop uploading
-+#: ../gtk/torrent-cell-renderer.c:75
-+#, c-format
-+msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
-+msgstr "%1$s de %2$s (%3$s%%), enviado %4$s (Rácio: %5$s Objetivo: %6$s)"
-+
-+#. %1$s is how much we've got,
-+#. %2$s is the torrent's total size,
-+#. %3$s%% is a percentage of the two,
-+#. %4$s is how much we've uploaded,
-+#. %5$s is our upload-to-download ratio
-+#: ../gtk/torrent-cell-renderer.c:91
-+#, c-format
-+msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s)"
-+msgstr "%1$s de %2$s (%3$s%%), enviado %4$s (Rácio: %5$s)"
-+
-+#. %1$s is the torrent's total size,
-+#. %2$s is how much we've uploaded,
-+#. %3$s is our upload-to-download ratio,
-+#. %4$s is the ratio we want to reach before we stop uploading
-+#: ../gtk/torrent-cell-renderer.c:108
-+#, c-format
-+msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
-+msgstr "%1$s, enviado %2$s (Rácio: %3$s Objetivo: %4$s)"
-+
-+#. %1$s is the torrent's total size,
-+#. %2$s is how much we've uploaded,
-+#. %3$s is our upload-to-download ratio
-+#: ../gtk/torrent-cell-renderer.c:120
-+#, c-format
-+msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
-+msgstr "%1$s, enviado %2$s (Rácio: %3$s)"
-+
-+#: ../gtk/torrent-cell-renderer.c:135
-+msgid "Remaining time unknown"
-+msgstr "Tempo restante desconhecido"
-+
-+#. time remaining
-+#: ../gtk/torrent-cell-renderer.c:142
-+#, c-format
-+msgid "%s remaining"
-+msgstr "%s restante"
-+
-+#. down speed, down symbol, up speed, up symbol
-+#: ../gtk/torrent-cell-renderer.c:162
-+#, c-format
-+msgid "%1$s %2$s  %3$s %4$s"
-+msgstr "%1$s %2$s  %3$s %4$s"
-+
-+#. up speed, up symbol
-+#: ../gtk/torrent-cell-renderer.c:171
-+#, c-format
-+msgid "%1$s  %2$s"
-+msgstr "%1$s  %2$s"
-+
-+#: ../gtk/torrent-cell-renderer.c:175
-+msgid "Stalled"
-+msgstr "Paralisado"
-+
-+#: ../gtk/torrent-cell-renderer.c:207
-+#, c-format
-+msgid "Verifying local data (%.1f%% tested)"
-+msgstr "A verificar dados locais (%.1f%% testados)"
-+
-+#: ../gtk/torrent-cell-renderer.c:236
-+#, c-format
-+msgid "Tracker gave a warning: \"%s\""
-+msgstr "O rastreador forneceu um aviso: \"%s\""
-+
-+#: ../gtk/torrent-cell-renderer.c:237
-+#, c-format
-+msgid "Tracker gave an error: \"%s\""
-+msgstr "O rastreador forneceu um erro: \"%s\""
-+
-+#: ../gtk/torrent-cell-renderer.c:238
-+#, c-format
-+msgid "Error: %s"
-+msgstr "Erro: %s"
-+
-+#. Downloading metadata from 2 peer (s)(50% done)
-+#: ../gtk/torrent-cell-renderer.c:262
-+#, c-format
-+msgid "Downloading metadata from %1$'d %2$s (%3$d%% done)"
-+msgstr "A descarregar metadados de %1$'d %2$s (%3$d%% feito)"
-+
-+#: ../gtk/torrent-cell-renderer.c:263 ../gtk/torrent-cell-renderer.c:269 ../gtk/torrent-cell-renderer.c:282
-+msgid "peer"
-+msgid_plural "peers"
-+msgstr[0] "par"
-+msgstr[1] "pares"
-+
-+#. Downloading from 2 of 3 peer (s) and 2 webseed (s)
-+#: ../gtk/torrent-cell-renderer.c:268
-+#, c-format
-+msgid "Downloading from %1$'d of %2$'d %3$s and %4$'d %5$s"
-+msgstr "A descarregar de %1$'d de %2$'d %3$s e %4$'d %5$s"
-+
-+#: ../gtk/torrent-cell-renderer.c:270 ../gtk/torrent-cell-renderer.c:276
-+msgid "web seed"
-+msgid_plural "web seeds"
-+msgstr[0] "semear da web"
-+msgstr[1] "semeares da web"
-+
-+#. Downloading from 3 web seed (s)
-+#: ../gtk/torrent-cell-renderer.c:275
-+#, c-format
-+msgid "Downloading from %1$'d %2$s"
-+msgstr "A descarregar de %1$'d %2$s"
-+
-+#. Downloading from 2 of 3 peer (s)
-+#: ../gtk/torrent-cell-renderer.c:281
-+#, c-format
-+msgid "Downloading from %1$'d of %2$'d %3$s"
-+msgstr "A descarregar de %1$'d de %2$'d %3$s"
-+
-+#: ../gtk/torrent-cell-renderer.c:289
-+#, c-format
-+msgid "Seeding to %1$'d of %2$'d connected peer"
-+msgid_plural "Seeding to %1$'d of %2$'d connected peers"
-+msgstr[0] "A semear para %1$'d de %2$'d par conectado"
-+msgstr[1] "A semear para %1$'d de %2$'d pares conectados"
-+
-+#: ../gtk/tr-core.c:1241
-+#, c-format
-+msgid "Couldn't read \"%s\": %s"
-+msgstr "Não foi possível ler \"%s\": %s"
-+
-+#: ../gtk/tr-core.c:1337
-+#, c-format
-+msgid "Skipping unknown torrent \"%s\""
-+msgstr "A ignorar o torrent desconhecido \"%s\""
-+
-+#: ../gtk/tr-core.c:1612
-+msgid "Inhibiting desktop hibernation"
-+msgstr "Impedir a hibernação"
-+
-+#: ../gtk/tr-core.c:1616
-+#, c-format
-+msgid "Couldn't inhibit desktop hibernation: %s"
-+msgstr "Não foi possível impedir a hibernação: %s"
-+
-+#: ../gtk/tr-core.c:1649
-+msgid "Allowing desktop hibernation"
-+msgstr "Permitir hibernação"
-+
-+#: ../gtk/tr-icon.c:57
-+msgid "Idle"
-+msgstr "Inativo"
-+
-+#: ../gtk/tr-icon.c:80 ../gtk/tr-icon.c:102
-+#, c-format
-+msgid " (Limit: %s)"
-+msgstr " (Limite: %s)"
-+
-+#. %1$s: current upload speed
-+#. * %2$s: current upload limit, if any
-+#. * %3$s: current download speed
-+#. * %4$s: current download limit, if any
-+#: ../gtk/tr-icon.c:109
-+#, c-format
-+msgid ""
-+"Transmission\n"
-+"Up: %1$s %2$s\n"
-+"Down: %3$s %4$s"
-+msgstr ""
-+"Transmission\n"
-+"Env: %1$s %2$s\n"
-+"Rec: %3$s %4$s"
-+
-+#: ../gtk/tr-prefs.c:258
-+msgctxt "Gerund"
-+msgid "Adding"
-+msgstr "A adicionar"
-+
-+#: ../gtk/tr-prefs.c:260
-+msgid "Automatically add .torrent files _from:"
-+msgstr "Adicionar automaticamente ficheiros .torrent _de:"
-+
-+#: ../gtk/tr-prefs.c:267
-+msgid "Show the Torrent Options _dialog"
-+msgstr "Mostrar a _janela de opções do torrent"
-+
-+#: ../gtk/tr-prefs.c:271
-+msgid "_Start added torrents"
-+msgstr "_Iniciar torrents adicionados"
-+
-+#: ../gtk/tr-prefs.c:280
-+msgid "Save to _Location:"
-+msgstr "Gravar na _localização:"
-+
-+#: ../gtk/tr-prefs.c:287
-+msgid "Download Queue"
-+msgstr "Fila de descarregamento"
-+
-+#: ../gtk/tr-prefs.c:289
-+msgid "Ma_ximum active downloads:"
-+msgstr "Número má_ximo de descarregamentos:"
-+
-+#: ../gtk/tr-prefs.c:293
-+msgid "Downloads sharing data in the last _N minutes are active:"
-+msgstr "Descarregamentos a partilharem dados nos últimos _X minutos estão ativos:"
-+
-+#: ../gtk/tr-prefs.c:298 ../libtransmission/torrent.c:2170
-+msgid "Incomplete"
-+msgstr "Imcompleto"
-+
-+#: ../gtk/tr-prefs.c:300
-+msgid "Append \"._part\" to incomplete files' names"
-+msgstr "Anexar \"._part\" ao nome dos ficheiros incompletos"
-+
-+#: ../gtk/tr-prefs.c:304
-+msgid "Keep _incomplete torrents in:"
-+msgstr "Manter os torrents incompletos em:"
-+
-+#: ../gtk/tr-prefs.c:311
-+msgid "Call scrip_t when torrent is completed:"
-+msgstr "Executar scrip_t quando um torrent terminar:"
-+
-+#: ../gtk/tr-prefs.c:334
-+msgid "Limits"
-+msgstr "Limites"
-+
-+#: ../gtk/tr-prefs.c:336
-+msgid "Stop seeding at _ratio:"
-+msgstr "Parar de semear no _rácio:"
-+
-+#: ../gtk/tr-prefs.c:343
-+msgid "Stop seeding if idle for _N minutes:"
-+msgstr "Parar de semear se estiver inativo por _X minutos:"
-+
-+#: ../gtk/tr-prefs.c:365 ../gtk/tr-prefs.c:1258
-+msgid "Desktop"
-+msgstr "Secretária"
-+
-+#: ../gtk/tr-prefs.c:367
-+msgid "_Inhibit hibernation when torrents are active"
-+msgstr "_Impedir a hibernação quando os torrents estão ativos"
-+
-+#: ../gtk/tr-prefs.c:371
-+msgid "Show Transmission icon in the _notification area"
-+msgstr "Mostrar o ícone do Transmission na área de notificações"
-+
-+#: ../gtk/tr-prefs.c:376
-+msgid "Notification"
-+msgstr "Notificação"
-+
-+#: ../gtk/tr-prefs.c:378
-+msgid "Show a notification when torrents are a_dded"
-+msgstr "Mostrar uma notificação quando são a_dicionados torrents"
-+
-+#: ../gtk/tr-prefs.c:382
-+msgid "Show a notification when torrents _finish"
-+msgstr "Mostrar uma notificação quando os torrents terminam"
-+
-+#: ../gtk/tr-prefs.c:386
-+msgid "Play a _sound when torrents finish"
-+msgstr "Reproduzir um _som quando os torrents terminam"
-+
-+#: ../gtk/tr-prefs.c:412
-+#, c-format
-+msgid "Blocklist contains %'d rule"
-+msgid_plural "Blocklist contains %'d rules"
-+msgstr[0] "A lista de bloqueios contém %'d regra"
-+msgstr[1] "A lista de bloqueios contém %'d regras"
-+
-+#: ../gtk/tr-prefs.c:446
-+#, c-format
-+msgid "Blocklist has %'d rule."
-+msgid_plural "Blocklist has %'d rules."
-+msgstr[0] "A lista de bloqueios tem %'d regra."
-+msgstr[1] "A lista de bloqueios tem %'d regras."
-+
-+#: ../gtk/tr-prefs.c:450
-+msgid "<b>Unable to update.</b>"
-+msgstr "<b>Não foi possível atualizar.</b>"
-+
-+#: ../gtk/tr-prefs.c:450
-+msgid "<b>Update succeeded!</b>"
-+msgstr "<b>Atualização bem sucedida!</b>"
-+
-+#: ../gtk/tr-prefs.c:461
-+msgid "Update Blocklist"
-+msgstr "Atualizar Lista de Bloqueios"
-+
-+#: ../gtk/tr-prefs.c:463
-+msgid "Getting new blocklist…"
-+msgstr "A obter a nova lista de bloqueios…"
-+
-+#: ../gtk/tr-prefs.c:488
-+msgid "Allow encryption"
-+msgstr "Permitir encriptação"
-+
-+#: ../gtk/tr-prefs.c:488
-+msgid "Prefer encryption"
-+msgstr "Preferir encriptação"
-+
-+#: ../gtk/tr-prefs.c:489
-+msgid "Require encryption"
-+msgstr "Usar apenas encriptação"
-+
-+#: ../gtk/tr-prefs.c:511 ../gtk/tr-prefs.c:1256
-+msgid "Privacy"
-+msgstr "Privacidade"
-+
-+#: ../gtk/tr-prefs.c:513
-+msgid "_Encryption mode:"
-+msgstr "Modo de _Encriptação:"
-+
-+#: ../gtk/tr-prefs.c:518
-+msgid "Blocklist"
-+msgstr "Lista de bloqueio"
-+
-+#: ../gtk/tr-prefs.c:520
-+msgid "Enable _blocklist:"
-+msgstr "Ativar lista de _bloqueio"
-+
-+#: ../gtk/tr-prefs.c:534
-+msgid "_Update"
-+msgstr "_Atualizar"
-+
-+#: ../gtk/tr-prefs.c:546
-+msgid "Enable _automatic updates"
-+msgstr "Ativar _atualizações automáticas"
-+
-+#: ../gtk/tr-prefs.c:747
-+msgid "Remote Control"
-+msgstr "Controlo Remoto"
-+
-+#. "enabled" checkbutton
-+#: ../gtk/tr-prefs.c:750
-+msgid "Allow _remote access"
-+msgstr "Permitir acesso _remoto"
-+
-+#: ../gtk/tr-prefs.c:756
-+msgid "_Open web client"
-+msgstr "_Abrir cliente web"
-+
-+#: ../gtk/tr-prefs.c:765
-+msgid "HTTP _port:"
-+msgstr "_Porta HTTP:"
-+
-+#. require authentication
-+#: ../gtk/tr-prefs.c:769
-+msgid "Use _authentication"
-+msgstr "Usar _autenticação"
-+
-+#. username
-+#: ../gtk/tr-prefs.c:777
-+msgid "_Username:"
-+msgstr "_Nome de utilizador:"
-+
-+#. password
-+#: ../gtk/tr-prefs.c:784
-+msgid "Pass_word:"
-+msgstr "Palavra-passe:"
-+
-+#. require authentication
-+#: ../gtk/tr-prefs.c:792
-+msgid "Only allow these IP a_ddresses:"
-+msgstr "Permitir apenas estes en_dereços IP:"
-+
-+#: ../gtk/tr-prefs.c:816
-+msgid "IP addresses may use wildcards, such as 192.168.*.*"
-+msgstr "Os endereços IP podem ter caracteres-curinga, como por ex: 192.168.*.*"
-+
-+#: ../gtk/tr-prefs.c:835
-+msgid "Addresses:"
-+msgstr "Endereços:"
-+
-+#: ../gtk/tr-prefs.c:935
-+msgid "Every Day"
-+msgstr "Todos os dias"
-+
-+#: ../gtk/tr-prefs.c:936
-+msgid "Weekdays"
-+msgstr "Dias da semana"
-+
-+#: ../gtk/tr-prefs.c:937
-+msgid "Weekends"
-+msgstr "Fins de semana"
-+
-+#: ../gtk/tr-prefs.c:938
-+msgid "Sunday"
-+msgstr "Domingo"
-+
-+#: ../gtk/tr-prefs.c:939
-+msgid "Monday"
-+msgstr "Segunda-Feira"
-+
-+#: ../gtk/tr-prefs.c:940
-+msgid "Tuesday"
-+msgstr "Terça-Feira"
-+
-+#: ../gtk/tr-prefs.c:941
-+msgid "Wednesday"
-+msgstr "Quarta-Feira"
-+
-+#: ../gtk/tr-prefs.c:942
-+msgid "Thursday"
-+msgstr "Quinta-Feira"
-+
-+#: ../gtk/tr-prefs.c:943
-+msgid "Friday"
-+msgstr "Sexta-Feira"
-+
-+#: ../gtk/tr-prefs.c:944
-+msgid "Saturday"
-+msgstr "Sábado"
-+
-+#: ../gtk/tr-prefs.c:975
-+msgid "Speed Limits"
-+msgstr "Limites de Velocidade"
-+
-+#: ../gtk/tr-prefs.c:977
-+#, c-format
-+msgid "_Upload (%s):"
-+msgstr "_Enviar (%s):"
-+
-+#: ../gtk/tr-prefs.c:984
-+#, c-format
-+msgid "_Download (%s):"
-+msgstr "_Descarregar (%s):"
-+
-+#: ../gtk/tr-prefs.c:993
-+msgid "Alternative Speed Limits"
-+msgstr "Limites de velocidade alternativos"
-+
-+#: ../gtk/tr-prefs.c:1002
-+msgid "Override normal speed limits manually or at scheduled times"
-+msgstr "Ignorar limites de velocidade normal manualmente ou em horas programadas"
-+
-+#: ../gtk/tr-prefs.c:1009
-+#, c-format
-+msgid "U_pload (%s):"
-+msgstr "_Enviar (%s):"
-+
-+#: ../gtk/tr-prefs.c:1013
-+#, c-format
-+msgid "Do_wnload (%s):"
-+msgstr "_Descarregar (%s):"
-+
-+#: ../gtk/tr-prefs.c:1017
-+msgid "_Scheduled times:"
-+msgstr "_Horas programadas:"
-+
-+#: ../gtk/tr-prefs.c:1022
-+msgid " _to "
-+msgstr "_a"
-+
-+#: ../gtk/tr-prefs.c:1033
-+msgid "_On days:"
-+msgstr "_nos dias:"
-+
-+#: ../gtk/tr-prefs.c:1064 ../gtk/tr-prefs.c:1137 ../gtk/tr-prefs.c:1219
-+msgid "Status unknown"
-+msgstr "Estado desconhecido"
-+
-+#: ../gtk/tr-prefs.c:1090
-+msgid "Port is <b>closed</b>"
-+msgstr "A porta está <b>fechada</b>"
-+
-+#: ../gtk/tr-prefs.c:1090
-+msgid "Port is <b>open</b>"
-+msgstr "A porta está <b>aberta</b>"
-+
-+#: ../gtk/tr-prefs.c:1104
-+msgid "<i>Testing TCP port…</i>"
-+msgstr "<i>A testar a porta TCP…</i>"
-+
-+#: ../gtk/tr-prefs.c:1130
-+msgid "Listening Port"
-+msgstr "Porta de escuta"
-+
-+#: ../gtk/tr-prefs.c:1132
-+msgid "_Port used for incoming connections:"
-+msgstr "_Porta utilizada para entrada de ligações:"
-+
-+#: ../gtk/tr-prefs.c:1140
-+msgid "Te_st Port"
-+msgstr "Te_star Porta"
-+
-+#: ../gtk/tr-prefs.c:1147
-+msgid "Pick a _random port every time Transmission is started"
-+msgstr "Escolher uma porta _aleatória sempre que o Transmission for iniciado"
-+
-+#: ../gtk/tr-prefs.c:1151
-+msgid "Use UPnP or NAT-PMP port _forwarding from my router"
-+msgstr "Usar redirecionamento de portas UPnP ou NAT-PMP no meu router"
-+
-+#: ../gtk/tr-prefs.c:1156
-+msgid "Peer Limits"
-+msgstr "Limites de pares"
-+
-+#: ../gtk/tr-prefs.c:1159
-+msgid "Maximum peers per _torrent:"
-+msgstr "Máximo de pares por _torrent:"
-+
-+#: ../gtk/tr-prefs.c:1161
-+msgid "Maximum peers _overall:"
-+msgstr "Máximo _total de pares:"
-+
-+#: ../gtk/tr-prefs.c:1167
-+msgid "Enable _uTP for peer communication"
-+msgstr "Ativar _uTP para comunicação de pares"
-+
-+#: ../gtk/tr-prefs.c:1169
-+msgid "uTP is a tool for reducing network congestion."
-+msgstr "O uTP é uma ferramenta para reduzir o congestionamento na rede."
-+
-+#: ../gtk/tr-prefs.c:1174
-+msgid "Use PE_X to find more peers"
-+msgstr "Usar PE_X para encontrar mais pares"
-+
-+#: ../gtk/tr-prefs.c:1176
-+msgid "PEX is a tool for exchanging peer lists with the peers you're connected to."
-+msgstr "O PEX é uma ferramenta para trocar listas de pares com os pares aos quais está conectado."
-+
-+#: ../gtk/tr-prefs.c:1180
-+msgid "Use _DHT to find more peers"
-+msgstr "Usar o _DHT para encontrar mais pares"
-+
-+#: ../gtk/tr-prefs.c:1182
-+msgid "DHT is a tool for finding peers without a tracker."
-+msgstr "O DHT é uma ferramenta para encontrar pares sem um rastreador (tracker)."
-+
-+#: ../gtk/tr-prefs.c:1186
-+msgid "Use _Local Peer Discovery to find more peers"
-+msgstr "Usar _LPD para descobrir mais pares"
-+
-+#: ../gtk/tr-prefs.c:1188
-+msgid "LPD is a tool for finding peers on your local network."
-+msgstr "O LPD (descoberta local de pares) é uma ferramenta para encontrar pares na sua rede local."
-+
-+#: ../gtk/tr-prefs.c:1244
-+msgid "Transmission Preferences"
-+msgstr "Preferências do Transmission"
-+
-+#: ../gtk/tr-prefs.c:1254
-+msgctxt "Gerund"
-+msgid "Downloading"
-+msgstr "Descarregar"
-+
-+#: ../gtk/tr-prefs.c:1255
-+msgctxt "Gerund"
-+msgid "Seeding"
-+msgstr "Semear"
-+
-+#: ../gtk/tr-prefs.c:1257
-+msgid "Network"
-+msgstr "Rede"
-+
-+#: ../gtk/tr-prefs.c:1259
-+msgid "Remote"
-+msgstr "Remoto"
-+
-+#: ../gtk/tr-window.c:127
-+msgid "Torrent"
-+msgstr "Torrent"
-+
-+#: ../gtk/tr-window.c:227
-+msgid "Total Ratio"
-+msgstr "Rácio Total"
-+
-+#: ../gtk/tr-window.c:228
-+msgid "Session Ratio"
-+msgstr "Rácio da Sessão"
-+
-+#: ../gtk/tr-window.c:229
-+msgid "Total Transfer"
-+msgstr "Transferência Total"
-+
-+#: ../gtk/tr-window.c:230
-+msgid "Session Transfer"
-+msgstr "Transferência na Sessão"
-+
-+#: ../gtk/tr-window.c:255
-+#, c-format
-+msgid ""
-+"Click to disable Alternative Speed Limits\n"
-+" (%1$s down, %2$s up)"
-+msgstr ""
-+"Clique para desativar os limites de velocidade alternativos\n"
-+" (%1$s rec, %2$s env)"
-+
-+#: ../gtk/tr-window.c:256
-+#, c-format
-+msgid ""
-+"Click to enable Alternative Speed Limits\n"
-+" (%1$s down, %2$s up)"
-+msgstr ""
-+"Clique para ativar os limites de velocidade alternativos\n"
-+" (%1$s rec, %2$s env)"
-+
-+#: ../gtk/tr-window.c:310
-+#, c-format
-+msgid "Tracker will allow requests in %s"
-+msgstr "O rastreador irá permitir pedidos dentro de %s"
-+
-+#: ../gtk/tr-window.c:380
-+msgid "Unlimited"
-+msgstr "Ilimitado"
-+
-+#: ../gtk/tr-window.c:451
-+msgid "Seed Forever"
-+msgstr "Semear para sempre"
-+
-+#: ../gtk/tr-window.c:489
-+msgid "Limit Download Speed"
-+msgstr "Limitar velocidade de descarregamento"
-+
-+#: ../gtk/tr-window.c:493
-+msgid "Limit Upload Speed"
-+msgstr "Limitar velocidade de envio"
-+
-+#: ../gtk/tr-window.c:500
-+msgid "Stop Seeding at Ratio"
-+msgstr "Parar de semear no rácio"
-+
-+#: ../gtk/tr-window.c:533
-+#, c-format
-+msgid "Stop at Ratio (%s)"
-+msgstr "Parar no rácio (%s)"
-+
-+#: ../gtk/tr-window.c:761 ../gtk/tr-window.c:787
-+#, c-format
-+msgid "Ratio: %s"
-+msgstr "Rácio: %s"
-+
-+#. Translators: "size|" is here for disambiguation. Please remove it from your translation.
-+#. %1$s is the size of the data we've downloaded
-+#. %2$s is the size of the data we've uploaded
-+#: ../gtk/tr-window.c:771
-+#, c-format
-+msgid "Down: %1$s, Up: %2$s"
-+msgstr "Receb: %1$s, Env: %2$s"
-+
-+#. Translators: "size|" is here for disambiguation. Please remove it from your translation.
-+#. %1$s is the size of the data we've downloaded
-+#. %2$s is the size of the data we've uploaded
-+#: ../gtk/tr-window.c:781
-+#, c-format
-+msgid "size|Down: %1$s, Up: %2$s"
-+msgstr "Receb: %1$s, Env: %2$s"
-+
-+#: ../gtk/transmission-gtk.appdata.xml.in:12 ../gtk/transmission-gtk.desktop.in:5
-+msgid "Download and share files over BitTorrent"
-+msgstr "Descarregar e partilhar ficheiros pelo BitTorrent"
-+
-+#. Translators: these are the application description paragraphs in the AppData file.
-+#: ../gtk/transmission-gtk.appdata.xml.in:16
-+msgid "BitTorrent is a peer-to-peer file-sharing protocol that is commonly used to distribute large amounts of data between multiple users."
-+msgstr "O BitTorrent é um protocolo de partilha de ficheiros ponto-a-ponto que é comum utilizar para distribuir grandes quantidades de dados entre vários utilizadores."
-+
-+#: ../gtk/transmission-gtk.appdata.xml.in:20
-+msgid "Transmission is a BitTorrent client with an easy-to-use frontend on top a cross-platform backend. Native frontends are available for OS X and Windows, as well as command line and web frontends."
-+msgstr "O Transmission é um cliente BitTorrent com uma interface fácil de utilizar sobre um código multi-plataforma. Existem várias interfaces nativas para OS X e Windows, assim como em linha de comandos e baseado na web."
-+
-+#: ../gtk/transmission-gtk.appdata.xml.in:26
-+msgid "Notable features of Transmission include support for Local Peer Discovery, encryption, DHT, µTP, PEX and Magnet Link."
-+msgstr "O Transmission tem funcionalidaes notáveis como , descoberta de pares locais (LPD), encriptação, tabelas de hash distribuídas (DHT), protocolo de transporte micro (µTP), troca de pares (PEX) e links magnéticos."
-+
-+#: ../gtk/transmission-gtk.desktop.in:4
-+msgid "BitTorrent Client"
-+msgstr "Cliente BitTorrent"
-+
-+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-+#: ../gtk/transmission-gtk.desktop.in:7
-+msgid "torrents;downloading;uploading;share;sharing;"
-+msgstr "torrents;descarregar;baixar;transferir;transferência;enviar;partilhar;partilha;"
-+
-+#: ../gtk/transmission-gtk.desktop.in:21
-+msgid "Start Transmission with All Torrents Paused"
-+msgstr "Iniciar o Transmission com todos os torrents em pausa"
-+
-+#: ../gtk/transmission-gtk.desktop.in:25
-+msgid "Start Transmission Minimized"
-+msgstr "Iniciar o Transmission minimizado"
-+
-+#: ../gtk/util.c:36
-+msgid "KiB"
-+msgstr "KiB"
-+
-+#: ../gtk/util.c:37
-+msgid "MiB"
-+msgstr "MiB"
-+
-+#: ../gtk/util.c:38
-+msgid "GiB"
-+msgstr "GiB"
-+
-+#: ../gtk/util.c:39
-+msgid "TiB"
-+msgstr "TiB"
-+
-+#: ../gtk/util.c:42
-+msgid "kB"
-+msgstr "kB"
-+
-+#: ../gtk/util.c:43
-+msgid "MB"
-+msgstr "MB"
-+
-+#: ../gtk/util.c:44
-+msgid "GB"
-+msgstr "GB"
-+
-+#: ../gtk/util.c:45
-+msgid "TB"
-+msgstr "TB"
-+
-+#: ../gtk/util.c:48
-+msgid "kB/s"
-+msgstr "kB/s"
-+
-+#: ../gtk/util.c:49
-+msgid "MB/s"
-+msgstr "MB/s"
-+
-+#: ../gtk/util.c:50
-+msgid "GB/s"
-+msgstr "GB/s"
-+
-+#: ../gtk/util.c:51
-+msgid "TB/s"
-+msgstr "TB/s"
-+
-+#: ../gtk/util.c:122
-+#, c-format
-+msgid "%'d day"
-+msgid_plural "%'d days"
-+msgstr[0] "%'d dia"
-+msgstr[1] "%'d dias"
-+
-+#: ../gtk/util.c:123
-+#, c-format
-+msgid "%'d hour"
-+msgid_plural "%'d hours"
-+msgstr[0] "%'d hora"
-+msgstr[1] "%'d horas"
-+
-+#: ../gtk/util.c:124
-+#, c-format
-+msgid "%'d minute"
-+msgid_plural "%'d minutes"
-+msgstr[0] "%'d minuto"
-+msgstr[1] "%'d minutos"
-+
-+#: ../gtk/util.c:125
-+#, c-format
-+msgid "%'d second"
-+msgid_plural "%'d seconds"
-+msgstr[0] "%'d segundo"
-+msgstr[1] "%'d segundos"
-+
-+#: ../gtk/util.c:258
-+#, c-format
-+msgid "The torrent file \"%s\" contains invalid data."
-+msgstr "O ficheiro torrent \"%s\" contém dados inválidos."
-+
-+#: ../gtk/util.c:262
-+#, c-format
-+msgid "The torrent file \"%s\" is already in use by \"%s.\""
-+msgstr "O ficheiro torrent \"%s\" está a ser utilizador pelo \"%s.\""
-+
-+#: ../gtk/util.c:267
-+#, c-format
-+msgid "The torrent file \"%s\" encountered an unknown error."
-+msgstr "O ficheiro torrent \"%s\" encontrou um erro desconhecido."
-+
-+#: ../gtk/util.c:271
-+msgid "Error opening torrent"
-+msgstr "Erro ao abrir o torrent"
-+
-+#: ../gtk/util.c:594
-+msgid "Unrecognized URL"
-+msgstr "URL irreconhecido"
-+
-+#: ../gtk/util.c:596
-+#, c-format
-+msgid "Transmission doesn't know how to use \"%s\""
-+msgstr "O Transmission não sabe como utilizar \"%s\""
-+
-+#: ../gtk/util.c:601
-+#, c-format
-+msgid "This magnet link appears to be intended for something other than BitTorrent. BitTorrent magnet links have a section containing \"%s\"."
-+msgstr "Este link magnético parece ser para outra coisa que não o BitTorrent. Os links magnéticos BitTorrent têm uma secção com \"%s\"."
-+
-+#: ../gtk/util.c:723
-+#, c-format
-+msgid "%s free"
-+msgstr "%s livre"
-+
-+#: ../libtransmission/announcer-http.c:221 ../libtransmission/announcer-http.c:389
-+#, c-format
-+msgid "Tracker gave HTTP response code %1$ld (%2$s)"
-+msgstr "O rastreador forneceu o código HTTP de resposta %1$ld (%2$s)"
-+
-+#: ../libtransmission/announcer-udp.c:273 ../libtransmission/announcer-udp.c:423
-+msgid "Unknown error"
-+msgstr "Erro desconhecido"
-+
-+#: ../libtransmission/announcer-udp.c:513
-+#, c-format
-+msgid "DNS Lookup failed: %s"
-+msgstr "Falhou a consulta de DNS: %s"
-+
-+#: ../libtransmission/announcer-udp.c:616
-+msgid "Connection failed"
-+msgstr "A ligação falhou"
-+
-+#: ../libtransmission/announcer.c:1150 ../libtransmission/announcer.c:1469
-+msgid "Could not connect to tracker"
-+msgstr "Não foi possível conectar ao rastreador"
-+
-+#: ../libtransmission/announcer.c:1154 ../libtransmission/announcer.c:1473
-+msgid "Tracker did not respond"
-+msgstr "O rastreador não respondeu"
-+
-+#: ../libtransmission/announcer.c:1218
-+msgid "Success"
-+msgstr "Sucesso"
-+
-+#: ../libtransmission/blocklist.c:63 ../libtransmission/blocklist.c:360 ../libtransmission/utils.c:258
-+#, c-format
-+msgid "Couldn't read \"%1$s\": %2$s"
-+msgstr "Não foi possível ler \"%1$s\": %2$s"
-+
-+#: ../libtransmission/blocklist.c:103
-+#, c-format
-+msgid "Blocklist \"%s\" contains %zu entries"
-+msgstr "A lista de bloqueios \"%s\" contém %zu entradas"
-+
-+#. don't try to display the actual lines - it causes issues
-+#: ../libtransmission/blocklist.c:403
-+#, c-format
-+msgid "blocklist skipped invalid address at line %d"
-+msgstr "a lista de bloqueios ignorou endereços inválidos na linha %d"
-+
-+#: ../libtransmission/blocklist.c:460 ../libtransmission/rpcimpl.c:1650 ../libtransmission/rpcimpl.c:1664 ../libtransmission/rpcimpl.c:1687 ../libtransmission/variant.c:1226
-+#, c-format
-+msgid "Couldn't save file \"%1$s\": %2$s"
-+msgstr "Não foi possível gravar o ficheiro \"%1$s\": %2$s"
-+
-+#: ../libtransmission/blocklist.c:466
-+#, c-format
-+msgid "Blocklist \"%s\" updated with %zu entries"
-+msgstr "A lista de bloqueios \"%s\" foi atualizada com %zu entradas"
-+
-+#: ../libtransmission/fdlimit.c:168
-+#, c-format
-+msgid "Couldn't get directory for \"%1$s\": %2$s"
-+msgstr "Não foi possível obter o diretório de \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:174 ../libtransmission/file-posix.c:243
-+#, c-format
-+msgid "Couldn't create \"%1$s\": %2$s"
-+msgstr "Não foi possível criar \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:195
-+#, c-format
-+msgid "Couldn't open \"%1$s\": %2$s"
-+msgstr "Não foi possível abrir \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:207
-+msgid "full"
-+msgstr "cheio"
-+
-+#: ../libtransmission/fdlimit.c:212
-+msgid "sparse"
-+msgstr "escasso"
-+
-+#: ../libtransmission/fdlimit.c:219
-+#, c-format
-+msgid "Couldn't preallocate file \"%1$s\" (%2$s, size: %3$<PRIu64>): %4$s"
-+msgstr "Não foi possível pré-alocar o ficheiro \"%1$s\" (%2$s, tamanho: %3$<PRIu64>): %4$s"
-+
-+#: ../libtransmission/fdlimit.c:224
-+#, c-format
-+msgid "Preallocated file \"%1$s\" (%2$s, size: %3$<PRIu64>)"
-+msgstr "Ficheiro pré-alocado \"%1$s\" (%2$s, tamanho: %3$<PRIu64>)"
-+
-+#: ../libtransmission/fdlimit.c:235
-+#, c-format
-+msgid "Couldn't truncate \"%1$s\": %2$s"
-+msgstr "Não foi possível truncar \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:553
-+#, c-format
-+msgid "Couldn't create socket: %s"
-+msgstr "Não foi possível criar o socket: %s"
-+
-+#: ../libtransmission/file-posix.c:153
-+#, c-format
-+msgid "File \"%s\" is in the way"
-+msgstr "O ficheiro \"%s\" está no caminho"
-+
-+#: ../libtransmission/makemeta.c:54
-+#, c-format
-+msgid "Torrent Creator is skipping file \"%s\": %s"
-+msgstr "O criador de torrents está a ignorar o ficheiro \"%s\": %s"
-+
-+#: ../libtransmission/makemeta.c:209
-+#, c-format
-+msgid "Failed to set piece size to %s, leaving it at %s"
-+msgstr "Não foi possível definir o tamanho das peças em %s, a utilizar %s"
-+
-+#: ../libtransmission/metainfo.c:759
-+#, c-format
-+msgid "Invalid metadata entry \"%s\""
-+msgstr "Entrada de metadados inválidos \"%s\""
-+
-+#: ../libtransmission/natpmp.c:30
-+msgid "Port Forwarding (NAT-PMP)"
-+msgstr "Redirecionamento de portas (NAT-PMP)"
-+
-+#: ../libtransmission/natpmp.c:73
-+#, c-format
-+msgid "%s succeeded (%d)"
-+msgstr "%s bem sucedido (%d)"
-+
-+#: ../libtransmission/natpmp.c:138
-+#, c-format
-+msgid "Found public address \"%s\""
-+msgstr "Endereço público encontrado \"%s\""
-+
-+#: ../libtransmission/natpmp.c:173
-+#, c-format
-+msgid "no longer forwarding port %d"
-+msgstr "já não está a redirecionar a porta %d"
-+
-+#: ../libtransmission/natpmp.c:222
-+#, c-format
-+msgid "Port %d forwarded successfully"
-+msgstr "Porta %d redirecionada com sucesso"
-+
-+#: ../libtransmission/net.c:323
-+#, c-format
-+msgid "Couldn't set source address %s on %<PRIdMAX>: %s"
-+msgstr "Não foi possível definir o endereço da fonte %s em %<PRIdMAX>: %s"
-+
-+#: ../libtransmission/net.c:339
-+#, c-format
-+msgid "Couldn't connect socket %<PRIdMAX> to %s, port %d (errno %d - %s)"
-+msgstr "Não foi possível conectar o socket %<PRIdMAX> a %s, porta %d (errno %d - %s)"
-+
-+#: ../libtransmission/net.c:436
-+msgid "Is another copy of Transmission already running?"
-+msgstr "Está a ser executada outra instância do Transmission?"
-+
-+#: ../libtransmission/net.c:445
-+#, c-format
-+msgid "Couldn't bind port %d on %s: %s"
-+msgstr "Não foi possível vincular a porta %d em %s: %s"
-+
-+#: ../libtransmission/net.c:449
-+#, c-format
-+msgid "Couldn't bind port %d on %s: %s (%s)"
-+msgstr "Não foi possível vincular a porta %d em %s: %s (%s)"
-+
-+#: ../libtransmission/peer-msgs.c:2134
-+#, c-format
-+msgid "Please Verify Local Data! Piece #%zu is corrupt."
-+msgstr "Por favor verifique os dados locais! A peça #%zu está corrompida."
-+
-+#: ../libtransmission/platform.c:472
-+#, c-format
-+msgid "Searching for web interface file \"%s\""
-+msgstr "A procurar pelo ficheiro de interface web \"%s\""
-+
-+#: ../libtransmission/port-forwarding.c:29
-+msgid "Port Forwarding"
-+msgstr "Redirecionamento de portas"
-+
-+#: ../libtransmission/port-forwarding.c:57
-+msgid "Starting"
-+msgstr "A iniciar"
-+
-+#: ../libtransmission/port-forwarding.c:60
-+msgid "Forwarded"
-+msgstr "Redirecionado"
-+
-+#: ../libtransmission/port-forwarding.c:63
-+msgid "Stopping"
-+msgstr "A parar"
-+
-+#: ../libtransmission/port-forwarding.c:66
-+msgid "Not forwarded"
-+msgstr "Não redirecionado"
-+
-+#: ../libtransmission/port-forwarding.c:106 ../libtransmission/torrent.c:2302
-+#, c-format
-+msgid "State changed from \"%1$s\" to \"%2$s\""
-+msgstr "Estado alterado de \"%1$s\" para \"%2$s\""
-+
-+#: ../libtransmission/port-forwarding.c:196
-+msgid "Stopped"
-+msgstr "Parado"
-+
-+#: ../libtransmission/rpc-server.c:1096
-+#, c-format
-+msgid "Couldn't find settings key \"%s\""
-+msgstr "Não foi possível encontrar a chave de configurações \"%s\""
-+
-+#: ../libtransmission/rpc-server.c:1230
-+#, c-format
-+msgid "%s is not a valid address"
-+msgstr "%s não é um endereço válido"
-+
-+#: ../libtransmission/rpc-server.c:1235
-+#, c-format
-+msgid "%s is not an IPv4 or IPv6 address. RPC listeners must be IPv4 or IPv6"
-+msgstr "%s não é um endereço IPv4 nem IPv6. Os RPC listeners têm de ser IPv4 ou IPv6"
-+
-+#: ../libtransmission/rpc-server.c:1243
-+#, c-format
-+msgid "Serving RPC and Web requests on %s:%d%s"
-+msgstr "A servir pedidos RPC e Web em %s:%d%s"
-+
-+#: ../libtransmission/rpc-server.c:1249
-+msgid "Whitelist enabled"
-+msgstr "Lista branca ativada"
-+
-+#: ../libtransmission/rpc-server.c:1254
-+msgid "Password required"
-+msgstr "Necessária palavra-passe"
-+
-+#: ../libtransmission/rpcimpl.c:1674
-+#, c-format
-+msgid "Error uncompressing blocklist: %s (%d)"
-+msgstr "Erro ao descomprimir a lista de bloqueios: %s (%d)"
-+
-+#. first %s is the application name
-+#. second %s is the version number
-+#: ../libtransmission/session.c:769
-+#, c-format
-+msgid "%s %s started"
-+msgstr "1%s 1%s iniciado"
-+
-+#: ../libtransmission/session.c:2170
-+#, c-format
-+msgid "Loaded %d torrents"
-+msgstr "%d torrents carregados"
-+
-+#: ../libtransmission/torrent-magnet.c:310
-+msgid "Magnet torrent's metadata is not usable"
-+msgstr "Os metadados do torrent magnético não são utilizáveis"
-+
-+#: ../libtransmission/torrent.c:616
-+#, c-format
-+msgid "Tracker warning: \"%s\""
-+msgstr "Aviso do rastreador: \"%s\""
-+
-+#: ../libtransmission/torrent.c:623
-+#, c-format
-+msgid "Tracker error: \"%s\""
-+msgstr "Erro do rastreador: \"%s\""
-+
-+#: ../libtransmission/torrent.c:916
-+msgid "No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it."
-+msgstr "Não foram encontrados dados. Certifique-se que as suas drives estão ligadas ou utiliza \"Definir Localização\". Para tornar a descarregar, remova o torrent e torne a adicioná-lo."
-+
-+#: ../libtransmission/torrent.c:1868
-+msgid "Restarted manually -- disabling its seed ratio"
-+msgstr "Reiniciado manualmente - a desativar o rácio de semear"
-+
-+#: ../libtransmission/torrent.c:2078
-+msgid "Removing torrent"
-+msgstr "A remover o torrent"
-+
-+#. Translators: this is a minor point that's safe to skip over, but FYI:
-+#. "Complete" and "Done" are specific, different terms in Transmission:
-+#. "Complete" means we've downloaded every file in the torrent.
-+#. "Done" means we're done downloading the files we wanted, but NOT all
-+#. that exist
-+#: ../libtransmission/torrent.c:2164
-+msgid "Done"
-+msgstr "Feito"
-+
-+#: ../libtransmission/torrent.c:2167
-+msgid "Complete"
-+msgstr "Completo"
-+
-+#: ../libtransmission/torrent.c:3466
-+#, c-format
-+msgid "Piece %<PRIu32>, which was just downloaded, failed its checksum test"
-+msgstr "A peça %<PRIu32>, que acabou de ser descarregada, falhou no teste de  soma de verificação (checksum)"
-+
-+#: ../libtransmission/upnp.c:29
-+msgid "Port Forwarding (UPnP)"
-+msgstr "Redirecionamento de portas (UPnP)"
-+
-+#: ../libtransmission/upnp.c:200
-+#, c-format
-+msgid "Found Internet Gateway Device \"%s\""
-+msgstr "Foi encontrado o Internet Gateway Device \"%s\""
-+
-+#: ../libtransmission/upnp.c:201
-+#, c-format
-+msgid "Local Address is \"%s\""
-+msgstr "O endereço local é \"%s\""
-+
-+#: ../libtransmission/upnp.c:228
-+#, c-format
-+msgid "Port %d isn't forwarded"
-+msgstr "A porta %d não está a ser redirecionada"
-+
-+#: ../libtransmission/upnp.c:238
-+#, c-format
-+msgid "Stopping port forwarding through \"%s\", service \"%s\""
-+msgstr "A parar o redirecionamento de portas por \"%s\", serviço \"%s\""
-+
-+#: ../libtransmission/upnp.c:275
-+#, c-format
-+msgid "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)"
-+msgstr "A redirecionar portas por \"%s\", serviço \"%s\". (endereço local: %s:%d)"
-+
-+#: ../libtransmission/upnp.c:280
-+msgid "Port forwarding successful!"
-+msgstr "Redirecionamento de portas bem sucedido!"
-+
-+#: ../libtransmission/utils.c:270 ../libtransmission/utils.c:271
-+msgid "Not a regular file"
-+msgstr "Não é um ficheiro normal"
-+
-+#. did caller give us an uninitialized val?
-+#: ../libtransmission/variant.c:926
-+msgid "Invalid metadata"
-+msgstr "metadados inválidos"
-+
-+#: ../libtransmission/variant.c:1211 ../libtransmission/variant.c:1235
-+#, c-format
-+msgid "Couldn't save temporary file \"%1$s\": %2$s"
-+msgstr "Não foi possível gravar o ficheiro temporário \"%1$s\": %2$s"
-+
-+#: ../libtransmission/variant.c:1221
-+#, c-format
-+msgid "Saved \"%s\""
-+msgstr "\"%s\" gravado"
-+
-+#: ../libtransmission/variant.c:1264
-+msgid "Unable to parse file content"
-+msgstr "Não foi possível processar o conteúdo do ficheiro"
-+
-+#: ../libtransmission/verify.c:220
-+msgid "Verifying torrent"
-+msgstr "A verificar o torrent"
-+
-+#, c-format
-+#~ msgid "Server returned \"%1$ld %2$s\""
-+#~ msgstr "O servidor devolveu \"%1$ld %2$s\""
-+
-+#, c-format
-+#~ msgid "Error opening \"%s\""
-+#~ msgstr "Erro ao abrir \"%s\""
diff --git a/srcpkgs/transmission/patches/fix-makefiles.patch b/srcpkgs/transmission/patches/fix-makefiles.patch
deleted file mode 100644
index 37f994ef0072..000000000000
--- a/srcpkgs/transmission/patches/fix-makefiles.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 642db5762b1f8e9d2bb8527b153b6c47d856cb9d Mon Sep 17 00:00:00 2001
-From: Mike Gelfand <mikedld@mikedld.com>
-Date: Sat, 23 May 2020 01:39:36 +0300
-Subject: [PATCH] Add missing files that fail build from tarball
-
-Fixes: #1246
----
- libtransmission/Makefile.am | 3 +++
- macosx/Makefile.am          | 2 ++
- po/LINGUAS                  | 1 +
- third-party/Makefile.am     | 3 +++
- 4 files changed, 9 insertions(+)
-
-diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
-index 0885fab0d..d9a61c12f 100644
---- a/libtransmission/Makefile.am
-+++ b/libtransmission/Makefile.am
-@@ -316,3 +316,6 @@ watchdir_generic_test_CPPFLAGS = -DWATCHDIR_TEST_FORCE_GENERIC $(AM_CPPFLAGS)
- rename_test_SOURCES = rename-test.c $(TEST_SOURCES)
- rename_test_LDADD = ${apps_ldadd}
- rename_test_LDFLAGS = ${apps_ldflags}
-+
-+EXTRA_DIST = \
-+  subprocess-test.cmd
-diff --git a/macosx/Makefile.am b/macosx/Makefile.am
-index 27abb77b6..5a6fec9ef 100644
---- a/macosx/Makefile.am
-+++ b/macosx/Makefile.am
-@@ -95,6 +95,8 @@ EXTRA_DIST = \
-     InfoTabButtonBack.m \
-     InfoTabButtonCell.h \
-     InfoTabButtonCell.m \
-+    InfoTabMatrix.h \
-+    InfoTabMatrix.m \
-     InfoTextField.h \
-     InfoTextField.m \
-     InfoActivityViewController.h \
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 08629cd1b..6b3145a37 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -68,6 +68,7 @@ pa
- pl
- pt
- pt_BR
-+pt_PT
- ro
- ru
- si
-diff --git a/third-party/Makefile.am b/third-party/Makefile.am
-index 9f66878d9..33df96d42 100644
---- a/third-party/Makefile.am
-+++ b/third-party/Makefile.am
-@@ -22,5 +22,8 @@ SUBDIRS = \
-   $(UTP_DIR)
- 
- EXTRA_DIST = \
-+  curl \
-+  libevent \
-+  openssl \
-   macosx-libevent-config.h \
-   macosx-libevent-event-config.h
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 5a61a0a2bdd3..d5a1d98d5f8a 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,19 +1,19 @@
 # Template file for 'transmission'
 pkgname=transmission
-version=3.00
-revision=5
+version=4.0.2
+revision=1
 build_style=cmake
-configure_args="-DENABLE_CLI=ON"
+configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF"
 hostmakedepends="autoconf automake intltool glib-devel
  libtool pkg-config qt5-host-tools qt5-qmake"
-makedepends="dbus-glib-devel gtk+3-devel
- libcurl-devel libevent-devel qt5-tools-devel"
+makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel
+ libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel"
 short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"
-distfiles="https://github.com/transmission/transmission-releases/raw/master/${pkgname}-${version}.tar.xz"
-checksum=9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2
+distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8
 
 # Create transmission system user/group
 system_accounts="transmission"
@@ -24,13 +24,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
-post_configure() {
-	# Add missing includes which happen as side-effects with glibc
-	sed -i libtransmission/transmission.h \
-		 -e "/#include <inttypes.h>.*/i #include <sys/types.h> /* ssize_t */" \
-		 -e "/#include <inttypes.h>.*/i #include <stdio.h> /* off_t */"
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/share/${pkgname}/web/LICENSE
 	vsv transmission-daemon
@@ -45,7 +38,7 @@ transmission-qt_package() {
 		vmove usr/share/man/man1/transmission-qt.1
 		vmove usr/share/transmission/translations
 		sed -i '/Icon=/s/transmission/&-qt/' ${DESTDIR}/usr/share/applications/transmission-qt.desktop
-		vinstall ${wrksrc}/qt/icons/transmission.png 644 usr/share/pixmaps transmission-qt.png
+		vinstall ${wrksrc}/qt/icons/transmission.svg 644 usr/share/pixmaps transmission-qt.svg
 		vinstall ${wrksrc}/gtk/icons/hicolor_apps_scalable_transmission.svg \
 			644 usr/share/icons/hicolor/scalable/apps transmission-qt.svg
 		vmove usr/share/applications/transmission-qt.desktop
@@ -60,7 +53,7 @@ transmission-gtk_package() {
 		vmove usr/share/man/man1/transmission-gtk.1
 		vmove usr/share/icons/hicolor
 		vmove usr/share/applications/transmission-gtk.desktop
-		vinstall ${wrksrc}/qt/icons/transmission.png 644 usr/share/pixmaps
+		vinstall ${wrksrc}/qt/icons/transmission.svg 644 usr/share/pixmaps
 		# This install path seems to be used with musl libc
 		if [ -d ${DESTDIR}/usr/lib/locale ]; then
 			mv ${DESTDIR}/usr/lib/locale ${DESTDIR}/usr/share

From fe4e79952462795e32aea6e2f4628a11f4784284 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Thu, 30 Mar 2023 23:54:20 -0600
Subject: [PATCH 1126/1853] toybox: update to 0.8.9

---
 srcpkgs/toybox/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template
index d9b67535114f..302abb234c6d 100644
--- a/srcpkgs/toybox/template
+++ b/srcpkgs/toybox/template
@@ -1,6 +1,6 @@
 # Template file for 'toybox'
 pkgname=toybox
-version=0.8.7
+version=0.8.9
 revision=1
 create_wrksrc=yes
 short_desc="BSD-licensed alternative to busybox"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="0BSD"
 homepage="http://www.landley.net/toybox"
 distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz"
-checksum=b508bf336f82cb0739b77111f945931d1a143b5a53905cb753cd2607cfdd1494
+checksum=06913dde3de7139b40f947bd7f23869dfc8796e9c6ff39de02719f8b7b2d47ad
 
 post_extract() {
 	mv toybox-${version} toybox
@@ -30,10 +30,12 @@ do_build() {
 }
 
 _rm_failing_tests() {
-	# XXX: Some tests for du, find and grep fail
+	# XXX: Some tests for du, find, grep, sed and tar fail
 	rm tests/du.test
 	rm tests/find.test
 	rm tests/grep.test
+	rm tests/sed.test
+	rm tests/tar.test
 	[ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ] && return 0
 	# XXX: chattr, hostname,losetup, rmdir tests fail on CI
 	rm tests/chattr.test

From 58c66ce95a9abd29e574c5a03448ca9d991150c2 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Wed, 29 Mar 2023 23:49:07 +0100
Subject: [PATCH 1127/1853] apache: Update to 2.4.56

---
 srcpkgs/apache/template | 42 +++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..36fcec88ddd7 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.54
-revision=2
+version=2.4.56
+revision=1
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
@@ -34,7 +34,7 @@ license="Apache-2.0"
 homepage="https://httpd.apache.org/"
 changelog="https://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
-checksum=eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340
+checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
 
 system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"
@@ -55,12 +55,32 @@ fi
 
 pre_configure() {
 	# set default user
-	sed -e 's#User daemon#User _apache#' \
+	vsed -e 's#User daemon#User _apache#' \
 		-e 's#Group daemon#Group _apache#' \
 		-i docs/conf/httpd.conf.in
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
 	if [ "$CROSS_BUILD" ]; then
+		# NOTE: Here, we prepare a modified version of
+		# libtool into $XBPS_WRAPPERDIR. This sets...
+		#
+		# `CC=${CC:=gcc}`
+		# `LD=${LD:=ld}`
+		#
+		# ...so the build doesn't attempt to use the
+		# host linker...
+		sed ${XBPS_CROSS_BASE}/usr/bin/libtool \
+			-e 's;^\(LD\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+			-e 's;^\(CC\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+			> ${XBPS_WRAPPERDIR}/libtool
+		chmod +x ${XBPS_WRAPPERDIR}/libtool
+
+		# Here, we're altering the configure script
+		# to use our modified libtool...
+		vsed -i configure \
+			-e "s;\(my_libtool=\).*$;\1\""${XBPS_WRAPPERDIR}"/libtool\";g" \
+			-e "s;\(SH_LIBTOOL=\)'\$(SHELL).*'$;\1'\$(LIBTOOL)';g"
+
 		# pcre{,2}-config detection doesn't work on cross
 		# since httpd-2.4.53, manually export PCRE_CONFIG
 		# to let configure know where it is
@@ -76,14 +96,12 @@ pre_configure() {
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		# Build gen_test_char using $BUILD_CC
-		sed -i server/Makefile \
+		vsed -i server/Makefile \
 			-e "s;\$(LINK) \$(EXTRA_LDFLAGS) \$(\(gen_test_char\).*;${BUILD_CC} -o \1 \1.c -I${XBPS_CROSS_BASE}/usr/include/apr-1;"
 		# More hacks to make cross compiling work
-		sed -i build/*.mk Makefile */Makefile \
+		vsed -i build/rules.mk support/Makefile \
 			-e "s;--mode=compile;& --tag=CC;" \
-			-e "s;--mode=link;& --tag=CC;" \
-			-e "s;-\(L|R\)/usr/lib;-\1${XBPS_CROSS_BASE}/usr/lib;" \
-			-e "s;^\(LIBTOOL =\) /usr/share/apr-1/build/libtool;\1 ${XBPS_CROSS_BASE}/usr/bin/libtool;"
+			-e "s;--mode=link;& --tag=CC;"
 	fi
 }
 
@@ -108,7 +126,7 @@ post_install() {
 	#  * httpd-userdir.conf
 	#  * httpd-default.conf
 	#
-	sed \
+	vsed \
 		-e 's|ServerRoot ""|ServerRoot "/srv/www/apache"|' \
 		-e 's|#\(LoadModule include_module /usr/libexec/httpd/mod_include.so\)|\1|' \
 		-e 's|\(LoadModule unique_id_module /usr/libexec/httpd/mod_unique_id.so\)|#\1|' \
@@ -123,10 +141,6 @@ post_install() {
 		-e 's|#\(Include /etc/apache/extra/httpd-default.conf\)|\1|' \
 		-i "${DESTDIR}/etc/apache/httpd.conf"
 
-	# Remove references to hardening -specs.
-	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
-		${DESTDIR}/usr/share/apache/webroot/build/config{.nice,_vars.mk}
-
 	# Remove unused stuff.
 	vmkdir usr/share/apache/webroot
 	mv ${DESTDIR}/srv/www/$pkgname/cgi-bin ${DESTDIR}/usr/share/apache/webroot

From b268482e9fee154f36de7f0986e4332b05cf9a31 Mon Sep 17 00:00:00 2001
From: Gabriel Vinicius Canzi Candido <gabriel.vccandido@gmail.com>
Date: Sun, 19 Mar 2023 13:54:11 -0300
Subject: [PATCH 1128/1853] bind-utils: move nsupdate from bind to bind-utils

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 50700e0dfec9..54493e5d9cf9 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.22
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-largefile --with-libtool
@@ -54,7 +54,7 @@ bind-libs_package() {
 bind-utils_package() {
 	short_desc+=" - DNS utils"
 	pkg_install() {
-		for f in dig host nslookup; do
+		for f in dig host nslookup nsupdate; do
 			vmove usr/bin/${f}
 			vmove usr/share/man/man1/${f}.1
 		done

From 93eac7f73d047c7c18c5342501d78e3c767d7c84 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Mon, 20 Mar 2023 17:27:20 +0900
Subject: [PATCH 1129/1853] gforth: fix build on musl

---
 srcpkgs/gforth/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gforth/template b/srcpkgs/gforth/template
index f0df03991086..053a4814dd8e 100644
--- a/srcpkgs/gforth/template
+++ b/srcpkgs/gforth/template
@@ -14,6 +14,8 @@ checksum=2f62f2233bf022c23d01c920b1556aa13eab168e3236b13352ac5e9f18542bb0
 disable_parallel_build=yes
 
 nocross="Configure script is picky: https://api.travis-ci.org/jobs/158049419/log.txt?deansi=true"
-case "${XBPS_TARGET_MACHINE}" in
-	*-musl) broken="Tests fail, might just be a flushing problem";;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# Tests fail, might just be a flushing problem
+	make_check=no
+	configure_args="--without-check"
+fi

From 3772e0b53584628e17d88e043fa6fe67b1f3b853 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 25 Mar 2023 00:57:00 +0530
Subject: [PATCH 1130/1853] lua-language-server: update to 3.6.22.

---
 srcpkgs/lua-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template
index acd45f5fc61f..66162ef20b3a 100644
--- a/srcpkgs/lua-language-server/template
+++ b/srcpkgs/lua-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'lua-language-server'
 pkgname=lua-language-server
-version=3.6.17
+version=3.6.22
 revision=1
 hostmakedepends="ninja"
 short_desc="Lua LSP implementation written in Lua"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/LuaLS/lua-language-server"
 changelog="https://raw.githubusercontent.com/LuaLS/lua-language-server/master/changelog.md"
 distfiles="https://github.com/LuaLS/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip"
-checksum=3b305a17b885fbbf405eb029907984e86e0be0491f5ef94cb2778300120ed7ea
+checksum=e4bb02a5e32f0af584298da424ad3a0517bd1b9b359cc88c0d64d02a5452608f
 
 do_build() {
 	ninja -C 3rd/luamake -f compile/ninja/linux.ninja

From aeee0f83dd6f48bcd9bdbf024c361681bdfc18e8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 28 Mar 2023 01:20:49 +0530
Subject: [PATCH 1131/1853] libva: update to 2.18.0.

---
 srcpkgs/libva/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 5bb1bbd13a22..a411f3ee45da 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,7 @@
 # Template file for 'libva'
-# NOTE: keep this pkg synchronized with libva-glx
+# NOTE: keep this pkg synchronized with libva-glx and the minor version with libva-utils
 pkgname=libva
-version=2.17.0
+version=2.18.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no"
@@ -13,8 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
-distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001
+distfiles="https://github.com/intel/libva/archive/refs/tags/${version}.tar.gz"
+checksum=9d666c70c12dfefcdd27ae7dea771557f75e24961d0ed4cb050d96fb6136f438
 
 build_options="wayland"
 build_options_default="wayland"

From d4299e01b3210dfdac22627d3797c0a12b0a25f9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 28 Mar 2023 01:23:20 +0530
Subject: [PATCH 1132/1853] libva-glx: update to 2.18.0.

---
 srcpkgs/libva-glx/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index 2e4849927001..4c299577993d 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -4,10 +4,10 @@
 #
 # 	libva -> mesa -> libva
 #
-# KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
+# NOTE: keep this pkg synchronized with libva and the minor version with libva-utils
 #
 pkgname=libva-glx
-version=2.17.0
+version=2.18.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=yes -Dwith_wayland=yes"
@@ -18,8 +18,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
-distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001
+distfiles="https://github.com/intel/libva/archive/refs/tags/${version}.tar.gz"
+checksum=9d666c70c12dfefcdd27ae7dea771557f75e24961d0ed4cb050d96fb6136f438
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From 62817fcd5d65427dbdaf696979c6ec0c8597fa84 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 31 Mar 2023 13:20:10 +0530
Subject: [PATCH 1133/1853] libva-utils: update to 2.18.2.

---
 srcpkgs/libva-utils/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template
index e5422e5921a3..be76e29c3487 100644
--- a/srcpkgs/libva-utils/template
+++ b/srcpkgs/libva-utils/template
@@ -1,6 +1,7 @@
 # Template file for 'libva-utils'
+# NOTE: keep minor version synchronized with libva and libva-glx
 pkgname=libva-utils
-version=2.17.1
+version=2.18.2
 revision=1
 build_style=meson
 configure_args="-Ddrm=true -Dx11=true -Dwayland=true"
@@ -13,7 +14,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia"
 changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS"
 distfiles="https://github.com/intel/libva-utils/archive/refs/tags/${version}.tar.gz"
-checksum=6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966
+checksum=c4c0555c96ca678f9ac47fbb56f0ae56ca39fd50fe3553bae5cb13117bfcb406
 
 post_install() {
 	vlicense COPYING

From da8a6f59fbb937c54b6a459cfd88a426d35bfe9c Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 14 Mar 2023 23:12:36 +0100
Subject: [PATCH 1134/1853] kapow: update to 1.6.1.

---
 srcpkgs/kapow/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kapow/template b/srcpkgs/kapow/template
index b81bf7c3d6e4..2afc9cf7ac36 100644
--- a/srcpkgs/kapow/template
+++ b/srcpkgs/kapow/template
@@ -1,14 +1,14 @@
 # Template file for 'kapow'
 pkgname=kapow
-version=1.5.10
+version=1.6.1
 revision=1
-build_style=qmake
-hostmakedepends="pkg-config qt5-qmake qt5-tools-devel"
-makedepends="qt5-devel"
+build_style=cmake
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Simple punch-clock style time tracker"
 maintainer="Jakub Skrzypnik <jakub.skrzypnik@interia.pl>"
 license="GPL-3.0-or-later"
 homepage="https://gottcode.org/kapow/"
-changelog="https://raw.githubusercontent.com/gottcode/kapow/master/NEWS"
-distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}-src.tar.bz2"
-checksum=6ba62239f5717422d899573ff50f8a967aea8fbbd79ac57406d6b86a333d027c
+changelog="https://raw.githubusercontent.com/gottcode/kapow/master/ChangeLog"
+distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=02d28c49dc84c53be1d42042f9e5e063369e098819d5cac89ce07fc3a8dd4a9d

From 23db709db3e005b9f565358abb4dee6a032b7c1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 23 Jun 2023 22:11:58 +0200
Subject: [PATCH 1135/1853] apache: fix distfiles url

---
 srcpkgs/apache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 36fcec88ddd7..72c09ee934aa 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -33,7 +33,7 @@ maintainer="ologantr <mrphyber@protonmail.com>"
 license="Apache-2.0"
 homepage="https://httpd.apache.org/"
 changelog="https://www.apache.org/dist/httpd/CHANGES_2.4"
-distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
+distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
 
 system_accounts="_apache"

From 7c580587c03a0bbe39ee4e4476b804e11befd0bd Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Mon, 13 Feb 2023 20:58:47 -0500
Subject: [PATCH 1136/1853] megatools: update to 1.11.1

---
 srcpkgs/megatools/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index cf3fe3ffe039..fc06292f89e4 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,8 +1,8 @@
 # Template file for 'megatools'
 pkgname=megatools
-version=1.11.0
+version=1.11.1
 revision=1
-_release_date=20220519
+_release_date=20230212
 build_style=meson
 hostmakedepends="pkg-config asciidoc docbook2x"
 makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
@@ -10,8 +10,9 @@ short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="https://megatools.megous.com/"
-distfiles="${homepage}/builds/megatools-${version}.${_release_date}.tar.gz"
-checksum=b30b1d87d916570f7aa6d36777dd378e83215d75ea5a2c14106028b6bddc261b
+changelog="https://megatools.megous.com/builds/NEWS"
+distfiles="https://megatools.megous.com/builds/megatools-${version}.${_release_date}.tar.gz"
+checksum=ecfa2ee4b277c601ebae648287311030aa4ca73ea61ee730bc66bef24ef19a34
 
 post_install() {
 	vinstall contrib/bash-completion/megatools 644 usr/share/bash-completion/completions

From 1c975ee4a5e2de525150b4f64948f3e976cef557 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:58:01 -0400
Subject: [PATCH 1137/1853] gst-libav: update to 1.22.2

---
 srcpkgs/gst-libav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index e9a79dc650a5..8c72fc3e97ee 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config yasm"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe
+checksum=fcaaf9878fe8f3bc82317ef13a1558824cb68df1f8968c6797f556c5e33bcffd
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From d860361804301d0a61b257fd66188ee07cf059ff Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:58:18 -0400
Subject: [PATCH 1138/1853] gst-omx: update to 1.22.2

---
 srcpkgs/gst-omx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 893535c463da..5ad54cc7b9d8 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Dexamples=disabled -Dtarget=generic"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8db48040bb41f09edf8d17ff6d16c54888d7777ba4501c2c69f0083350ea9a15
+checksum=1b0c57f2cc4ddeec5e7f0c436e502f06665c4e93c73261855b94e04fc94337b2

From d67b76667152c2b0c35a89a15db266c8cea0853e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1139/1853] gst-plugins-bad1: update to 1.22.2

---
 common/shlibs                     | 1 +
 srcpkgs/gst-plugins-bad1/template | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e91bf520622..7bc98cc1b474 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1135,6 +1135,7 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
+libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.22.1_1
 libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index f55f82fd4c77..77bf79981c20 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.20.3
-revision=3
+version=1.22.2
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f
+checksum=3d8faf1ce3402c8535ce3a8c4e1a6c960e4b5655dbda6b55943db9ac79022d0f
 
 build_options="gir gme wayland"
 build_options_default="gir wayland"

From 30b61a0df618386c4cef426067b2b244004d82f0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1140/1853] gst-plugins-base1: update to 1.22.2

---
 srcpkgs/gst-plugins-base1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 29e8f76bd1fe..2f20ea819849 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f
+checksum=eb65120c4ee79b7a153c3c1972d5c0158c2151877cc51ec7725bba5749679d49
 
 build_options="cdparanoia gir sndio wayland"
 build_options_default="cdparanoia gir wayland"

From 276d181fefae94ef047104b7f86b0f6097e244ab Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1141/1853] gst-plugins-good1: update to 1.22.2

---
 srcpkgs/gst-plugins-good1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 1f5e620ce1fd..5d0fe1bfe284 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7
+checksum=7c8cc59425f2b232f60ca7d13e56edd615da4f711e73dd01a7cffa46e6bc0cdd
 
 build_options="gtk3 wayland"
 build_options_default="gtk3 wayland"

From a5818267ed57133cd4bf578a6ae391581ba488dd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1142/1853] gst-plugins-ugly1: update to 1.22.2

---
 srcpkgs/gst-plugins-ugly1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index e254fd40f869..85ae64bc7a0a 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-ugly1'
 pkgname=gst-plugins-ugly1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=8caa20789a09c304b49cf563d33cca9421b1875b84fcc187e4a385fa01d6aefd
+checksum=8f30f44db0bd063709bf6fbe55138e3a98af0abcb61c360f35582bbe10e80691

From 5a80075b750cf06763fe5a2030251034ede29105 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:31 -0400
Subject: [PATCH 1143/1853] gst1-editing-services: update to 1.22.2

---
 srcpkgs/gst1-editing-services/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 673b46970f24..102440f7f253 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
-checksum=5fd896de69fbe24421eb6b0ff8d2f8b4c3cba3f3025ceacd302172f39a8abaa2
+checksum=453b1464fc3857de269a7cb0ebd966afe02171d97bef672a0b8a0a6d43e0cebf
 
 do_check() {
 	: # Tests fail in older versions as well

From 6fd3130ab35248ef9c43269fd0b8d55c8c054987 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:00 -0400
Subject: [PATCH 1144/1853] gst-rtsp-server: update to 1.22.2

---
 srcpkgs/gst-rtsp-server/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template
index 33cd64ceb95e..2f0c0c45ff82 100644
--- a/srcpkgs/gst-rtsp-server/template
+++ b/srcpkgs/gst-rtsp-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-rtsp-server'
 pkgname=gst-rtsp-server
-version=1.20.3
-revision=2
+version=1.22.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config python3"
 makedepends="glib-devel gst-plugins-bad1-devel gobject-introspection
@@ -10,5 +10,5 @@ short_desc="GStreamer multimedia graph framework - rtsp server"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
-distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz"
-checksum=ee402718be9b127f0e5e66ca4c1b4f42e4926ec93ba307b7ccca5dc6cc9794ca
+distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=2be4aecfb88710100ea7115ed0216403e8094344ebf146094271b8d4d73828bf

From 78937eb51e905539844bd06bb0a0c1aadb2cd7e9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:39 -0400
Subject: [PATCH 1145/1853] gst1-python3: update to 1.22.2

---
 srcpkgs/gst1-python3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 3f564ac64b93..789e40f036ea 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.20.3
-revision=2
+version=1.22.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config python3"
 makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=db348120eae955b8cc4de3560a7ea06e36d6e1ddbaa99a7ad96b59846601cfdc
+checksum=bef2b3d82ce4be46b775b1bb56305c1003ee01b535a53a82f9fe8924972153ad

From dd7662db6016769e979266f056f5cf3cba657ba4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:46 -0400
Subject: [PATCH 1146/1853] gstreamer-vaapi: update to 1.22.2

---
 srcpkgs/gstreamer-vaapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 3cc4e057559a..0a5ee8b1ca3f 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=6ee99eb316abdde9ad37002915bd8c3867918f6fdc74b7cf2ac4c1ae0d690b45
+checksum=d2e642f9745f97d9f73a7f5085e7659a9a31fe209b774e6e45dae041b435df06
 
 pre_check() {
 	# Seems to need certain hardware to pass

From da39198d9ec39138fd54151089739e030a23d13f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:51 -0400
Subject: [PATCH 1147/1853] gstreamer1: update to 1.22.2

---
 srcpkgs/gstreamer1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index ae8a49cb20e8..571148f2ff33 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=607daf64bbbd5fb18af9d17e21c0d22c4d702fffe83b23cb22d1b1af2ca23a2a
+checksum=b2afe73603921c608ba48969dbb7d743776744bfe5d8059ece241137b7f88e21
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From 56218417f7fe030636d49792edc759482df5378e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 23 Jun 2023 17:50:13 +0200
Subject: [PATCH 1148/1853] cocogitto: update to 5.4.0

---
 srcpkgs/cocogitto/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index a4399ef38921..d539c000e0ce 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
-version=5.3.1
-revision=2
+version=5.4.0
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/cocogitto/cocogitto"
 changelog="https://raw.githubusercontent.com/cocogitto/cocogitto/main/CHANGELOG.md"
 distfiles="https://github.com/cocogitto/cocogitto/archive/refs/tags/${version}.tar.gz"
-checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
+checksum=93065217191d3e1739e6bca78b0b6de7d7dd1b5334229702fff9e84162060feb
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 
@@ -28,12 +28,9 @@ post_install() {
 		vcompletion cog.${shell} ${shell} cog
 	done
 
-	vtargetrun ${cog} generate-manpage cog > cog.1
-	vman cog.1
-
-	for subcommand in bump changelog check commit edit init install-hook log verify; do
-		vtargetrun ${cog} generate-manpage ${subcommand} > cog-${subcommand}.1
-		vman cog-${subcommand}.1
+	vtargetrun ${cog} generate-manpages "${XBPS_BUILDDIR}/${pkgname}-${version}/gen"
+	for manpage in gen/*.1; do
+		vman ${manpage}
 	done
 
 	vdoc README.md

From c4c725b6b7c947fbac7036e953bf4946fc1c3560 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 23 Jun 2023 10:57:33 -0300
Subject: [PATCH 1149/1853] icewm: update to 3.4.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index de72f7c9962b..3b34b3557382 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=3.3.5
+version=3.4.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=cdf46a4cb3c75541e37577a652729e8c2bdd302f5e13e30526ced27d91be596a
+checksum=2355bd274d62f639a202a8bc7224e049ef576f8ac5a08084668c8920cb9bc6be
 # broken tests
 make_check=no
 

From 520a7523f5be1306918af4f6a37874ff0d4b25e6 Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 24 Mar 2023 19:42:35 -0400
Subject: [PATCH 1150/1853] New package: newsraft-0.17

---
 srcpkgs/newsraft/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/newsraft/template

diff --git a/srcpkgs/newsraft/template b/srcpkgs/newsraft/template
new file mode 100644
index 000000000000..68cd33eea0f8
--- /dev/null
+++ b/srcpkgs/newsraft/template
@@ -0,0 +1,19 @@
+# Template file for 'newsraft'
+pkgname=newsraft
+version=0.17
+revision=1
+build_style=gnu-makefile
+make_install_args="EXAMPLES_DIR=${DESTDIR}/usr/share/examples/newsraft"
+hostmakedepends="scdoc"
+makedepends="libcurl-devel expat-devel gumbo-parser-devel ncurses-devel sqlite-devel yajl-devel"
+short_desc="Feed reader with ncurses user interface"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="ISC"
+homepage="https://codeberg.org/grisha/newsraft"
+changelog="https://codeberg.org/grisha/newsraft/releases"
+distfiles="https://codeberg.org/grisha/newsraft/archive/newsraft-${version}.tar.gz"
+checksum=12a09b4d4ade374d1ccf4256a9d7eb511f4a59e175e4d832842dfd2b95d8742c
+
+post_install() {
+	vlicense doc/license.txt
+}

From 26fa7810d90ff341a5424ca6decbcaeb0deb8849 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 21:57:40 +0200
Subject: [PATCH 1151/1853] New package: wtfutil-0.43.0

---
 srcpkgs/wtfutil/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/wtfutil/template

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
new file mode 100644
index 000000000000..363b4e71f2d9
--- /dev/null
+++ b/srcpkgs/wtfutil/template
@@ -0,0 +1,18 @@
+# Template file for 'wtfutil'
+pkgname=wtfutil
+version=0.43.0
+revision=1
+build_style=go
+go_import_path="github.com/wtfutil/wtf"
+short_desc="Personal information dashboard for the terminal"
+maintainer="Bnyro <bnyro@tutanota.com>"
+license="MPL-2.0"
+homepage="http://wtfutil.com"
+changelog="https://raw.githubusercontent.com/wtfutil/wtf/master/CHANGELOG.md"
+distfiles="https://github.com/wtfutil/wtf/archive/refs/tags/v${version}.tar.gz"
+checksum=bb48e38e479b26e0b956b163e4804e99cd49545214090c2fdf99e54382b3d651
+
+post_install() {
+	# Rename the binary to wtfutil when installing
+	mv ${DESTDIR}/usr/bin/wtf{,util}
+}

From bfc1e9f1fe9a864dff3f01c18b3f679abff389c4 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Fri, 23 Jun 2023 21:13:24 +0200
Subject: [PATCH 1152/1853] mu4e: update to 1.10.4

---
 srcpkgs/mu4e/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index 43938e2dacba..498adc73113a 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,16 +1,16 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.10.3
+version=1.10.4
 revision=1
 build_style=meson
 hostmakedepends="emacs libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel"
 short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
+maintainer="Pascal Huber <pascal.huber@resolved.ch>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 changelog="https://github.com/djcb/mu/raw/master/NEWS.org"
 distfiles="https://github.com/djcb/mu/releases/download/v${version}/mu-${version}.tar.xz"
-checksum=c83970fcb6163c27d135c207d1a5eb6f38a5732161741a4a88da2ae894e0245f
+checksum=8eba7864aad442212b2bc62aac6491708084ba5d84416a22b8a8ddf2ee7240ec
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"

From 4a60a4b2753ba6bdc3cda53e5229176c9fc21b3a Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Mon, 7 Nov 2022 19:32:44 -0500
Subject: [PATCH 1153/1853] New package: drm_info-2.5.0

---
 srcpkgs/drm_info/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/drm_info/template

diff --git a/srcpkgs/drm_info/template b/srcpkgs/drm_info/template
new file mode 100644
index 000000000000..f1f14030dec5
--- /dev/null
+++ b/srcpkgs/drm_info/template
@@ -0,0 +1,18 @@
+# Template file for 'drm_info'
+pkgname=drm_info
+version=2.5.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc"
+makedepends="libdrm-devel json-c-devel"
+short_desc="Small utility to dump info about DRM devices"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/emersion/drm_info"
+changelog="https://gitlab.freedesktop.org/emersion/drm_info/-/tags"
+distfiles="https://gitlab.freedesktop.org/emersion/drm_info/-/archive/v${version}/drm_info-v${version}.tar.bz2"
+checksum=73e04f964aaf62529aca2cd57292f972c2246af4dcd7553835e16821a75961c2
+
+post_install() {
+	vlicense LICENSE
+}

From f03411da0dabd101c98e4e629e7e6e53e0127d1b Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Wed, 26 Apr 2023 23:34:05 -0400
Subject: [PATCH 1154/1853] NoiseTorch: update to 0.12.2.

Closes: https://github.com/void-linux/void-packages/pull/43646
---
 srcpkgs/NoiseTorch/template | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index a9e9fb2c92d4..1729a51943c5 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,17 +1,34 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
-version=0.11.4
+version=0.12.2
 revision=1
+build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"
 go_import_path="noisetorch"
 depends="libcap-progs"
 short_desc="Real-time microphone noise suppression on Linux"
-maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/lawl/NoiseTorch"
-distfiles="https://github.com/lawl/NoiseTorch/archive/${version}.tar.gz"
-checksum=3da6cad119ecca6f4e131c8bca86eb122d2363d5d30dcd1da41974af5887a3c1
+homepage="https://github.com/NoiseTorch/NoiseTorch"
+_c_ringbuf_commit=2037560fb90dea5d2538611d983964d790bdbac2
+_rnnoise_commit=1cbdbcf1283499bbb2230a6b0f126eb9b236defd
+distfiles="https://github.com/NoiseTorch/NoiseTorch/archive/v${version}.tar.gz
+ https://github.com/NoiseTorch/c-ringbuf/archive/${_c_ringbuf_commit}.tar.gz
+ https://github.com/NoiseTorch/rnnoise/archive/${_rnnoise_commit}.tar.gz"
+checksum="4a30650314a6f83d979f3303d49618847ba58e39e3e26482dfe58b5e261c5611
+ 877b08413c59baac56b4cc7720fa56cf0eb399192a0ec652ce7b590c9cd9ad8a
+ 68c7ab4e408426088603e19955e746bb2a412d84bb121b6f39834c60fc8068b7"
+
+post_extract() {
+	rmdir "${build_wrksrc}/c/c-ringbuf" "${build_wrksrc}/c/rnnoise"
+	ln -rsf "c-ringbuf-${_c_ringbuf_commit}" "${build_wrksrc}/c/c-ringbuf"
+	ln -rsf "rnnoise-${_rnnoise_commit}" "${build_wrksrc}/c/rnnoise"
+}
+
+post_patch() {
+	vsed -e '/git submodule/d' -i Makefile
+}
 
 pre_build() {
 	make rnnoise

From 60c89e618d4dbac106f90a680d19d09c3d7fa88c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 23:03:38 +0200
Subject: [PATCH 1155/1853] gopls: update to 0.12.4.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index d766a2bba3e6..2006f9a1f5e5 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.12.3
+version=0.12.4
 revision=1
 build_wrksrc=gopls
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/golang/tools/tree/master/gopls"
 distfiles="https://github.com/golang/tools/archive/refs/tags/gopls/v${version}.tar.gz"
-checksum=77fa296b58ea38d9727b3f564d28bf816eb05ffaa587a2830ef405e479dab060
+checksum=746b0e1942c028c62fd8c114242a024faed19009ac64180f2cbfc9480fd45544
 
 post_install() {
 	vlicense ../LICENSE

From 429df58c43259807fb1eaa1513a8a04fe9898f1e Mon Sep 17 00:00:00 2001
From: Petr Cizmar <xxb0322@xpc.ovh>
Date: Thu, 22 Jun 2023 11:17:57 +0000
Subject: [PATCH 1156/1853] New package: n2n-3.0

Closes: #44562 [via git-merge-pr]
---
 srcpkgs/n2n/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/n2n/template

diff --git a/srcpkgs/n2n/template b/srcpkgs/n2n/template
new file mode 100644
index 000000000000..689421215b0c
--- /dev/null
+++ b/srcpkgs/n2n/template
@@ -0,0 +1,19 @@
+# Template file for 'n2n'
+pkgname=n2n
+version=3.0
+revision=1
+build_style=gnu-configure
+configure_args=CFLAGS="-O3" # No justification?
+hostmakedepends="autoconf automake pkg-config"
+short_desc="Light VPN software"
+maintainer="Petr Cizmar <xxb0322@xpc.ovh>"
+license="GPL-3.0-only"
+homepage="https://github.com/ntop/n2n"
+changelog="https://raw.githubusercontent.com/ntop/n2n/dev/CHANGELOG.md"
+distfiles="https://github.com/ntop/n2n/archive/refs/tags/${version}.tar.gz"
+checksum=25fcabba7bfcf25f4c9cd7fecc7ce11de48beb0b0f3506053d8485604ea8f50d
+
+pre_configure() {
+	vsed -i 's|/sbin|/bin|g' Makefile.in
+	./autogen.sh
+}

From 981e9d034157a6c7b949dfdbca9fa2b208e7452c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jun 2023 02:27:58 +0200
Subject: [PATCH 1157/1853] base-files: revbump for sgx group

---
 srcpkgs/base-files/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 5594c5a0efb4..c3b59c8e6cd2 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=2
+revision=3
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 216f9ceb5b5a1eff7245fb09ea5e6966500f7bd8 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Sat, 24 Jun 2023 01:49:37 +0300
Subject: [PATCH 1158/1853] transmission: update to 4.0.3.

---
 srcpkgs/transmission/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index d5a1d98d5f8a..29d74a610e74 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,6 +1,6 @@
 # Template file for 'transmission'
 pkgname=transmission
-version=4.0.2
+version=4.0.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"
 distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8
+checksum=b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a
 
 # Create transmission system user/group
 system_accounts="transmission"

From ffdfb598a9845ad8b109b2807f25853d4b363231 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 24 Jun 2023 07:39:24 +0200
Subject: [PATCH 1159/1853] dhcpcd: fix dhcpv6-pd for pppoe

---
 ...-Improve-learning-IPv6-address-flags.patch | 62 +++++++++++++++++++
 srcpkgs/dhcpcd/template                       |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch

diff --git a/srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch b/srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch
new file mode 100644
index 000000000000..5fceb5e4f3d5
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch
@@ -0,0 +1,62 @@
+From 45e441ada6d3ea4355d623cf12d9a559a5c2afde Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Tue, 23 May 2023 22:14:57 +0100
+Subject: [PATCH] Linux: Improve learning IPv6 address flags
+
+Rather than matching addresses during netlink message processing,
+extract the local, address and flag parts.
+Once done, then match local and address to the address we are
+looking for and if equal apply the flags.
+
+Fixes #201 and maybe #149.
+---
+ src/if-linux.c | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/src/if-linux.c b/src/if-linux.c
+index f2f609ed..212ed5df 100644
+--- a/src/if-linux.c
++++ b/src/if-linux.c
+@@ -1996,7 +1996,8 @@ _if_addrflags6(__unused struct dhcpcd_ctx *ctx,
+ 	size_t len;
+ 	struct rtattr *rta;
+ 	struct ifaddrmsg *ifa;
+-	bool matches_addr = false;
++	struct in6_addr *local = NULL, *address = NULL;
++	uint32_t *flags = NULL;
+ 
+ 	ifa = NLMSG_DATA(nlm);
+ 	if (ifa->ifa_index != ia->ifa_ifindex || ifa->ifa_family != AF_INET6)
+@@ -2007,17 +2008,26 @@ _if_addrflags6(__unused struct dhcpcd_ctx *ctx,
+ 	for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
+ 		switch (rta->rta_type) {
+ 		case IFA_ADDRESS:
+-			if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, (struct in6_addr *)RTA_DATA(rta)))
+-				ia->ifa_found = matches_addr = true;
+-			else
+-				matches_addr = false;
++			address = (struct in6_addr *)RTA_DATA(rta);
++			break;
++		case IFA_LOCAL:
++			local = (struct in6_addr *)RTA_DATA(rta);
+ 			break;
+ 		case IFA_FLAGS:
+-			if (matches_addr)
+-				memcpy(&ia->ifa_flags, RTA_DATA(rta), sizeof(ia->ifa_flags));
++			flags = (uint32_t *)RTA_DATA(rta);
+ 			break;
+ 		}
+ 	}
++
++	if (local) {
++	       if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, local))
++			ia->ifa_found = true;
++	} else if (address) {
++	       if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, address))
++			ia->ifa_found = true;
++	}
++	if (flags && ia->ifa_found)
++		memcpy(&ia->ifa_flags, flags, sizeof(ia->ifa_flags));
+ 	return 0;
+ }
+ 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index b30bb7c24af4..09a30b9a3c8a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=10.0.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 configure_args="

From 9521e60b5f38723631f407524470764311c6d76d Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Sat, 24 Jun 2023 00:21:13 -0600
Subject: [PATCH 1160/1853] qt6ct: update to 0.8

Closes: https://github.com/void-linux/void-packages/pull/43133
---
 srcpkgs/qt6ct/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index 34f7947920dc..21edb46beadb 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6ct'
 pkgname=qt6ct
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=cmake
 hostmakedepends="qt6-tools qt6-base"
 makedepends="qt6-base-devel"
@@ -11,7 +11,7 @@ maintainer="Adam Pschorr <adampschorr13@aol.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/trialuser02/qt6ct"
 distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
-checksum=6bc4c35e7c567908d8e123b8ccc11a55d27b5353ad035905cfa44b98c29ca862
+checksum=ca3706770cbdbce769ee4393de9f7469be043810fe40283690612f5f6552018a
 
 post_install() {
 	vlicense COPYING

From a306b015815ce9312a714a6743126fa4153ad00e Mon Sep 17 00:00:00 2001
From: oliverwiegers <oliver.wiegers@gmail.com>
Date: Thu, 22 Jun 2023 21:26:12 +0200
Subject: [PATCH 1161/1853] nyxt: update to 3.2.1

---
 srcpkgs/nyxt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index d0f7ddf489cd..fd7353026197 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,6 +1,6 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=3.2.0
+version=3.2.1
 revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=3e7a2812563ea3f2fe0c039db0d693a4de99d22cef1b0dec09173d1b7fbaf691
+checksum=55112dca1a7e0fc8d8c2c2531ecd996c2020ab0e242e240d223aa00498b63d66
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From 887aba0dd54107fc3d1a1a5991636f47ba1c5407 Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 19 May 2023 16:36:06 -0400
Subject: [PATCH 1162/1853] New package: qbe-1.1

Closes: https://github.com/void-linux/void-packages/pull/43951
---
 srcpkgs/qbe/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/qbe/template

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
new file mode 100644
index 000000000000..e56a69ffcc10
--- /dev/null
+++ b/srcpkgs/qbe/template
@@ -0,0 +1,27 @@
+# Template file for 'qbe'
+pkgname=qbe
+version=1.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Small embeddable C compiler backend"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="MIT"
+homepage="https://c9x.me/compile/"
+distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
+checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+
+# Currently only aarch64 and x86_64 targets are supported and the checks
+# test the compiled binaries.
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|x86_64*) ;;
+	*) make_check=no ;;
+esac
+
+post_install() {
+	vdoc doc/abi.txt
+	vdoc doc/il.txt
+	vdoc doc/llvm.txt
+
+	vlicense LICENSE
+}

From 24da6a5f2b1beda1587888908cb2100238c56bc7 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sat, 29 Apr 2023 01:27:18 -0500
Subject: [PATCH 1163/1853] New package: n-9.1.0

---
 srcpkgs/n/files/README.voidlinux |  3 +++
 srcpkgs/n/template               | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 srcpkgs/n/files/README.voidlinux
 create mode 100644 srcpkgs/n/template

diff --git a/srcpkgs/n/files/README.voidlinux b/srcpkgs/n/files/README.voidlinux
new file mode 100644
index 000000000000..faefa91351e5
--- /dev/null
+++ b/srcpkgs/n/files/README.voidlinux
@@ -0,0 +1,3 @@
+It is strongly recommended to set the environment variable N_PREFIX to install to a user-writable area. For example:
+
+export N_PREFIX=$HOME/local/n
diff --git a/srcpkgs/n/template b/srcpkgs/n/template
new file mode 100644
index 000000000000..bf63fe5a0dba
--- /dev/null
+++ b/srcpkgs/n/template
@@ -0,0 +1,22 @@
+# Template file for 'n'
+pkgname=n
+version=9.1.0
+revision=1
+build_style=gnu-makefile
+depends="curl"
+short_desc="Simple command line NodeJS version management"
+maintainer="anelki <akierig@fastmail.de>"
+license="MIT"
+homepage="https://github.com/tj/n"
+changelog="https://raw.githubusercontent.com/tj/n/master/CHANGELOG.md"
+distfiles="https://github.com/tj/n/archive/refs/tags/v${version}.tar.gz"
+checksum=48306496413c61d37eeaa0a7328a4520b1da0c42739e046f6f9242de0d0ae270
+
+do_install() {
+	vbin bin/n n
+	vdoc ${FILESDIR}/README.voidlinux
+}
+
+post_install() {
+	vlicense LICENSE
+}

From ac869de9ed3833cc03864c8b36e357eaa5eabbb0 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Thu, 27 Apr 2023 15:51:23 -0500
Subject: [PATCH 1164/1853] New package: mmv-go 0.1.6

---
 srcpkgs/mmv-go/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/mmv-go/template

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
new file mode 100644
index 000000000000..28f23c1354fa
--- /dev/null
+++ b/srcpkgs/mmv-go/template
@@ -0,0 +1,18 @@
+# Template file for 'mmv-go'
+pkgname=mmv-go
+version=0.1.6
+revision=1
+build_style=go
+go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+short_desc="Rename and move multiple files at once with your editor"
+maintainer="anelki <akierig@fastmail.de>"
+license="MIT"
+homepage="https://github.com/itchyny/mmv"
+changelog="https://raw.githubusercontent.com/itchyny/mmv/main/CHANGELOG.md"
+distfiles="https://github.com/itchyny/mmv/archive/refs/tags/v${version}.tar.gz"
+checksum=18d181e6a53437ad18c4409f3c423bc23687152a17b53a605dde13dfffb0d215
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/mmv ${DESTDIR}/usr/bin/mmv-go
+	vlicense LICENSE
+}

From 2666087e39664cb817ee81d1b30c42c91a60cb7b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Wed, 19 Apr 2023 12:02:20 +0200
Subject: [PATCH 1165/1853] New package: solo2-cli-0.2.2

---
 srcpkgs/solo2-cli/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/solo2-cli/template

diff --git a/srcpkgs/solo2-cli/template b/srcpkgs/solo2-cli/template
new file mode 100644
index 000000000000..e61154b73bab
--- /dev/null
+++ b/srcpkgs/solo2-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'solo2-cli'
+pkgname=solo2-cli
+version=0.2.2
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel pcsclite-devel"
+short_desc="CLI tools for SoloKeys Solo 2 security keys"
+maintainer="Philipp David <pd@3b.pm>"
+license="Apache-2.0"
+homepage="https://github.com/solokeys/solo2-cli"
+distfiles="https://github.com/solokeys/solo2-cli/archive/v${version}.tar.gz
+ https://github.com/solokeys/solo2-cli/releases/download/v$version/solo2.completions.bash
+ https://github.com/solokeys/solo2-cli/releases/download/v$version/solo2.completions.fish
+ https://github.com/solokeys/solo2-cli/releases/download/v$version/solo2.completions.zsh"
+checksum="49a30c5ee6f38be968a520089741f8b936099611e98e6bf2b25d05e5e9335fb4
+ 09e5ae1da36e3fbb2e9183188c93277ac113fc2397f3e2447abdf7c718037f0e
+ d002a00bc6a58b23828d2cf7fcc49793dc34185c13aa6858622cda9a28a45379
+ eeda949e2a282cbbc759be939df1e0d96c50578a441dc6caa86a48a7a264a200"
+skip_extraction="solo2.completions.bash
+ solo2.completions.fish
+ solo2.completions.zsh"
+
+post_install() {
+	for shell in bash fish zsh; do
+		vcompletion "$XBPS_SRCDISTDIR/${pkgname}-${version}/solo2.completions.${shell}" \
+			"${shell}" solo2
+	done
+	vinstall 70-solo2.rules 644 usr/lib/udev/rules.d
+}

From 256284684dd3e2e979ebdf20e864c617015e44d1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 17 Jun 2023 10:24:03 +0200
Subject: [PATCH 1166/1853] New package: zls-0.10.0

---
 srcpkgs/zls/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/zls/template

diff --git a/srcpkgs/zls/template b/srcpkgs/zls/template
new file mode 100644
index 000000000000..c525b3bc1cc6
--- /dev/null
+++ b/srcpkgs/zls/template
@@ -0,0 +1,29 @@
+# Template file for 'zls'
+pkgname=zls
+version=0.10.0
+revision=1
+build_style=zig-build
+short_desc="Zig language server"
+maintainer="Bnyro <bnyro@tutanota.com>"
+license="MIT"
+homepage="https://github.com/zigtools/zls"
+_known_folders_gitrev="d13ba6137084e55f873f6afb67447fe8906cc951"
+_tracy_gitrev="f493d4aa8ba8141d9680473fad007d8a6348628e"
+distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz
+ https://github.com/ziglibs/known-folders/archive/${_known_folders_gitrev}.tar.gz
+ https://github.com/wolfpld/tracy/archive/${_tracy_gitrev}.tar.gz"
+checksum="ad8c16721a10a55b759f0cd63243301565b948b1d48075e1fda89ccf264a2bdf
+	1fa1c5cb7da6c2ba76ae3c52602ce525ccbbf5741d1ca9c4d2687ff10333a0cf
+	84577b79a36566a777eec3cf2b596920a0c1d7b6c216d941c04ef967a727b041"
+skip_extraction="${_known_folders_gitrev}.tar.gz ${_tracy_gitrev}.tar.gz"
+
+post_extract() {
+	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_known_folders_gitrev.tar.gz" \
+		--strip-components=1 -C "$wrksrc/src/known-folders"
+	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_tracy_gitrev.tar.gz" \
+		--strip-components=1 -C "$wrksrc/src/tracy"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From bef4cb5b020da682c9a66b2bcc1c8c75e2b48e8d Mon Sep 17 00:00:00 2001
From: dvar <dvar@tuta.io>
Date: Wed, 19 Apr 2023 14:15:58 +0200
Subject: [PATCH 1167/1853] New package: way-displays-1.8.1

---
 srcpkgs/way-displays/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/way-displays/template

diff --git a/srcpkgs/way-displays/template b/srcpkgs/way-displays/template
new file mode 100644
index 000000000000..c4b35f08d293
--- /dev/null
+++ b/srcpkgs/way-displays/template
@@ -0,0 +1,20 @@
+# Template file for 'way-displays'
+pkgname=way-displays
+version=1.8.1
+revision=1
+build_style=gnu-makefile
+make_build_args="PREFIX_ETC=/"
+make_install_args="PREFIX_ETC=/"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel yaml-cpp-devel wlroots-devel eudev-libudev-devel"
+short_desc="Auto Manage Your Wayland Displays"
+maintainer="dvar <dvar@tuta.io>"
+license="MIT"
+homepage="https://github.com/alex-courtis/way-displays"
+distfiles="https://github.com/alex-courtis/way-displays/archive/refs/tags/${version}.tar.gz"
+checksum=529d074e55f8d15abcf6fd934abe080509509d5578aa8d4fd303f5b882970047
+
+post_install() {
+	vlicense LICENSE
+	vman way-displays.1
+}

From 37ba0eb4f5286ff711e5bfcbef0b81354bfa0c07 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 26 Feb 2023 20:32:45 +0100
Subject: [PATCH 1168/1853] New package: sheldon-0.7.3

---
 srcpkgs/sheldon/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/sheldon/template

diff --git a/srcpkgs/sheldon/template b/srcpkgs/sheldon/template
new file mode 100644
index 000000000000..ba1d1ca71a44
--- /dev/null
+++ b/srcpkgs/sheldon/template
@@ -0,0 +1,30 @@
+# Template file for 'sheldon'
+pkgname=sheldon
+version=0.7.3
+revision=1
+build_style=cargo
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel openssl-devel zlib-devel"
+checkdepends="git"
+short_desc="Fast, configurable shell plugin manager"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://sheldon.cli.rs/"
+changelog="https://raw.githubusercontent.com/rossmacarthur/sheldon/trunk/RELEASES.md"
+distfiles="https://github.com/rossmacarthur/sheldon/archive/refs/tags/${version}.tar.gz"
+checksum=cf8844dce853156d076a6956733420ad7a9365e16a928e419b11de8bc634fc67
+
+if [ "$XBPS_BUILD_ENVIRONMENT" == "void-packages-ci" ]; then
+	make_check_args="-- --skip lock_and_source_clean_permission_denied"
+fi
+
+post_install() {
+	for shell in bash zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/sheldon completions --shell ${shell} > sheldon.${shell}
+		vcompletion sheldon.${shell} ${shell}
+	done
+
+	vlicense LICENSE-MIT
+	vdoc README.md
+}

From 993a5d60822a0f7d32c44da3f6d4f5c65dc2f68d Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloi.torrentsj@gmail.com>
Date: Fri, 25 Mar 2022 11:30:25 +0100
Subject: [PATCH 1169/1853] New package: ansifilter-2.18

---
 srcpkgs/ansifilter/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/ansifilter/template

diff --git a/srcpkgs/ansifilter/template b/srcpkgs/ansifilter/template
new file mode 100644
index 000000000000..30519cb8ef6c
--- /dev/null
+++ b/srcpkgs/ansifilter/template
@@ -0,0 +1,11 @@
+# Template file for 'ansifilter'
+pkgname=ansifilter
+version=2.18
+revision=1
+build_style=gnu-makefile
+short_desc="Remove or convert ANSI codes to another format"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-only"
+homepage="https://gitlab.com/saalen/ansifilter"
+distfiles="https://gitlab.com/saalen/ansifilter/-/archive/${version}/ansifilter-${version}.tar.gz"
+checksum=e91cc14bd5a464cfd39e77a254ea6e12314a2b7d4554766d6b7043a8cb5faa04

From 40a11f30db73a98333d112b76b1a5cec2d65d731 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Fri, 28 Jan 2022 18:06:24 +0900
Subject: [PATCH 1170/1853] New package: keynav-0.0.20180821

---
 .../patches/fix-cursor-passthrough.patch      | 161 ++++++++++++++++++
 .../patches/fix-overlapping-screens.patch     |  57 +++++++
 srcpkgs/keynav/template                       |  27 +++
 3 files changed, 245 insertions(+)
 create mode 100644 srcpkgs/keynav/patches/fix-cursor-passthrough.patch
 create mode 100644 srcpkgs/keynav/patches/fix-overlapping-screens.patch
 create mode 100644 srcpkgs/keynav/template

diff --git a/srcpkgs/keynav/patches/fix-cursor-passthrough.patch b/srcpkgs/keynav/patches/fix-cursor-passthrough.patch
new file mode 100644
index 000000000000..85fcce7ebb6c
--- /dev/null
+++ b/srcpkgs/keynav/patches/fix-cursor-passthrough.patch
@@ -0,0 +1,161 @@
+From 024fc8fe47454f460faa14cbb1727e04596886c0 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Sun, 23 Feb 2020 01:50:36 -0800
+Subject: [PATCH 1/2] Set input shape to 0x0 to passthrough mouse
+
+Define the input shape to be empty so that one cannot click on the grid.
+This resolves all issues where the cursor ends up pointing to the grid
+itself instead of the window under the grid due to openpixel() not being
+called.
+---
+ keynav.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/keynav.c b/keynav.c
+index 65abe7c..4453fc8 100644
+--- a/keynav.c
++++ b/keynav.c
+@@ -983,6 +983,9 @@ void cmd_start(char *args) {
+     /* Tell the window manager not to manage us */
+     winattr.override_redirect = 1;
+     XChangeWindowAttributes(dpy, zone, CWOverrideRedirect, &winattr);
++    /* Set the input shape to be nothing so that the mouse can still
++     * click/scroll if on the grid */
++    XShapeCombineRectangles(dpy, zone, ShapeInput, 0, 0, NULL, 0, ShapeSet, 0);
+ 
+     XSelectInput(dpy, zone, StructureNotifyMask | ExposureMask
+                  | PointerMotionMask | LeaveWindowMask );
+
+From 88aba2415bd20e70be91a24e2eb2409cb44b4076 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Sun, 23 Feb 2020 04:35:37 -0800
+Subject: [PATCH 2/2] Remove {open,close}pixel(), var mouseinfo, type
+ mouseinfo_t
+
+Input shape is now set to 0x0, which takes care of the functionality
+that {open,close}pixel() previously provided. As such, completely remove
+{open,close}pixel() since they're no longer needed. In addition, remove
+the mouseinfo var and the mouseinfo_t type since those were used only by
+{open,close}pixel().
+---
+ keynav.c | 64 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 63 deletions(-)
+
+diff --git a/keynav.c b/keynav.c
+index 4453fc8..fae5a76 100644
+--- a/keynav.c
++++ b/keynav.c
+@@ -80,11 +80,6 @@ typedef struct wininfo {
+   int curviewport;
+ } wininfo_t;
+ 
+-typedef struct mouseinfo {
+-  int x;
+-  int y;
+-} mouseinfo_t;
+-
+ typedef struct viewport {
+   int x;
+   int y;
+@@ -96,7 +91,6 @@ typedef struct viewport {
+ } viewport_t;
+ 
+ static wininfo_t wininfo;
+-static mouseinfo_t mouseinfo;
+ static viewport_t *viewports;
+ static int nviewports = 0;
+ static int xinerama = 0;
+@@ -191,8 +185,6 @@ void sighup(int sig);
+ void restart();
+ void recordings_save(const char *filename);
+ void parse_recordings(const char *filename);
+-void openpixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo);
+-void closepixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo);
+ 
+ typedef struct dispatch {
+   char *command;
+@@ -1178,21 +1170,7 @@ void cmd_warp(char *args) {
+   x = wininfo.x + wininfo.w / 2;
+   y = wininfo.y + wininfo.h / 2;
+ 
+-  if (mouseinfo.x != -1 && mouseinfo.y != -1) {
+-    closepixel(dpy, zone, &mouseinfo);
+-  }
+-
+-  /* Open pixels hould be relative to the window coordinates,
+-   * not screen coordinates. */
+-  mouseinfo.x = x - wininfo.x;
+-  mouseinfo.y = y - wininfo.y;
+-  openpixel(dpy, zone, &mouseinfo);
+-
+   xdo_move_mouse(xdo, x, y, viewports[wininfo.curviewport].screen_num);
+-  xdo_wait_for_mouse_move_to(xdo, x, y);
+-
+-  /* TODO(sissel): do we need to open again? */
+-  openpixel(dpy, zone, &mouseinfo);
+ }
+ 
+ void cmd_click(char *args) {
+@@ -1981,36 +1959,6 @@ void parse_recordings(const char *filename) {
+   fclose(fp);
+ }
+ 
+-void openpixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo) {
+-  XRectangle rect;
+-  if (mouseinfo->x == -1 && mouseinfo->y == -1) {
+-    return;
+-  }
+-
+-  rect.x = mouseinfo->x;
+-  rect.y = mouseinfo->y;
+-  rect.width = 1;
+-  rect.height = 1;
+-
+-  XShapeCombineRectangles(dpy, zone, ShapeBounding, 0, 0, &rect, 1,
+-                          ShapeSubtract, 0);
+-} /* void openpixel */
+-
+-void closepixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo) {
+-  XRectangle rect;
+-  if (mouseinfo->x == -1 && mouseinfo->y == -1) {
+-    return;
+-  }
+-
+-  rect.x = mouseinfo->x;
+-  rect.y = mouseinfo->y;
+-  rect.width = 1;
+-  rect.height = 1;
+-
+-  XShapeCombineRectangles(dpy, zone, ShapeBounding, 0, 0, &rect, 1,
+-                          ShapeUnion, 0);
+-} /* void closepixel */
+-
+ int main(int argc, char **argv) {
+   char *pcDisplay;
+   int ret;
+@@ -2099,17 +2047,6 @@ int main(int argc, char **argv) {
+         }
+         break;
+ 
+-      case MotionNotify:
+-        if (zone) {
+-        if (mouseinfo.x != -1 && mouseinfo.y != -1) {
+-          closepixel(dpy, zone, &mouseinfo);
+-        }
+-        mouseinfo.x = e.xmotion.x;
+-        mouseinfo.y = e.xmotion.y;
+-        openpixel(dpy, zone, &mouseinfo);
+-        }
+-        break;
+-
+       // Ignorable events.
+       case GraphicsExpose:
+       case NoExpose:
+@@ -2118,6 +2055,7 @@ int main(int argc, char **argv) {
+       case DestroyNotify: // window was destroyed
+       case UnmapNotify:   // window was unmapped (hidden)
+       case MappingNotify: // when keyboard mapping changes
++      case MotionNotify:  // when mouse movement is detected
+         break;
+       default:
+         if (e.type == xrandr_event_base + RRScreenChangeNotify) {
diff --git a/srcpkgs/keynav/patches/fix-overlapping-screens.patch b/srcpkgs/keynav/patches/fix-overlapping-screens.patch
new file mode 100644
index 000000000000..ea9385b9f7a5
--- /dev/null
+++ b/srcpkgs/keynav/patches/fix-overlapping-screens.patch
@@ -0,0 +1,57 @@
+From b3d7a0966c94ea9b6dd0265c512cb7a14293f71e Mon Sep 17 00:00:00 2001
+From: Yutao Yuan <infmagic2047reg@outlook.com>
+Date: Mon, 4 Oct 2021 22:33:32 +0800
+Subject: [PATCH] Treat overlapping screens (like xrandr --same-as) as one
+ screen
+
+---
+ keynav.c | 33 ++++++++++++++++++++++-----------
+ 1 file changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/keynav.c b/keynav.c
+index 65abe7c..b4e5103 100644
+--- a/keynav.c
++++ b/keynav.c
+@@ -1811,20 +1811,31 @@ void query_screens() {
+ }
+ 
+ void query_screen_xinerama() {
+-  int i;
++  int i, j, num_screens;
+   XineramaScreenInfo *screeninfo;
+ 
+-  screeninfo = XineramaQueryScreens(dpy, &nviewports);
++  screeninfo = XineramaQueryScreens(dpy, &num_screens);
+   free(viewports);
+-  viewports = calloc(nviewports, sizeof(viewport_t));
+-  for (i = 0; i < nviewports; i++) {
+-    viewports[i].x = screeninfo[i].x_org;
+-    viewports[i].y = screeninfo[i].y_org;
+-    viewports[i].w = screeninfo[i].width;
+-    viewports[i].h = screeninfo[i].height;
+-    viewports[i].screen_num = 0;
+-    viewports[i].screen = ScreenOfDisplay(dpy, 0);
+-    viewports[i].root = DefaultRootWindow(dpy);
++  viewports = calloc(num_screens, sizeof(viewport_t));
++  nviewports = 0;
++  for (i = 0; i < num_screens; i++) {
++    int overlapping = 0;
++    for (j = 0; j < nviewports; j++) {
++      if (viewports[j].x == screeninfo[i].x_org && viewports[j].y == screeninfo[i].y_org) {
++        overlapping = 1;
++        break;
++      }
++    }
++    if (!overlapping) {
++      viewports[nviewports].x = screeninfo[i].x_org;
++      viewports[nviewports].y = screeninfo[i].y_org;
++      viewports[nviewports].w = screeninfo[i].width;
++      viewports[nviewports].h = screeninfo[i].height;
++      viewports[nviewports].screen_num = 0;
++      viewports[nviewports].screen = ScreenOfDisplay(dpy, 0);
++      viewports[nviewports].root = DefaultRootWindow(dpy);
++      nviewports++;
++    }
+   }
+   XFree(screeninfo);
+ }
diff --git a/srcpkgs/keynav/template b/srcpkgs/keynav/template
new file mode 100644
index 000000000000..6e77ba8c6ad5
--- /dev/null
+++ b/srcpkgs/keynav/template
@@ -0,0 +1,27 @@
+# Template file for 'keynav'
+pkgname=keynav
+version=0.0.20180821
+revision=1
+_commit=78f9e076a5618aba43b030fbb9344c415c30c1e5
+build_style=gnu-makefile
+make_use_env=yes
+make_install_args="PREFIX=\${DESTDIR}/usr"
+hostmakedepends="pkg-config perl"
+makedepends="cairo-devel libXinerama-devel xdotool-devel libglib-devel
+ libXrandr-devel"
+checkdepends="xorg-server-xvfb"
+short_desc="Quick way to use cursor via the keyboard"
+maintainer="hazen2215 <haz@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://www.semicomplete.com/projects/keynav/"
+distfiles="https://github.com/jordansissel/keynav/archive/${_commit}.tar.gz"
+checksum=def79c32ea8aec57ec65310ede962f4d5d54ef26c5adccb351a19fb5683b678f
+
+do_check() {
+	./test.sh
+}
+
+post_install() {
+	vsconf keynavrc
+	vlicense COPYRIGHT
+}

From d434d13d1625f1a369b07bb1dae6a54b370c6cdc Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 23 Jan 2022 20:49:34 -0500
Subject: [PATCH 1171/1853] New package: cagebreak-2.2.0

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: https://github.com/void-linux/void-packages/pull/35214
---
 srcpkgs/cagebreak/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/cagebreak/template

diff --git a/srcpkgs/cagebreak/template b/srcpkgs/cagebreak/template
new file mode 100644
index 000000000000..620b827e8697
--- /dev/null
+++ b/srcpkgs/cagebreak/template
@@ -0,0 +1,28 @@
+# Template file for 'cagebreak'
+pkgname=cagebreak
+version=2.2.0
+revision=1
+build_style=meson
+configure_args="-Dman-pages=true $(vopt_bool xwayland xwayland)"
+conf_files="/etc/xdg/cagebreak/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel cairo-devel pango-devel libevdev-devel"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
+short_desc="Tiling wayland compositor based on cage inspired by ratpoison"
+maintainer="Jose G Perez Taveras <josegpt27@gmail.com>"
+license="MIT"
+homepage="https://github.com/project-repo/cagebreak"
+changelog="https://raw.githubusercontent.com/project-repo/cagebreak/master/Changelog.md"
+distfiles="https://github.com/project-repo/cagebreak/releases/download/${version}/release_${version}.tar.gz"
+checksum=c90361c0fa77ea90f821721c132d25600eca466e37fe5c12c1af99ee466c0f54
+
+build_options="xwayland"
+build_options_default="xwayland"
+desc_option_xwayland="Enable Xwayland support"
+
+make_check=no # the tests are not really tests
+
+post_install() {
+	vsconf examples/config
+	vlicense LICENSE
+}

From 7599d4538523f305bdb1acd418fe9474055ccd9f Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 9 Sep 2022 12:15:52 +0200
Subject: [PATCH 1172/1853] New package: lesspass-10.2.1

---
 srcpkgs/lesspass/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/lesspass/template

diff --git a/srcpkgs/lesspass/template b/srcpkgs/lesspass/template
new file mode 100644
index 000000000000..5194852fe64c
--- /dev/null
+++ b/srcpkgs/lesspass/template
@@ -0,0 +1,15 @@
+# Template file for 'lesspass'
+pkgname=lesspass
+version=10.2.1
+revision=1
+build_wrksrc="cli"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pexpect python3-mock python3-requests"
+short_desc="Stateless password generator"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-only"
+homepage="https://www.lesspass.com"
+distfiles="https://github.com/lesspass/lesspass/archive/refs/tags/cli-v${version}.tar.gz"
+checksum=6727af1561acf4dd061a47995571a999f8b2972b5aeeca7bab6d2e4347134cbf

From 65e5a732a6ad95f6b2d5a3373b97a07eb82ad5de Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 7 Sep 2022 21:08:27 +0530
Subject: [PATCH 1173/1853] New package: carapace-0.24.1

Closes: #39168 [via git-merge-pr]
---
 srcpkgs/carapace/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/carapace/template

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
new file mode 100644
index 000000000000..e99aa377ea45
--- /dev/null
+++ b/srcpkgs/carapace/template
@@ -0,0 +1,27 @@
+# Template file for 'carapace'
+pkgname=carapace
+version=0.24.5
+revision=1
+build_style=go
+go_import_path=github.com/rsteube/carapace-bin
+go_package="${go_import_path}/cmd/carapace"
+go_build_tags="release"
+go_ldflags="-X main.version=${version}"
+short_desc="Multi-shell multi-command argument completer"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://github.com/rsteube/carapace-bin"
+distfiles="https://github.com/rsteube/carapace-bin/archive/refs/tags/v${version}.tar.gz"
+checksum=7f2b9dd360b716c9c1399fb080fbf42fcfdd299336928a4135b5b2a095b186f1
+
+pre_build() {
+	GOARCH= go generate ./cmd/...
+}
+
+do_check() {
+	go test ./cmd/carapace/...
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 2fe7835c9efa35b47c3e2990cd0bd34ac3f83a64 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Sep 2022 19:40:47 +0530
Subject: [PATCH 1174/1853] New package: selene-0.25.0

---
 srcpkgs/selene/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/selene/template

diff --git a/srcpkgs/selene/template b/srcpkgs/selene/template
new file mode 100644
index 000000000000..36d3933566e1
--- /dev/null
+++ b/srcpkgs/selene/template
@@ -0,0 +1,12 @@
+# Template file for 'selene'
+pkgname=selene
+version=0.25.0
+revision=1
+build_style=cargo
+short_desc="CLI tool designed to help write correct and idiomatic Lua code"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MPL-2.0"
+homepage="https://kampfkarren.github.io/selene/"
+changelog="https://raw.githubusercontent.com/Kampfkarren/selene/main/CHANGELOG.md"
+distfiles="https://static.crates.io/crates/selene/selene-${version}.crate"
+checksum=b32a033da3f3fce367ac2c639ebe9c6ea0c454044b8df9151485dc6313a13252

From 15813b66ff8d892b5ceb3e771f168a88a2e0cd77 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Thu, 29 Dec 2022 23:58:57 +0100
Subject: [PATCH 1175/1853] new package: lapce

---
 srcpkgs/lapce/patches/desktop-icon.patch | 12 ++++++++++++
 srcpkgs/lapce/template                   | 21 +++++++++++++++++++++
 srcpkgs/lapce/update                     |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 srcpkgs/lapce/patches/desktop-icon.patch
 create mode 100644 srcpkgs/lapce/template
 create mode 100644 srcpkgs/lapce/update

diff --git a/srcpkgs/lapce/patches/desktop-icon.patch b/srcpkgs/lapce/patches/desktop-icon.patch
new file mode 100644
index 000000000000..484471b5441a
--- /dev/null
+++ b/srcpkgs/lapce/patches/desktop-icon.patch
@@ -0,0 +1,12 @@
+diff --git a/extra/linux/dev.lapce.lapce.desktop b/extra/linux/dev.lapce.lapce.desktop
+index 83f9c5cc..8d81cd87 100644
+--- a/extra/linux/dev.lapce.lapce.desktop
++++ b/extra/linux/dev.lapce.lapce.desktop
+@@ -6,6 +6,6 @@ Name=Lapce
+ Comment=Lightning-fast and powerful code editor written in Rust
+ Categories=Development;IDE;
+ 
+-Icon=dev.lapce.lapce
++Icon=/usr/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
+ Exec=lapce
+ Terminal=false
diff --git a/srcpkgs/lapce/template b/srcpkgs/lapce/template
new file mode 100644
index 000000000000..482b8b135fe9
--- /dev/null
+++ b/srcpkgs/lapce/template
@@ -0,0 +1,21 @@
+# Template file for 'lapce'
+pkgname=lapce
+version=0.2.8
+revision=1
+archs="aarch64* x86_64*" # wasmer-vm crate fails to build (unsupported platform)
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="fontconfig-devel gtk+3-devel openssl-devel"
+short_desc="Lightning-fast and powerful code editor"
+maintainer="Alex Lohr <alexthkloss@web.de>"
+license="Apache-2.0"
+homepage="https://lapce.dev/"
+changelog="https://github.com/lapce/lapce/releases"
+distfiles="https://github.com/lapce/lapce/archive/refs/tags/v${version}.tar.gz"
+checksum=650b81c3dfbd727101111de60c208c191258fb27a96b1cec392afa7c0579a6ff
+
+post_install() {
+	vinstall extra/linux/dev.lapce.lapce.desktop 644 usr/share/applications/
+	vinstall extra/linux/dev.lapce.lapce.metainfo.xml 644 usr/share/appdata/
+	vinstall extra/images/logo_color.svg 644 usr/share/icons/hicolor/scalable/apps/ dev.lapce.lapce.svg
+}
diff --git a/srcpkgs/lapce/update b/srcpkgs/lapce/update
new file mode 100644
index 000000000000..8f131b7b53cd
--- /dev/null
+++ b/srcpkgs/lapce/update
@@ -0,0 +1,2 @@
+site="https://github.com/lapce/lapce/releases"
+pattern="\bv\K(\d+\.\d+\.\d+)\b"

From 3e137ae6222b0420ba7356902592d861e5d64491 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Thu, 29 Dec 2022 21:46:08 +0100
Subject: [PATCH 1176/1853] New package: pipr-0.0.16

Co-authord-by: Duncaen <duncaen@voidlinux.org>
Closes: #41354 [via git-merge-pr]
---
 srcpkgs/pipr/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/pipr/template

diff --git a/srcpkgs/pipr/template b/srcpkgs/pipr/template
new file mode 100644
index 000000000000..2f2af9486491
--- /dev/null
+++ b/srcpkgs/pipr/template
@@ -0,0 +1,23 @@
+# Template file for 'pipr'
+pkgname=pipr
+version=0.0.16
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="oniguruma-devel"
+short_desc="Tool for writing interactive shell pipelines"
+maintainer="Emil Miler <em@0x45.cz>"
+license="MIT"
+homepage="https://github.com/elkowar/pipr"
+distfiles="https://github.com/elkowar/pipr/archive/v${version}/pipr-${version}.tar.gz"
+checksum=4be6f79ff25f69efe6d4fe45bdc0b751b3adc8de33a2dc825073d59e5d50d3d0
+
+post_extract() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg@1.0.1 --precise 1.1.0
+}
+
+post_install() {
+	vdoc Readme.md
+	vlicense LICENSE
+}

From fb368b6681fee5f7742be3cabb7d82641661d8bd Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Sun, 18 Dec 2022 14:45:44 +0100
Subject: [PATCH 1177/1853] New package: shotgun-2.5.0

---
 srcpkgs/shotgun/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/shotgun/template

diff --git a/srcpkgs/shotgun/template b/srcpkgs/shotgun/template
new file mode 100644
index 000000000000..dcefbb2cccb4
--- /dev/null
+++ b/srcpkgs/shotgun/template
@@ -0,0 +1,22 @@
+# Template file for 'shotgun'
+pkgname=shotgun
+version=2.5.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+short_desc="Minimal screenshot utility for X11"
+maintainer="Emil Miler <em@0x45.cz>"
+license="MPL-2.0"
+homepage="https://github.com/nexromancers/shotgun"
+distfiles="https://github.com/neXromancers/shotgun/archive/refs/tags/v${version}.tar.gz"
+checksum=862b9d6f1c418181d37375153e3ceadf87b738f5a48fcbd7257e07cd78b622a0
+
+post_extract() {
+	rm build.rs
+	vsed -i Cargo.toml -e '/^build = "build.rs"/ d'
+}
+
+post_install() {
+	vdoc README.md
+	vlicense LICENSE
+}

From 15423e7cceb4702f4ea4771af26b7a2e19a2c9ce Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Tue, 20 Dec 2022 17:16:27 +0100
Subject: [PATCH 1178/1853] New package: system-monitoring-center-2.14.0

---
 srcpkgs/system-monitoring-center/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/system-monitoring-center/template

diff --git a/srcpkgs/system-monitoring-center/template b/srcpkgs/system-monitoring-center/template
new file mode 100644
index 000000000000..0fac7cee3d7c
--- /dev/null
+++ b/srcpkgs/system-monitoring-center/template
@@ -0,0 +1,13 @@
+# Template file for 'system-monitoring-center'
+pkgname=system-monitoring-center
+version=2.14.0
+revision=1
+build_style=meson
+hostmakedepends="kdelibs4support-devel gettext"
+depends="dmidecode gir-freedesktop hwids iproute2 python3 python3-cairo util-linux"
+short_desc="Multi-featured system monitor"
+maintainer="zenobit <zen@osowoso.xyz>"
+license="GPL-3.0-only"
+homepage="https://github.com/hakandundar34coding/system-monitoring-center"
+distfiles="https://github.com/hakandundar34coding/system-monitoring-center/archive/refs/tags/v${version}.tar.gz"
+checksum=0ae387300d5a30c1323cb6f0f037cfe0d304270560018bb41933046eb20b2763

From 04d733252a46d0266e9a5c0e3200a7b656b07541 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 22 Nov 2022 17:30:51 +0000
Subject: [PATCH 1179/1853] new package: xosd-2.2.14

---
 srcpkgs/xosd/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/xosd/template

diff --git a/srcpkgs/xosd/template b/srcpkgs/xosd/template
new file mode 100644
index 000000000000..4cd325037dbc
--- /dev/null
+++ b/srcpkgs/xosd/template
@@ -0,0 +1,27 @@
+# Template file for 'xosd'
+pkgname=xosd
+version=2.2.14
+revision=1
+build_style="gnu-configure"
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
+short_desc="Simple tool to display shaped text on your X display"
+maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://sourceforge.net/projects/libxosd/"
+distfiles="${SOURCEFORGE_SITE}/libxosd/xosd-${version}.tar.gz
+ http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_${version}-2.1.debian.tar.xz"
+checksum="4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508
+ ccde8324c909d75e60b124146d1e20c6a586385934dc15df02b7209f7324322d"
+skip_extraction="xosd_${version}-2.1.debian.tar.xz"
+
+post_extract() {
+	bsdtar xvJf ${XBPS_SRCDISTDIR}/xosd-${version}/xosd_${version}-2.1.debian.tar.xz \
+		-C ${wrksrc}/ --strip-components=1 \
+		debian/patches/328676.diff debian/patches/25_fix_mangapges.diff
+}
+
+post_patch() {
+	patch -Np1 -i patches/328676.diff
+	patch -Np1 -i patches/25_fix_mangapges.diff
+}

From ee7f4972f43f5355ca1e56dd6bad644727e86884 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 7 Nov 2022 15:04:44 +0530
Subject: [PATCH 1180/1853] New package: mazter-0.4.1

---
 srcpkgs/mazter/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/mazter/template

diff --git a/srcpkgs/mazter/template b/srcpkgs/mazter/template
new file mode 100644
index 000000000000..5925e0a4db59
--- /dev/null
+++ b/srcpkgs/mazter/template
@@ -0,0 +1,15 @@
+# Template file for 'mazter'
+pkgname=mazter
+version=0.4.1
+revision=1
+build_style=cargo
+short_desc="Mazes in your terminal"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://dystroy.org/mazter/"
+distfiles="https://static.crates.io/crates/mazter/mazter-${version}.crate"
+checksum=75a4cb6b9b2df3da849f08e587ea0bd74c7a5aaf8a99d078a3b9adec1342102b
+
+post_install() {
+	vlicense LICENSE
+}

From e88fd9a5caa9a9e79de0f92602599e57718112dc Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Sat, 29 Oct 2022 00:45:02 -0500
Subject: [PATCH 1181/1853] New package: pinentry-bemenu-0.12.0

---
 common/shlibs                    |  1 +
 srcpkgs/pinentry-bemenu/template | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/pinentry-bemenu/template

diff --git a/common/shlibs b/common/shlibs
index 7bc98cc1b474..258b257a75c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1393,6 +1393,7 @@ libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libbenchmark.so.1 benchmark-1.5.5_1
 libbenchmark_main.so.1 benchmark-1.5.5_1
+libbemenu.so.0 bemenu-0.6.5_1
 libKF5Torrent.so.6 libktorrent-2.1_1
 libvncserver.so.1 libvncserver-0.9.13_2
 libvncclient.so.1 libvncserver-0.9.13_2
diff --git a/srcpkgs/pinentry-bemenu/template b/srcpkgs/pinentry-bemenu/template
new file mode 100644
index 000000000000..5c7c3bec169e
--- /dev/null
+++ b/srcpkgs/pinentry-bemenu/template
@@ -0,0 +1,15 @@
+# Template file for 'pinentry-bemenu'
+pkgname=pinentry-bemenu
+version=0.12.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libgpg-error-devel libassuan-devel bemenu-devel popt-devel"
+short_desc="Pinentry based on bemenu"
+maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/t-8ch/pinentry-bemenu"
+distfiles="https://github.com/t-8ch/pinentry-bemenu/archive/v${version}.tar.gz"
+checksum=f59c72bf2af1b1629890b6b501cbd355f1739e0ac45be1906717dad5ca493d84
+
+alternatives="pinentry:pinentry:/usr/bin/pinentry-bemenu"

From 8eef3c9b8d2fe53e948d53afc26e659ea2a4c64b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 17 May 2023 13:49:33 -0400
Subject: [PATCH 1182/1853] New package: nwg-look-0.2.2

---
 srcpkgs/nwg-look/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/nwg-look/template

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
new file mode 100644
index 000000000000..5f079c5b1a32
--- /dev/null
+++ b/srcpkgs/nwg-look/template
@@ -0,0 +1,27 @@
+# Template file for 'nwg-look'
+pkgname=nwg-look
+version=0.2.2
+revision=1
+build_style=go
+go_import_path=github.com/nwg-piotr/nwg-look
+hostmakedepends="pkg-config"
+makedepends="cairo-devel gtk+3-devel libglib-devel pango-devel"
+depends="xcur2png"
+short_desc="GTK3 settings editor adapted to work in the wlroots environment"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/nwg-piotr/nwg-look"
+distfiles="https://github.com/nwg-piotr/nwg-look/archive/refs/tags/v${version}.tar.gz"
+checksum=250e5e4e29c3e4fa047c3ab95c1946307c7290cc5a30b0cfe08c0919ace6ba87
+
+post_install() {
+	vinstall stuff/main.glade 644 /usr/share/nwg-look
+	vinstall stuff/nwg-look.desktop 644 /usr/share/applications
+	vinstall stuff/nwg-look.svg 644 /usr/share/pixmaps
+
+	for lang in langs/*.json; do
+		vinstall ${lang} 644 /usr/share/nwg-look/langs
+	done
+
+	vlicense LICENSE
+}

From 0e2f8e91e1294e414e25249e5a59b51b611b6560 Mon Sep 17 00:00:00 2001
From: akhil <akhil.j@outlook.in>
Date: Sat, 22 Oct 2022 11:54:38 +0530
Subject: [PATCH 1183/1853] New package: SwayNotificationCenter-0.9.0

Co-authored-by: Duncaen <duncaen@voidlinu.org>
Closes: #40099 [via git-merge-pr]
---
 srcpkgs/SwayNotificationCenter/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/SwayNotificationCenter/template

diff --git a/srcpkgs/SwayNotificationCenter/template b/srcpkgs/SwayNotificationCenter/template
new file mode 100644
index 000000000000..09f6cdc9dea6
--- /dev/null
+++ b/srcpkgs/SwayNotificationCenter/template
@@ -0,0 +1,15 @@
+# Template file for 'SwayNotificationCenter'
+pkgname=SwayNotificationCenter
+version=0.9.0
+revision=1
+build_style=meson
+hostmakedepends="vala glib-devel pkg-config scdoc"
+makedepends="gobject-introspection gtk+3-devel gtk-layer-shell-devel
+json-glib-devel libhandy1-devel libgee-devel pulseaudio-devel"
+depends="dbus"
+short_desc="Simple notification daemon with a GTK gui"
+maintainer="Akhil Jalagam <akhil.j@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/ErikReider/SwayNotificationCenter"
+distfiles="https://github.com/ErikReider/SwayNotificationCenter/archive/refs/tags/v${version}.tar.gz"
+checksum=3f00bc858b7b3610e88ef0f6ee64d727892dd82f280f1dfc01dde863c2ea3376

From 895902d6746756a561349aa0789cfc64c7626309 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 16 Oct 2022 18:04:48 -0500
Subject: [PATCH 1184/1853] New package: lziprecover-1.23

Closes: #39999 [via git-merge-pr]
---
 srcpkgs/lziprecover/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/lziprecover/template

diff --git a/srcpkgs/lziprecover/template b/srcpkgs/lziprecover/template
new file mode 100644
index 000000000000..38dbd9d901da
--- /dev/null
+++ b/srcpkgs/lziprecover/template
@@ -0,0 +1,20 @@
+# Template file for 'lziprecover'
+pkgname=lziprecover
+version=1.23
+revision=1
+build_style=configure
+checkdepends="lzip"
+short_desc="Data recovery tool and decompressor for files in the lzip format"
+maintainer="Matt Boehlke <mtboehlke@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.nongnu.org/lzip/lziprecover.html"
+distfiles="${NONGNU_SITE}/lzip/lziprecover/lziprecover-${version}.tar.lz"
+checksum=9a41c9823670541573b160945c23783b644e84eb940c2c803b6b8d11b2c3d208
+
+do_configure() {
+	./configure --prefix=/usr \
+		CXX="${CXX}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}

From 842ae94e41c05d2c35583495186dfb1eb3db54eb Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@proton.me>
Date: Tue, 18 Oct 2022 15:16:08 +0500
Subject: [PATCH 1185/1853] New package: xone-0.3

---
 srcpkgs/xone/files/README.voidlinux |  2 ++
 srcpkgs/xone/template               | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/xone/files/README.voidlinux
 create mode 100644 srcpkgs/xone/template

diff --git a/srcpkgs/xone/files/README.voidlinux b/srcpkgs/xone/files/README.voidlinux
new file mode 100644
index 000000000000..24c2f6a6cd5a
--- /dev/null
+++ b/srcpkgs/xone/files/README.voidlinux
@@ -0,0 +1,2 @@
+Use the included 'xone-update-firmware' script
+to update wireless dongle firmware
diff --git a/srcpkgs/xone/template b/srcpkgs/xone/template
new file mode 100644
index 000000000000..263495968aa8
--- /dev/null
+++ b/srcpkgs/xone/template
@@ -0,0 +1,24 @@
+# Template file for 'xone'
+pkgname=xone
+version=0.3
+revision=1
+depends="curl cabextract dkms"
+short_desc="Modern Linux driver for Xbox One and Xbox Series X|S controllers"
+maintainer="xolophreny <xolophreny@proton.me>"
+license="GPL-2.0-only"
+homepage="https://github.com/medusalix/xone"
+distfiles="https://github.com/medusalix/xone/archive/refs/tags/v${version}.tar.gz"
+checksum=993f6b2b07c3236ce283d5de4da47dbfc16a86e056af504a4958d87f718ece20
+
+dkms_modules="${pkgname} ${version}"
+
+do_install() {
+	vinstall install/modprobe.conf 644 /usr/lib/modprobe.d xone.conf
+	vbin install/firmware.sh xone-update-firmware
+	vdoc "${FILESDIR}/README.voidlinux"
+	find . -type f \( -name dkms.conf -o -name '*.c' \) -exec sed -i "s/#VERSION#/$version/" {} +
+	vmkdir /usr/src/${pkgname}-${version}
+	for file in bus driver transport Kbuild dkms.conf; do
+		vcopy $file /usr/src/${pkgname}-${version}/
+	done
+}

From ff9dd9b2c344472dd2f60979c00d1e3cdc06a137 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Tue, 11 Oct 2022 17:13:49 -0400
Subject: [PATCH 1186/1853] New package: nextdns-1.39.4

---
 srcpkgs/nextdns/files/nextdns/run             |  4 +++
 .../Don't touch files managed by xbps.patch   | 26 +++++++++++++++++++
 srcpkgs/nextdns/template                      | 18 +++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/nextdns/files/nextdns/run
 create mode 100644 srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch
 create mode 100644 srcpkgs/nextdns/template

diff --git a/srcpkgs/nextdns/files/nextdns/run b/srcpkgs/nextdns/files/nextdns/run
new file mode 100644
index 000000000000..d77ac6f24d27
--- /dev/null
+++ b/srcpkgs/nextdns/files/nextdns/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+exec /usr/bin/nextdns run ${OPTS:--config-file /etc/nextdns.conf}
diff --git a/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch b/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch
new file mode 100644
index 000000000000..cb4556525126
--- /dev/null
+++ b/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch	
@@ -0,0 +1,26 @@
+diff --recursive --unified nextdns-1.39.4-clean/host/service/runit/service.go nextdns-1.39.4/host/service/runit/service.go
+--- nextdns-1.39.4-clean/host/service/runit/service.go	2023-04-14 00:46:58.232616533 -0400
++++ nextdns-1.39.4/host/service/runit/service.go	2023-04-14 01:12:43.931927878 -0400
+@@ -31,20 +31,14 @@
+ }
+ 
+ func (s Service) Install() error {
+-	if err := internal.CreateWithTemplate(s.Path, tmpl, 0755, s.Config); err != nil {
+-		return err
+-	}
+-	if err := os.Symlink(strings.TrimSuffix(s.Path, "/run"), "/etc/runit/runsvdir/current/"+s.Config.Name); err != nil {
++	if err := os.Symlink(strings.TrimSuffix(s.Path, "/run"), "/var/service/"+s.Config.Name); err != nil {
+ 		return err
+ 	}
+ 	return nil
+ }
+ 
+ func (s Service) Uninstall() error {
+-	if err := os.RemoveAll("/etc/runit/runsvdir/current/" + s.Config.Name); err != nil {
+-		return err
+-	}
+-	if err := os.RemoveAll(strings.TrimSuffix(s.Path, "/run")); err != nil {
++	if err := os.RemoveAll("/var/service/" + s.Config.Name); err != nil {
+ 		return err
+ 	}
+ 	return nil
diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
new file mode 100644
index 000000000000..576e9c169401
--- /dev/null
+++ b/srcpkgs/nextdns/template
@@ -0,0 +1,18 @@
+# Template file for 'nextdns'
+pkgname=nextdns
+version=1.39.4
+revision=1
+build_style=go
+go_import_path="github.com/nextdns/nextdns"
+go_ldflags="-X main.version=${version}"
+short_desc="NextDNS CLI client (DoH Proxy)"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="MIT"
+homepage="https://nextdns.io/"
+distfiles="https://github.com/nextdns/nextdns/archive/refs/tags/v${version}.tar.gz"
+checksum=e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac
+
+post_install() {
+	vsv nextdns
+	vlicense LICENSE
+}

From a58b38be1cd99e393c8a21a915b8294c1ab53802 Mon Sep 17 00:00:00 2001
From: Numair Dubas <Numair2644@protonmail.com>
Date: Mon, 26 Dec 2022 19:06:49 -0500
Subject: [PATCH 1187/1853] New package: flavours-0.6.1

flavours: remove $wrksrc and edit $distfiles to use $homepage
---
 srcpkgs/flavours/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/flavours/template

diff --git a/srcpkgs/flavours/template b/srcpkgs/flavours/template
new file mode 100644
index 000000000000..7e5dfd626932
--- /dev/null
+++ b/srcpkgs/flavours/template
@@ -0,0 +1,29 @@
+# Template file for 'flavours'
+pkgname=flavours
+version=0.6.1
+revision=1
+build_style=cargo
+build_helper=qemu
+short_desc="Simple and easy cli to build and use base16 schemes"
+maintainer="Numair Dubas <Numair2644@protonmail.com>"
+license="MIT"
+homepage="https://github.com/Misterio77/flavours"
+distfiles=${homepage}/archive/refs/tags/v${version}.tar.gz
+checksum=48c7659031d399ff125a07b71419935946e0da8d3ef1817a9f89dda32c2dcac1
+
+post_build() {
+	FLAVOURS="target/${RUST_TARGET}/release/flavours"
+	vtargetrun ${FLAVOURS} --completions bash > flavours.bash
+	vtargetrun ${FLAVOURS} --completions zsh  > flavours.zsh
+	vtargetrun ${FLAVOURS} --completions fish > flavours.fish
+}
+
+post_install() {
+	vcompletion flavours.bash bash
+	vcompletion flavours.zsh zsh
+	vcompletion flavours.fish fish
+
+	vlicense LICENSE
+	vdoc README.md
+	vsconf example.toml
+}

From ed5f570dfbdc6c4d1c245a56e03ddc598bb82a48 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Mon, 6 Mar 2023 23:48:38 -0500
Subject: [PATCH 1188/1853] New package: ferium-4.4.0

---
 srcpkgs/ferium/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ferium/template

diff --git a/srcpkgs/ferium/template b/srcpkgs/ferium/template
new file mode 100644
index 000000000000..859e790f75d1
--- /dev/null
+++ b/srcpkgs/ferium/template
@@ -0,0 +1,21 @@
+# Template file for 'ferium'
+pkgname=ferium
+version=4.4.0
+revision=1
+build_style=cargo
+build_helper=qemu
+short_desc="CLI program for managing Minecraft mods and modpacks"
+maintainer="yosh <yosh-git@riseup.net>"
+license="MPL-2.0"
+homepage="https://github.com/gorilla-devs/ferium"
+changelog="https://raw.githubusercontent.com/gorilla-devs/ferium/main/CHANGELOG.md"
+distfiles="https://github.com/gorilla-devs/ferium/archive/refs/tags/v${version}.tar.gz"
+checksum=a19b5ea7b12123ef68b2caf96a1c58025aa30d7e14e8c0dbfef44ffc01938045
+
+post_install() {
+	local ferium="${DESTDIR}/usr/bin/ferium"
+	for shell in bash fish zsh; do
+		vtargetrun ${ferium} complete ${shell} > ferium.${shell}
+		vcompletion ferium.${shell} ${shell}
+	done
+}

From efbcf9ba25c0d6428deafbf52f0e2dc78945e7a4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 1 Mar 2023 02:39:21 +0530
Subject: [PATCH 1189/1853] lv2: update to 1.18.10, adopt

---
 srcpkgs/lv2/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5577167b3b87..6333cf33dc88 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -1,18 +1,16 @@
 # Template file for 'lv2'
 pkgname=lv2
-version=1.18.2
+version=1.18.10
 revision=1
-build_style=waf3
+build_style=meson
 hostmakedepends="pkg-config"
-makedepends="libsndfile-devel gtk+-devel"
+makedepends="libsndfile-devel gtk+-devel libsamplerate-devel"
 short_desc="Plugin standard for audio systems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="ISC"
-homepage="http://lv2plug.in"
-distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
-checksum=4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e
-python_version=3
-lib32disabled=yes
+homepage="https://lv2plug.in"
+distfiles="https://lv2plug.in/spec/lv2-${version}.tar.xz"
+checksum=78c51bcf21b54e58bb6329accbb4dae03b2ed79b520f9a01e734bd9de530953f
 
 post_install() {
 	vlicense COPYING

From f693f8c872451c67c3d7a75929da0ab396cb2e95 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 1 Mar 2023 02:44:30 +0530
Subject: [PATCH 1190/1853] New package: lsp-plugins-1.2.6

---
 srcpkgs/lsp-plugins-devel    |  1 +
 srcpkgs/lsp-plugins-doc      |  1 +
 srcpkgs/lsp-plugins/template | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/lsp-plugins-devel
 create mode 120000 srcpkgs/lsp-plugins-doc
 create mode 100644 srcpkgs/lsp-plugins/template

diff --git a/srcpkgs/lsp-plugins-devel b/srcpkgs/lsp-plugins-devel
new file mode 120000
index 000000000000..f59057b0c7f7
--- /dev/null
+++ b/srcpkgs/lsp-plugins-devel
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-doc b/srcpkgs/lsp-plugins-doc
new file mode 120000
index 000000000000..f59057b0c7f7
--- /dev/null
+++ b/srcpkgs/lsp-plugins-doc
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template
new file mode 100644
index 000000000000..added109cfbd
--- /dev/null
+++ b/srcpkgs/lsp-plugins/template
@@ -0,0 +1,42 @@
+# Template file for 'lsp-plugins'
+pkgname=lsp-plugins
+version=1.2.6
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="VERBOSE=0"
+hostmakedepends="pkg-config php lv2"
+makedepends="lv2 libglvnd-devel jack-devel libsndfile-devel
+ libXrandr-devel cairo-devel freetype-devel"
+short_desc="Collection of open-source audio plugins for studios"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://lsp-plug.in/"
+changelog="https://raw.githubusercontent.com/sadko4u/lsp-plugins/master/CHANGELOG"
+distfiles="https://github.com/sadko4u/lsp-plugins/releases/download/$version/lsp-plugins-src-${version}.tar.gz"
+checksum=94dac8b175b764d28c170b25e6aa305aa2bf65a09a414025ad2b1c9ec3b1bd58
+nocross="Build system doesn't support cross-compilation properly"
+
+do_configure() {
+	make LD="$CXX" PREFIX=/usr config
+}
+
+lsp-plugins-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
+lsp-plugins-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		for f in $DESTDIR/usr/lib/*; do
+			if echo ${f##*/} | grep -Eq '^[^.]*\.(a|so)$'; then
+				vmove ${f#$DESTDIR/}
+			fi
+		done
+	}
+}

From 0314c52c3d37b2ba1d09d84da18e1e11dce0e067 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 14 Jan 2023 13:06:02 +0530
Subject: [PATCH 1191/1853] New package: hg-evolve-11.0.1

---
 srcpkgs/hg-evolve/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/hg-evolve/template

diff --git a/srcpkgs/hg-evolve/template b/srcpkgs/hg-evolve/template
new file mode 100644
index 000000000000..e173aab9c989
--- /dev/null
+++ b/srcpkgs/hg-evolve/template
@@ -0,0 +1,32 @@
+# Template file for 'hg-evolve'
+pkgname=hg-evolve
+version=11.0.1
+revision=1
+_hg_version=6.3.2 # sync with mercurial version in repo"
+build_style=python3-module
+build_wrksrc="hg-evolve-${version}"
+hostmakedepends="python3-setuptools"
+depends="mercurial"
+checkdepends="mercurial unzip"
+short_desc="Mercurial extension for faster and safer mutable history"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.mercurial-scm.org/doc/evolution/"
+changelog="https://www.mercurial-scm.org/repo/evolve/file/tip/CHANGELOG"
+distfiles="${PYPI_SITE}/h/hg-evolve/hg-evolve-${version}.tar.gz
+ https://www.mercurial-scm.org/release/mercurial-${_hg_version}.tar.gz"
+checksum="82ea42df9a4b40e2604a65e2069f8ac6a5ae317de22925fdc4352d11a07fc054
+ cfe6eeb5dd893ab32c0b79c1531aac420773e0fc837a35db3d4d92703df45a98"
+
+do_check() {
+	_skips="check-compat-strings check-sdist version-install"
+	for skip in $_skips; do rm "tests/test-${skip}.t"; done
+
+	python3 ${wrksrc}/mercurial-${_hg_version}/tests/run-tests.py \
+		${makejobs} --with-hg=/usr/bin/hg tests
+}
+
+post_install() {
+	# resolve conflict against mercurial
+	rm ${DESTDIR}/${py3_sitelib}/hgext3rd/__init__.py
+}

From 195320e4f7a660812f0b5847a03fe134024287db Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 8 Sep 2022 10:33:00 +0530
Subject: [PATCH 1192/1853] New package: hurl-3.0.0

---
 srcpkgs/hurl/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/hurl/template

diff --git a/srcpkgs/hurl/template b/srcpkgs/hurl/template
new file mode 100644
index 000000000000..77634e4f2065
--- /dev/null
+++ b/srcpkgs/hurl/template
@@ -0,0 +1,27 @@
+# Template file for 'hurl'
+pkgname=hurl
+version=3.0.0
+revision=1
+build_style=cargo
+make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel libcurl-devel libxml2-devel"
+short_desc="CLI to run HTTP requests defined in a simple plain text format"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://hurl.dev"
+changelog="https://raw.githubusercontent.com/Orange-OpenSource/hurl/master/CHANGELOG.md"
+distfiles="https://github.com/Orange-OpenSource/hurl/archive/refs/tags/${version}.tar.gz"
+checksum=7ad9a1043129edb4850727c085a83010b916b3515c2af5afddd0809c1e2bd85c
+
+if [[ "$XBPS_WORDSIZE" -eq 32 ]]; then
+	make_check=no # https://github.com/Orange-OpenSource/hurl/issues/1220
+fi
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/hurl
+	vbin target/${RUST_TARGET}/release/hurlfmt
+
+	vman docs/manual/hurl.1
+	vman docs/manual/hurlfmt.1
+}

From 406d3b40f442774beda077c33672f4f4a777e0df Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Sun, 22 Jan 2023 18:45:57 -0500
Subject: [PATCH 1193/1853] New package: gdm-settings-3.1

Co-authord-by: Duncaen <duncaen@voidlinux.org>
Closes: #41817 [via git-merge-pr]
---
 srcpkgs/gdm-settings/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/gdm-settings/template

diff --git a/srcpkgs/gdm-settings/template b/srcpkgs/gdm-settings/template
new file mode 100644
index 000000000000..d607cb00d5f1
--- /dev/null
+++ b/srcpkgs/gdm-settings/template
@@ -0,0 +1,19 @@
+# Template file for 'gdm-settings'
+pkgname=gdm-settings
+version=3.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils gtk-update-icon-cache gtk4 libadwaita glib-devel"
+makedepends="libglib-devel python3-gobject-devel libadwaita-devel"
+short_desc="Settings app for GNOME's Login Manager, GDM"
+maintainer="Owen Law <owenlaw222@gmail.com>"
+license="AGPL-3.0-or-later"
+homepage="https://gdm-settings.github.io/"
+changelog="https://github.com/gdm-settings/gdm-settings/releases"
+distfiles="https://github.com/gdm-settings/gdm-settings/archive/refs/tags/v${version}.tar.gz"
+checksum=aa1eb4a857904363689edb1d36cc143c820bb8eba72e68081da24da9828bdf89
+
+post_install() {
+	vlicense LICENSE
+}

From 362be2ad25e491337cd718d6a29b2f7b82935b77 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 12 Jan 2023 00:15:42 +0100
Subject: [PATCH 1194/1853] New package: taskwarrior-tui-0.23.7

---
 srcpkgs/taskwarrior-tui/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/taskwarrior-tui/template

diff --git a/srcpkgs/taskwarrior-tui/template b/srcpkgs/taskwarrior-tui/template
new file mode 100644
index 000000000000..4e46cfa31506
--- /dev/null
+++ b/srcpkgs/taskwarrior-tui/template
@@ -0,0 +1,24 @@
+# Template file for 'taskwarrior-tui'
+pkgname=taskwarrior-tui
+version=0.23.7
+revision=1
+build_style=cargo
+depends="task"
+checkdepends="git task"
+short_desc="Terminal user interface for taskwarrior"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="MIT"
+homepage="https://kdheepak.com/taskwarrior-tui/"
+distfiles="https://github.com/kdheepak/taskwarrior-tui/archive/refs/tags/v${version}.tar.gz"
+checksum=9e7dbd61219a0a7cc1916c71d05b778e515fb4eff5a22c523e4efb3ff826f4cb
+
+post_install() {
+	vlicense LICENSE
+}
+
+do_check() {
+	git clone https://github.com/kdheepak/taskwarrior-testdata/
+	export TASKRC=$(pwd)/taskwarrior-testdata/.taskrc
+	export TASKDATA=$(pwd)/taskwarrior-testdata/.task
+	task import $(pwd)/taskwarrior-testdata/export.json
+}

From e0349afb19e31ac4eb5e17127941cb764e531e1c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Dec 2022 20:47:54 +0530
Subject: [PATCH 1195/1853] joker: update to 1.1.0.

---
 srcpkgs/joker/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index 10bf26db0b17..14f4996daa29 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,26 +1,29 @@
 # Template file for 'joker'
 pkgname=joker
-version=0.14.1
-revision=2
+version=1.1.0
+revision=1
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://joker-lang.org/"
-distfiles="https://github.com/candid82/joker/archive/v${version}.tar.gz"
-checksum=c14789a091d38f7c9373705e9dc9edd24ab6c3c877f83788db4a0b14ebef26ef
+distfiles="https://github.com/candid82/joker/archive/refs/tags/v${version}.tar.gz"
+checksum=a963d8a3f1361143e33e0fa2463650173095cbf2e4593463007f32f4a81d3e57
 
 if [ "$CROSS_BUILD" ]; then
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		broken="https://github.com/candid82/joker#cross-platform-builds"
+	fi
 	hostmakedepends+=" joker"
 fi
 
 pre_build() {
 	JOKER="joker"
+	CGO_ENABLED=0 GOARCH= go generate ./...
 
 	if [ -z "$CROSS_BUILD" ]; then
 		JOKER="../joker"
-		go generate ./...
 		go build
 	fi
 

From dcef8f76069d4d5f5e9877cf8885fffc4978289f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 13 Feb 2023 15:03:45 -0500
Subject: [PATCH 1196/1853] fractal: update to 4.4.2

---
 srcpkgs/fractal/patches/meson-0.61.patch | 35 ------------------------
 srcpkgs/fractal/template                 | 11 ++------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/fractal/patches/meson-0.61.patch

diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch
deleted file mode 100644
index 79197803abf5..000000000000
--- a/srcpkgs/fractal/patches/meson-0.61.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001
-From: Jonas Platte <jplatte+git@posteo.de>
-Date: Sun, 31 Oct 2021 15:23:31 +0100
-Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file
-
-See https://github.com/mesonbuild/meson/issues/9441
----
- fractal-gtk/res/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build
-index 7a7a7d65..a176787c 100644
---- a/fractal-gtk/res/meson.build
-+++ b/fractal-gtk/res/meson.build
-@@ -2,7 +2,7 @@ subdir('icons')
- 
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Fractal.desktop.in.in'),
-@@ -28,7 +28,7 @@ endif
- 
- metainfo_conf = configuration_data()
- metainfo_conf.set('appid', application_id)
--metainfo_file = i18n.merge_file ('metainfo-file',
-+metainfo_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Fractal.metainfo.xml.in.in'),
-     output: 'org.gnome.Fractal.metainfo.xml.in',
--- 
-GitLab
-
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index fe462fc6e2d2..f86fc5f771e8 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,6 +1,6 @@
 # Template file for 'fractal'
 pkgname=fractal
-version=4.4.0
+version=4.4.2
 revision=1
 build_style=meson
 build_helper="rust"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cam@nohom.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Fractal"
 distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=33d8b5303f9309bc4a29bdcabe263f316cfb8805b50d7f4b6b2f0a0a7dd9efaf
+checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
 
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0
@@ -23,10 +23,3 @@ post_patch() {
 		-e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \
 		-e '/CARGO_HOME/d'
 }
-
-pre_build() {
-	# fixes an indexmap error when cross compiling
-	cargo update --package autocfg:1.0.0 --precise 1.1.0
-	cargo update --package autocfg:0.1.7 --precise 0.1.8
-	cargo update --package socket2 --precise 0.3.19
-}

From b4f3925287cc697d7d837bae00742b4a62aef089 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 14 Feb 2023 12:57:59 -0500
Subject: [PATCH 1197/1853] rabbitmq-c: update to 0.13.0

---
 srcpkgs/rabbitmq-c/patches/test.patch | 89 ---------------------------
 srcpkgs/rabbitmq-c/template           | 10 +--
 2 files changed, 5 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/rabbitmq-c/patches/test.patch

diff --git a/srcpkgs/rabbitmq-c/patches/test.patch b/srcpkgs/rabbitmq-c/patches/test.patch
deleted file mode 100644
index 0f10d8210906..000000000000
--- a/srcpkgs/rabbitmq-c/patches/test.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 26ecf6d3012be81f5dfb8a2d822c722e916a86cb Mon Sep 17 00:00:00 2001
-From: Simon Lepasteur <simon.lepasteur@swissdotnet.ch>
-Date: Wed, 11 Mar 2020 15:13:29 +0100
-Subject: [PATCH] Add option to run system tests (disabled by default).
-
-System tests require a RabbitMQ or other AMQP server to be running on
-`localhost` at TCP port number 5672 and therefore fails if no such
-server is running on the build machine.
-
-This is surprising for everyone running the standard `make test`
-to ensure the library is built correctly.
----
- .travis.yml          | 2 +-
- CMakeLists.txt       | 1 +
- README.md            | 2 ++
- appveyor.yml         | 2 +-
- tests/CMakeLists.txt | 8 +++++---
- 5 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git .travis.yml .travis.yml
-index 52a66b9c..5f56cb03 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -19,7 +19,7 @@ addons:
-       name: "alanxz/rabbitmq-c"
-       description: "C AMQP client for RabbitMQ"
-     notification_email: alan.antonuk@gmail.com
--    build_command_prepend: mkdir build && pushd build && cmake .. && popd
-+    build_command_prepend: mkdir build && pushd build && cmake .. -DRUN_SYSTEM_TESTS=ON && popd
-     build_command: cmake --build ./build
-     branch_pattern: coverity_scan
- 
-diff --git CMakeLists.txt CMakeLists.txt
-index f620ddc8..a39645f4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
- option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
- option(BUILD_TESTS "Build tests (run tests with make test)" ON)
- option(BUILD_API_DOCS "Build Doxygen API docs" ${DOXYGEN_FOUND})
-+option(RUN_SYSTEM_TESTS "Run system tests (i.e. tests requiring an accessible RabbitMQ server instance on localhost)" OFF)
- 
- if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
-     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
-diff --git README.md README.md
-index b7776c65..31347b15 100644
---- a/README.md
-+++ b/README.md
-@@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake:
-    default this is ON if the OpenSSL headers and library can be found.
- * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by
-    default this is OFF
-+* `RUN_SYSTEM_TESTS=ON/OFF` toggles building the system tests (i.e. tests requiring 
-+   an accessible RabbitMQ server instance on localhost), by default this is OFF
- 
- ## Running the examples
- 
-diff --git appveyor.yml appveyor.yml
-index 7e41c099..af315227 100644
---- a/appveyor.yml
-+++ b/appveyor.yml
-@@ -30,7 +30,7 @@ install:
-   - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART"
- 
- before_build:
--  - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
-+  - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DRUN_SYSTEM_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
- 
- build:
-   project: ALL_BUILD.vcxproj
-diff --git tests/CMakeLists.txt tests/CMakeLists.txt
-index cf042b04..320a73d7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -33,9 +33,11 @@ add_executable(test_basic
-                test_basic.c)
- target_link_libraries(test_basic rabbitmq-static)
- 
--if (NOT APPLE)
--  add_test(basic test_basic)
--endif()
-+if (RUN_SYSTEM_TESTS)
-+  if (NOT APPLE)
-+    add_test(basic test_basic)
-+  endif()
-+endif(RUN_SYSTEM_TESTS)
- 
- add_executable(test_sasl_mechanism test_sasl_mechanism.c)
- target_link_libraries(test_sasl_mechanism rabbitmq-static)
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 95ad7a333435..1352a274eba0 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,7 +1,7 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
-version=0.10.0
-revision=2
+version=0.13.0
+revision=1
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
@@ -10,11 +10,11 @@ short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"
 homepage="https://github.com/alanxz/rabbitmq-c"
-distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz"
-checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0
+distfiles="https://github.com/alanxz/rabbitmq-c/archive/v${version}.tar.gz"
+checksum=8b224e41bba504fc52b02f918d8df7e4bf5359d493cbbff36c06078655c676e6
 
 post_install() {
-	vlicense LICENSE-MIT LICENSE
+	vlicense LICENSE
 }
 
 rabbitmq-c-devel_package() {

From c2e70df3bd3cb2b6db3a032794638296a9222263 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Feb 2023 11:16:08 -0500
Subject: [PATCH 1198/1853] tarpaulin: update to 0.25.0, patch tests

---
 srcpkgs/tarpaulin/patches/0.20.1-tests.patch | 18 ++++++++++++++++++
 srcpkgs/tarpaulin/patches/0.25.0-tests.patch | 16 ++++++++++++++++
 srcpkgs/tarpaulin/template                   |  4 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tarpaulin/patches/0.20.1-tests.patch
 create mode 100644 srcpkgs/tarpaulin/patches/0.25.0-tests.patch

diff --git a/srcpkgs/tarpaulin/patches/0.20.1-tests.patch b/srcpkgs/tarpaulin/patches/0.20.1-tests.patch
new file mode 100644
index 000000000000..eb89bf66d9be
--- /dev/null
+++ b/srcpkgs/tarpaulin/patches/0.20.1-tests.patch
@@ -0,0 +1,18 @@
+From: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-util/cargo-tarpaulin/files/cargo-tarpaulin-0.20.1-tests.patch
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 12f578a..e8e27dd 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -15,10 +15,6 @@ build = "build.rs"
+ [[bin]]
+ name = "cargo-tarpaulin"
+ 
+-[[test]]
+-name = "integration"
+-path = "tests/mod.rs"
+-
+ [dependencies]
+ cargo_metadata = "0.14"
+ chrono = "0.4"
+
diff --git a/srcpkgs/tarpaulin/patches/0.25.0-tests.patch b/srcpkgs/tarpaulin/patches/0.25.0-tests.patch
new file mode 100644
index 000000000000..ddfc333d6c8e
--- /dev/null
+++ b/srcpkgs/tarpaulin/patches/0.25.0-tests.patch
@@ -0,0 +1,16 @@
+From: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-util/cargo-tarpaulin/files/cargo-tarpaulin-0.25.0-tests.patch
+
+diff --git a/src/report/coveralls.rs b/src/report/coveralls.rs
+index 5541e21..7feea1a 100644
+--- a/src/report/coveralls.rs
++++ b/src/report/coveralls.rs
+@@ -148,7 +148,7 @@ mod tests {
+     use super::*;
+     use std::process::Command;
+ 
+-    #[test]
++    #[test] #[ignore]
+     fn git_info_correct() {
+         let manifest = Path::new(env!("CARGO_MANIFEST_DIR")).join("Cargo.toml");
+         let res = match get_git_info(&manifest) {
+
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index 1b1dea55d0b3..07f40c6892e7 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,6 +1,6 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
-version=0.18.5
+version=0.25.0
 revision=1
 archs="x86_64*"
 build_style=cargo
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/xd009642/tarpaulin"
 distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
-checksum=08b9ac70a6e857fe9b2d39db39a7f3b67f2934be873fa44de405a9d206df4eb7
+checksum=3dde8f50a6e9eb6948062556a6125ce6d27ebe36ca808b5dd3fc7b9c8ed10112
 
 post_install() {
 	vlicense LICENSE-MIT

From 2f32a50de4bf3eb2f84cf1e5c6e4a5f449285de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Feb 2023 11:46:23 +0100
Subject: [PATCH 1199/1853] crun: update to 1.8.5.

---
 srcpkgs/crun/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 5c2f41607f4c..15c643959056 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.7.2
+version=1.8.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,9 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05
+checksum=5a786d7a0ece5068447e730f8a67c9cb18a95c883f5314e154865ad87c520106
+# most of the tests don't work inside a container
+make_check=ci-skip
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
@@ -25,13 +27,6 @@ case "$XBPS_MACHINE" in
 	*) ;;
 esac
 
-do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		# most of the tests don't work inside a container
-		make check ${makejobs}
-	fi
-}
-
 post_install() {
-	rm -f ${DESTDIR}/usr/lib/*.a
+	rm ${DESTDIR}/usr/lib/*.a
 }

From 569b48fa24d9deaff1ba067de436e1d05917ee20 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 4 Feb 2023 11:51:41 -0500
Subject: [PATCH 1200/1853] xrootd: update to 5.5.4

---
 srcpkgs/xrootd/patches/musl.patch | 227 ------------------------------
 srcpkgs/xrootd/template           |  10 +-
 2 files changed, 7 insertions(+), 230 deletions(-)
 delete mode 100644 srcpkgs/xrootd/patches/musl.patch

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
deleted file mode 100644
index 7dccd97d6c45..000000000000
--- a/srcpkgs/xrootd/patches/musl.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
-index a06ad462f..702403d82 100644
---- a/src/Xrd/XrdConfig.hh
-+++ b/src/Xrd/XrdConfig.hh
-@@ -34,6 +34,11 @@
- #include "Xrd/XrdProtLoad.hh"
- #include "Xrd/XrdProtocol.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_mode_t
-+#include <bits/alltypes.h>
-+#endif
-+
- class XrdSysError;
- class XrdTcpMonInfo;
- class XrdNetSecurity;
-diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
-index e663fdd35..14c3b19d6 100644
---- a/src/XrdAcc/XrdAccGroups.cc
-+++ b/src/XrdAcc/XrdAccGroups.cc
-@@ -46,6 +46,14 @@
- #include "XrdAcc/XrdAccGroups.hh"
- #include "XrdAcc/XrdAccPrivs.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+int innetgr(const char *netgroup, const char *host, const char *user,
-+             const char *domain)
-+{
-+   return 0;
-+}
-+#endif
-+
- // Additionally, this routine does not support a user in more than
- // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
-   
-diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
-index 9f9d8b91f..5ff49cbbc 100644
---- a/src/XrdCl/XrdClFileStateHandler.hh
-+++ b/src/XrdCl/XrdClFileStateHandler.hh
-@@ -42,6 +42,12 @@
- #include <sys/uio.h>
- #include <cstdint>
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_suseconds_t
-+#define __NEED_struct_timeval
-+#include <bits/alltypes.h>
-+#endif
-+
- namespace
- {
-   class PgReadHandler;
-diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
-index 2fc753777..d22c3c275 100644
---- a/src/XrdCl/XrdClMonitor.hh
-+++ b/src/XrdCl/XrdClMonitor.hh
-@@ -43,6 +43,12 @@
- 
- #include "XrdCl/XrdClFileSystem.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_suseconds_t
-+#define __NEED_struct_timeval
-+#include <bits/alltypes.h>
-+#endif
-+
- namespace XrdCl
- {
-   class URL;
-diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
-index 0f8451127..e39b1ef4b 100644
---- a/src/XrdNet/XrdNetSecurity.cc
-+++ b/src/XrdNet/XrdNetSecurity.cc
-@@ -40,12 +40,14 @@
- #include <sys/types.h>
- #include <Winsock2.h>
- #include <io.h>
-+#include "XrdSys/XrdWin32.hh"
-+#endif
-+#if WIN32 || defined(__linux__) && !defined(__GLIBC__)
- int innetgr(const char *netgroup, const char *host, const char *user,
-              const char *domain)
- {
-    return 0;
- }
--#include "XrdSys/XrdWin32.hh"
- #endif
- 
- #include "XrdNet/XrdNetAddr.hh"
-diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
-index 0f32dc2ee..b6dea957f 100644
---- a/src/XrdPosix/XrdPosix.cc
-+++ b/src/XrdPosix/XrdPosix.cc
-@@ -37,6 +37,9 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/uio.h>
-+#if defined(__linux__) && !defined(_IO_ERR_SEEN)
-+#include <stdio_ext.h>
-+#endif
- 
- #include "XrdSys/XrdSysHeaders.hh"
- #include "XrdPosix/XrdPosixLinkage.hh"
-@@ -311,8 +314,12 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
-         if (bytes > 0 && size) rc = bytes/size;
- #ifndef SUNX86
- #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
-+#ifdef _IO_ERR_SEEN
-    else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
-    else                stream->_flags |= _IO_EOF_SEEN;
-+#else
-+   else if (bytes < 0) __fseterr(stream);
-+#endif
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-    else if (bytes < 0) stream->_flags |= __SEOF;
-    else                stream->_flags |= __SERR;
-@@ -482,7 +489,11 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
-    if (bytes > 0 && size) rc = bytes/size;
- #ifndef SUNX86
- #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
-+#ifdef _IO_ERR_SEEN
-       else stream->_flags |= _IO_ERR_SEEN;
-+#else
-+      else  __fseterr(stream);
-+#endif
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-       else stream->_flags |= __SERR;
- #else
-diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
-index 903153252..b5cc6d4b4 100644
---- a/src/XrdPosix/XrdPosixLinkage.hh
-+++ b/src/XrdPosix/XrdPosixLinkage.hh
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- 
- #include "XrdPosix/XrdPosixOsDep.hh"
-+#include "XrdPosix/XrdPosixXrootd.hh"
- #include "XrdSys/XrdSysPlatform.hh"
- 
- /******************************************************************************/
-diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
-index ac2da483a..a15602787 100644
---- a/src/XrdPosix/XrdPosixMap.hh
-+++ b/src/XrdPosix/XrdPosixMap.hh
-@@ -36,6 +36,11 @@
- #include "XrdCl/XrdClFileSystem.hh"
- #include "XrdCl/XrdClXRootDResponses.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_dev_t
-+#include <bits/alltypes.h>
-+#endif
-+
- class XrdPosixMap
- {
- public:
-diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
-index 867b73479..d967c53b3 100644
---- a/src/XrdPosix/XrdPosixPreload.cc
-+++ b/src/XrdPosix/XrdPosixPreload.cc
-@@ -42,6 +42,22 @@
- 
- #include "XrdPosix/XrdPosixExtern.hh"
-  
-+#ifdef creat64
-+#undef creat64
-+#undef fseeko64
-+#undef ftello64
-+#undef ftruncate64
-+#undef lseek64
-+#undef open64
-+#undef pread64
-+#undef pwrite64
-+#undef readdir64
-+#undef readdir64_r
-+#undef statfs64
-+#undef statvfs64
-+#undef truncate64
-+#endif
-+
- /******************************************************************************/
- /*                   G l o b a l   D e c l a r a t i o n s                    */
- /******************************************************************************/
-diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
-index a1ac544ad..eaeaeabac 100644
---- a/src/XrdSys/XrdSysPlatform.hh
-+++ b/src/XrdSys/XrdSysPlatform.hh
-@@ -241,16 +241,8 @@ extern "C"
- #if defined(_AIX) || \
-    (defined(XR__SUNGCC3) && !defined(__arch64__))
- #   define SOCKLEN_t size_t
--#elif defined(XR__GLIBC) || \
--   defined(__FreeBSD__) || \
--   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
--   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
--   (defined(__sun) && defined(_SOCKLEN_T))
--#   ifndef SOCKLEN_t
--#      define SOCKLEN_t socklen_t
--#   endif
- #elif !defined(SOCKLEN_t)
--#   define SOCKLEN_t int
-+#   define SOCKLEN_t socklen_t
- #endif
- 
- #ifdef _LP64
-diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
-index 17f8fd0be..78741a7dc 100644
---- a/src/XrdSys/XrdSysPthread.hh
-+++ b/src/XrdSys/XrdSysPthread.hh
-@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
- 
-         XrdSysRWLock(PrefType ptype)
-                     {
--#ifdef __linux__
-+#ifdef __GLIBC__
-                      pthread_rwlockattr_t attr;
-                      pthread_rwlockattr_setkind_np(&attr,
-                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
-@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
- inline void ReInitialize(PrefType ptype)
- {
-   pthread_rwlock_destroy(&lock);
--#ifdef __linux__
-+#ifdef __GLIBC__
-   pthread_rwlockattr_t attr;
-   pthread_rwlockattr_setkind_np(&attr,
-                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index 2bd0b59714c2..8a5358e691aa 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,15 +1,19 @@
 # Template file for 'xrootd'
 pkgname=xrootd
-version=5.4.2
+version=5.5.4
 revision=1
 build_style=cmake
-makedepends="zlib-devel openssl-devel libuuid-devel readline-devel"
+configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="pkgconf"
+makedepends="zlib-devel openssl-devel libuuid-devel readline-devel
+ libcurl-devel mit-krb5-devel libxml2-devel tinyxml-devel libcppunit-devel
+ fuse-devel json-c-devel"
 short_desc="Low latency, scalable and fault tolerant access to data"
 maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://xrootd.slac.stanford.edu"
 distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
-checksum=d868ba5d8b71ec38f7a113d2d8f3e25bbcedc1bc23d21bba1686ddfdb2b900c1
+checksum=41a8557ea2d118b1950282b17abea9230b252aa5ee1a5959173e2534b7d611d3
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"

From 9ce96a5272487c1bd2852f6dbbb8917afccb1f8c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 23 May 2023 07:32:35 -0400
Subject: [PATCH 1201/1853] xrootd: update to 5.5.5, with musl patch (merged
 upstream)

---
 srcpkgs/xrootd/patches/musl.patch | 460 ++++++++++++++++++++++++++++++
 srcpkgs/xrootd/template           |   4 +-
 2 files changed, 462 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xrootd/patches/musl.patch

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
new file mode 100644
index 000000000000..901970620d8e
--- /dev/null
+++ b/srcpkgs/xrootd/patches/musl.patch
@@ -0,0 +1,460 @@
+diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
+index 8b182e61e..9f7c9aa59 100644
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -70,6 +70,21 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
+   set( LINUX TRUE )
+   include( GNUInstallDirs )
+   set( EXTRA_LIBS rt )
++
++  # Check for musl libc with the compiler, since it provides way to detect it
++  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
++    OUTPUT_VARIABLE TARGET_TRIPLE ERROR_VARIABLE TARGET_ERROR)
++
++  if (NOT TARGET_ERROR)
++    if ("${TARGET_TRIPLE}" MATCHES "musl")
++      message(STATUS "Detected musl libc")
++      add_definitions(-DMUSL=1)
++    endif()
++  else()
++    message(WARNING "Could not detect system information!")
++  endif()
++
++  unset(TARGET_ERROR)
+ endif()
+ 
+ #-------------------------------------------------------------------------------
+diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
+index a06ad462f..2d1403a5e 100644
+--- a/src/Xrd/XrdConfig.hh
++++ b/src/Xrd/XrdConfig.hh
+@@ -34,6 +34,8 @@
+ #include "Xrd/XrdProtLoad.hh"
+ #include "Xrd/XrdProtocol.hh"
+ 
++#include <sys/types.h>
++
+ class XrdSysError;
+ class XrdTcpMonInfo;
+ class XrdNetSecurity;
+diff --git a/src/Xrd/XrdPoll.hh b/src/Xrd/XrdPoll.hh
+index 3790b03b0..d9bda5d62 100644
+--- a/src/Xrd/XrdPoll.hh
++++ b/src/Xrd/XrdPoll.hh
+@@ -29,7 +29,7 @@
+ /* specific prior written permission of the institution or contributor.       */
+ /******************************************************************************/
+ 
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "XrdSys/XrdSysPthread.hh"
+ 
+ #define XRD_NUMPOLLERS 3
+diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
+index e663fdd35..94b8edbc7 100644
+--- a/src/XrdAcc/XrdAccGroups.cc
++++ b/src/XrdAcc/XrdAccGroups.cc
+@@ -46,6 +46,14 @@
+ #include "XrdAcc/XrdAccGroups.hh"
+ #include "XrdAcc/XrdAccPrivs.hh"
+ 
++#ifdef MUSL
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ // Additionally, this routine does not support a user in more than
+ // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
+   
+diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
+index 197151321..f83538819 100644
+--- a/src/XrdCl/XrdClFileStateHandler.hh
++++ b/src/XrdCl/XrdClFileStateHandler.hh
+@@ -39,6 +39,7 @@
+ #include <set>
+ #include <vector>
+ 
++#include <sys/time.h>
+ #include <sys/uio.h>
+ #include <cstdint>
+ 
+diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
+index 2fc753777..2b3a96c46 100644
+--- a/src/XrdCl/XrdClMonitor.hh
++++ b/src/XrdCl/XrdClMonitor.hh
+@@ -43,6 +43,8 @@
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+ 
++#include <sys/time.h>
++
+ namespace XrdCl
+ {
+   class URL;
+diff --git a/src/XrdNet/XrdNetMsg.cc b/src/XrdNet/XrdNetMsg.cc
+index fa6c16f87..f97e1af09 100644
+--- a/src/XrdNet/XrdNetMsg.cc
++++ b/src/XrdNet/XrdNetMsg.cc
+@@ -29,7 +29,7 @@
+ /******************************************************************************/
+ 
+ #include <cerrno>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "XrdNet/XrdNet.hh"
+ #include "XrdNet/XrdNetMsg.hh"
+diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
+index 0f8451127..0faf563dd 100644
+--- a/src/XrdNet/XrdNetSecurity.cc
++++ b/src/XrdNet/XrdNetSecurity.cc
+@@ -40,11 +40,6 @@
+ #include <sys/types.h>
+ #include <Winsock2.h>
+ #include <io.h>
+-int innetgr(const char *netgroup, const char *host, const char *user,
+-             const char *domain)
+-{
+-   return 0;
+-}
+ #include "XrdSys/XrdWin32.hh"
+ #endif
+ 
+@@ -53,6 +48,14 @@ int innetgr(const char *netgroup, const char *host, const char *user,
+ #include "XrdNet/XrdNetUtils.hh"
+ #include "XrdSys/XrdSysTrace.hh"
+ 
++#if defined(MUSL) || defined(WIN32)
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ /******************************************************************************/
+ /*                         L o c a l   C l a s s e s                          */
+ /******************************************************************************/
+diff --git a/src/XrdOfs/XrdOfsHandle.cc b/src/XrdOfs/XrdOfsHandle.cc
+index 963f17a5a..26b40ce08 100644
+--- a/src/XrdOfs/XrdOfsHandle.cc
++++ b/src/XrdOfs/XrdOfsHandle.cc
+@@ -30,7 +30,7 @@
+ 
+ #include <cstdio>
+ #include <ctime>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/types.h>
+ 
+ #include "XrdOfs/XrdOfsHandle.hh"
+diff --git a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
+index b1a94acd6..0202579cc 100644
+--- a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
++++ b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
+@@ -38,9 +38,7 @@
+ #include <memory>
+ #include <mutex>
+ 
+-#if defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
+-#include <byteswap.h>
+-#elif defined(__APPLE__)
++#if defined(__APPLE__)
+ // Make sure that byte swap functions are not already defined.
+ #if !defined(bswap_16)
+ // Mac OS X / Darwin features
+@@ -49,6 +47,8 @@
+ #define bswap_32(x) OSSwapInt32(x)
+ #define bswap_64(x) OSSwapInt64(x)
+ #endif
++#else
++#include <byteswap.h>
+ #endif
+ 
+ class XrdOssCsiTagstoreFile : public XrdOssCsiTagstore
+diff --git a/src/XrdOuc/XrdOucBackTrace.cc b/src/XrdOuc/XrdOucBackTrace.cc
+index 813183c32..c61a89b63 100644
+--- a/src/XrdOuc/XrdOucBackTrace.cc
++++ b/src/XrdOuc/XrdOucBackTrace.cc
+@@ -34,7 +34,7 @@
+ #include <vector>
+ #include <sys/syscall.h>
+ 
+-#ifdef __GNUC__
++#ifndef MUSL /* glibc, uclibc, and macOS all have execinfo.h */
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ #endif
+@@ -176,13 +176,11 @@ XrdInfo *CvtRsp(const char *name, int snum)
+ /*                              D e m a n g l e                               */
+ /******************************************************************************/
+   
++#ifndef MUSL
+ namespace
+ {
+ int Demangle(char *cSym, char *buff, int blen)
+ {
+-#ifndef __GNUC__
+-   return -1;
+-#else
+    int   status;
+    char *plus = index(cSym, '+');
+    char *brak = (plus ? index(plus, '[') : 0);
+@@ -201,7 +199,6 @@ int Demangle(char *cSym, char *buff, int blen)
+    status = snprintf(buff, blen, "%s %s+%s\n", brak, realname, plus+1);
+    free(realname);
+    return status;
+-#endif
+ }
+ }
+ 
+@@ -221,6 +218,7 @@ int DumpDepth()
+    return (depth <= maxDepth ? depth : maxDepth);
+ }
+ }
++#endif
+ 
+ /******************************************************************************/
+ /*                             D u m p S t a c k                              */
+@@ -230,8 +228,8 @@ namespace
+ {
+ void DumpStack(char *bP, int bL, TidType tid)
+ {
+-#ifndef __GNUC__
+-   snprintf(bP, bL, "TBT " TidFmt " No stack information available, not gnuc.", tid);
++#ifdef MUSL
++   snprintf(bP, bL, "TBT " TidFmt " No stack information available with musl libc.", tid);
+    return;
+ #else
+    static int btDepth = DumpDepth(); // One time MT-safe call
+diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
+index 0f32dc2ee..e4f020c09 100644
+--- a/src/XrdPosix/XrdPosix.cc
++++ b/src/XrdPosix/XrdPosix.cc
+@@ -53,6 +53,58 @@
+   
+ extern XrdPosixLinkage   Xunix;
+ 
++/******************************************************************************/
++/*                      U t i l i t y  F u n c t i o n s                      */
++/******************************************************************************/
++
++#ifdef MUSL
++#include <stdio_ext.h>
++#endif
++
++static inline void fseterr(FILE *fp)
++{
++  /* Most systems provide FILE as a struct and the necessary bitmask in
++     <stdio.h>, because they need it for implementing getc() and putc() as
++     fast macros. This function is based on gnulib's fseterr.c */
++#if defined _IO_ERR_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
++  fp->_flags |= _IO_ERR_SEEN;
++#elif defined __sferror || defined __APPLE__ || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++  fp->_flags |= __SERR;
++#elif defined _IOERR
++  /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
++  fp->_flag |= _IOERR;
++#elif defined __UCLIBC__            /* uClibc */
++  fp->__modeflags |= __FLAG_ERROR;
++#elif defined MUSL /* musl libc */
++  __fseterr(fp);
++#else
++ #error "Unsupported platform! Please report it as a bug."
++#endif
++}
++
++static inline void fseteof(FILE *fp)
++{
++  /* Most systems provide FILE as a struct and the necessary bitmask in
++     <stdio.h>, because they need it for implementing getc() and putc() as
++     fast macros.  */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
++  fp->_flags |= _IO_EOF_SEEN;
++#elif defined __sferror || defined __APPLE__ || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++  fp->_flags |= __SEOF;
++#elif defined _IOEOF
++  /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
++  fp->_flag |= _IOEOF;
++#elif defined __UCLIBC__            /* uClibc */
++  fp->__modeflags |= __FLAG_EOF;
++#else
++  (void) fseek(fp, 0L, SEEK_END);
++#endif
++}
++
+ /******************************************************************************/
+ /*                       X r d P o s i x _ A c c e s s                        */
+ /******************************************************************************/
+@@ -308,19 +360,9 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
+ 
+ // Get the right return code. Note that we cannot emulate the flags in sunx86
+ //
+-        if (bytes > 0 && size) rc = bytes/size;
+-#ifndef SUNX86
+-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+-   else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
+-   else                stream->_flags |= _IO_EOF_SEEN;
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
+-   else if (bytes < 0) stream->_flags |= __SEOF;
+-   else                stream->_flags |= __SERR;
+-#else
+-   else if (bytes < 0) stream->_flag  |= _IOERR;
+-   else                stream->_flag  |= _IOEOF;
+-#endif
+-#endif
++   if (bytes > 0 && size) rc = bytes/size;
++   else if (bytes < 0) fseterr(stream);
++   else                fseteof(stream);
+ 
+    return rc;
+ }
+@@ -477,18 +519,10 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
+ 
+    bytes = Xroot.Write(fd, ptr, size*nitems);
+ 
+-// Get the right return code. Note that we cannot emulate the flags in sunx86
++// Get the right return code.
+ //
+    if (bytes > 0 && size) rc = bytes/size;
+-#ifndef SUNX86
+-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+-      else stream->_flags |= _IO_ERR_SEEN;
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
+-      else stream->_flags |= __SERR;
+-#else
+-      else stream->_flag  |= _IOERR;
+-#endif
+-#endif
++   else fseterr(stream);
+ 
+    return rc;
+ }
+diff --git a/src/XrdPosix/XrdPosixFile.hh b/src/XrdPosix/XrdPosixFile.hh
+index 4d77b88d3..6d99cf464 100644
+--- a/src/XrdPosix/XrdPosixFile.hh
++++ b/src/XrdPosix/XrdPosixFile.hh
+@@ -35,6 +35,7 @@
+ #include <sys/time.h>
+ #include <sys/param.h>
+ #include <sys/resource.h>
++#include <sys/types.h>
+ #include <sys/uio.h>
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
+index 903153252..b5cc6d4b4 100644
+--- a/src/XrdPosix/XrdPosixLinkage.hh
++++ b/src/XrdPosix/XrdPosixLinkage.hh
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ 
+ #include "XrdPosix/XrdPosixOsDep.hh"
++#include "XrdPosix/XrdPosixXrootd.hh"
+ #include "XrdSys/XrdSysPlatform.hh"
+ 
+ /******************************************************************************/
+diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
+index a62f0c658..8db1400d4 100644
+--- a/src/XrdPosix/XrdPosixPreload.cc
++++ b/src/XrdPosix/XrdPosixPreload.cc
+@@ -45,6 +45,22 @@
+ /******************************************************************************/
+ 
+ #include "XrdPosix/XrdPosixExtern.hh"
++
++#ifdef MUSL
++#undef creat64
++#undef fseeko64
++#undef ftello64
++#undef ftruncate64
++#undef lseek64
++#undef open64
++#undef pread64
++#undef pwrite64
++#undef readdir64
++#undef readdir64_r
++#undef statfs64
++#undef statvfs64
++#undef truncate64
++#endif
+  
+ /******************************************************************************/
+ /*                   G l o b a l   D e c l a r a t i o n s                    */
+diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
+index a1ac544ad..eaeaeabac 100644
+--- a/src/XrdSys/XrdSysPlatform.hh
++++ b/src/XrdSys/XrdSysPlatform.hh
+@@ -241,16 +241,8 @@ extern "C"
+ #if defined(_AIX) || \
+    (defined(XR__SUNGCC3) && !defined(__arch64__))
+ #   define SOCKLEN_t size_t
+-#elif defined(XR__GLIBC) || \
+-   defined(__FreeBSD__) || \
+-   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
+-   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
+-   (defined(__sun) && defined(_SOCKLEN_T))
+-#   ifndef SOCKLEN_t
+-#      define SOCKLEN_t socklen_t
+-#   endif
+ #elif !defined(SOCKLEN_t)
+-#   define SOCKLEN_t int
++#   define SOCKLEN_t socklen_t
+ #endif
+ 
+ #ifdef _LP64
+diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
+index 17f8fd0be..6d9802460 100644
+--- a/src/XrdSys/XrdSysPthread.hh
++++ b/src/XrdSys/XrdSysPthread.hh
+@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
+ 
+         XrdSysRWLock(PrefType ptype)
+                     {
+-#ifdef __linux__
++#if defined(__linux__) && (defined(__GLIBC__) || defined(__UCLIBC__))
+                      pthread_rwlockattr_t attr;
+                      pthread_rwlockattr_setkind_np(&attr,
+                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
+ inline void ReInitialize(PrefType ptype)
+ {
+   pthread_rwlock_destroy(&lock);
+-#ifdef __linux__
++#if defined(__linux__) && (defined(__GLIBC__) || defined(__UCLIBC__))
+   pthread_rwlockattr_t attr;
+   pthread_rwlockattr_setkind_np(&attr,
+                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+diff --git a/src/XrdTls/XrdTlsTempCA.cc b/src/XrdTls/XrdTlsTempCA.cc
+index faf69785f..37431dee9 100644
+--- a/src/XrdTls/XrdTlsTempCA.cc
++++ b/src/XrdTls/XrdTlsTempCA.cc
+@@ -30,7 +30,7 @@
+ #include <cstdlib>
+ #include <fcntl.h>
+ #include <dirent.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include <unordered_set>
+ #include <memory>
+diff --git a/src/XrdVoms/XrdVomsMapfile.cc b/src/XrdVoms/XrdVomsMapfile.cc
+index 8ffbe9218..fddbfdc06 100644
+--- a/src/XrdVoms/XrdVomsMapfile.cc
++++ b/src/XrdVoms/XrdVomsMapfile.cc
+@@ -40,7 +40,7 @@
+ #include <vector>
+ #include <string>
+ #include <fcntl.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ bool XrdVomsMapfile::tried_configure = false;
+ std::unique_ptr<XrdVomsMapfile> XrdVomsMapfile::mapper;
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index 8a5358e691aa..10ed861b1391 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,6 +1,6 @@
 # Template file for 'xrootd'
 pkgname=xrootd
-version=5.5.4
+version=5.5.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release"
@@ -13,7 +13,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://xrootd.slac.stanford.edu"
 distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
-checksum=41a8557ea2d118b1950282b17abea9230b252aa5ee1a5959173e2534b7d611d3
+checksum=0710caae527082e73d3bf8f9d1dffe95808afd3fcaaaa15ab0b937b8b226bc1f
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"

From 4fa7d5b32678acfebf1a639e1d70bc24dc264f33 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Jan 2023 16:54:39 +0200
Subject: [PATCH 1202/1853] CopyQ: update to 7.0.0.

---
 srcpkgs/CopyQ/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index cc16f0151a5e..0ccb3e2ec171 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.3.2
+version=7.0.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=ce122ed7f8e3e230b1c6dcce8f1ec6d717eef8c59829390cae1750c35b342c4a
+checksum=5898ba2025f8e9f61a4b4732e85adf3b1653fad20b5c1f1b0c879a7b72cd4d48

From 1e933e3cc9824168088ac5f6e563b18cbe2381b4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 6 Mar 2023 13:54:33 +0530
Subject: [PATCH 1203/1853] librsvg: update to 2.56.1.

---
 srcpkgs/librsvg/template | 38 ++++++++++++++++++--------------------
 srcpkgs/librsvg/update   |  2 ++
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/librsvg/update

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 83aec008a129..a70f0061afa3 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,36 +1,31 @@
 # Template file for 'librsvg'
 pkgname=librsvg
-version=2.52.2
-revision=2
+version=2.56.1
+revision=1
 build_style=gnu-configure
-build_helper="gir"
+build_helper="gir rust"
 configure_args="--disable-static --enable-introspection --enable-vala"
-hostmakedepends="cargo pkg-config glib-devel gdk-pixbuf-devel vala"
+hostmakedepends="cargo pkg-config glib-devel gdk-pixbuf-devel
+ gi-docgen python3-docutils"
 makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel
- libglib-devel libxml2-devel pango-devel rust vala"
+ libglib-devel libxml2-devel pango-devel vala-devel"
 short_desc="SVG library for GNOME"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="GPL-2.0-or-later, LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibRsvg"
 # update changelog when release series changes
-changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.50/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d2887c18ffb906e1a60f97fe46a7169f69aa28d6db5d285748f3618b093427
+changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.55/NEWS"
+distfiles="${GNOME_SITE}/librsvg/${version%.*}/librsvg-${version}.tar.xz"
+checksum=1685aeacae9a441dcb12c0c3ec63706172a2f52705dafbefb8e7311d4d5e430b
 
 # reference files are for specific pango and harfbuzz versions
 # the test suite isn't designed to be run by distros
 make_check=no
 
-pre_configure() {
-	# otherwise the final linking step uses "cc" instead of $CC
-	if [ "$CROSS_BUILD" ]; then
-		cat >> .cargo/config <<- EOF
-
-		[target.${RUST_TARGET}]
-		linker = "${CC}"
-		EOF
-	fi
-}
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" vala"
+	makedepends+=" rust-std"
+fi
 
 librsvg-devel_package() {
 	depends="gdk-pixbuf-devel cairo-devel libcroco-devel ${sourcepkg}>=${version}_${revision}"
@@ -39,11 +34,14 @@ librsvg-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
+
+		vmkdir usr/share/gtk-doc/html
+		mv ${DESTDIR}/usr/share/doc/Rsvg-2.0 ${PKGDESTDIR}/usr/share/gtk-doc/html/
 	}
 }
+
 librsvg-utils_package() {
 	short_desc+=" - utilities"
 	pkg_install() {
diff --git a/srcpkgs/librsvg/update b/srcpkgs/librsvg/update
new file mode 100644
index 000000000000..a8b303385110
--- /dev/null
+++ b/srcpkgs/librsvg/update
@@ -0,0 +1,2 @@
+site="https://gitlab.gnome.org/GNOME/librsvg/-/tags"
+pattern=">\K[\d.]+(?= - stable<)"

From cf44c294013cbcffbc85a7762f03fa3187e81ca2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jun 2023 16:52:27 +0200
Subject: [PATCH 1204/1853] taskwarrior-tui: update to 0.24.2.

---
 srcpkgs/taskwarrior-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taskwarrior-tui/template b/srcpkgs/taskwarrior-tui/template
index 4e46cfa31506..22fd59f7b4ac 100644
--- a/srcpkgs/taskwarrior-tui/template
+++ b/srcpkgs/taskwarrior-tui/template
@@ -1,6 +1,6 @@
 # Template file for 'taskwarrior-tui'
 pkgname=taskwarrior-tui
-version=0.23.7
+version=0.24.2
 revision=1
 build_style=cargo
 depends="task"
@@ -10,7 +10,7 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="MIT"
 homepage="https://kdheepak.com/taskwarrior-tui/"
 distfiles="https://github.com/kdheepak/taskwarrior-tui/archive/refs/tags/v${version}.tar.gz"
-checksum=9e7dbd61219a0a7cc1916c71d05b778e515fb4eff5a22c523e4efb3ff826f4cb
+checksum=6f567acd8f0ba6009f20d9ba60078e2b999fddb0fdbcffa75f088c62679b2dc3
 
 post_install() {
 	vlicense LICENSE

From dc32f77eddf018f41807fadfc511cd2242de925a Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 22 Feb 2023 04:42:14 +0900
Subject: [PATCH 1205/1853] timidity: build on musl without broken alsa audio

---
 srcpkgs/timidity/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/timidity/template b/srcpkgs/timidity/template
index 4488d67ad953..9efb53716ee8 100644
--- a/srcpkgs/timidity/template
+++ b/srcpkgs/timidity/template
@@ -1,12 +1,10 @@
 # Template file for 'timidity'
 pkgname=timidity
 version=2.15.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-default-path=/etc/timidity
- --enable-audio=alsa,oss,ao,vorbis,flac --enable-server
- --enable-alsaseq=yes --enable-network
- --enable-gtk --enable-ncurses"
+configure_args="--with-default-path=/etc/timidity --enable-server
+ --enable-alsaseq=yes --enable-network --enable-gtk --enable-ncurses"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libvorbis-devel libao-devel libflac-devel
  libX11-devel gtk+-devel ncurses-devel"
@@ -17,9 +15,12 @@ homepage="http://timidity.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/timidity/TiMidity++-${version}.tar.xz"
 checksum=9eaf4fadb0e19eb8e35cd4ac16142d604c589e43d0e8798237333697e6381d39
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="uses alsa's pcm_old.h, which depends on symbol versioning to work";;
-esac
+# disable alsa audio on musl since it uses pcm_old.h, which depends on symbol versioning to work
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" --enable-audio=oss,ao,vorbis,flac"
+else
+	configure_args+=" --enable-audio=alsa,oss,ao,vorbis,flac"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	# check for va_copy runs test program; assume no for target

From c4914d1caa045621d79eabcd976becd26ce6ec51 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 29 May 2023 21:59:47 +0200
Subject: [PATCH 1206/1853] k3d: update to 5.5.1.

---
 srcpkgs/k3d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index ca389fe60a10..ee8f06416f1c 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
-version=5.4.8
-revision=2
+version=5.5.1
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://k3d.io/"
 changelog="https://raw.githubusercontent.com/k3d-io/k3d/main/CHANGELOG.md"
 distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
-checksum=05870da540960bbbedf3e52e4b24bae35529061d407c45f237eae8722359d4bd
+checksum=e01e274a5a9ea547bcdd885504bd44ef37b67a5a3f597bcb69b84d54eb8bfef0
 _completions="bash zsh fish"
 
 post_build() {

From e9b83f43f02092457dffb7d0728f1c99764d29ea Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 16 Mar 2023 15:06:32 +0100
Subject: [PATCH 1207/1853] geckodriver: update to 0.33.0.

---
 srcpkgs/geckodriver/template | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 784f4b381dff..e19a79900a1c 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,27 +1,14 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.30.0
+version=0.33.0
 revision=1
-_hg_commit="d372710b98a6"
-build_wrksrc=testing/geckodriver
 build_style=cargo
 short_desc="WebDriver for Firefox"
 maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/geckodriver"
-distfiles="https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/geckodriver/>geckodriver.zip
- https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/webdriver/>webdriver.zip
- https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/mozbase/rust/>mozbase-rust.zip
- https://hg.mozilla.org/mozilla-central/raw-file/${_hg_commit}/Cargo.lock"
-checksum="7f8820ec83ca7671236ee74345bdbd20cf328fde4896397353952c0cc4e0eb91
- 4828ec0256835b893e5642439f83f9de84512a84e4a711262b6f2c37dff15ec8
- 71043889235bf513b2539490d1c163589484628f6fcf24e4591ba4281e620d6f
- 5daceea2850bd034ffb1b538b4aa5f8f6915f36631ef6dbeeb9d30fe26180c38"
-skip_extraction="Cargo.lock"
-
-post_extract() {
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock ${build_wrksrc}
-}
+distfiles="https://github.com/mozilla/geckodriver/archive/refs/tags/v${version}.tar.gz"
+checksum=f796679ae35a4c32b9248da9401f058578e06eec1808f4ce0abb76e2ee64b653
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="there is no firefox for armv5/6" ;;

From 809d5570ca8b70a209a251bdd1d8312ee2b1a31e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:19 +0200
Subject: [PATCH 1208/1853] plasma-sdk: update to 5.27.6.1.

---
 srcpkgs/plasma-sdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index d0fce312449e..c9c0a5844f2b 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.27.5
+version=5.27.6.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,8 +12,8 @@ short_desc="Plasma development applications"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f10245b27687bbd21b18e78267a1895aab9644722456a2b92fb54f7ca0b06915
+distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=2e4b0e466fced4345ecbd9c3b208bd334793762b02ae18bc54904860a69dceaf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 639d18e8fff8e424cb4a68af9d7b4cbc3f141d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:49 +0200
Subject: [PATCH 1209/1853] bluedevil: update to 5.27.6.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index a48ce07318ae..91af92c573f7 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=61535ae665a5bc1e17c8210d660ba79a3a694ae4ca4b3016e6523ab227a54ded
+checksum=7ceff877200edd7043a57aeba3bf54828b2d96501b4e58497b6f0ec01b73df74

From 4d4d41f6c4607ed9c2c3fa1297fe313d584da9c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:50 +0200
Subject: [PATCH 1210/1853] breeze-gtk: update to 5.27.6.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index ba5e31ead109..f5b66efa7633 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo qt5-devel"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c4956ddab4d65471dcf26634672c088b4499d27f766e41b6a8d083442e55c968
+checksum=ac2aab13b9224ddea6560fdbac9fe9d93a08a86787f95b95c43a95b134836bda

From 5f043383c93c70addff804e13e8a738b55a9d42c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:55 +0200
Subject: [PATCH 1211/1853] breeze: update to 5.27.6.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8b16b3342bb9..598469f2b120 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=70d8a35bf8c0758f9c3e3873b657250b1e09c1c79f92b066d3385a1e44fec868
+checksum=5d9a8d7e5b061ce4183c4f842b0e82e6132b6c8e7ebc2c1d579baa066ffa6c6c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From a0e11dd3845487d4a7c23bbc6994705ea11a1c2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:56 +0200
Subject: [PATCH 1212/1853] flatpak-kcm: update to 5.27.6.

---
 srcpkgs/flatpak-kcm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index 37e14d15abf2..cf5fba05e127 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -1,16 +1,16 @@
 # Template file for 'flatpak-kcm'
 pkgname=flatpak-kcm
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake
  gettext kconfig-devel kcmutils-devel"
 makedepends="flatpak-devel kcmutils-devel kdeclarative-devel
- ki18n-devel kconfig-devel"
+ ki18n-devel kconfig-devel kitemmodels-devel"
 short_desc="KDE Config Module for Flatpak Permissions"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/flatpak-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7b7541780654c1007ff268c8e0460def4aa7a58360550410a57531cb0e45ba9a
+checksum=fcee94bb9eeb58db5b304e16b5db060d8f559e1b10b202e83ab8e342be927f7a

From bc25c2326f90597341e7c7fa91ffc3e930558bcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:57 +0200
Subject: [PATCH 1213/1853] kactivitymanagerd: update to 5.27.6.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 6cf9a1001ee7..2c98ca84032a 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a209f4727bc5c44754f48ed1947fbe66419877407f83a0bad458dcab2d03b619
+checksum=06180b32ad64f88e2f3ea598e887c42cf68189dba14b220dceafcb0490c5b02d

From 264308bfbafd6f1773f0dc0faa4cd2c43d770fe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:58 +0200
Subject: [PATCH 1214/1853] kde-cli-tools: update to 5.27.6.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 0436ff1231a8..f8b1d7f7fc91 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed745637701210102e0e2e1354823e4e0f2bf8b7d4778cf5ed9c104fb57cef67
+checksum=b5e2b1c3bf82c112c8488aea73dca11a49963ea66e66db8f358f8e0394ba0faa
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 3284e851557a40ca35ff5f659c509cbc5ae6862d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:00 +0200
Subject: [PATCH 1215/1853] kde-gtk-config5: update to 5.27.6.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0fda095c0818..4a47776d0c87 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=477bb7c20901926faaaa0ad9d5ef61e33891a5d3bf4e51a5798eee6e5c5c1028
+checksum=b3f23a5602530b77d55ff08e108692576740de056edb01f7b1bc3843d890f820
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 12b1f5792c4d3d941bc8ebc5ee6def0c9d589a1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:01 +0200
Subject: [PATCH 1216/1853] kdecoration: update to 5.27.6.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 17d328c513fa..1ec3497326ff 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=effbf6c5c79802d07fa14f8bd40a9d57bbfc2af2861b6ed596687db48230be42
+checksum=9db69b439a9a6c863c5be74ba380964087c83b0f438aeaf6d0a97f5fd05294e6
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 9503aceb4ffdaad4a2b0d565719c99b84e389f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:02 +0200
Subject: [PATCH 1217/1853] kdeplasma-addons5: update to 5.27.6.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 4e3e38d15db2..877694cb3f46 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c9351ab0317c75b0340be44cc906b7ba66e69f5c672d33fbfd5b32bc2a560ff9
+checksum=343b0d40a81bf498633c71a138902b43e61461fcae2209b6f09e7cf6c8baf087

From a28e5c09a9175fbb796052c3d803b1dddba8311b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:03 +0200
Subject: [PATCH 1218/1853] kgamma5: update to 5.27.6.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 181febdc4142..8ff8cdf39889 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7b6626473944a8b4afb8e986a9d06ffe9afb6f24938f24053b33fcfb5ce84dd9
+checksum=61f111ecccd2fae7f46a1c7ef80d49a21bd80d8aadb65541453df134351fd692

From c400f38172a332ec4108fc26e70340c840d18432 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:05 +0200
Subject: [PATCH 1219/1853] khotkeys: update to 5.27.6.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index edcbecd5d0e1..979bf131d825 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=83e85326de1e3b430ebd0364955e2167ccee50d33fdaaba9fa0e5cf488e6ec20
+checksum=dbc7ec600e0450901648e6513f25f7c1ccad6798ce38b70437258daa6d833d7e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 12edaf7bc2f44fbb4453c3cf9f06afabde2f2bd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:07 +0200
Subject: [PATCH 1220/1853] kinfocenter: update to 5.27.6.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 354a7a0b042c..937d78309c50 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0be970049e2be8a5c21128a0ce3ba69e6b82415268a1ed1aa0a30c77c94adc48
+checksum=cd96e9952cc8c73337dda0786d45f3f381ca5137f8eca5feee2209f63981901b

From 64210d629d0c1654ac3a1ce7d313174982e270a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:08 +0200
Subject: [PATCH 1221/1853] kmenuedit: update to 5.27.6.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 253320d9914b..15080cf358a3 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=446263c4bcc4592251c0e93f3bbab1635452b26e5650605928d4933d70f31127
+checksum=89144ffa83855627506cae2c10e5e646f3f1efd839121b1d7eb595b7c51a4696

From e66da80957d03c73e965c0d710ef330fe640c7e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:09 +0200
Subject: [PATCH 1222/1853] kpipewire: update to 5.27.6.

---
 srcpkgs/kpipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template
index 05ad025944da..db4e42f0d456 100644
--- a/srcpkgs/kpipewire/template
+++ b/srcpkgs/kpipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'kpipewire'
 pkgname=kpipewire
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules plasma-wayland-protocols gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kpipewire"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=41326adceeaad0d5e0fba78af69403dea12c007b769ed4b5d5534c21f27bdd98
+checksum=7ed653bfc0e82aa32e05766def3466937a5b2e31abbf3d50c9298b23e6e4328b
 
 kpipewire-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a37e6469898c0e0cf5b501eec71cf94f8f5d41f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:10 +0200
Subject: [PATCH 1223/1853] kscreen: update to 5.27.6.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index ba630a1f14a1..4fc07d033b23 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7297aac39b79d477ecd66df5a5c464d2064d375e7b2249eb67f62195a9824468
+checksum=ded0651eec67e22f22fa3d6b0dbb03e81bfb2d4e5a7468e9efc5f5a4598bf254

From 85ad360cc6ce761d7b63bdf8db9737d431385ab1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:12 +0200
Subject: [PATCH 1224/1853] kscreenlocker: update to 5.27.6.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 262dd08205cb..c4c134123d91 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c8807f1c2ed8fa14a9b29639c7d5697b5d5bab44d6b88020e5d3f463880ec92
+checksum=5d04960f82895a15e51ad07238a394e347f28815ab93e9f5a97106c21bf1f55d
 
 kscreenlocker-devel_package() {
 	short_desc+=" - development"

From b8e94a03fa8b14ad9368eca0aa3c3eca0198148c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:13 +0200
Subject: [PATCH 1225/1853] ksshaskpass: update to 5.27.6.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 206db539f9f5..117ee058efa9 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f6ed26693e3dea8387c0980bf7335d96dc18c5c68c9e289d009dba22c79b0cd7
+checksum=854cad79eb8b27685e97c4f62fd96e97744fc6a38491f156c047d0bce5c6e8c5
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 21e3501b580197e347c49f70fff9385f38ef8940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:14 +0200
Subject: [PATCH 1226/1853] ksystemstats: update to 5.27.6.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index a899f447f23f..d503471bdc57 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d59d84cdf8c9cd8a2c3639ebb5986f50995f1f7f74a833af867709b7c336dcf8
+checksum=f1810ac6641bb17c42a90f643ef0fb45226e9b155601dd1827ccaf302ffa2376

From 6db075faab195295fb222b9acb77725af1e480aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:15 +0200
Subject: [PATCH 1227/1853] kwallet-pam: update to 5.27.6.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 8a71a61a4d3f..6b8834e7d388 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6a9aaa8dc25ed62058058c1d813d674c7b430b4915e42253f48227e997929190
+checksum=b7adf0065f20855edc18959f5fa661f79fe53081cc35d4c4df242988e3d16830

From 86af97385f03da20c39503e7242b18fb3c745260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:16 +0200
Subject: [PATCH 1228/1853] kwayland-integration: update to 5.27.6.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6f9815bcab65..e2395bb392d9 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9ae1fc40a70d1453841e16dca2e399fc5c68de3a9ffa7475673f98bf7dcb18f9
+checksum=10b7db4dfa276fe4e2398f742f60459367c5db1c91f8a9015e06e9f51e092c83

From b420f5d4d24776531761a99046f637681a72a31f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:18 +0200
Subject: [PATCH 1229/1853] kwin: update to 5.27.6.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index d04158fdf630..c530ec5ea57d 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -22,7 +22,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bb1226b15919681ea5f1de58b24ea4b568ea3f2b5452411f76daa80eb30c20ea
+checksum=62d5bd5e91e951c9ad8c2fc49c29485feca78db985731f0779cdaaf5052499ec
 replaces="kwayland-server>=0"
 
 kwin-devel_package() {

From 9f962f8fc96902a5bfa2ae9e89c829ba89341d76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:19 +0200
Subject: [PATCH 1230/1853] kwrited: update to 5.27.6.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2f3cd4b4af73..106bfabc1b52 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f2baec5827a87c035a116795615f2dba51ebaaab6297cbe8adf50410865fcc91
+checksum=0665240812594b9c5ec20b24dde1734bedc33f1440eb8591e72429ab2b1a7894

From 7be6e1378f70473564ab2e722d1667bec8118a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:20 +0200
Subject: [PATCH 1231/1853] layer-shell-qt: update to 5.27.6.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index e03e6a3efa7f..6f6e1735ca6d 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ccdf6aa579f0437f3bad377ac35268dfab36f6816227c03bae0591301c8d1d21
+checksum=e65c29ca65bf945da4f53bce9eb3614eb1105e57652e3fb1782ee9d24a9e8793
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7a5a4d7973fcb1628727de00cd76fb25c48a7a2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:21 +0200
Subject: [PATCH 1232/1853] libkscreen: update to 5.27.6.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index b40c6b2d9151..d15037a28a7b 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=29aff3f28d8706e864b914dea4ab59e5518ed0381bb1c6625f454f08196deb65
+checksum=c1a9373faab5a7ec77980a696a7599583b4fda8e1f12da2c5716bc9562789efb
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 15be85cd05e916e5d84484face55025983e18199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:22 +0200
Subject: [PATCH 1233/1853] libksysguard: update to 5.27.6.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 006ac131c898..9ca1ac1dd256 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7e7eb53af05fefcfea6b38fed4947409370ad303247892e4719bc2a809e85e14
+checksum=9ecb2cb4aab6ba8f0b790267f22aab48244a78c6370b86eb662a0480fb031bdb
 
 build_options="webengine"
 

From 7daeb90254182c282af502bf5dec1a0927efa084 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:23 +0200
Subject: [PATCH 1234/1853] milou: update to 5.27.6.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 8d94a9cad774..ea8e16b85ef9 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1b1b0a3e672f06eb81f889b0c48726af4b3702b103eb1e680c3972ef5c8d0298
+checksum=feaea739bc100f313d098a13614b16c01bdafc7dbe0e9ebed5e7a6d8cfd381c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5456520a09dc0e214b1000d9291f9c972a42a012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:25 +0200
Subject: [PATCH 1235/1853] oxygen-sounds: update to 5.27.6.

---
 srcpkgs/oxygen-sounds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-sounds/template b/srcpkgs/oxygen-sounds/template
index 1713e184170a..d631f4127513 100644
--- a/srcpkgs/oxygen-sounds/template
+++ b/srcpkgs/oxygen-sounds/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-sounds'
 pkgname=oxygen-sounds
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,4 +9,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen-sounds"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21fb31e2c4047f56e3ec09cd4960f56120b746152485336f716c9101cd2c8566
+checksum=afeaf30c41d191e43582d41601102b17effa2b9c2e65c61ca6a3e36ef2fc327e

From 8f71340ad23e00106f946f857460810b2321301f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:26 +0200
Subject: [PATCH 1236/1853] oxygen: update to 5.27.6.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 7ce53c433e2a..a1f2b850c247 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb764ea8820a01ab9c9d0cfccf588b64c4a5b9e6644b6e4188c618a793227ebd
+checksum=a9063912e238fcd113f719c01d100028545373d1b7881b147fcc92f910dc0906

From f4db0415b389c3a395c2ab072c3e071601dfc350 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:27 +0200
Subject: [PATCH 1237/1853] plasma-browser-integration: update to 5.27.6.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 4210c96ba5bd..c6427418751e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b490451d672bb2f0294f53422d41df7594690bc8761f9724081147d5fdd1d925
+checksum=72f86d1ee1b6474921ed102439dabf4c3813c2ae3731496c222656b8ab69198a

From ad1c34860ffa44c74b7e850e3d88baa030312260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:29 +0200
Subject: [PATCH 1238/1853] plasma-desktop: update to 5.27.6.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 7fb502a99151..c7740e305b6b 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -20,6 +20,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4f2b573134658f640717d6ee67eaee41d9df4c578856016efa769b4415e91cb1
+checksum=e2485ea25d695ba22c1f14957abe14af658741a5e788269543ab7ff33045a683
 replaces="user-manager>=0"
 python_version=3

From 20ca0c6f698f70979e82187f484721625bfe5889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:30 +0200
Subject: [PATCH 1239/1853] plasma-disks: update to 5.27.6.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 9b0da9de04cd..4dffe8008ef7 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ea10e289596b3ce53c0d6ea5ee714306918c5b7368262c22965f44a1dab1480b
+checksum=3cc04456b7c16c5bb78c0e89f9a864cc48ec6d571d4d85c9025f232c3a876427

From 2a8e2929cbbbd1e40c21c2d2c2ccdc79854e3070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:31 +0200
Subject: [PATCH 1240/1853] plasma-firewall: update to 5.27.6.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 5ca700e07262..ab17632b74d4 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e32c90aa52ec35d35fd04e04d00989f18d43ea1f7b244e53de7feb7745235b41
+checksum=c8623cdfed38cd886153c51a1f6bda4af6709d237ae70963806f182cd2f76cc9

From 86fbef85813771ac8152dfb55ba69b4e97e4831b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:32 +0200
Subject: [PATCH 1241/1853] plasma-integration: update to 5.27.6.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index ae9952e93c10..7fda166d22aa 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8dedc5630828f0fb5912ca7cad9df5cde2492e17fd2956de6f514d43b4f89f7b
+checksum=a5fd5df218788b44c0bb2a437db1cad11917d4ebe6acefd89abd3f72104d8dab

From f9a546fb2f29139ae60676048d315253a2c99ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:34 +0200
Subject: [PATCH 1242/1853] plasma-nm: update to 5.27.6.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a4b533ef4c38..75e85a94a9ec 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=152f48e44b6207a606b89548c9f298f1a12a9778ff4876c3ffeeb1f2188ca62e
+checksum=0a649ee81433340eb106889d06a3b6592b99dc41dab898f9dcd14312fb68d9c9

From 1d23c247f564c4ef1dc0c19e2a7beadb8f4c9f6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:35 +0200
Subject: [PATCH 1243/1853] plasma-pa: update to 5.27.6.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index fc410aa573f6..294f5605c013 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c2ab3f73bfdeed68a5cda3bf72a67ef609bef1c3e96e43bab0a18df822d98188
+checksum=4e7608ba32a47affe64bb77ec30bc3ed977a4ca7577399238dd3821df5856e4f

From 571316ef96f029641397fb3cd5ff7c8ce54a1990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:37 +0200
Subject: [PATCH 1244/1853] plasma-systemmonitor: update to 5.27.6.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 01ded45075a8..bcfa7e9ad070 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=82e551398f208270f543d5f91be6f3f3b27b1ce9f2c0e90263f29f8d238b2e34
+checksum=796eb25f061f05cd4e59019cfe902cb61d53be60904bec69366b347c3cfb9c1d

From fba43d80e69552930e12a5d8a6d81e241dde3004 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:39 +0200
Subject: [PATCH 1245/1853] plasma-thunderbolt: update to 5.27.6.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ea02f0d85a7d..07d8ff6a90e6 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=310564c501c6621c3d0f1421865d18839191bc82915ffba555a80214e0db90d5
+checksum=669fee26f59bb2c9122b9a9286a45f0808de42d47ed4b66382bf40ae925d6cc6
 
 do_check() {
 	: # Requires running dbus and bolt services

From 105055d0777d9637cb9ac155be721659b66fe265 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:40 +0200
Subject: [PATCH 1246/1853] plasma-vault: update to 5.27.6.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index ebc592f1c804..340117f4ed11 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=74f22be02ae0e02cf2e9eb3fad62a5ca9fb5f984775455f6c7e1c6aa553527e8
+checksum=245f5f4dac9934c2491fc9369feacb4002d16bde8c4366114557de2b2a40aa73

From 7d42b3849f184741ee6fded1aaea08091beca87c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:43 +0200
Subject: [PATCH 1247/1853] plasma-workspace-wallpapers: update to 5.27.6.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index d2c3eb5e5bb7..1fedd14d1093 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=23805edcc147377c7bd7444278e76327003d142f9c4048e3970000cb6f38c840
+checksum=1303557516376eac7759c7aff796f2815a65e6874ecdd260118c66a061df1b05

From 457638316dd14fc90437251448b92936779b7668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:45 +0200
Subject: [PATCH 1248/1853] plasma-workspace: update to 5.27.6.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 027ec664e9e8..772c0dd6e846 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed0b95b2eefd0782ea652c2c6eed262e8eb91f97ff72925bb3f7e161d1f72a17
+checksum=1ce6f70f7bb909b9ed9c213bc5528a4e7c264f570a9c94f2f4fb25c1528f8883
 
 build_options="pipewire"
 build_options_default="pipewire"

From 85d108fa471d9b4ccbbdf63e1aa28d4c60606686 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:46 +0200
Subject: [PATCH 1249/1853] polkit-kde-agent: update to 5.27.6.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 9f5ce9a706c0..6d0641de9dbe 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=2ae3b4ff0c74d9f55fe85cb0fb8106401f0301a96760d0ffefb66161215a2a2f
+checksum=df737ae267ffab5abe460624c325daad176882ac1a4fd5df81e4ba44be4ced4c

From e140ac338dd7208e9950c08a8a1662dc71eeb9e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:47 +0200
Subject: [PATCH 1250/1853] powerdevil: update to 5.27.6.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index e6198d4f2cdb..e1c6ad4f3de9 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0379862c57efef4ce980f6c9583d66deafde1ed522f0e129aa50cef038fb500e
+checksum=6b230fabf2738455e3dfc3ab15e70b942ec827dc3080434774c6cb19d3217fb5

From e33e6756a49f8389ead5676ad3ad7a0624075b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:48 +0200
Subject: [PATCH 1251/1853] sddm-kcm: update to 5.27.6.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index cd45480f71b6..b09bc794b21f 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5605f2dffe33b731b08ec51b7ef4cea8ec6fb796497ae46242fe8f40e8aa199a
+checksum=dc70ab178f6954a6aaf7862440a64742c0c600c48f454462e97e09a1ddd6b5e2

From 4525e0c616cd5fcddc661376b697c657e6136dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:49 +0200
Subject: [PATCH 1252/1853] systemsettings: update to 5.27.6.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 287ef9b9c8bd..c4d9dc209e26 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5454eb0aaba331e724bd91650474bbe1658f26fcc543ab7804186bccf50b4db
+checksum=bc2c471f1e13e9d063b616552bdc0d831c430338f3e3b32bbb3c0418956e789d

From fc4eab963a038e87b03555c40b41f02f723a8b8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:50 +0200
Subject: [PATCH 1253/1853] xdg-desktop-portal-kde: update to 5.27.6.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 818e2c721b77..94cc75f56e13 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cfa3f24cff9b18baeef245e122f969092a89c41d872ea5a8df628061d8f1aab
+checksum=aed5e49660a47c86f26df67bf80ac3e55d2ce9bf2a3e676bfaa905516810f773

From c0d277d51420014510a5f1f8a16993214085ef0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Jun 2023 17:18:19 +0200
Subject: [PATCH 1254/1853] ktextaddons: update to 1.3.2.

---
 srcpkgs/ktextaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextaddons/template b/srcpkgs/ktextaddons/template
index 34ad96f9f815..ac47e5b59144 100644
--- a/srcpkgs/ktextaddons/template
+++ b/srcpkgs/ktextaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextaddons'
 pkgname=ktextaddons
-version=1.2.0
+version=1.3.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/ktextaddons"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=88126cecc592be4c5ecc0c6641474a4ca846dd1866056ce24bada9eb5d080183
+checksum=981ec78762e3ae0f03d86c43c8709ad6ce825668390c3921c1a7c4aad4aa51e3
 
 ktextaddons-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 53fc6116c37dba2809033444c89e04173c8f515f Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 27 Dec 2022 10:22:39 +0100
Subject: [PATCH 1255/1853] New package: outguess-0.4

---
 srcpkgs/outguess/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/outguess/template

diff --git a/srcpkgs/outguess/template b/srcpkgs/outguess/template
new file mode 100644
index 000000000000..e45f00e35815
--- /dev/null
+++ b/srcpkgs/outguess/template
@@ -0,0 +1,22 @@
+# Template file for 'outguess'
+pkgname=outguess
+version=0.4
+revision=1
+build_style=gnu-configure
+configure_args="--with-generic-jconfig"
+hostmakedepends="automake"
+short_desc="Universal steganographic tool"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="BSD-4-Clause"
+homepage="https://github.com/resurrecting-open-source-projects/outguess"
+changelog="https://github.com/resurrecting-open-source-projects/outguess/blob/master/ChangeLog"
+distfiles="https://github.com/resurrecting-open-source-projects/outguess/archive/refs/tags/${version}.tar.gz"
+checksum=1279b05f3bb5e8956c6eb424db247e773440898310c10dbf9571e7b6afae5d60
+
+pre_configure() {
+	./autogen.sh
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 0ee961295831b936cf4b4f9339e447a5c400495c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 24 Jun 2023 18:15:38 +0100
Subject: [PATCH 1256/1853] svt-av1: update to 1.6.0.

---
 srcpkgs/svt-av1/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index 3ca728ac94c8..99aa3571cbe5 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,16 +1,20 @@
 # Template file for 'svt-av1'
 pkgname=svt-av1
-version=1.4.1
-revision=2
+version=1.6.0
+revision=1
 build_style=cmake
-hostmakedepends="nasm"
+configure_args="-DSVT_AV1_LTO=ON"
 short_desc="AV1-compliant encoder/decoder library core"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-3-Clause-Clear"
 homepage="https://gitlab.com/AOMediaCodec/SVT-AV1"
 changelog="https://gitlab.com/AOMediaCodec/SVT-AV1/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${version}/SVT-AV1-v${version}.tar.gz"
-checksum=e3f7fc194afc6c90b43e0b80fa24c09940cb03bea394e0e1f5d1ded18e9ab23f
+checksum=3bc207247568ac713245063555082bfc905edc31df3bf6355e3b194cb73ad817
+
+case "$XBPS_TARGET_MACHINE" in
+	i686* | x86_64*) hostmakedepends="nasm"
+esac
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="32-bit is not supported"

From b8d26f70576cc38cc16c96766b53b1449f458e01 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 24 Jun 2023 14:30:05 +0200
Subject: [PATCH 1257/1853] cpuid: update to 20230614.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 849aec8d173d..9686b47b3cce 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20230505
+version=20230614
 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=55d30400cd6bab9acf3597edfc9a527a258e3a7b5c40ccc9b8b32b10d3e29b30
+checksum=b1c83045efc26076307751e0662d580277f5f9bf89cf027231a7812003c3a4e8
 
 conflicts="msr-tools"

From 072d6992ff881d7b3aa2fa7a458bd57e085e6ad8 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 24 Jun 2023 14:24:20 +0200
Subject: [PATCH 1258/1853] hcloud: update to 1.36.0.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index da0f7d134550..cf663f5dea31 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.35.0
+version=1.36.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=3dad20aa8b4592c65046a0587ded4cccc87aeba308bf1f5f07cde0bb864e6717
+checksum=d281bff826b626cd1e33ab7a3342988a647941fd02c643cf96da1bd7e2cf3c9d
 
 post_install() {
 	vlicense LICENSE

From bf0e2b3d6d488230ed60e0bf10c5d77febfad26f Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 24 Jun 2023 14:21:57 +0200
Subject: [PATCH 1259/1853] pgweb: update to 0.14.1.

---
 srcpkgs/pgweb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 08649e9df49b..2520622abc87 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.14.0
-revision=2
+version=0.14.1
+revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://sosedoff.github.io/pgweb"
 changelog="https://github.com/sosedoff/pgweb/raw/master/CHANGELOG.md"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=801f83449b88ef241a30f69d5c4201adc295f4393182cea195e51281c6df58e1
+checksum=e6636ff079c8b01ac2add78c7a05f86d61550a5213155065c892015e6217be01
 
 post_install() {
 	vdoc README.md

From eb01c48eeb7b6693b857b88eee852d24f42ba9d1 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 23 Jun 2023 17:44:05 -0500
Subject: [PATCH 1260/1853] imlib2: add JPEG XL support.

---
 srcpkgs/imlib2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index f819c0c76def..19cb61e08f4c 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,13 +1,13 @@
 # Template file for 'imlib2'
 pkgname=imlib2
 version=1.11.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
 hostmakedepends="pkg-config"
 makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
  tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
- libheif-devel librsvg-devel libopenjpeg2-devel libspectre-devel"
+ libheif-devel librsvg-devel libopenjpeg2-devel libspectre-devel libjxl-devel"
 short_desc="Image manipulation library"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"

From 66e611ad0ab49349d9a306ebf43e3204858963f6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Fri, 23 Jun 2023 08:57:58 +0700
Subject: [PATCH 1261/1853] krita: enable JPEG XL support

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index f070ef21bfb3..b39dffdd1135 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=6
+revision=7
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -15,7 +15,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
  poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
  python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
  libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel"
+ qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="Painting and image editing program"
 maintainer="John <me@johnnynator.dev>"

From 635061f69d71d4b0287a32260193efd7b09da748 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 15:00:27 +0200
Subject: [PATCH 1262/1853] clipman: update to 1.6.2.

---
 srcpkgs/clipman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index ff96c3da0e75..f6665547f4ef 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
-version=1.6.1
-revision=2
+version=1.6.2
+revision=1
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/yory8/clipman"
 changelog="https://raw.githubusercontent.com/yory8/clipman/master/CHANGELOG.md"
 distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz"
-checksum=9bfd69ed299f7641188e05668442f074fca3b01858ea8e680499ace7a36dd108
+checksum=6a94df2317e798a086dcb2b7f3cc4a6fa84189f648bac875d1789ce544cf6bc2
 
 post_install() {
 	vman docs/clipman.1

From 0d594b7ed8b439258adf280b4624f6f16e0b5ca3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 24 Jun 2023 11:56:07 -0400
Subject: [PATCH 1263/1853] scryer-prolog: update to 0.9.1

---
 srcpkgs/scryer-prolog/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3bf5b11120fc..6bdba3e996f2 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -1,28 +1,25 @@
 # Template file for 'scryer-prolog'
 pkgname=scryer-prolog
-version=0.8.123
-revision=3
+version=0.9.1
+revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel mpfr-devel libmpc-devel"
+makedepends="gmp-devel libmpc-devel libsodium-devel mpfr-devel openssl-devel"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
-distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
-checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
-nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.2.2/build.rs#L1278"
+distfiles="https://github.com/mthom/scryer-prolog/archive/refs/tags/v${version}.tar.gz"
+checksum=e69109af51f81568cec1137842cd438cb675f9fb966ba90b6a4ee85b469cd37d
+nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.5.3/build.rs#L1309"
 export CARGO_FEATURE_USE_SYSTEM_LIBS=1
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) ;;
+	x86_64*|aarch64*) ;;
+	i686*|arm*) broken="upstream dropped 32 bit support" ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-post_patch() {
-	cargo update --package lexical-core:0.4.6 --precise 0.4.8
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 24df8d87572af3ff5bc482b014d34a8c5791c318 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 24 Jun 2023 19:08:50 +0100
Subject: [PATCH 1264/1853] ghostscript: update to 10.01.2, adopt.

---
 srcpkgs/ghostscript/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 51fef8519ffd..42862a17d62a 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,18 +1,18 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=10.01.1
+version=10.01.2
 revision=1
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 short_desc="Interpreter for the PostScript language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
 changelog="https://ghostscript.readthedocs.io/en/latest/News.html"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=c91193635aa2578f9508b8ba846106c1e3705fbd3fed5fd9a015f21b55f15d68
+checksum=48d079242a2ca02a2e47a76a52cdfa818b2ad769c2bab00ad0497dd13560e7e7
 
 build_options="cups"
 build_options_default="cups"

From 862c345eafabbf41a3773a7e0e994a845685ceb4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 24 Jun 2023 13:17:54 +0200
Subject: [PATCH 1265/1853] eog: update to 44.2.

---
 srcpkgs/eog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index ea3fd2aa56af..1017a2cc4a98 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=44.0
+version=44.2
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=41d85fab05c430898dbfd847e48e1f5b4935dc3cbcee546e759a907eda671054
+checksum=468f539f6b67ee46188170f244480cc311dd1efe4786fe1554bffe26a65c72c4
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 17dc7c2b3e9f56104255f1400b5c4152c24068f8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:48:28 +0200
Subject: [PATCH 1266/1853] intellij-idea-community-edition: update to
 2023.1.3.

---
 srcpkgs/intellij-idea-community-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 63390bf45691..2ea7974e151a 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2023.1.2
+version=2023.1.3
 revision=1
 archs="x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"
-checksum=f222f0282bebe2e8c3fef6a27b160c760c118e45a0cdb7c9053d645a8e00844a
+checksum=336ec81b78645349e0b476047e2d1993ed3f1c571f8961565a3e47fe5c9c02bf
 repository=nonfree
 nopie=yes
 python_version=3

From f960fa2a41f4b6596d5d1d084372f07e825324de Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:31:03 -0500
Subject: [PATCH 1267/1853] perl-Test-Simple: update to 1.302195.

---
 srcpkgs/perl-Test-Simple/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index c23acff58480..49807f0f6e6a 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test-Simple'
 pkgname=perl-Test-Simple
-version=1.302192
+version=1.302195
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=27a7532e716b0551713db57cdc8596aec27ba4edf1b6f24f90565d5fb30865d8
+checksum=b390bb23592e0b946c95adbb3c30b11bc634a286b2847be611ad929c57e39a6c

From 3332bd34fce9203cf4d8f69824ec590f398f082c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:33:21 -0500
Subject: [PATCH 1268/1853] perl-Test2-Suite: update to 0.000155.

---
 srcpkgs/perl-Test2-Suite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Test2-Suite/template b/srcpkgs/perl-Test2-Suite/template
index 3708562dd3d5..952c32e4ff70 100644
--- a/srcpkgs/perl-Test2-Suite/template
+++ b/srcpkgs/perl-Test2-Suite/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test2-Suite'
 pkgname=perl-Test2-Suite
-version=0.000145
+version=0.000155
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test2-Suite"
 distfiles="${CPAN_SITE}/Test/EXODIST/Test2-Suite-${version}.tar.gz"
-checksum=ed44be739c8879fe178d3107b238f2db960d52797db0058de53be5b84600358b
+checksum=c78e6bc4d69bc097836976863382b52b9e0c31ee185066ce60c54bd74baad53d

From 8486c159069f12c21b8e051549bc111be64627e7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:34:27 -0500
Subject: [PATCH 1269/1853] perl-Test-Deep: update to 1.204.

---
 srcpkgs/perl-Test-Deep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Test-Deep/template b/srcpkgs/perl-Test-Deep/template
index 44b1c9d586ef..47e4d35b9515 100644
--- a/srcpkgs/perl-Test-Deep/template
+++ b/srcpkgs/perl-Test-Deep/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Deep'
 pkgname=perl-Test-Deep
-version=1.130
-revision=2
+version=1.204
+revision=1
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Deep"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-}-${version}.tar.gz"
-checksum=4064f494f5f62587d0ae501ca439105821ee5846c687dc6503233f55300a7c56
+checksum=b6591f6ccdd853c7efc9ff3c5756370403211cffe46047f082b1cd1611a84e5f

From e1f1811ee03a273896d1e8114f267047aad02f2f Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:44:44 -0500
Subject: [PATCH 1270/1853] perl-YAML-LibYAML: update to 0.88.

---
 srcpkgs/perl-YAML-LibYAML/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template
index fc434a4a9b23..281ad69994b8 100644
--- a/srcpkgs/perl-YAML-LibYAML/template
+++ b/srcpkgs/perl-YAML-LibYAML/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-YAML-LibYAML'
 pkgname=perl-YAML-LibYAML
-version=0.86
+version=0.88
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/YAML-LibYAML"
 distfiles="${CPAN_SITE}/YAML/YAML-LibYAML-${version}.tar.gz"
-checksum=b139675326591c95d2e431be8d8dd13fd87080b5826716de99879fc5e614f9d8
+checksum=a8a2738cccc332a8f7549c4c27f3e0090c9ab11eef0f6c856445177398135678

From be4f05321016ff387289f9eba4f0976a4a730b06 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:57:19 -0500
Subject: [PATCH 1271/1853] perl-YAML-PP: update to 0.036.

---
 srcpkgs/perl-YAML-PP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-YAML-PP/template b/srcpkgs/perl-YAML-PP/template
index 8d58f32ae540..413449c2ebf1 100644
--- a/srcpkgs/perl-YAML-PP/template
+++ b/srcpkgs/perl-YAML-PP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-YAML-PP'
 pkgname=perl-YAML-PP
-version=0.035
+version=0.036
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/YAML-PP"
 distfiles="${CPAN_SITE}/YAML/YAML-PP-${version}.tar.gz"
-checksum=893368b89dfe23cd1ee5c848ee73f2e9c5388814dcfb9a353e2b10ac185b673d
+checksum=c8b4e50584adf92ef7573f6bb01d6ed58e6217632c57427b7274cfa7ca46fc1b

From 8fb835023ec7be042de89d96558f6d8eba34d9bf Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Sun, 18 Jun 2023 16:37:59 +0200
Subject: [PATCH 1272/1853] ansible: update to 8.0.0

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index b1161f4a9312..de839b7dfc1d 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=7.5.0
+version=8.0.0
 revision=1
 build_style="python3-pep517"
 hostmakedepends="python3-setuptools python3-wheel"
@@ -10,6 +10,6 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=4f08ca25bb29005c1afc4125e837882ad7a2c67ff0cc9d1a361b89ad09cf8c44
+checksum=8670c7c46021c188cac235e9fde7adadbb3c380c2436a3b0c1c493c4ba10bcab
 # Relevant tests happen in ansible-core
 make_check=no

From a8171a483c59efe7c2c3ef5b0625d5607b4f2395 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Mon, 19 Jun 2023 00:36:30 +0200
Subject: [PATCH 1273/1853] python3-ansible-lint: update to 6.17.1

---
 srcpkgs/python3-ansible-lint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index a842f6193637..ac598237f248 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=6.16.2
+version=6.17.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -17,7 +17,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/ansible/ansible-lint"
 distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=93ad8a04adcda6025d4ff218a10694120fe70cb91da8ac9f85c5dc82b32456e4
+checksum=f34e333f3555c99ff34c778f61d470d1e3a1eb6dc76090d0dd7b95b2c94745c2
 # cba anymore, the list of failing tests changes with every update
 make_check="no"
 

From 1bfa7a12853dbccbdaaa7617676c7484a61468fd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 18:01:22 +0100
Subject: [PATCH 1274/1853] libaio: update to 0.3.113.

---
 srcpkgs/libaio/template | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/libaio/template b/srcpkgs/libaio/template
index c7940e2fcbdf..2cdb1df6b9ab 100644
--- a/srcpkgs/libaio/template
+++ b/srcpkgs/libaio/template
@@ -1,18 +1,19 @@
 # Template file for 'libaio'
 pkgname=libaio
-version=0.3.112
+version=0.3.113
 revision=1
-short_desc="The Linux-native asynchronous I/O facility (aio) library"
+short_desc="Linux-native asynchronous I/O facility (aio) library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://lse.sourceforge.net/io/aio.html"
-distfiles="${DEBIAN_SITE}/main/liba/$pkgname/${pkgname}_${version}.orig.tar.xz"
-checksum=f69e5800425f4ea957426693ac09f9896bb993db5490fa021644454adcc72a32
+homepage="https://lse.sourceforge.net/io/aio.html"
+distfiles="${DEBIAN_SITE}/main/liba/$pkgname/${pkgname}_${version}.orig.tar.gz"
+checksum=2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b
 
 do_build() {
 	CFLAGS="${CFLAGS/-fstack-protector-strong/} -fno-stack-protector"
-	make CC=$CC
+	make CC=$CC ${makejobs}
 }
+
 do_install() {
 	make prefix=${DESTDIR}/usr install
 }
@@ -22,7 +23,11 @@ libaio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+
+		for f in man/*.3; do
+			vman "$f"
+		done
 	}
 }

From a56c0b193f1e28d63ff2af14f7f41b0e1677e5e4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 20 Jun 2023 12:16:10 -0400
Subject: [PATCH 1275/1853] broot: update to 1.23.0

---
 srcpkgs/broot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 266e1470a053..bc4edb797c2b 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,7 +1,7 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.18.0
-revision=3
+version=1.23.0
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="oniguruma-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://dystroy.org/broot/"
 changelog="https://raw.githubusercontent.com/Canop/broot/main/CHANGELOG.md"
 distfiles="https://github.com/Canop/broot/archive/refs/tags/v${version}.tar.gz"
-checksum=b195fa6b47b282a8f4baa3b7eb69fa6fd2f3fde80238bd5fe70c4dd4ae288610
+checksum=4dc855cb67eecb203759b88fb819fe4e725ea646dfdfb7af548805d2f98162b5
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="exr crate errors on big endian"

From 37aecdc7e5c7830cd07a42c8fc6466808b8a42f4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Feb 2023 23:01:14 +0200
Subject: [PATCH 1276/1853] spdx-licenses-list: update to 3.20.

Also:
- update common/travis/license.lst.
---
 common/travis/license.lst           | 40 +++++++++++++++++++++++++++++
 srcpkgs/spdx-licenses-list/template |  4 +--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index f6fdacb0e2de..649728a15e51 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -23,6 +23,7 @@ APSL-1.1
 APSL-1.2
 APSL-2.0
 Abstyles
+AdaCore-doc
 Adobe-2006
 Adobe-Glyph
 Afmparse
@@ -38,6 +39,7 @@ Artistic-1.0
 Artistic-2.0
 Autoconf-exception-2.0
 Autoconf-exception-3.0
+Autoconf-exception-generic
 BSD-1-Clause
 BSD-2-Clause-Patent
 BSD-2-Clause-Views
@@ -55,6 +57,10 @@ BSD-3-Clause
 BSD-4-Clause-Shortened
 BSD-4-Clause-UC
 BSD-4-Clause
+BSD-4.3RENO
+BSD-4.3TAHOE
+BSD-Advertising-Acknowledgement
+BSD-Attribution-HPND-disclaimer
 BSD-Protection
 BSD-Source-Code
 BSL-1.0
@@ -66,10 +72,12 @@ Beerware
 Bison-exception-2.2
 BitTorrent-1.0
 BitTorrent-1.1
+Bitstream-Charter
 Bitstream-Vera
 BlueOak-1.0.0
 Bootloader-exception
 Borceux
+Brian-Gladman-3-Clause
 C-UDA-1.0
 CAL-1.0-Combined-Work-Exception
 CAL-1.0
@@ -99,6 +107,7 @@ CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-DE
 CC-BY-NC-SA-2.0-FR
 CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
@@ -141,7 +150,9 @@ CERN-OHL-1.2
 CERN-OHL-P-2.0
 CERN-OHL-S-2.0
 CERN-OHL-W-2.0
+CFITSIO
 CLISP-exception-2.0
+CMU-Mach
 CNRI-Jython
 CNRI-Python-GPL-Compatible
 CNRI-Python
@@ -153,8 +164,10 @@ CUA-OPL-1.0
 Caldera
 ClArtistic
 Classpath-exception-2.0
+Clips
 Community-Spec-1.0
 Condor-1.1
+Cornell-Lossless-JPEG
 Crossword
 CrystalStacker
 Cube
@@ -216,6 +229,7 @@ GFDL-1.3-only
 GFDL-1.3-or-later
 GL2PS
 GLWTPL
+GNAT-exception
 GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
@@ -230,6 +244,11 @@ GStreamer-exception-2008
 Giftware
 Glide
 Glulxe
+Graphics-Gems
+HP-1986
+HPND-Markus-Kuhn
+HPND-export-US
+HPND-sell-variant-MIT-disclaimer
 HPND-sell-variant
 HPND
 HTMLTIDY
@@ -237,6 +256,8 @@ HaskellReport
 Hippocratic-2.1
 IBM-pibs
 ICU
+IEC-Code-Components-EULA
+IJG-short
 IJG
 IPA
 IPL-1.0
@@ -247,10 +268,12 @@ Info-ZIP
 Intel-ACPI
 Intel
 Interbase-1.0
+JPL-image
 JPNIC
 JSON
 Jam
 JasPer-2.0
+Kazlib
 KiCad-libraries-exception
 Knuth-CTAN
 LAL-1.2
@@ -264,6 +287,7 @@ LGPL-3.0-only
 LGPL-3.0-or-later
 LGPLLR
 LLVM-exception
+LOOP
 LPL-1.0
 LPL-1.02
 LPPL-1.0
@@ -287,6 +311,7 @@ Linux-syscall-note
 MIT-0
 MIT-CMU
 MIT-Modern-Variant
+MIT-Wu
 MIT-advertising
 MIT-enna
 MIT-feh
@@ -302,6 +327,7 @@ MS-PL
 MS-RL
 MTLL
 MakeIndex
+Martin-Birgmeier
 Minpack
 MirOS
 Motosoto
@@ -342,6 +368,7 @@ OCLC-2.0
 OCaml-LGPL-linking-exception
 ODC-By-1.0
 ODbL-1.0
+OFFIS
 OFL-1.0-RFN
 OFL-1.0-no-RFN
 OFL-1.0
@@ -381,6 +408,7 @@ OSL-2.0
 OSL-2.1
 OSL-3.0
 OpenJDK-assembly-exception-1.0
+OpenPBS-2.3
 OpenSSL
 PDDL-1.0
 PHP-3.0
@@ -395,6 +423,8 @@ PolyForm-Small-Business-1.0.0
 PostgreSQL
 Python-2.0.1
 Python-2.0
+QPL-1.0-INRIA-2004-exception
+QPL-1.0-INRIA-2004
 QPL-1.0
 Qhull
 Qt-GPL-exception-1.0
@@ -426,6 +456,7 @@ SPL-1.0
 SSH-OpenSSH
 SSH-short
 SSPL-1.0
+SWI-exception
 SWL
 Saxpath
 SchemeReport
@@ -437,15 +468,21 @@ Spencer-86
 Spencer-94
 Spencer-99
 SugarCRM-1.1.3
+SunPro
 Swift-exception
+Symlinks
 TAPR-OHL-1.0
 TCL
 TCP-wrappers
 TMate
 TORQUE-1.1
 TOSL
+TPDL
+TPL-1.0
+TTWL
 TU-Berlin-1.0
 TU-Berlin-2.0
+UCAR
 UCL-1.0
 UPL-1.0
 Unicode-DFS-2015
@@ -538,8 +575,11 @@ mplus
 openvpn-openssl-exception
 psfrag
 psutils
+snprintf
 u-boot-exception-2.0
+w3m
 x11vnc-openssl-exception
 xinetd
+xlock
 xpp
 zlib-acknowledgement
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index 35018791faa4..2fc2aba58140 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,14 +2,14 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.19
+version=3.20
 revision=1
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=2c5f6d611c1f0d6e794de5c40ddefcfdf72244b9e40d92126770cdf2d1677b2d
+checksum=fba795a26f8d646340b0cef2d22c3fa490158809636b225c7a0c2214a91c156f
 
 do_install() {
 	vmkdir usr/share/spdx

From 483299734ba336340288dd4c9c239e80563748c7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 19:16:37 +0530
Subject: [PATCH 1277/1853] gallery-dl: update to 1.25.6.

---
 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 d782205eb048..2c893c251a71 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.5
+version=1.25.6
 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=a6a036c19702a48709130db07468e9716277915ad4e5ea37cb63abdc8321fd87
+checksum=d162f97c62e9d54ef3efdf00cd6c76ee422929bf19871b948caa6b3e0a1cc356
 
 pre_build() {
 	make man completion

From bdb96cbc6df15da6fe3020cb4f96af3361e2121e Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Fri, 10 Jun 2022 09:53:21 +0100
Subject: [PATCH 1278/1853] vice: update to 3.7.1.

---
 srcpkgs/vice/template | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..fe9d33a81194 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,26 +1,24 @@
 # Template file for 'vice'
 pkgname=vice
-version=3.5
+version=3.7.1
 revision=1
 build_style=gnu-configure
 configure_args="
 	$(vopt_enable sdl2 sdlui2)
 	$(vopt_with sdl2 sdlsound)
-	$(vopt_enable gtk3 gnomeui3)
+	$(vopt_enable gtk3 native-gtk3ui)
+	$(vopt_enable gtk3 desktop-files)
 	$(vopt_with gtk3 pulse)
-	$(vopt_enable ffmpeg  external-ffmpeg)
-	--disable-option-checking
+	$(vopt_enable ffmpeg external-ffmpeg)
 	--enable-cpuhistory
 	--enable-x64
 	--disable-pdf-docs
-	AR=${AR}"
-hostmakedepends="bdftopcf flex mkfontdir perl pkg-config xa
- glib-devel autoconf texinfo automake dos2unix"
+	--libdir=/usr/lib$XBPS_TARGET_WORDSIZE"
+hostmakedepends="pkg-config flex dos2unix xa perl glib-devel xdg-utils"
 makedepends="
 	zlib-devel
 	readline-devel
 	libpng-devel
-	giflib-devel
 	glew-devel
 	alsa-lib-devel
 	$(vopt_if sdl2 SDL2_mixer-devel)
@@ -32,10 +30,10 @@ makedepends="
 short_desc="Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://vice-emu.sourceforge.net/"
+homepage="https://vice-emu.sourceforge.net/"
 changelog="https://vice-emu.sourceforge.io/NEWS"
 distfiles="${SOURCEFORGE_SITE}/vice-emu/releases/vice-${version}.tar.gz"
-checksum=56b978faaeb8b2896032bd604d03c3501002187eef1ca58ceced40f11a65dc0e
+checksum=7e3811e6024db0698bfbc321bb324572446b8853d01b4073f09865957b0cab98
 
 # Package build options
 build_options="sdl2 gtk3 ffmpeg"
@@ -43,15 +41,14 @@ build_options_default="gtk3 ffmpeg"
 
 desc_option_ffmpeg="Support video recording via FFmpeg"
 
-CFLAGS="-fcommon"
+export XDG_DATA_DIRS=$DESTDIR/usr/share
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --disable-nls";;
-esac
+post_patch() {
+	vsed -i src/arch/gtk3/data/unix/Makefile.in -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/'
+}
 
-pre_configure() {
-	# __u_char is not portable...
-	sed -i 's,__u_char,unsigned char,g' src/*.[ch]
-	sed -i 's/lib64/lib/g' configure.ac
-	autoreconf -fi
+pre_install() {
+	# required for xdg-desktop-menu to work
+	vmkdir usr/share/applications
+	vmkdir usr/share/desktop-directories
 }

From f5b9f986a0559160e9b77736f33abd884939fd5b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 25 Jun 2023 00:23:38 +0530
Subject: [PATCH 1279/1853] mazter: update to 1.0.0.

---
 srcpkgs/mazter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mazter/template b/srcpkgs/mazter/template
index 5925e0a4db59..cff89608ab7f 100644
--- a/srcpkgs/mazter/template
+++ b/srcpkgs/mazter/template
@@ -1,6 +1,6 @@
 # Template file for 'mazter'
 pkgname=mazter
-version=0.4.1
+version=1.0.0
 revision=1
 build_style=cargo
 short_desc="Mazes in your terminal"
@@ -8,7 +8,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://dystroy.org/mazter/"
 distfiles="https://static.crates.io/crates/mazter/mazter-${version}.crate"
-checksum=75a4cb6b9b2df3da849f08e587ea0bd74c7a5aaf8a99d078a3b9adec1342102b
+checksum=0e2de0a4fa68700fba6beaf243076f24722cd924aaa9cadb018ad209b4893db0
 
 post_install() {
 	vlicense LICENSE

From f766a71dd3cf0572fb6248fc0a6867eb6f6dab9c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 24 Jun 2023 15:18:03 -0400
Subject: [PATCH 1280/1853] syft: update to 0.84.0

---
 srcpkgs/syft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index dd7ea798ffb6..a38b2524bd87 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,6 +1,6 @@
 # Template file for 'syft'
 pkgname=syft
-version=0.83.0
+version=0.84.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/syft"
 distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz"
-checksum=46124db55e6c56a09f80be123737716a9b6e35e675908639ba3bf34d10e650f6
+checksum=fc16bd2e207d864a56c7122b0ad48b393214383f606e63d3f71bc4761d809326
 
 post_install() {
 	syft="${DESTDIR}/usr/bin/syft"

From 4ce1a1514ba3a2f69e00a6065d19cb204fdcf955 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 24 Jun 2023 15:25:19 -0400
Subject: [PATCH 1281/1853] grype: update to 0.63.0

---
 srcpkgs/grype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 47170f268d9e..11972217100b 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,6 +1,6 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.62.3
+version=0.63.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=f97c8412f7c5f74a348fe011f84f5926153d23475d875e2dc61ddca30872e489
+checksum=a55aa18498a2b67f7bdcfb0fac0746a351ceb8a2e9da0842ab1a68a07f0ffa65
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

From 5c9f7ea5435b67eca9ac683bf2746d1d54d465d0 Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Sun, 25 Jun 2023 01:07:39 +0200
Subject: [PATCH 1282/1853] open-vm-tools: update to 12.2.5.

---
 srcpkgs/open-vm-tools/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 67ee6db8275d..a8781238bb76 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=12.2.0
+version=12.2.5
 revision=1
 archs="x86_64* i686* aarch64*"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
- --without-xmlsecurity --without-kernel-modules --disable-containerinfo
+ --without-xmlsecurity --without-kernel-modules --disable-containerinfo --disable-glibc-check
  $(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
@@ -18,15 +18,11 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/ReleaseNotes.md"
 distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz"
-checksum=5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
+checksum=8cf14932fde137d9079891c1c08ac8f41024de0af90e8ff3707fe0e66c687775
 
 build_options="pam x11"
 build_options_default="pam x11"
 
-if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then
-	configure_args+=" --disable-glibc-check"
-fi
-
 pre_configure() {
 	autoreconf -vfi
 }

From e72032f14fa65a48d4c8a347edda6477f8bcb6d0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 24 Jun 2023 23:20:58 +0200
Subject: [PATCH 1283/1853] arduino-cli: update to 0.33.0.

---
 srcpkgs/arduino-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index c1394d8dbc29..d8ee02a3b755 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,9 +1,9 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
-version=0.32.2
+version=0.33.0
 revision=1
-build_helper=qemu
 build_style=go
+build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli
 go_ldflags="-X ${go_import_path}/version.versionString=${version}"
 short_desc="Arduino command line interface"
@@ -11,7 +11,7 @@ maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arduino/arduino-cli"
 distfiles="https://github.com/arduino/arduino-cli/archive/${version}.tar.gz"
-checksum=a40462b6f9c8af1fa27cb5dda33315e7f9a6afdf845693613aa8d0550e7e9957
+checksum=5ee6a8b2e77573efb3f742f8007d9866c2d177c098794be7f03acc4a6128e616
 
 case "$XBPS_TARGET_MACHINE" in
 	# the downloaded toolchains use glibc, this allows them to work on musl

From ce6ac6b2d7f80f1cb08c37a9435cb85f7555271d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 23:31:54 -0400
Subject: [PATCH 1284/1853] New package: void-live-audio-0.1

---
 srcpkgs/void-live-audio/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/void-live-audio/template

diff --git a/srcpkgs/void-live-audio/template b/srcpkgs/void-live-audio/template
new file mode 100644
index 000000000000..db6fe559c8e4
--- /dev/null
+++ b/srcpkgs/void-live-audio/template
@@ -0,0 +1,12 @@
+# Template file for 'void-live-audio'
+pkgname=void-live-audio
+version=0.1
+revision=1
+build_style=gnu-makefile
+depends="bash alsa-utils"
+short_desc="Script for enabling and configuring audio (for live environments)"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-or-later, CC0-1.0"
+homepage="https://github.com/classabbyamp/void-live-audio"
+distfiles="https://github.com/classabbyamp/void-live-audio/archive/refs/tags/v${version}.tar.gz"
+checksum=7be549cce856a3ef01c22fa1dacca22e43f06da59a541622dd049abc089b0f89

From 4f78e5e71824b433e1beb262e2e0cd7859915e75 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 24 Jun 2023 21:23:05 +0100
Subject: [PATCH 1285/1853] openjdk17: update to 17.0.8+6.

Also fix openjdk17-jmods depending on itself instead of openjdk17.
---
 srcpkgs/openjdk17/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index a937dc0640d7..76373a138310 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.8+5
+version=17.0.8+6
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${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="adf42ea4a9bb2cffa4689c9eb98605a7cd804034cb88312c2b7bf4c5285e32ce
+checksum="ce6e1b61c70cc9d7f3c4c27bda1fa9c21d5a54f5cdb98512c30425703dee9ce4
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"
@@ -229,7 +229,7 @@ openjdk17-static-libs_package() {
 
 openjdk17-jmods_package() {
 	short_desc+=" - JMODs"
-	depends="${pkgname}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove $_jdk_home/jmods
 	}

From 9d6b038910aee09ff98d120e080d637501955217 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Jun 2023 09:18:41 +0200
Subject: [PATCH 1286/1853] wine: update to 8.11.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 18d0a93517fd..83c50e54a7cd 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.10
+version=8.11
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="c4f36dd73c176cef8e7016ca4139ee76f5b498a4afd7edb517e14c0d5394736f
- 04ff999dd3c8a469f66cb559296051bb234ab355991374deceabeaf546b7d5e3"
+checksum="0b5f2c8085352332590f076410174c486f7773da5727337745b1c1dcfe897fc9
+ 3405ef0fa99fb92b39bb7a5480774b837cb929e35e3675b33c1c260eebfcbb85"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From eb303c829892a72fdf463c68e56e7ca79708a282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 24 Jun 2023 20:20:46 -0300
Subject: [PATCH 1287/1853] transmission: add changelog

---
 srcpkgs/transmission/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 29d74a610e74..3b9dc2e0cb7e 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -12,6 +12,7 @@ short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"
+changelog="https://github.com/transmission/transmission/releases"
 distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
 checksum=b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a
 

From df74bf89eaf20e7d6fc8bc2144b99e40fc61f0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 23 Jun 2023 18:04:18 -0300
Subject: [PATCH 1288/1853] transmission-remote-gtk: update to 1.6.0.

---
 srcpkgs/transmission-remote-gtk/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/transmission-remote-gtk/template b/srcpkgs/transmission-remote-gtk/template
index 107565f0a645..08fc30401de8 100644
--- a/srcpkgs/transmission-remote-gtk/template
+++ b/srcpkgs/transmission-remote-gtk/template
@@ -1,19 +1,16 @@
 # Template file for 'transmission-remote-gtk'
 pkgname=transmission-remote-gtk
-version=1.4.1
+version=1.6.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if geoip geoip) appstream-glib-devel libcurl-devel
- gtk+3-devel json-glib-devel libnotify-devel libproxy-devel libmrss-devel"
+build_style=meson
+hostmakedepends="pkg-config gettext glib-devel perl appstream-glib
+ desktop-file-utils"
+makedepends="gtk+3-devel libglib-devel json-glib-devel libsoup3-devel
+ libayatana-appindicator-devel geoip-devel"
 short_desc="GTK client for remote management of the Transmission BitTorrent client"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/transmission-remote-gtk/transmission-remote-gtk"
+changelog="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=59978381a558fc6d1a11091c702a88ac0be8fc7fa135ca367eec55f572a112ab
-
-build_options="geoip"
-build_options_default="geoip"
-
-CFLAGS="-fcommon"
+checksum=b090844f6a482e6f3588070ff3fdd54b79e8f85df02b39853cfb01fccee10cac

From a6b937acd9cc1d37c69750528e4424c24c8193b2 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Fri, 9 Jun 2023 16:32:32 +0200
Subject: [PATCH 1289/1853] New package: osc-1.1.4

---
 srcpkgs/osc/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/osc/template

diff --git a/srcpkgs/osc/template b/srcpkgs/osc/template
new file mode 100644
index 000000000000..7e34f9377b3b
--- /dev/null
+++ b/srcpkgs/osc/template
@@ -0,0 +1,15 @@
+# Template file for 'osc'
+pkgname=osc
+version=1.1.4
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-cryptography python3-devel
+ rpm-python3 python3-urllib3"
+depends="python3-cryptography rpm-python3 python3-urllib3"
+checkdepends="diffstat"
+short_desc="Command Line Interface for Open Build Service"
+maintainer="Emil Miler <em@0x45.cz>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/openSUSE/osc"
+distfiles="https://github.com/openSUSE/osc/archive/refs/tags/${version}.tar.gz"
+checksum=8407ccdcaa6089601e3b9f42c03c015d938ba756b1553f65e2eb122ff00b83e5

From 07fe96bd2b298217ffd582e6c61355207881e1dd Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sat, 3 Jun 2023 23:10:10 +0200
Subject: [PATCH 1290/1853] new package: yaydl-0.13.0

---
 srcpkgs/yaydl/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/yaydl/template

diff --git a/srcpkgs/yaydl/template b/srcpkgs/yaydl/template
new file mode 100644
index 000000000000..6c64581af1d2
--- /dev/null
+++ b/srcpkgs/yaydl/template
@@ -0,0 +1,14 @@
+# Template file for 'yaydl'
+pkgname=yaydl
+version=0.13.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Command-line video downloader"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="GPL-3.0-or-later"
+homepage="https://code.rosaelefanten.org/yaydl/index"
+changelog="https://github.com/dertuxmalwieder/yaydl/tags"
+distfiles="https://github.com/dertuxmalwieder/yaydl/archive/refs/tags/release-${version}.tar.gz"
+checksum=7d5e2246f72cf4bb3e59e97378386747a04f7d233b9ae5f41b5e82f59ce10f59

From 8daa48f1a5305d30ad9ad7cc5d8b787069cb90af Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 1 Jun 2023 22:53:46 +0200
Subject: [PATCH 1291/1853] New package: podman-tui-0.9.1

---
 srcpkgs/podman-tui/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/podman-tui/template

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
new file mode 100644
index 000000000000..05777323de45
--- /dev/null
+++ b/srcpkgs/podman-tui/template
@@ -0,0 +1,18 @@
+# Template file for 'podman-tui'
+pkgname=podman-tui
+version=0.9.1
+revision=1
+build_style=go
+go_import_path="github.com/containers/podman-tui"
+hostmakedepends="pkg-config"
+makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel"
+short_desc="Podman Terminal User Interface"
+maintainer="Uli Baum <xeji@cat3.de>"
+license="Apache-2.0"
+homepage="https://github.com/containers/podman-tui"
+distfiles="https://github.com/containers/podman-tui/archive/v${version}.tar.gz"
+checksum=c3d2cf9fbac9e319c725a79385eccb079ab8395fc35f0107a6de12b3be01128d
+
+post_install() {
+	vdoc docs/README.md
+}

From 7879903d08e4c418ad6ae7f26427cb0d5a6a6f42 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 24 May 2023 09:31:00 +0300
Subject: [PATCH 1292/1853] New package: shortwave-3.2.0

---
 srcpkgs/shortwave/patches/no-git.patch | 12 ++++++++++++
 srcpkgs/shortwave/template             | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 srcpkgs/shortwave/patches/no-git.patch
 create mode 100644 srcpkgs/shortwave/template

diff --git a/srcpkgs/shortwave/patches/no-git.patch b/srcpkgs/shortwave/patches/no-git.patch
new file mode 100644
index 000000000000..43f197af9708
--- /dev/null
+++ b/srcpkgs/shortwave/patches/no-git.patch
@@ -0,0 +1,12 @@
+diff -ru a/meson.build b/meson.build
+--- a/meson.build	2023-02-07 02:12:17.000000000 +0300
++++ b/meson.build	2023-04-27 23:57:14.057890647 +0300
+@@ -31,7 +31,7 @@
+ base_id    = 'de.haeckerfelix.Shortwave'
+ path_id    = '/de/haeckerfelix/Shortwave'
+ app_id     = base_id
+-vcs_tag    = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
++vcs_tag    = 'none'
+ profile    = get_option('profile')
+ datadir    = join_paths(get_option('prefix'), get_option('datadir'))
+ localedir  = join_paths(get_option('prefix'), get_option('localedir'))
diff --git a/srcpkgs/shortwave/template b/srcpkgs/shortwave/template
new file mode 100644
index 000000000000..a9c3f36c28f7
--- /dev/null
+++ b/srcpkgs/shortwave/template
@@ -0,0 +1,23 @@
+# Template file for 'shortwave'
+pkgname=shortwave
+version=3.2.0
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="pkg-config cargo gettext desktop-file-utils glib-devel
+ gtk-update-icon-cache"
+makedepends="libadwaita-devel libshumate-devel rust-std"
+depends="gst-plugins-good1"
+short_desc="Listen to internet radio"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Shortwave"
+distfiles="https://gitlab.gnome.org/World/Shortwave/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=b1d5272d41bf6dd2d7b578e3c352a0f3ca3e502cd3ec0c28ba8153c8887d08b9
+
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i src/meson.build \
+			-e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+	fi
+}

From e2067507e41cb5eb99d4516f725bc1a2d55e2681 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 24 May 2023 03:13:16 +0300
Subject: [PATCH 1293/1853] New package: amberol-0.10.3

---
 srcpkgs/amberol/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/amberol/template

diff --git a/srcpkgs/amberol/template b/srcpkgs/amberol/template
new file mode 100644
index 000000000000..e28139a15dd6
--- /dev/null
+++ b/srcpkgs/amberol/template
@@ -0,0 +1,29 @@
+# Template file for 'amberol'
+pkgname=amberol
+version=0.10.3
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo desktop-file-utils gettext m4 pkg-config glib-devel
+ gtk-update-icon-cache"
+makedepends="libadwaita-devel rust-std"
+depends="gst-plugins-good1 xdg-desktop-portal"
+short_desc="Small and simple sound and music player"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/amberol"
+changelog="https://gitlab.gnome.org/World/amberol/-/raw/main/CHANGES.md"
+distfiles="https://gitlab.gnome.org/World/amberol/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=52372ec6f5ba066409e8dfc4a62fdb2c57e79f83a809cf295ff0e040eebb233b
+
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i src/meson.build \
+			-e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+
+		vsed -i meson.build \
+			-e "/'libdir': get_option('libdir'),/d" \
+			-e "/'datadir': get_option('datadir'),/d" \
+			-e "/'bindir': get_option('bindir'),/d"
+	fi
+}

From 81fa67cb3848477b985d38c09c4e871bfe2f245f Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+github@gmail.com>
Date: Thu, 1 Jun 2023 22:26:16 -0500
Subject: [PATCH 1294/1853] New package: adguardian-1.3.0

---
 srcpkgs/adguardian/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/adguardian/template

diff --git a/srcpkgs/adguardian/template b/srcpkgs/adguardian/template
new file mode 100644
index 000000000000..a9f1f76579fe
--- /dev/null
+++ b/srcpkgs/adguardian/template
@@ -0,0 +1,16 @@
+# Template file for 'adguardian'
+pkgname=adguardian
+version=1.3.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+short_desc="Terminal-based real-time traffic monitor for AdGuard home instance"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/Lissy93/AdGuardian-Term"
+distfiles="https://github.com/Lissy93/AdGuardian-Term/archive/${version}.tar.gz"
+checksum=44a2ee5cdd40341ea0ea2a6800797e4440393d5d10cf377ae84db22ba0563505
+
+post_install() {
+	vlicense LICENSE
+}

From b78c6196a52fbf08353c84f81abac9e7e075165b Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Mon, 22 May 2023 06:40:39 +0700
Subject: [PATCH 1295/1853] New package: babelfish-1.1.0

---
 srcpkgs/babelfish/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/babelfish/template

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
new file mode 100644
index 000000000000..d14a9f042cd0
--- /dev/null
+++ b/srcpkgs/babelfish/template
@@ -0,0 +1,17 @@
+# Template file for 'babelfish'
+pkgname=babelfish
+version=1.1.0
+revision=1
+build_style=go
+go_import_path="bou.ke/babelfish"
+short_desc="Translate bash scripts to fish"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
+license="MIT"
+homepage="https://github.com/bouk/babelfish/"
+distfiles="https://github.com/bouk/babelfish/archive/refs/tags/v$version.tar.gz"
+checksum=7896c3e998e82ed15300f0951052af1e3a5a4c54fa9a07f1e2f743854b7ad239
+
+post_install() {
+	vcompletion babel.fish fish
+	vlicense LICENSE
+}

From 043fd9f480d02427afb1710b010b43593636a253 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Tue, 9 May 2023 23:27:54 -0700
Subject: [PATCH 1296/1853] New package: kamera-23.04.0

---
 srcpkgs/kamera/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kamera/template

diff --git a/srcpkgs/kamera/template b/srcpkgs/kamera/template
new file mode 100644
index 000000000000..2e01f65b6c22
--- /dev/null
+++ b/srcpkgs/kamera/template
@@ -0,0 +1,16 @@
+# Template file for 'kamera'
+pkgname=kamera
+version=23.04.0
+revision=1
+build_style=cmake
+configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
+hostmakedepends="extra-cmake-modules intltool pkg-config kdoctools-devel
+ kcoreaddons-devel kcmutils-devel qt5-qmake qt5-host-tools"
+makedepends="qt5-devel kio-devel ki18n-devel libgphoto2-devel kcmutils-devel
+ kcoreaddons-devel kdoctools-devel"
+short_desc="KDE integration for gphoto2 cameras"
+maintainer="Kenneth Raplee <kenrap@kennethraplee.com>"
+license="GPL-2.0-or-later"
+homepage="https://apps.kde.org/kamera/"
+distfiles="${KDE_SITE}/release-service/${version}/src/kamera-${version}.tar.xz"
+checksum=12be6f3d0de644a9c4252a166a1a19fc2fe565f5f170b1d5aec2b054bb481da8

From 4ead0d450f9c79a3ba4b01aad6ffe236956597b5 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 4 May 2023 21:37:40 +0300
Subject: [PATCH 1297/1853] polychromatic: update to 0.8.1.

---
 srcpkgs/polychromatic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polychromatic/template b/srcpkgs/polychromatic/template
index 79f243dc0a4c..965a69d0e531 100644
--- a/srcpkgs/polychromatic/template
+++ b/srcpkgs/polychromatic/template
@@ -1,6 +1,6 @@
 # Template file for 'polychromatic'
 pkgname=polychromatic
-version=0.8.0
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="ninja sassc which gettext"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://polychromatic.app"
 changelog="https://github.com/polychromatic/polychromatic/raw/master/CHANGELOG"
 distfiles="https://github.com/polychromatic/polychromatic/archive/v${version}.tar.gz"
-checksum=b751a226a22d01018c25a72222f410dfb6cd4260eda4225da70b884be499bf00
+checksum=8b905c07d9371f5277409d4921a420c96510acbf0b17e643a3d8736cc39a5a86

From 74a83078d978c87bc8aaa0d3ce3b842119928a0f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 3 May 2023 16:05:11 +0530
Subject: [PATCH 1298/1853] New package: cargo-modules-0.8.0

---
 srcpkgs/cargo-modules/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/cargo-modules/template

diff --git a/srcpkgs/cargo-modules/template b/srcpkgs/cargo-modules/template
new file mode 100644
index 000000000000..e5b5e5428650
--- /dev/null
+++ b/srcpkgs/cargo-modules/template
@@ -0,0 +1,12 @@
+# Template file for 'cargo-modules'
+pkgname=cargo-modules
+version=0.8.0
+revision=1
+build_style=cargo
+short_desc="Cargo plugin to render crate's module/item structure as a tree or graph"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MPL-2.0"
+homepage="https://github.com/regexident/cargo-modules"
+changelog="https://raw.githubusercontent.com/regexident/cargo-modules/main/CHANGELOG.md"
+distfiles="https://github.com/regexident/cargo-modules/archive/refs/tags/${version}.tar.gz"
+checksum=998132b0953bf8f2a0c998c2a9542996e035b8a535c0742da1f04ad0af96bcb7

From f23e2e64a2c507f789c33fd5d60dc40e0e73dbf8 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Tue, 2 May 2023 23:14:57 +0200
Subject: [PATCH 1299/1853] python3-mpv: update to 1.0.3

---
 srcpkgs/python3-mpv/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template
index bdd70c5f9e8e..d14b3f6eda14 100644
--- a/srcpkgs/python3-mpv/template
+++ b/srcpkgs/python3-mpv/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-mpv'
 pkgname=python3-mpv
-version=1.0.1
-revision=2
-build_style=python3-module
+version=1.0.3
+revision=1
+build_style=python3-pep517
 # this test takes too long and has a low chance of failure
 # https://github.com/jaseg/python-mpv/issues/209#issuecomment-1180248112
 make_check_args="--deselect tests/test_mpv.py::TestLifecycle::test_wait_for_prooperty_event_overflow"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-wheel"
 depends="python3 mpv"
 checkdepends="python3-pytest python3-xvfbwrapper mpv-devel"
 short_desc="Python3 interface to the MPV media player"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/jaseg/python-mpv"
 distfiles="https://github.com/jaseg/python-mpv/archive/v${version}.tar.gz"
-checksum=b5dc6dbf2e2b90ec21ffa7e30729eb7d9556296e0617742f24af179377e6bfd9
+checksum=fe14008723fd3c380098e87a0fec811fca6e8885dd9501e20ee1db29aa4920a0

From 089ca1f35389190b3b9e9ea094495c70a4b79b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Jun 2023 17:58:08 +0200
Subject: [PATCH 1300/1853] goldendict: update to 1.5.0.

---
 srcpkgs/goldendict/patches/endian.patch  | 18 ++++++++----------
 srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---------------------
 srcpkgs/goldendict/template              | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch

diff --git a/srcpkgs/goldendict/patches/endian.patch b/srcpkgs/goldendict/patches/endian.patch
index 2f7264d003e1..e0dc17f6a334 100644
--- a/srcpkgs/goldendict/patches/endian.patch
+++ b/srcpkgs/goldendict/patches/endian.patch
@@ -10,16 +10,14 @@ Date:   Sat Jan 4 23:12:59 2020 +0100
 
     This will fail with undefined reference to qbswap<unsigned long>.
 
-diff --git ripemd.cc ripemd.cc
-index bad8fc7..24ac811 100644
---- a/ripemd.cc
-+++ b/ripemd.cc
-@@ -173,7 +173,7 @@ void RIPEMD128::update( const uint8_t * data, size_t len )
+--- goldendict-1.5.0/ripemd.cc	2023-05-29 16:51:31.000000000 +0200
++++ -	2023-06-24 18:02:27.579627739 +0200
+@@ -174,7 +174,7 @@
  
- void RIPEMD128::digest( uint8_t * digest )
+ void RIPEMD128::digest( uchar * digest )
  {
--  uint64_t finalcount = qFromLittleEndian( count << 3 );
-+  uint64_t finalcount = qFromLittleEndian<quint64>( count << 3 );
-   update( (const uint8_t *) "\200", 1 );
+-  quint64 finalcount = qFromLittleEndian( count << 3 );
++  quint64 finalcount = qFromLittleEndian<quint64>( count << 3 );
+   update( (const uchar *) "\200", 1 );
    while ( ( count & 63 ) != 56 )
-     update( ( const uint8_t * ) "", 1 );
+     update( ( const uchar * ) "", 1 );
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc      2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
-     return false;
-   }
-
--  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-   if ( !avioBuffer )
-   {
-     errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
-   }
-
-   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
--       codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+       codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
-   {
-     av_init_packet( &packet );
-     int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 4544ae710ee6..f4a05759f693 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,22 +1,25 @@
 # Template file for 'goldendict'
 pkgname=goldendict
-version=1.5.0RC2
-revision=6
+version=1.5.0
+revision=1
 build_style=qmake
-configure_args="CONFIG+=zim_support"
+configure_args="CONFIG+=zim_support goldendict.pro"
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="tiff-devel qt5-devel libvorbis-devel zlib-devel
  libXtst-devel hunspell-devel qt5-tools-devel qt5-declarative-devel
  qt5-webkit-devel lzo-devel bzip2-devel libao-devel qt5-svg-devel
- libeb-devel qt5-x11extras-devel ffmpeg-devel liblzma-devel"
+ libeb-devel qt5-x11extras-devel ffmpeg-devel liblzma-devel
+ qt5-multimedia-devel"
 short_desc="A feature-rich dictionary lookup program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://goldendict.org/"
-distfiles="https://github.com/goldendict/goldendict/archive/${version/RC/-RC}.tar.gz"
-checksum=bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde
+distfiles="https://github.com/goldendict/goldendict/archive/${version}.tar.gz"
+checksum=f9f8e068ece74cc026fdc5f56615246228b4e70c97c7197ccd4c14ceae412c7c
 
-CXXFLAGS="-std=c++14 -Wno-deprecated"
+post_patch() {
+	vsed -e '/VERSION/ s/+git//' -i goldendict.pro
+}
 
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/goldendict.png

From 650312c3f1acc873f531d25cf06a1d437c6f4899 Mon Sep 17 00:00:00 2001
From: Oliver Wilkes <oliverwilkes2006@icloud.com>
Date: Mon, 29 May 2023 19:32:09 +0100
Subject: [PATCH 1301/1853] New package: eludris-0.3.3

---
 srcpkgs/eludris/template | 20 ++++++++++++++++++++
 srcpkgs/eludris/update   |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/eludris/template
 create mode 100644 srcpkgs/eludris/update

diff --git a/srcpkgs/eludris/template b/srcpkgs/eludris/template
new file mode 100644
index 000000000000..6215920c922c
--- /dev/null
+++ b/srcpkgs/eludris/template
@@ -0,0 +1,20 @@
+# Template file for 'eludris'
+pkgname=eludris
+version=0.3.3
+revision=1
+build_style=cargo
+build_helper=rust
+configure_args="--bin eludris"
+make_install_args="--path cli"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Simple CLI to help with setting up and managing your Eludris instance"
+maintainer="Oliver Wilkes <oliverwilkes2006@icloud.com>"
+license="MIT"
+homepage="https://github.com/eludris/eludris/tree/main/cli"
+distfiles="https://github.com/eludris/eludris/archive/refs/tags/v${version}.tar.gz"
+checksum=e204969d056e147a97cb8d1b2a0c16b7e4d06c5895ef9bb939884ddc0ecdb3c2
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/eludris/update b/srcpkgs/eludris/update
new file mode 100644
index 000000000000..f1803c315380
--- /dev/null
+++ b/srcpkgs/eludris/update
@@ -0,0 +1,2 @@
+site="https://github.com/eludris/eludris/tags"
+pattern='\/tags\/v\K[\d.]+(?=\.tar\.gz)'

From 11348b619f3a859aeb135df4ca3ea27f94367460 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 2 May 2023 09:18:41 -0400
Subject: [PATCH 1302/1853] vaultwarden-web: update to 2023.5.0.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index ac2875b0ef10..18d61ff8eeef 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2023.3.0b
+version=2023.5.0
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=ac3d27cbbb0dabb09cba0029c0b4d13b4f866fa3ae4eaa2dfd1f3880800ce19c
+checksum=7c272ff02d0a635f19348b8a991c7990c1866e3df61eeaf978f97e6ff91f5cb4
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

From 2236d4233cb27052181971ce260d1ea830e8bf61 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 17 Apr 2023 14:53:38 +0200
Subject: [PATCH 1303/1853] New package: linuxwave-0.1.3

---
 srcpkgs/linuxwave/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/linuxwave/template

diff --git a/srcpkgs/linuxwave/template b/srcpkgs/linuxwave/template
new file mode 100644
index 000000000000..60f47d8ac427
--- /dev/null
+++ b/srcpkgs/linuxwave/template
@@ -0,0 +1,17 @@
+# Template file for 'linuxwave'
+pkgname=linuxwave
+version=0.1.3
+revision=1
+build_style=zig-build
+short_desc="Generate music from the entropy of Linux"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://orhun.dev/linuxwave/"
+changelog="https://raw.githubusercontent.com/orhun/linuxwave/main/CHANGELOG.md"
+distfiles="https://github.com/orhun/linuxwave/releases/download/v${version}/v${version}.tar.gz"
+checksum=d82e0eda6f2bb3080e3af6a86bafa22ed91291eaf2afbb38492326a316f1853e
+
+post_install() {
+	vlicense LICENSE
+	vman man/linuxwave.1
+}

From 9aaa899f915da52e9b79f19c5af72252d2d15436 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jun 2023 17:36:18 +0200
Subject: [PATCH 1304/1853] cppcheck: update to 2.11.

---
 srcpkgs/cppcheck/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index bf2f4bdbf2da..98f1af93b724 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.10.3
+version=2.11
 revision=1
 build_style=cmake
 configure_args="
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=8aae5e116daeaaf5d19f3efa61b91c06f161cb97412a1d1af6e1e20686e48967
+checksum=ef7d77c16e6903834cc016986a60157918a90958e981863746a7f3147bfb94c6
 
 export CXXFLAGS="-DNDEBUG"
 
@@ -31,6 +31,7 @@ post_extract() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -e '/run-dmake/d' -i test/CMakeLists.txt -i cli/CMakeLists.txt
 	fi
+	vsed -e 's/"2.11"/"2.11.0"/' -i cmake/versions.cmake
 }
 
 post_install() {

From 4ca803a9f160f37f1cc7a060601db6a03e67e89d Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 14 Apr 2023 14:11:43 -0400
Subject: [PATCH 1305/1853] New package: minipro-0.6

Closes: #43443 [via git-merge-pr]
---
 srcpkgs/minipro/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/minipro/template

diff --git a/srcpkgs/minipro/template b/srcpkgs/minipro/template
new file mode 100644
index 000000000000..a6824c0a95c8
--- /dev/null
+++ b/srcpkgs/minipro/template
@@ -0,0 +1,25 @@
+# Template file for 'minipro'
+pkgname=minipro
+version=0.6
+revision=1
+build_style=gnu-makefile
+make_use_env=compliant
+hostmakedepends="pkg-config which"
+makedepends="libusb-devel"
+short_desc="Program for controlling the MiniPRO TL866xx series of chip programmers"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/DavidGriffith/minipro"
+distfiles="https://gitlab.com/DavidGriffith/minipro/-/archive/${version}/minipro-${version}.tar.gz"
+checksum=16b4220b5fc07dddc4d1d49cc181a2c6a735c833cc27f24ab73eac2572c9304a
+
+post_patch() {
+	vsed -i Makefile -e 's/CC=gcc/CC?=gcc/'
+}
+
+post_install() {
+	vmkdir usr/lib/udev/rules.d
+	vcopy "udev/*" usr/lib/udev/rules.d
+
+	vcompletion bash_completion.d/minipro bash
+}

From ca054b4d2b537e6025e8a98bf50a8d31ca8069d0 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 14 Apr 2023 00:03:13 +0200
Subject: [PATCH 1306/1853] New package: frobby-0.9.5

---
 srcpkgs/frobby-devel                  |  1 +
 srcpkgs/frobby/patches/Makefile.patch | 35 +++++++++++++++++++++++++++
 srcpkgs/frobby/template               | 28 +++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/frobby-devel
 create mode 100644 srcpkgs/frobby/patches/Makefile.patch
 create mode 100644 srcpkgs/frobby/template

diff --git a/srcpkgs/frobby-devel b/srcpkgs/frobby-devel
new file mode 120000
index 000000000000..5a25e67f7b46
--- /dev/null
+++ b/srcpkgs/frobby-devel
@@ -0,0 +1 @@
+frobby
\ No newline at end of file
diff --git a/srcpkgs/frobby/patches/Makefile.patch b/srcpkgs/frobby/patches/Makefile.patch
new file mode 100644
index 000000000000..2269f8bfde61
--- /dev/null
+++ b/srcpkgs/frobby/patches/Makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index 36a3778..2529515 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,10 +6,8 @@
+ # ========================
+ # For GMP set **both**  GMP_INC_DIR  **and**  ldflags_for_gmp
+ # If you have a system installation of GMP with C++ support use next 2 lines:
+-# GMP_INC_DIR=
+-# ldflags_for_gmp=-lgmpxx -lgmp
+-GMP_INC_DIR=/usr/local/include
+-ldflags_for_gmp=-L/usr/local/lib -lgmpxx -lgmp
++GMP_INC_DIR=
++ldflags_for_gmp=-lgmpxx -lgmp
+ 
+ 
+ 
+@@ -80,7 +78,7 @@ ifndef CXX
+ endif
+ 
+ ifndef BIN_INSTALL_DIR
+-  BIN_INSTALL_DIR = "/usr/local/bin/"
++  BIN_INSTALL_DIR = "/usr/bin/"
+ endif
+ 
+ cxxflags = $(CXXFLAGS) $(CPPFLAGS) -I $(GMP_INC_DIR) -Wno-uninitialized -Wno-unused-parameter
+@@ -252,7 +250,7 @@ endif
+ 
+ -include $(objs:.o=.d)
+ 
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ MAN1DIR ?= $(PREFIX)/share/man/man1
+ 
+ # Installation.
diff --git a/srcpkgs/frobby/template b/srcpkgs/frobby/template
new file mode 100644
index 000000000000..99ead8fe3ef2
--- /dev/null
+++ b/srcpkgs/frobby/template
@@ -0,0 +1,28 @@
+# Template file for 'frobby'
+pkgname=frobby
+version=0.9.5
+revision=1
+build_style=gnu-makefile
+makedepends="gmp-devel gmpxx-devel"
+short_desc="Computations with monomial ideals"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Macaulay2/frobby"
+changelog="https://raw.githubusercontent.com/Macaulay2/frobby/master/changelog.txt"
+distfiles="https://github.com/Macaulay2/frobby/archive/refs/tags/v${version}.tar.gz"
+checksum=714c33c4f68e86d82062d7a42ad42c581d4b4c60d6a73ee1836ba1be7f985eb3
+
+post_build() {
+	RANLIB=/usr/bin/ranlib make CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" library
+}
+
+frobby-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmkdir usr/include
+		vcopy src/frobby.h usr/include
+		vcopy src/stdinc.h usr/include
+		vcopy bin/libfrobby.a usr/lib
+	}
+}

From e499438d20bfeade8f9540bd9e1c39f844942f90 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 13 Apr 2023 13:02:18 +0000
Subject: [PATCH 1307/1853] New package: rtx-1.32.0

---
 srcpkgs/rtx/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/rtx/template

diff --git a/srcpkgs/rtx/template b/srcpkgs/rtx/template
new file mode 100644
index 000000000000..31b40dd9d808
--- /dev/null
+++ b/srcpkgs/rtx/template
@@ -0,0 +1,23 @@
+# Template file for 'rtx'
+pkgname=rtx
+version=1.32.0
+revision=1
+build_style=cargo
+# skip cli tests: fail to find executable
+make_check_args="-- --skip cli::direnv::exec::tests"
+short_desc="Polyglot runtime manager (asdf rust clone)"
+maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
+license="MIT"
+homepage="https://github.com/jdxcode/rtx"
+changelog="https://github.com/jdxcode/rtx/releases"
+distfiles="https://github.com/jdxcode/rtx/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=54bb235dcfc34e24c48bd5bc1f2ac9b8a6f9eb7cf1d3b64c514ebbf6d34570f1
+
+post_install() {
+	vlicense LICENSE
+	vman man/man1/rtx.1
+	vdoc README.md
+	vcompletion completions/rtx.bash bash rtx
+	vcompletion completions/rtx.fish fish rtx
+	vcompletion completions/_rtx zsh rtx
+}

From faa4e1d54590f197213ea115161beb9f6e83956c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 7 Apr 2023 22:32:18 +0530
Subject: [PATCH 1308/1853] New package: memray-1.7.0

---
 srcpkgs/memray/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/memray/template

diff --git a/srcpkgs/memray/template b/srcpkgs/memray/template
new file mode 100644
index 000000000000..8c73d35d25e0
--- /dev/null
+++ b/srcpkgs/memray/template
@@ -0,0 +1,26 @@
+# Template file for 'memray'
+pkgname=memray
+version=1.7.0
+revision=1
+build_style=python3-pep517
+make_check_target="tests/unit"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="python3-devel libunwind-devel liblz4-devel"
+depends="python3-Jinja2 python3-rich"
+checkdepends="${depends} python3-pytest"
+short_desc="Reports memory allocations in python code & compiled extensions"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://bloomberg.github.io/memray/"
+changelog="https://bloomberg.github.io/memray/changelog.html"
+distfiles="https://github.com/bloomberg/memray/archive/refs/tags/v${version}.tar.gz"
+checksum=0c735753d6d8a9050c9313c55ee41bfca271c3dec7cc37d2ed01eba5d358a7d6
+make_check_pre="env PYTHONPATH=src"
+
+pre_build() {
+	export MEMRAY_LIBBACKTRACE_TARGET="${XBPS_TARGET_MACHINE%-musl}"
+}
+
+pre_check() {
+	python3 setup.py build_ext --inplace
+}

From e54ca766508a209721d298cb27ba078375f3e358 Mon Sep 17 00:00:00 2001
From: Arya Kiran <arya@projectsegfau.lt>
Date: Tue, 11 Apr 2023 20:57:44 +0530
Subject: [PATCH 1309/1853] nheko: update to 0.11.3

---
 srcpkgs/nheko/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 6bcbeb17bd63..867dcd209ce2 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,6 +1,6 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.11.1
+version=0.11.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://nheko-reborn.github.io"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=a84d6f3a6d17ff0b6ffd07804804bbebb1191e4243f00b9b49b00891e8023b6a
+checksum=f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

From 05c646178f6d578a68f8cfa208f60f990b9b1af5 Mon Sep 17 00:00:00 2001
From: Arya Kiran <arya@projectsegfau.lt>
Date: Wed, 12 Apr 2023 12:19:58 +0530
Subject: [PATCH 1310/1853] mtxclient: update to 0.9.2

Closes: https://github.com/void-linux/void-packages/pull/43390
---
 srcpkgs/mtxclient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index a93f2e06eaa0..c7a328ed8fb0 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=bae82daa019ecdedb2433177b3d973b72f337d14e7a4f480a490559235391005
+checksum=f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
 
 post_install() {
 	vlicense LICENSE

From 5aa2fc6c9fc34d1740ee024fdadb65b2daedef5b Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Mon, 10 Apr 2023 20:04:22 +0200
Subject: [PATCH 1311/1853] New package: tessen-2.2.1

Closes: https://github.com/void-linux/void-packages/pull/43377
---
 srcpkgs/tessen/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/tessen/template

diff --git a/srcpkgs/tessen/template b/srcpkgs/tessen/template
new file mode 100644
index 000000000000..318958cf8f6f
--- /dev/null
+++ b/srcpkgs/tessen/template
@@ -0,0 +1,13 @@
+# Template file for 'tessen'
+pkgname=tessen
+version=2.2.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="scdoc"
+checkdepends="shellcheck shfmt"
+short_desc="Interactive menu to autotype and copy pass and gopass data"
+maintainer="reedts <j.reedts@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://git.sr.ht/~ayushnix/tessen"
+distfiles="https://git.sr.ht/~ayushnix/tessen/refs/download/v${version}/tessen-${version}.tar.gz"
+checksum=31d510d5ffac5825bc7e63f13283c5d432eb102db2d2483ee937c9135c8cfc04

From 2f36234f8af213cb0fd624e541d7c4d63d04eb78 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 12:56:55 -0500
Subject: [PATCH 1312/1853] ktextaddons: update common/shlibs

---
 common/shlibs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 258b257a75c3..abe182d69b9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3213,13 +3213,14 @@ libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.18 gloox-1.0.24_1
 libgsmsd.so.8 gammu-smsd-1.39.0_1
 libGammu.so.8 gammu-1.39.0_1
-libKF5TextAutoCorrection.so.1 ktextaddons-1.2.0_1
-libKF5TextEditTextToSpeech.so.1 ktextaddons-1.2.0_1
-libKF5TextEmoticonsWidgets.so.1 ktextaddons-1.2.0_1
-libKF5TextEmoticonsCore.so.1 ktextaddons-1.2.0_1
-libKF5TextGrammarCheck.so.1 ktextaddons-1.2.0_1
-libKF5TextTranslator.so.1 ktextaddons-1.2.0_1
-libKF5TextAddonsWidgets.so.1 ktextaddons-1.2.0_1
+libKF5TextAutoCorrectionCore.so.1 ktextaddons-1.3.2_1
+libKF5TextAutoCorrectionWidgets.so.1 ktextaddons-1.3.2_1
+libKF5TextEditTextToSpeech.so.1 ktextaddons-1.3.2_1
+libKF5TextEmoticonsWidgets.so.1 ktextaddons-1.3.2_1
+libKF5TextEmoticonsCore.so.1 ktextaddons-1.3.2_1
+libKF5TextGrammarCheck.so.1 ktextaddons-1.3.2_1
+libKF5TextTranslator.so.1 ktextaddons-1.3.2_1
+libKF5TextAddonsWidgets.so.1 ktextaddons-1.3.2_1
 libz3.so z3-4.6.0_2
 libngspice.so.0 ngspice-35_1
 libvulkan.so.1 vulkan-loader-1.0.57.0_1

From 8bb77cc5fba768e0aa849dc37b78efcd810c22e4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:55 -0500
Subject: [PATCH 1313/1853] akregator: rebuild for ktextaddons

---
 srcpkgs/akregator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 8649a9a8ce72..a7def8ff0f4e 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,7 +1,7 @@
 # Template file for 'akregator'
 pkgname=akregator
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools

From 3787ff25f235ae8706534fd2b8672557e6f2704c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:55 -0500
Subject: [PATCH 1314/1853] kalarm: rebuild for ktextaddons

---
 srcpkgs/kalarm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 0915e023030e..5513632081ed 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"

From c57596393f2205babda2ff505bc3747b364bc7cb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1315/1853] kmail: rebuild for ktextaddons

---
 srcpkgs/kmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 7bf67ab803dc..77413e68ead1 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,7 +1,7 @@
 # Template file for 'kmail'
 pkgname=kmail
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
  gettext kcmutils kdoctools kconfig kcoreaddons"

From 9492d105b27fddd0115a5db6b7d3b0778310ec2e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1316/1853] knotes: rebuild for ktextaddons

---
 srcpkgs/knotes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index d3130f12f0d0..f2a625cd5d72 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,7 +1,7 @@
 # Template file for 'knotes'
 pkgname=knotes
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
  kcoreaddons kdoctools kconfig gettext kcmutils"

From 203fd4293d0c23eaf297903fc76e025853525163 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1317/1853] libksieve: rebuild for ktextaddons

---
 srcpkgs/libksieve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 724cb5dcf740..d63625fd5a3f 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,7 +1,7 @@
 # Template file for 'libksieve'
 pkgname=libksieve
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kdoctools kconfig"

From e38e6da6aaeea628d6f2529ff812d35e3f598bfb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1318/1853] messagelib: rebuild for ktextaddons

---
 srcpkgs/messagelib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index d49add61f4e4..0f59545094a9 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,7 +1,7 @@
 # Template file for 'messagelib'
 pkgname=messagelib
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kconfig"

From fd2bec4b2505e4cded8bf5daf6eb125b1ebd15ea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1319/1853] pimcommon: rebuild for ktextaddons

---
 srcpkgs/pimcommon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 973ecaf378ba..053ef120993b 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,7 +1,7 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
  gettext kconfig kgendesignerplugin"

From 77c11869a945f2ae8c4e11388c829f2eb86797d6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 25 Jun 2023 14:05:12 -0400
Subject: [PATCH 1320/1853] common/shlibs: update libmatrix_client entry

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index abe182d69b9e..1cc1b6815e7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -422,7 +422,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.1 mtxclient-0.9.1_1
+libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1

From a1bb15d0669bec3ec25a3e755b2cd063503004f0 Mon Sep 17 00:00:00 2001
From: Alexandru Barbur <alex@ctrlc.name>
Date: Wed, 21 Jun 2023 13:34:50 -0400
Subject: [PATCH 1321/1853] libspnav: update to 1.1, switch upstream to github

---
 srcpkgs/libspnav/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libspnav/template b/srcpkgs/libspnav/template
index 059d254e17b7..170a840ad618 100644
--- a/srcpkgs/libspnav/template
+++ b/srcpkgs/libspnav/template
@@ -1,24 +1,20 @@
 # Template file for 'libspnav'
 pkgname=libspnav
-version=1.0
-revision=2
+version=1.1
+revision=1
 build_style=gnu-configure
-configure_args="--disable-opt"
 makedepends="libX11-devel"
 short_desc="Open source alternative to 3DConnextion drivers"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="BSD-3-Clause"
 homepage="http://spacenav.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/spacenav/${pkgname}-${version}.tar.gz"
-checksum=8849b7f7826d750f6956cf8f4f53937f2359ab6da97d6c834c71d5f771212e7c
-
-do_build() {
-	make CC="${CC}" AR="${AR}"
-}
+distfiles="https://github.com/FreeSpacenav/libspnav/archive/refs/tags/v${version}.tar.gz"
+checksum=04b297f68a10db4fa40edf68d7f823ba7b9d0442f2b665181889abe2cea42759
 
 post_install() {
 	vlicense LICENSE
 }
+
 libspnav-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 22d17caba080f2f3f2637bbde7c9a585891b495e Mon Sep 17 00:00:00 2001
From: Adam Frey <adam@adamfrey.me>
Date: Fri, 14 Apr 2023 10:58:19 -0400
Subject: [PATCH 1322/1853] clojure: update to 1.11.1.1273.

Closes: #43442 [via git-merge-pr]
---
 srcpkgs/clojure/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a14acb44c757..7259f25e6e34 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,14 +1,14 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.11.1.1200
+version=1.11.1.1273
 revision=1
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=dbde9c4bdd42b7da5a67d879548b4528e4903ce73ee26c329626b6165d57b61c
+checksum=5f8bafcf24bd148ac9bcbe60a8e7b8093c9ed8eb8e0f387199770e38f0e40ce6
 
 do_install() {
 	vmkdir /usr/lib/clojure

From d43a19c1e877c506db1859f262ed68faa9d1e1fe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:13:44 +0200
Subject: [PATCH 1323/1853] srcpkgs: orphan packages from inactive maintainer

---
 srcpkgs/caddy/template              | 2 +-
 srcpkgs/debug-me/template           | 2 +-
 srcpkgs/ghq/template                | 2 +-
 srcpkgs/git-absorb/template         | 2 +-
 srcpkgs/joker/template              | 2 +-
 srcpkgs/keybase-desktop/template    | 2 +-
 srcpkgs/libmodule/template          | 2 +-
 srcpkgs/linux-vt-setcolors/template | 2 +-
 srcpkgs/neovim-qt/template          | 2 +-
 srcpkgs/pokoy/template              | 2 +-
 srcpkgs/teensy_loader_cli/template  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index f113a2296f29..2a06c4a6c991 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -7,7 +7,7 @@ go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
 depends="shared-mime-info"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 changelog="https://github.com/caddyserver/caddy/releases"
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index f971f2156c77..c886d07b1759 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -6,7 +6,7 @@ build_style=haskell-stack
 stackage="lts-19.0"
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://debug-me.branchable.com/"
 distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 25062de44828..4c826587146a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -7,7 +7,7 @@ go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
 depends="git"
 short_desc="Remote repository management made easy"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/x-motemen/ghq"
 distfiles="https://github.com/x-motemen/ghq/archive/v${version}.tar.gz"
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 5f7d34c5fb31..8c6dd52ebf27 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -7,7 +7,7 @@ build_helper=qemu
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 short_desc="Like git commit --fixup, but automatic"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/tummychow/git-absorb"
 distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index 14f4996daa29..6bb756466ad9 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="EPL-1.0"
 homepage="https://joker-lang.org/"
 distfiles="https://github.com/candid82/joker/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 2b97c4e45b38..21e711e5edde 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -5,7 +5,7 @@ revision=1
 hostmakedepends="git nodejs yarn unzip"
 depends="keybase kbfs"
 short_desc="Keybase desktop client"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libmodule/template b/srcpkgs/libmodule/template
index 44d9597e3402..b9c49db930fb 100644
--- a/srcpkgs/libmodule/template
+++ b/srcpkgs/libmodule/template
@@ -4,7 +4,7 @@ version=5.0.0
 revision=1
 build_style=cmake
 short_desc="C simple and elegant implementation of an actor library"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/FedeDP/libmodule"
 distfiles="https://github.com/FedeDP/libmodule/archive/${version}.tar.gz"
diff --git a/srcpkgs/linux-vt-setcolors/template b/srcpkgs/linux-vt-setcolors/template
index fa3f7681b75b..8a1aee9454b7 100644
--- a/srcpkgs/linux-vt-setcolors/template
+++ b/srcpkgs/linux-vt-setcolors/template
@@ -4,7 +4,7 @@ version=1.0.0
 revision=1
 build_style=gnu-makefile
 short_desc="Utility tool to set the linux VT default color palette"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/EvanPurkhiser/linux-vt-setcolors"
 distfiles="https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v${version}.tar.gz"
diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template
index faea60a20084..ae7db35d3bd0 100644
--- a/srcpkgs/neovim-qt/template
+++ b/srcpkgs/neovim-qt/template
@@ -8,7 +8,7 @@ hostmakedepends="qt5-host-tools qt5-qmake neovim"
 makedepends="msgpack-devel qt5-devel qt5-svg-devel"
 depends="neovim"
 short_desc="Neovim client library and GUI, in Qt5"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/equalsraf/neovim-qt"
 distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz"
diff --git a/srcpkgs/pokoy/template b/srcpkgs/pokoy/template
index 490067f7d9ff..79c10c13ecec 100644
--- a/srcpkgs/pokoy/template
+++ b/srcpkgs/pokoy/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_use_env=yes
 makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel"
 short_desc="Daemon that helps prevent RSI and other computer related stress"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/ttygde/pokoy"
 distfiles="https://github.com/ttygde/pokoy/archive/v${version}.tar.gz"
diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template
index 28d93a5e5c05..4cf4dd73414c 100644
--- a/srcpkgs/teensy_loader_cli/template
+++ b/srcpkgs/teensy_loader_cli/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_target=teensy_loader_cli
 makedepends="libusb-compat-devel"
 short_desc="Command line Teensy Loader"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://www.pjrc.com/teensy/loader_cli.html"
 distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"

From 8cd908c854e9da63d2d91be4b9d3b8906cdc4f76 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 12 Apr 2023 01:47:24 +0530
Subject: [PATCH 1324/1853] gopass-jsonapi: update to 1.15.5.

Closes: https://github.com/void-linux/void-packages/pull/43396
---
 srcpkgs/gopass-jsonapi/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index cc6377ad70f4..f4e0e67d6063 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,8 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
-version=1.15.2
-revision=2
-create_wrksrc=yes
+version=1.15.5
+revision=1
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"
@@ -11,9 +10,9 @@ short_desc="Gopass JSON bridge for extensions"
 maintainer="KuhnChris <kuhnchris+voidpackages@kuhnchris.eu>"
 license="MIT"
 homepage="https://www.gopass.pw/"
-changelog="https://raw.githubusercontent.com/gopasspw/gopass-jsonapi/v${version}/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/gopasspw/gopass-jsonapi/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass-jsonapi/releases/download/v${version}/gopass-jsonapi-${version}.tar.gz"
-checksum=2e86b4c1705d7edfb86419549c7abbeb1cc94037e5b2d92ebcfd3a98c4538d93
+checksum=62d8df839014bad51d1b791837bc8348f7fdcafab0d04f0b7bf2b5d6f0dfc789
 
 post_install() {
 	vlicense LICENSE

From 2bd99ac5b3c289382b48ae0e4d5db0435c018cb3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 25 Jun 2023 08:08:25 -0400
Subject: [PATCH 1325/1853] onefetch: update to 2.18.1

---
 srcpkgs/onefetch/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index c46fab74df6c..3c0b1977725d 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.16.0
+version=2.18.1
 revision=1
 build_style=cargo
 make_check_args="-- --skip info::tests::test_style_subtitle"
@@ -9,10 +9,10 @@ makedepends="zlib-devel"
 short_desc="Git repository summary on your terminal"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
-homepage="https://github.com/o2sh/onefetch"
+homepage="https://onefetch.dev"
 changelog="https://github.com/o2sh/onefetch/raw/main/CHANGELOG.md"
-distfiles="https://github.com/o2sh/onefetch/archive/${version}.tar.gz"
-checksum=948abb476a1310ab9393fcce10cffabcedfa12c2cf7be238472edafe13753222
+distfiles="https://github.com/o2sh/onefetch/archive/refs/tags/${version}.tar.gz"
+checksum=7b0f03e9d2383ac32283cfb9ec09d10c8789a298969c8b7d45fa0168bd909140
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="exr crate unimplemented for BE"

From 0cb90bc03d3feff28024c7a41795ba4b3d67cb27 Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 13:10:09 +0200
Subject: [PATCH 1326/1853] New package: swayfx-0.2

---
 srcpkgs/swayfx/INSTALL           |  5 +++++
 srcpkgs/swayfx/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/swayfx/template          | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL
 create mode 100644 srcpkgs/swayfx/patches/7326.diff
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..c310f9af4c7c
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..2483ca15cfa2
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1,23 @@
+# Template file for 'swayfx'
+pkgname=swayfx
+version=0.2
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg@posteo.de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+conflicts="sway"
+
+post_install() {
+	vlicense LICENSE
+}

From 1093246239287d6a5d9e80ffc8dc23d485406be6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Thu, 2 Sep 2021 00:14:39 +0200
Subject: [PATCH 1327/1853] New package: ax25-tools-0.0.10.rc5

Closes: #43301 [via git-merge-pr]
---
 srcpkgs/ax25-tools/patches/musl.patch | 154 ++++++++++++++++++++++++++
 srcpkgs/ax25-tools/template           |  12 ++
 2 files changed, 166 insertions(+)
 create mode 100644 srcpkgs/ax25-tools/patches/musl.patch
 create mode 100644 srcpkgs/ax25-tools/template

diff --git a/srcpkgs/ax25-tools/patches/musl.patch b/srcpkgs/ax25-tools/patches/musl.patch
new file mode 100644
index 000000000000..53a8ac88f800
--- /dev/null
+++ b/srcpkgs/ax25-tools/patches/musl.patch
@@ -0,0 +1,154 @@
+Common subdirectories: tcpip/.deps and tcpip_a/.deps
+diff --color --new-file -Np1 tcpip/talkd.h tcpip_a/talkd.h
+*** a/tcpip/talkd.h	1970-01-01 01:00:00.000000000 +0100
+--- b/tcpip/talkd.h	2021-09-01 23:25:25.059430912 +0200
+***************
+*** 0 ****
+--- 1,127 ----
++ 
++ /*
++  * Copyright (c) 1983, 1993
++  *	The Regents of the University of California.  All rights reserved.
++  *
++  * Redistribution and use in source and binary forms, with or without
++  * modification, are permitted provided that the following conditions
++  * are met:
++  * 1. Redistributions of source code must retain the above copyright
++  *    notice, this list of conditions and the following disclaimer.
++  * 2. Redistributions in binary form must reproduce the above copyright
++  *    notice, this list of conditions and the following disclaimer in the
++  *    documentation and/or other materials provided with the distribution.
++  * 4. Neither the name of the University nor the names of its contributors
++  *    may be used to endorse or promote products derived from this software
++  *    without specific prior written permission.
++  *
++  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++  * SUCH DAMAGE.
++  *
++  *	@(#)talkd.h	8.1 (Berkeley) 6/2/93
++  */
++ 
++ #ifndef _PROTOCOLS_TALKD_H
++ #define	_PROTOCOLS_TALKD_H 1
++ 
++ /*
++  * This describes the protocol used by the talk server and clients.
++  *
++  * The talk server acts a repository of invitations, responding to
++  * requests by clients wishing to rendezvous for the purpose of
++  * holding a conversation.  In normal operation, a client, the caller,
++  * initiates a rendezvous by sending a CTL_MSG to the server of
++  * type LOOK_UP.  This causes the server to search its invitation
++  * tables to check if an invitation currently exists for the caller
++  * (to speak to the callee specified in the message).  If the lookup
++  * fails, the caller then sends an ANNOUNCE message causing the server
++  * to broadcast an announcement on the callee's login ports requesting
++  * contact.  When the callee responds, the local server uses the
++  * recorded invitation to respond with the appropriate rendezvous
++  * address and the caller and callee client programs establish a
++  * stream connection through which the conversation takes place.
++  */
++ 
++ #include <sys/types.h>
++ #include <sys/socket.h>
++ #include <stdint.h>
++ 
++ #include <features.h>
++ #ifndef __GLIBC__
++ struct osockaddr
++ {
++   unsigned short int sa_family;
++   unsigned char sa_data[14];
++ };
++ #else
++ #include <bits/types/struct_osockaddr.h>
++ #endif
++ 
++ /*
++  * Client->server request message format.
++  */
++ typedef struct {
++ 	unsigned char	vers;	/* protocol version */
++ 	unsigned char	type;	/* request type, see below */
++ 	unsigned char	answer;	/* not used */
++ 	unsigned char	pad;
++ 	uint32_t id_num;	/* message id */
++ 	struct	osockaddr addr;		/* old (4.3) style */
++ 	struct	osockaddr ctl_addr;	/* old (4.3) style */
++ 	int32_t	pid;		/* caller's process id */
++ #define	NAME_SIZE	12
++ 	char	l_name[NAME_SIZE];/* caller's name */
++ 	char	r_name[NAME_SIZE];/* callee's name */
++ #define	TTY_SIZE	16
++ 	char	r_tty[TTY_SIZE];/* callee's tty name */
++ } CTL_MSG;
++ 
++ /*
++  * Server->client response message format.
++  */
++ typedef struct {
++ 	unsigned char	vers;	/* protocol version */
++ 	unsigned char	type;	/* type of request message, see below */
++ 	unsigned char	answer;	/* response to request message, see below */
++ 	unsigned char	pad;
++ 	uint32_t	id_num;	/* message id */
++ 	struct	osockaddr addr;	/* address for establishing conversation */
++ } CTL_RESPONSE;
++ 
++ #define	TALK_VERSION	1		/* protocol version */
++ 
++ /* message type values */
++ #define LEAVE_INVITE	0	/* leave invitation with server */
++ #define LOOK_UP		1	/* check for invitation by callee */
++ #define DELETE		2	/* delete invitation by caller */
++ #define ANNOUNCE	3	/* announce invitation by caller */
++ 
++ /* answer values */
++ #define SUCCESS		0	/* operation completed properly */
++ #define NOT_HERE	1	/* callee not logged in */
++ #define FAILED		2	/* operation failed for unexplained reason */
++ #define MACHINE_UNKNOWN	3	/* caller's machine name unknown */
++ #define PERMISSION_DENIED 4	/* callee's tty doesn't permit announce */
++ #define UNKNOWN_REQUEST	5	/* request has invalid type value */
++ #define	BADVERSION	6	/* request has invalid protocol version */
++ #define	BADADDR		7	/* request has invalid addr value */
++ #define	BADCTLADDR	8	/* request has invalid ctl_addr value */
++ 
++ /*
++  * Operational parameters.
++  */
++ #define MAX_LIFE	60	/* max time daemon saves invitations */
++ /* RING_WAIT should be 10's of seconds less than MAX_LIFE */
++ #define RING_WAIT	30	/* time to wait before resending invitation */
++ 
++ #endif /* protocols/talkd.h */
++ 
+diff --color --new-file -Np1 tcpip/ttylinkd.c tcpip_a/ttylinkd.c
+*** a/tcpip/ttylinkd.c	2021-09-01 23:20:39.121449187 +0200
+--- b/tcpip/ttylinkd.c	2021-09-01 23:25:25.059430912 +0200
+***************
+*** 41,43 ****
+  
+! #include <protocols/talkd.h>
+  
+--- 41,43 ----
+  
+! #include "talkd.h"
+  
+*** a/dmascc/dmascc_cfg.c	2019-03-28 19:07:47.000000000 +0100
+--- b/dmascc/dmascc_cfg.c	2021-09-01 23:41:28.698369324 +0200
+***************
+*** 26,27 ****
+--- 26,28 ----
+  #include <sys/ioctl.h>
++ #include <sys/types.h>
+  #include <linux/if.h>
diff --git a/srcpkgs/ax25-tools/template b/srcpkgs/ax25-tools/template
new file mode 100644
index 000000000000..dadbd5891750
--- /dev/null
+++ b/srcpkgs/ax25-tools/template
@@ -0,0 +1,12 @@
+# Template file for 'ax25-tools'
+pkgname=ax25-tools
+version=0.0.10rc5
+revision=1
+build_style=gnu-configure
+makedepends="zlib-devel libax25-devel"
+short_desc="Basic AX.25 (Amateur Radio/hamradio) administrative tools and daemons"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
+license="GPL-2.0-or-later"
+homepage="https://linux-ax25.in-berlin.de/wiki/Main_Page"
+distfiles="https://linux-ax25.in-berlin.de/pub/ax25-tools/ax25-tools-${version/rc/-rc}.tar.gz"
+checksum=92a9cb8b58a86dcb9f55630fc54c9a46c58a20fc93bed524b8c111190b36aa06

From c0095551fbdbb64575d4be040e6335056a6270b4 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Sun, 25 Jun 2023 11:18:32 -0700
Subject: [PATCH 1328/1853] zoom: update to 5.15.0.4063

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 7c2f5befa040..4271caca95a0 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.14.10.3738
+version=5.15.0.4063
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=a0b2b0b1d7cab73ad884ab469d22f2a2ba895593eae78b91f2f3d5ec91710e8a
+checksum=5cd162d5a86144e4f87967f5a132c7f0b8cb6d9585fdc02d1ae0ea8a20bbe9db
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From ccf22e4a0f39b4991a8ee5ce12d20407aca894dd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:33:18 +0200
Subject: [PATCH 1329/1853] openfortivpn: update to 1.20.5.

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index b8500f0f2546..ca5988ae420d 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.20.4
+version=1.20.5
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=af4b729baa60897a566c920bf34c9ed927eefe14909d13a980a25c8ae91f144f
+checksum=82581408fd3fff3e017ad188e648ce6e935febc97f6bcd96945372638bfc7f13
 
 conf_files="/etc/openfortivpn/config"
 

From 536455fec9fe67a3af43edc15932b917686c05f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:33:30 +0200
Subject: [PATCH 1330/1853] minidlna: update to 1.3.3.

---
 srcpkgs/minidlna/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index e8081b1cbc67..d551e49ed465 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,6 +1,6 @@
 # Template file for 'minidlna'
 pkgname=minidlna
-version=1.3.2
+version=1.3.3
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -20,7 +20,7 @@ license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://minidlna.sourceforge.net/"
 changelog="https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0
+checksum=39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4
 
 system_accounts="minidlna"
 minidlna_homedir="/var/lib/minidlna"

From 08bf23e09b9f5b4ac04eb905f136a2a2c20e8be6 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 1 Apr 2023 07:32:58 +0200
Subject: [PATCH 1331/1853] New package: skate-0.2.2

---
 srcpkgs/skate/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/skate/template

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
new file mode 100644
index 000000000000..df8f47371c47
--- /dev/null
+++ b/srcpkgs/skate/template
@@ -0,0 +1,26 @@
+# Template file for 'skate'
+pkgname=skate
+version=0.2.2
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/charmbracelet/skate"
+go_ldflags="-X main.Version=${version}"
+short_desc="Personal key value store"
+maintainer="zenobit <zen@osowoso.xyz>"
+license="MIT"
+homepage="https://github.com/charmbracelet/skate"
+changelog="https://github.com/charmbracelet/skate/releases"
+distfiles="https://github.com/charmbracelet/skate/archive/refs/tags/v${version}.tar.gz"
+checksum=e982348a89a54c0f9fafe855ec705c91b12eb3bb9aceb70b37abf7504106b04e
+
+post_install() {
+	vlicense LICENSE
+
+	for shell in bash fish zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/skate completion $shell > skate.${shell}
+		vcompletion skate.${shell} $shell
+	done
+	vtargetrun ${DESTDIR}/usr/bin/skate man > skate.1
+	vman skate.1
+}

From f33f1c7089ea8e8da60aeaf9881417837117d678 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 25 Jun 2023 14:42:40 -0400
Subject: [PATCH 1332/1853] knotes: add missing dep

---
 srcpkgs/knotes/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index f2a625cd5d72..99a5886c1d3a 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,12 +1,13 @@
 # Template file for 'knotes'
 pkgname=knotes
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
  kcoreaddons kdoctools kconfig gettext kcmutils"
 makedepends="akonadi-notes-devel kcalutils-devel kdelibs4support-devel kdnssd-devel
- knotifyconfig-devel kontactinterface-devel pimcommon-devel grantleetheme-devel"
+ knotifyconfig-devel kontactinterface-devel pimcommon-devel grantleetheme-devel
+ ktextaddons-devel"
 short_desc="Popup notes"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"

From ab3d9972541b3b83b3c841155fc04a142c8b6254 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:43:41 +0200
Subject: [PATCH 1333/1853] knotes: fix build

---
 ...90def780440587084811c35c1f7cae3b4eff.patch | 186 ++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch

diff --git a/srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch b/srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch
new file mode 100644
index 000000000000..fed1f2a490cc
--- /dev/null
+++ b/srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch
@@ -0,0 +1,186 @@
+From 1a6190def780440587084811c35c1f7cae3b4eff Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 23 Apr 2023 15:36:08 +0200
+Subject: [PATCH] Adapt to build against last textaddons
+
+---
+ CMakeLists.txt                                | 11 +++++++-
+ noteshared/src/CMakeLists.txt                 |  7 ++++-
+ noteshared/src/config-noshared.h.in           |  7 +++++
+ .../widget/richtexteditwithautocorrection.cpp | 26 +++++++++++++++++++
+ .../widget/richtexteditwithautocorrection.h   | 11 ++++++++
+ 5 files changed, 60 insertions(+), 2 deletions(-)
+ create mode 100644 noteshared/src/config-noshared.h.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e0cd817..e89e0781 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,7 +115,16 @@ find_package(KPim${KF_MAJOR_VERSION}PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CO
+ find_package(KPim${KF_MAJOR_VERSION}TextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KPim${KF_MAJOR_VERSION}GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
+ 
+-find_package(KF${KF_MAJOR_VERSION}TextAutoCorrection ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
++find_package(KF${KF_MAJOR_VERSION}TextAutoCorrectionWidgets ${KTEXTADDONS_MIN_VERSION} CONFIG)
++set_package_properties(KF${KF_MAJOR_VERSION}TextAutoCorrectionWidgets PROPERTIES DESCRIPTION
++    "Add support for text auto correction"
++    TYPE OPTIONAL
++)
++if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets)
++    set(HAVE_TEXT_AUTOCORRECTION_WIDGETS TRUE)
++else()
++    find_package(KF${KF_MAJOR_VERSION}TextAutoCorrection ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ 
+ find_package(KPim${KF_MAJOR_VERSION}AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
+ set_package_properties(KPim${KF_MAJOR_VERSION}AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://invent.kde.org/pim/akonadi-search" TYPE REQUIRED PURPOSE "Provides search capabilities in pim apps and Akonadi")
+diff --git a/noteshared/src/CMakeLists.txt b/noteshared/src/CMakeLists.txt
+index c3bd6dc4..49ec63be 100644
+--- a/noteshared/src/CMakeLists.txt
++++ b/noteshared/src/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
+ add_definitions(-DTRANSLATION_DOMAIN=\"libnoteshared\")
++configure_file(config-noshared.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-noshared.h)
+ 
+ 
+ set(libnoteshared_SRCS
+@@ -99,7 +100,11 @@ target_link_libraries(notesharedprivate
+     if (TARGET Qt::Core5Compat)
+         target_link_libraries(notesharedprivate PRIVATE Qt::Core5Compat)
+     endif()
+-    target_link_libraries(notesharedprivate PRIVATE KF${KF_MAJOR_VERSION}::TextAutoCorrection)
++    if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets)
++        target_link_libraries(notesharedprivate PRIVATE KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets)
++    else()
++        target_link_libraries(notesharedprivate PRIVATE KF${KF_MAJOR_VERSION}::TextAutoCorrection)
++    endif()
+ 
+ set_target_properties(notesharedprivate
+     PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
+diff --git a/noteshared/src/config-noshared.h.in b/noteshared/src/config-noshared.h.in
+new file mode 100644
+index 00000000..2f9f3f8e
+--- /dev/null
++++ b/noteshared/src/config-noshared.h.in
+@@ -0,0 +1,7 @@
++/*
++SPDX-License-Identifier: CC0-1.0
++SPDX-FileCopyrightText: none
++*/
++#pragma once
++
++#cmakedefine01 HAVE_TEXT_AUTOCORRECTION_WIDGETS
+diff --git a/noteshared/src/widget/richtexteditwithautocorrection.cpp b/noteshared/src/widget/richtexteditwithautocorrection.cpp
+index 8d42e2fd..2e51782f 100644
+--- a/noteshared/src/widget/richtexteditwithautocorrection.cpp
++++ b/noteshared/src/widget/richtexteditwithautocorrection.cpp
+@@ -5,7 +5,12 @@
+ */
+ 
+ #include "richtexteditwithautocorrection.h"
++
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++#include <TextAutoCorrectionCore/AutoCorrection>
++#else
+ #include <TextAutoCorrection/AutoCorrection>
++#endif
+ 
+ #include <QKeyEvent>
+ 
+@@ -15,7 +20,11 @@ class NoteShared::RichTextEditWithAutoCorrectionPrivate
+ {
+ public:
+     RichTextEditWithAutoCorrectionPrivate()
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++        : mAutoCorrection(new TextAutoCorrectionCore::AutoCorrection())
++#else
+         : mAutoCorrection(new TextAutoCorrection::AutoCorrection())
++#endif
+     {
+     }
+ 
+@@ -25,7 +34,11 @@ class NoteShared::RichTextEditWithAutoCorrectionPrivate
+             delete mAutoCorrection;
+         }
+     }
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++    TextAutoCorrectionCore::AutoCorrection *mAutoCorrection = nullptr;
++#else
+     TextAutoCorrection::AutoCorrection *mAutoCorrection = nullptr;
++#endif
+     bool mNeedToDelete = true;
+ };
+ 
+@@ -36,21 +49,34 @@ RichTextEditWithAutoCorrection::RichTextEditWithAutoCorrection(QWidget *parent)
+ }
+ 
+ RichTextEditWithAutoCorrection::~RichTextEditWithAutoCorrection() = default;
++
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++void RichTextEditWithAutoCorrection::setAutocorrection(TextAutoCorrectionCore::AutoCorrection *autocorrect)
++#else
+ void RichTextEditWithAutoCorrection::setAutocorrection(TextAutoCorrection::AutoCorrection *autocorrect)
++#endif
+ {
+     d->mNeedToDelete = false;
+     delete d->mAutoCorrection;
+     d->mAutoCorrection = autocorrect;
+ }
+ 
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++TextAutoCorrectionCore::AutoCorrection *RichTextEditWithAutoCorrection::autocorrection() const
++#else
+ TextAutoCorrection::AutoCorrection *RichTextEditWithAutoCorrection::autocorrection() const
++#endif
+ {
+     return d->mAutoCorrection;
+ }
+ 
+ void RichTextEditWithAutoCorrection::setAutocorrectionLanguage(const QString &language)
+ {
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++    TextAutoCorrectionCore::AutoCorrectionSettings *settings = d->mAutoCorrection->autoCorrectionSettings();
++#else
+     TextAutoCorrection::AutoCorrectionSettings *settings = d->mAutoCorrection->autoCorrectionSettings();
++#endif
+     settings->setLanguage(language);
+     d->mAutoCorrection->setAutoCorrectionSettings(settings);
+ }
+diff --git a/noteshared/src/widget/richtexteditwithautocorrection.h b/noteshared/src/widget/richtexteditwithautocorrection.h
+index 9ad9ec4e..787350d8 100644
+--- a/noteshared/src/widget/richtexteditwithautocorrection.h
++++ b/noteshared/src/widget/richtexteditwithautocorrection.h
+@@ -6,11 +6,17 @@
+ 
+ #pragma once
+ 
++#include "config-noshared.h"
+ #include <KPIMTextEdit/RichTextEditor>
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++namespace TextAutoCorrectionCore
++#else
+ namespace TextAutoCorrection
++#endif
+ {
+ class AutoCorrection;
+ }
++
+ namespace NoteShared
+ {
+ class RichTextEditWithAutoCorrectionPrivate;
+@@ -25,8 +31,13 @@ class RichTextEditWithAutoCorrection : public KPIMTextEdit::RichTextEditor
+     explicit RichTextEditWithAutoCorrection(QWidget *parent = nullptr);
+     ~RichTextEditWithAutoCorrection() override;
+ 
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++    Q_REQUIRED_RESULT TextAutoCorrectionCore::AutoCorrection *autocorrection() const;
++    void setAutocorrection(TextAutoCorrectionCore::AutoCorrection *autocorrect);
++#else
+     Q_REQUIRED_RESULT TextAutoCorrection::AutoCorrection *autocorrection() const;
+     void setAutocorrection(TextAutoCorrection::AutoCorrection *autocorrect);
++#endif
+ 
+     void setAutocorrectionLanguage(const QString &language);
+ 

From 2e7bdef71254a98e5fcd84d1c8c5049c4fca78e0 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Mon, 27 Mar 2023 07:50:20 +0100
Subject: [PATCH 1334/1853] New package: clifm-1.11

---
 srcpkgs/clifm/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/clifm/template

diff --git a/srcpkgs/clifm/template b/srcpkgs/clifm/template
new file mode 100644
index 000000000000..824f00db336e
--- /dev/null
+++ b/srcpkgs/clifm/template
@@ -0,0 +1,14 @@
+# Template file for 'clifm'
+pkgname=clifm
+version=1.11
+revision=1
+build_style=gnu-makefile
+make_install_args="MANDIR=/usr/share/man"
+makedepends="libcap-devel acl-devel file-devel readline-devel"
+short_desc="Command Line Interface File Manager"
+maintainer="Greg Beard <gmbeard@googlemail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/leo-arch/clifm"
+changelog="https://raw.githubusercontent.com/leo-arch/clifm/master/CHANGELOG"
+distfiles="https://github.com/leo-arch/clifm/releases/download/v${version}/clifm-${version}.tar.gz"
+checksum=32f69ab2215bfcf10e8fe3920c5b4ffd6e699a68463577b32c39f9189d5a9c56

From f265ddfd96e6790586e2c7aaf42f3d6baf995424 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Mar 2023 12:19:03 +0300
Subject: [PATCH 1335/1853] New package: rinstall-0.2.0

---
 srcpkgs/rinstall/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/rinstall/template

diff --git a/srcpkgs/rinstall/template b/srcpkgs/rinstall/template
new file mode 100644
index 000000000000..3514d61352b8
--- /dev/null
+++ b/srcpkgs/rinstall/template
@@ -0,0 +1,13 @@
+# Template file for 'rinstall'
+pkgname=rinstall
+version=0.2.0
+revision=1
+build_style=cargo
+short_desc="Declarative install for programs"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/danyspin97/rinstall"
+changelog="https://raw.githubusercontent.com/danyspin97/rinstall/main/CHANGELOG.md"
+distfiles="https://github.com/danyspin97/rinstall/archive/refs/tags/${version}.tar.gz"
+checksum=386ae4d52ad62b03304596d5dfc7bb273492ac3fed54f1110d0da8dc1847e4c6
+conflicts="rset"

From fda51a9f335f7d6244129e83c82f50b2a6c6724e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 1 Mar 2023 23:18:45 +0100
Subject: [PATCH 1336/1853] New package: netavark-1.6.0

---
 srcpkgs/netavark/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/netavark/template

diff --git a/srcpkgs/netavark/template b/srcpkgs/netavark/template
new file mode 100644
index 000000000000..4bc741f29a5f
--- /dev/null
+++ b/srcpkgs/netavark/template
@@ -0,0 +1,23 @@
+# Template file for 'netavark'
+pkgname=netavark
+version=1.6.0
+revision=1
+build_style=cargo
+hostmakedepends="mandown protobuf"
+short_desc="Container network stack"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/containers/netavark"
+changelog="https://raw.githubusercontent.com/containers/netavark/main/RELEASE_NOTES.md"
+distfiles="https://github.com/containers/netavark/archive/refs/tags/v${version}.tar.gz"
+checksum=3bec9e9b0f3f8f857370900010fb2125ead462d43998ad8f43e4387a5b06f9d6
+# needs unshare which cannot be used in CI
+make_check=ci-skip
+
+post_install() {
+	vmkdir usr/libexec/podman
+	ln -sf ../../bin/netavark "${DESTDIR}/usr/libexec/podman"
+	ln -sf ../../bin/netavark-dhcp-proxy-client "${DESTDIR}/usr/libexec/podman"
+	mandown docs/netavark.1.md > netavark.1
+	vman netavark.1
+}

From 7b1d8daf65ce7054088755fc1068c8ad3a9c2f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 1 Mar 2023 23:29:23 +0100
Subject: [PATCH 1337/1853] New package: aardvark-dns-1.6.0

---
 srcpkgs/aardvark-dns/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/aardvark-dns/template

diff --git a/srcpkgs/aardvark-dns/template b/srcpkgs/aardvark-dns/template
new file mode 100644
index 000000000000..c4a47746f1f3
--- /dev/null
+++ b/srcpkgs/aardvark-dns/template
@@ -0,0 +1,17 @@
+# Template file for 'aardvark-dns'
+pkgname=aardvark-dns
+version=1.6.0
+revision=1
+build_style=cargo
+short_desc="Authoritative dns server for A/AAAA container records"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/containers/aardvark-dns"
+changelog="https://raw.githubusercontent.com/containers/aardvark-dns/main/RELEASE_NOTES.md"
+distfiles="https://github.com/containers/aardvark-dns/archive/refs/tags/v${version}.tar.gz"
+checksum=f3a2ff2d7baf07d8bf2785b6f1c9618db8aa188bd738b7f5cf1b0a31848232f5
+
+post_install() {
+	vmkdir usr/libexec/podman
+	ln -sf ../../bin/aardvark-dns "${DESTDIR}/usr/libexec/podman"
+}

From c084bea1d86f7459e32aa0e6e10485c3e04f7631 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Thu, 6 Apr 2023 09:40:03 -0600
Subject: [PATCH 1338/1853] New package: moar-1.13.0

---
 srcpkgs/moar/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/moar/template

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
new file mode 100644
index 000000000000..381454967d4e
--- /dev/null
+++ b/srcpkgs/moar/template
@@ -0,0 +1,20 @@
+# Template file for 'moar'
+pkgname=moar
+version=1.13.0
+revision=1
+build_style=go
+go_import_path=github.com/walles/moar
+go_ldflags="-X main.versionString=${version}"
+short_desc="Drop-in replacement for the less pager"
+maintainer="Diego Magdaleno <diegomagdaleno@pm.me>"
+license="BSD-2-Clause"
+homepage="https://github.com/walles/moar"
+changelog="https://github.com/waller/moar/releases"
+distfiles="https://github.com/walles/moar/archive/refs/tags/v${version}.tar.gz"
+checksum=65eac0d4f8a40f0198a93f0888a60a28e8466b2ee9d0437f143db5c25d5e9319
+conflicts="MoarVM"
+
+post_install() {
+	vman moar.1
+	vlicense LICENSE
+}

From 45ca6435904999c54ae1714aa922570c4558676d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 22 Mar 2023 01:12:44 +0530
Subject: [PATCH 1339/1853] New package: zet-1.0.0

---
 srcpkgs/zet/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/zet/template

diff --git a/srcpkgs/zet/template b/srcpkgs/zet/template
new file mode 100644
index 000000000000..86c2fdad2b29
--- /dev/null
+++ b/srcpkgs/zet/template
@@ -0,0 +1,13 @@
+# Template file for 'zet'
+pkgname=zet
+version=1.0.0
+revision=1
+build_style=cargo
+short_desc="CLI to find union, intersection, set difference, etc of files"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://github.com/yarrow/zet"
+changelog="https://raw.githubusercontent.com/yarrow/zet/main/CHANGELOG.md"
+distfiles="https://github.com/yarrow/zet/archive/refs/tags/v${version}.tar.gz"
+checksum=792a1a1de73bf4145ccaa71f8e6bb34b62e690270a432c4de4d8639e1a741b5b
+make_check=no # https://github.com/yarrow/zet/commit/8e21b96ec73979adcfb92550906e8d49fe46e75f

From 32b528605b4a636b27fab145d04749ab1e66ded0 Mon Sep 17 00:00:00 2001
From: Maeve Sproule <code@sprock.dev>
Date: Sun, 12 Mar 2023 14:38:57 -0600
Subject: [PATCH 1340/1853] New package: offpunk-1.9.2

---
 srcpkgs/offpunk/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/offpunk/template

diff --git a/srcpkgs/offpunk/template b/srcpkgs/offpunk/template
new file mode 100644
index 000000000000..c31ee75c07f9
--- /dev/null
+++ b/srcpkgs/offpunk/template
@@ -0,0 +1,21 @@
+# Template file for 'offpunk'
+pkgname=offpunk
+version=1.9.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="chafa file less python3-BeautifulSoup4 python3-cryptography
+ python3-feedparser python3-readability-lxml python3-requests
+ python3-setproctitle timg xdg-utils xsel"
+short_desc="Offline-first command-line browser for gemini, gopher and the web"
+maintainer="Maeve Sproule <code@sprock.dev>"
+license="BSD-2-Clause"
+homepage="https://sr.ht/~lioploum/offpunk"
+changelog="https://git.sr.ht/~lioploum/offpunk/blob/master/CHANGELOG"
+distfiles="https://git.sr.ht/~lioploum/offpunk/archive/v${version}.tar.gz"
+checksum=96574ac3754f1564af4a2231c7ef0c2ff238b99f118a1244c8baafc4dd753a76
+
+post_install() {
+	vlicense LICENSE
+	vman man/offpunk.1
+}

From 9ae62fc2801a894c2f307020ca50b4f751fd241b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 30 Jan 2023 09:22:24 -0500
Subject: [PATCH 1341/1853] New package: elfkickers-3.2.

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: #41960 [via git-merge-pr]
---
 .../patches/elfkickers-3.1-AR.patch           |  24 ++++
 ...lfkickers-3.1-respect-CFLAGS-LDFLAGS.patch | 104 ++++++++++++++++++
 .../patches/elfkickers-3.2-cross.patch        |  12 ++
 .../patches/elfkickers-3.2-install.patch      |  24 ++++
 srcpkgs/elfkickers/template                   |  14 +++
 5 files changed, 178 insertions(+)
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch
 create mode 100644 srcpkgs/elfkickers/template

diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch b/srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch
new file mode 100644
index 000000000000..dc1726a7706f
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch
@@ -0,0 +1,24 @@
+https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/elfkickers/files
+https://bugs.gentoo.org/724258
+--- a/ebfc/Makefile
++++ b/ebfc/Makefile
+@@ -10,7 +10,7 @@ brainfuck.o: brainfuck.c elfparts.h ebfc.h
+ 
+ libelfparts.a: elfparts.o ehdr.o phdrtab.o shdrtab.o progbits.o	\
+                strtab.o symtab.o hash.o rel.o got.o dynamic.o
+-	ar crs libelfparts.a $^
++	$(AR) crs libelfparts.a $^
+ 
+ elfparts.o: elfparts.c elfparts.h gen.h
+ ehdr.o: ehdr.c elfparts.h gen.h
+--- a/elfrw/Makefile
++++ b/elfrw/Makefile
+@@ -6,7 +6,7 @@ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+ 
+ libelfrw.a: $(LIBOBJS)
+-	ar crs $@ $^
++	$(AR) crs $@ $^
+ 
+ elfrw.o: elfrw.c elfrw.h elfrw_int.h
+ elfrw_dyn.o: elfrw_dyn.c elfrw_int.h
diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch b/srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..beedffa94031
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,104 @@
+https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/elfkickers/files
+diff -Naur ELFkickers-3.1.orig/ebfc/Makefile ELFkickers-3.1/ebfc/Makefile
+--- ELFkickers-3.1.orig/ebfc/Makefile	2014-11-17 14:50:34.000000000 -0500
++++ ELFkickers-3.1/ebfc/Makefile	2016-11-16 17:13:53.297033908 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for ebfc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
++CC ?= gcc
++CFLAGS += -Wno-missing-field-initializers
+ 
+ ebfc: ebfc.o brainfuck.o libelfparts.a
+ 
+diff -Naur ELFkickers-3.1.orig/elfls/Makefile ELFkickers-3.1/elfls/Makefile
+--- ELFkickers-3.1.orig/elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.1/elfls/Makefile	2016-11-16 17:12:48.885032137 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for elfls
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ elfls: elfls.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/elfrw/Makefile ELFkickers-3.1/elfrw/Makefile
+--- ELFkickers-3.1.orig/elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.1/elfrw/Makefile	2016-11-16 17:13:06.653032625 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for libelfrw.a
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -O3
++CC ?= gcc
+ 
+ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+diff -Naur ELFkickers-3.1.orig/elftoc/Makefile ELFkickers-3.1/elftoc/Makefile
+--- ELFkickers-3.1.orig/elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.1/elftoc/Makefile	2016-11-16 17:12:57.549032375 -0500
+@@ -1,8 +1,6 @@
+ #  Makefile for elftoc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
+        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
+diff -Naur ELFkickers-3.1.orig/infect/Makefile ELFkickers-3.1/infect/Makefile
+--- ELFkickers-3.1.orig/infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.1/infect/Makefile	2016-11-16 17:12:30.617031634 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.1.orig/objres/Makefile ELFkickers-3.1/objres/Makefile
+--- ELFkickers-3.1.orig/objres/Makefile	2016-11-14 16:46:24.000000000 -0500
++++ ELFkickers-3.1/objres/Makefile	2016-11-16 17:13:40.225033549 -0500
+@@ -1,8 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.o ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/rebind/Makefile ELFkickers-3.1/rebind/Makefile
+--- ELFkickers-3.1.orig/rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.1/rebind/Makefile	2016-11-16 17:13:17.373032920 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for rebind
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ rebind: rebind.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/sstrip/Makefile ELFkickers-3.1/sstrip/Makefile
+--- ELFkickers-3.1.orig/sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.1/sstrip/Makefile	2016-11-16 17:14:05.949034256 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for sstrip
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ sstrip: sstrip.c ../elfrw/libelfrw.a
+ 
diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch b/srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch
new file mode 100644
index 000000000000..2a13f820eec8
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch
@@ -0,0 +1,12 @@
+--- a/elftoc/Makefile
++++ b/elftoc/Makefile
+@@ -35,7 +35,9 @@
+ 	rm -f ./~elftmp.c
+ 
+ mknames: mknames.o
++	$(CC_FOR_BUILD) -o $@ $^
+ mknames.o: mknames.c
++	$(CC_FOR_BUILD) -c $^ $@
+ 
+ clean:
+ 	rm -f $(OBJS) elftoc elfnames.c mknames mknames.o
diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch b/srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch
new file mode 100644
index 000000000000..9ef65c547a27
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,5 @@
+ #  The top-level makefile simply invokes all the other makefiles
+ 
+-prefix = /usr/local
+-
+ PROGRAMS = elfls objres rebind sstrip elftoc ebfc infect
+ 
+ all: $(PROGRAMS)
+@@ -24,10 +22,9 @@
+ infect: bin/infect doc/infect.1
+ 
+ install: $(PROGRAMS)
+-	mkdir -p $(prefix)/bin
+-	cp bin/* $(prefix)/bin/.
+-	mkdir -p $(prefix)/share/man/man1
+-	cp doc/* $(prefix)/share/man/man1/.
++	install -d $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/man/man1
++	install bin/* $(DESTDIR)$(prefix)/bin
++	install -m 644 doc/* $(DESTDIR)$(prefix)/share/man/man1
+ 
+ clean:
+ 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/srcpkgs/elfkickers/template b/srcpkgs/elfkickers/template
new file mode 100644
index 000000000000..977b6e4cd4ef
--- /dev/null
+++ b/srcpkgs/elfkickers/template
@@ -0,0 +1,14 @@
+# Template file for 'elfkickers'
+pkgname=elfkickers
+version=3.2
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Collection of ELF utilities"
+maintainer="Zlice <zlice555@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+distfiles="http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"
+checksum=9b81e6c53e0c94fc198d9882eb737156f36d565152dc32118897c77b06a2687c
+
+disable_parallel_build=yes # makefiles are pretty broken

From 881fa829c30ca8d0fcd41a7d598b030db5834985 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 1342/1853] virtuoso: update to 7.2.10

test suite was failing on revbump

- remove patches that no longer apply
- disable static libraries as we're removing them after install anyway
- disable tgraphql test (fails inside ./xbps-src)
- add which to hostmakedepends
- add missing checkdepends
- update project homepage
---
 .../virtuoso/patches/always-ieee-floats.patch |   46 -
 .../patches/disable-tgraphql-test.patch       |   12 +
 .../virtuoso/patches/fix-utf8-bittest.patch   |   15 -
 srcpkgs/virtuoso/patches/musl-page_size.patch |   34 -
 .../remove-openssl-version-check.patch        |   48 -
 .../virtuoso/patches/ssl-connect-state.patch  |   15 -
 srcpkgs/virtuoso/patches/ssl1.1.patch         | 1400 -----------------
 srcpkgs/virtuoso/patches/ssl1.1_more.patch    |   20 -
 srcpkgs/virtuoso/patches/use-mkstemp.patch    |   18 -
 srcpkgs/virtuoso/template                     |   25 +-
 10 files changed, 23 insertions(+), 1610 deletions(-)
 delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
 create mode 100644 srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
 delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
 delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
 delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
 delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
 delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
 delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
 delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch

diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h>			 /* for ntohl, htonl */
- #endif
- 
--#if defined (i386) || \
--    defined (_WIN64) || \
--    defined (_M_IX86) || \
--    defined (_M_ALPHA) || \
--    defined (mc68000) || \
--    defined (sparc) || \
--    defined (__x86_64) || \
--    defined (__alpha) || \
--    defined (__powerpc) || \
--    defined (mips) || \
--    defined (__OS2__) || \
--    defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
- 
- macro_char_func readtable[256];
- ses_write_func writetable[256];
--- 
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/disable-tgraphql-test.patch b/srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
new file mode 100644
index 000000000000..dbd2c467eb1a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
@@ -0,0 +1,12 @@
+--- a/binsrc/tests/suite/testall.sh	2023-02-27 18:05:33.000000000 +0100
++++ b/binsrc/tests/suite/testall.sh	2023-03-09 14:55:56.918657063 +0100
+@@ -136,8 +136,7 @@
+ rtest \
+ trepl_rdf \
+ tsoap12 \
+-tvspxex \
+-tgraphql "
++tvspxex "
+ 
+ QUICKTEST=1
+ TPCDMODE=local
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c	2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c	2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
-           for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
-           for (c = 128; c < 256; c++)
-             {
--            if ((tcode[c/8] && (1 << (c&7))) != 0)
-+            if ((tcode[c/8] & (1 << (c&7))) != 0)
-               {
-               int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
-               start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
- 
- #include <sys/types.h>
-+#include <unistd.h>
- 
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
- 
- #define DEFAULT_AREA_SIZE (1024*10)
- 
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
- 
- #ifndef WIN32
- #ifdef USE_PRINTF
--- 
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac	2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac	2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl	AM_INIT_AUTOMAKE([1.8])
- dnl	AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
- 
- AM_MAINTAINER_MODE
- 
-@@ -867,32 +867,6 @@
- 	;;
- esac
- 
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old 
--#endif
--    ],[
--      AC_MSG_RESULT([>= 0.9.8e])
--    ],[
--      AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
--    ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
--    ],[
--      AC_MSG_RESULT([< 1.1.0])
--    ],[
--      AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
--    ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c	2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c	2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- 	  cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- 	  sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- 	}
--      ssl->state = SSL_ST_ACCEPT;
-+      SSL_set_accept_state (ssl);
-       while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- 	{
- 	  timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c      |   6 +-
- libsrc/Wi/bif_crypto.c   | 120 ++++++++++--------
- libsrc/Wi/http.c         |   2 +-
- libsrc/Wi/xmlenc.c       | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h       | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c  |   6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
-   unsigned char temp[EVP_MAX_MD_SIZE];
-   unsigned int size = 0;
-   caddr_t res = NULL;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   const EVP_MD *md = EVP_sha1 ();
- 
-   if (alg == 1)
-     md = EVP_ripemd160 ();
- 
--  HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
--  box_hmac_1 (box, &ctx);
--  HMAC_Final (&ctx, temp, &size);
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return res;
-+
-+  HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+  box_hmac_1 (box, ctx);
-+  HMAC_Final (ctx, temp, &size);
-   if (size)
-     {
-       res = dk_alloc_box (size + 1, DV_SHORT_STRING);
-       memcpy (res, temp, size);
-       res[size] = 0;
-     }
-+  HMAC_CTX_free(ctx);
-   return res;
- }
- 
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 	    {
- 	      int ii;
- 
--	      opp = op;
--	      ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
--	      if (ii < 0)
-+	      if (len + hl < 1)
- 		{
- 		  if (BIO_write (bp, "Bad boolean\n", 12))
- 		    goto end;
- 		}
--	      BIO_printf (bp, "%d", ii);
-+	      BIO_printf (bp, "%d", p[0]);
- 	    }
- 	  else if (tag == V_ASN1_BMPSTRING)
- 	    {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 		}
- 	      if (os != NULL)
- 		{
--		  M_ASN1_OCTET_STRING_free (os);
-+		  ASN1_STRING_free (os);
- 		  os = NULL;
- 		}
- 	    }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 		  if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- 		    goto end;
- 		}
--	      M_ASN1_INTEGER_free (bs);
-+	      ASN1_STRING_free (bs);
- 	    }
- 	  else if (tag == V_ASN1_ENUMERATED)
- 	    {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 		  if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- 		    goto end;
- 		}
--	      M_ASN1_ENUMERATED_free (bs);
-+	      ASN1_STRING_free (bs);
- 	    }
- 	  else if (len > 0 && dump)
- 	    {
-@@ -515,7 +518,7 @@ end:
-   if (o != NULL)
-     ASN1_OBJECT_free (o);
-   if (os != NULL)
--    M_ASN1_OCTET_STRING_free (os);
-+    ASN1_STRING_free (os);
-   *pp = p;
-   return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
-   int len = BIO_get_mem_data (out_bio, &ptr);
-   int to_read = len, readed = 0;
- 
--  to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+  to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
-   BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
-   CATCH_WRITE_FAIL (ses)
-     {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
-       } while (to_read > 0);
-     }
-   END_WRITE_FAIL (ses);
--  ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+  ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
-   BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
-   return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
-   if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
-     {
-       in_bio = strses_to_bio ((dk_session_t *) msg);
--      to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+      to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
-       BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
-     }
-   else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
-       p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
-       if (to_free)
- 	{
--	  ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+	  ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- 	  BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- 	}
-       BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
-     }
- 
-   certs = sk_X509_new_null ();
--  if (store && store->objs)
-+
-+  if (store && X509_STORE_get0_objects(store))
-     {
--      for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+      STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+      for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- 	{
--	  X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
--	  if (obj->type == X509_LU_X509)
--	    sk_X509_push (certs, X509_dup (obj->data.x509));
-+	  X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+	  if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+	    sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- 	}
- 
-     }
-+
-   if (store)
-     X509_STORE_free (store);
-   in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
-     sqlr_new_error ("42000", "CR006", "No recipient certificates");
- 
-   certs = sk_X509_new_null ();
--  if (store && store->objs)
-+
-+  if (store && X509_STORE_get0_objects(store))
-     {
--      for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+      STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+      for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- 	{
--	  X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
--	  if (obj->type == X509_LU_X509)
--	    sk_X509_push (certs, X509_dup (obj->data.x509));
-+	  X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+	  if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+	    sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- 	}
-     }
-+
-   if (store)
-     X509_STORE_free (store);
-   in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
-   char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
-   if (!ok && opts)
-     {
--      switch (ctx->error)
-+      switch (X509_STORE_CTX_get_error(ctx))
- 	{
- 	case X509_V_ERR_CERT_HAS_EXPIRED:
- 	  if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
-   if (!i)
-     {
-       const char *err_str;
--      err_str = X509_verify_cert_error_string (csc->error);
-+      err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
-       *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
-     }
- 
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
- 
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
-   size_t buf_len, n;
-   caddr_t buf;
-   buf_len = (size_t) BN_num_bytes (x);
--  if (buf_len <= BN_BYTES)
--    buf = box_num ((unsigned long) x->d[0]);
--  else
--    {
--      buf = dk_alloc_box (buf_len, DV_BIN);
--      n = BN_bn2bin (x, (unsigned char *) buf);
--      if (n != buf_len)
--	GPF_T;
--    }
-+  /* did not figure out where buf is free()ed */
-+  buf = dk_alloc_box (buf_len, DV_BIN);
-+  n = BN_bn2bin (x, (unsigned char *) buf);
-+  if (n != buf_len)
-+	  GPF_T;
-   return buf;
- }
- 
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- 	int i;
- 	char tmp[1024];
- 	char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
--	STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+	const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- 	for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- 	  {
- 	    X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- 		char *data_ptr;
- 		BIO *mem = BIO_new (BIO_s_mem ());
- 		if (!X509V3_EXT_print (mem, ex, 0, 0))
--		  M_ASN1_OCTET_STRING_print (mem, ex->value);
-+		  ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- 		len = BIO_get_mem_data (mem, &data_ptr);
- 		if (len > 0 && data_ptr)
- 		  {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- 	if (k)
- 	  {
- #ifdef EVP_PKEY_RSA
--	    if (k->type == EVP_PKEY_RSA)
-+	    if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	      {
--		RSA *x = k->pkey.rsa;
--		ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+		const BIGNUM *n, *e;
-+
-+		RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+		ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- 	      }
- 	    else
- #endif
- #ifdef EVP_PKEY_DSA
--	    if (k->type == EVP_PKEY_DSA)
-+	    if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- 	      {
--		DSA *x = k->pkey.dsa;
--		ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+		const BIGNUM *pub_key;
-+
-+		DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+		ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- 	      }
- 	    else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- 	int n, i, len;
- 	char *s, *data_ptr;
- 	BIO *mem = BIO_new (BIO_s_mem ());
--	for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+	for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- 	  {
--	    ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
--	    n = OBJ_obj2nid (ne->object);
-+	    ne = X509_NAME_get_entry(subj, i);
-+	    n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- 	    if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- 	      {
--		i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+		i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- 		s = buffer;
- 	      }
- 	    if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- 		break;
- 	      }
- 	  }
-+
- 	if (ne_ret)
- 	  {
--	    ASN1_STRING_print (mem, ne_ret->value);
-+	    ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- 	    len = BIO_get_mem_data (mem, &data_ptr);
- 	    if (len > 0 && data_ptr)
- 	      {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- 	dk_set_t set = NULL;
- 	caddr_t val;
- 	BIO *mem = BIO_new (BIO_s_mem ());
--	for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+	for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- 	  {
- 	    val = NULL;
--	    ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
--	    n = OBJ_obj2nid (ne->object);
-+	    ne = X509_NAME_get_entry(subj, i);
-+	    n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- 	    if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- 	      {
--		i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+		i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- 		s = buffer;
- 	      }
--	    ASN1_STRING_print (mem, ne->value);
-+	    ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- 	    len = BIO_get_mem_data (mem, &data_ptr);
- 	    if (len > 0 && data_ptr)
- 	      {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- 	  }
- 	BIO_free (mem);
- 	ret = list_to_array (dk_set_nreverse (set));
-+
- 	break;
-       }
-     case 12:
-       {
- 	const unsigned char *s;
- 	int i, n;
--	const ASN1_STRING *sig = cert->signature;
--	X509_ALGOR *sigalg = cert->sig_alg;
-+	const ASN1_STRING *sig;
-+	const X509_ALGOR *sigalg;
-+	const ASN1_OBJECT *sig_alg_algorithm;
- 	char buf[80];
- 	caddr_t val;
- 
--        i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+	X509_get0_signature(&sig, &sigalg, cert);
-+	X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+	i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
- 
- 	n = sig->length;
- 	s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- 	if (k)
- 	  {
- #ifdef EVP_PKEY_RSA
--	    if (k->type == EVP_PKEY_RSA)
-+	    if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	      {
- 		char *data_ptr;
- 		int len;
--		RSA *x = k->pkey.rsa;
-+		RSA *x = EVP_PKEY_get0_RSA(k);
- 		b = BIO_new (BIO_s_mem());
- 		i2d_RSA_PUBKEY_bio (b, x);
- 		len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
- 
- 
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
--  p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
-   RSA *rsa = NULL;
--  int num=1024;
--  unsigned long f4=RSA_F4;
-+  BIGNUM *bn = NULL;
-   int r;
-+
-   xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
-   if (NULL == pkey)
-     SQLR_NEW_KEY_ERROR (name);
- 
--  rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+  rsa = RSA_new();
-+  if (!rsa)
-+	  goto out;
-+  bn = BN_new();
-+  if (!bn)
-+	  goto out;
-+  if (!BN_set_word(bn, RSA_F4))
-+	  goto out;
-+
-+  if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+	  goto out;
-+
-   r = RSA_check_key(rsa);
-+  if (r != 1)
-+	  goto out;
-   pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
--  if (rsa == NULL)
--    {
--      sqlr_new_error ("42000", "XENC06",
--		    "RSA parameters generation error");
--    }
-   pkey->xek_rsa = rsa;
-   pkey->xek_private_rsa = rsa;
-+  BN_free(bn);
-   return 0;
-+out:
-+  if (bn)
-+	  BN_free(bn);
-+  if (rsa)
-+	  RSA_free(rsa);
-+  sqlr_new_error ("42000", "XENC06",
-+		  "RSA parameters generation error");
-+  return -1;
- }
- 
- 
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
- 
-   if (pkey)
-     {
--      switch (EVP_PKEY_type (pkey->type))
-+      switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- 	{
- 	case EVP_PKEY_DSA:
- 	  sign_algoname = DSIG_DSA_SHA1_ALGO;
- 	  enc_algoname = XENC_DSA_ALGO;
--	  dsa = pkey->pkey.dsa;
--	  private_dsa = private_key ? private_key->pkey.dsa : 0;
-+	  dsa = EVP_PKEY_get0_DSA(pkey);
-+	  private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- 	  break;
- 	case EVP_PKEY_RSA:
- 	  sign_algoname = DSIG_RSA_SHA1_ALGO;
- 	  enc_algoname = XENC_RSA_ALGO;
--	  rsa = pkey->pkey.rsa;
--	  private_rsa = private_key ? private_key->pkey.rsa : 0;
-+	  rsa = EVP_PKEY_get0_RSA(pkey);
-+	  private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- 	  break;
- 	default:
- 	  goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
-   return k;
- }
- 
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
--  p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
-       dh = DH_new ();
-       bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
-       bn_g = BN_bin2bn (g_bin, 1, NULL);
--      dh->p = bn_p;
--      dh->g = bn_g;
-+      if (dh)
-+	      DH_set0_pqg(dh, bn_p, NULL, bn_g);
- 
-       dk_free_box (mod_b64);
-       dk_free_box (mod);
-     }
-   else
-     {
--      dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+      dh = DH_new();
-+      if (dh) {
-+	      if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+		      DH_free(dh);
-+		      dh = NULL;
-+	      }
-+      }
-     }
-   if (!dh)
-     {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
-   int n, len;
-   caddr_t buf = NULL, ret, b64;
-   DH *dh;
--  BIGNUM *num;
-+  const BIGNUM *num;
- 
-   mutex_enter (xenc_keys_mtx);
-   key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
-   switch (param)
-     {
-   	case 1:
--	 num = dh->p;
-+	 DH_get0_pqg(dh, &num, NULL, NULL);
- 	 break;
- 	case 2:
--	 num = dh->g;
-+	 DH_get0_pqg(dh, NULL, NULL, &num);
- 	 break;
- 	case 3:
--	 num = dh->pub_key;
-+	 DH_get0_key(dh, &num, NULL);
- 	 break;
- 	case 4:
--	 num = dh->priv_key;
-+	 DH_get0_key(dh, NULL, &num);
- 	 break;
- 	default:
--	 num = dh->pub_key;
-+	 DH_get0_key(dh, &num, NULL);
-     }
- 
-   buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-   xenc_key_t * k;
-   caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
-   int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
--  RSA *rsa = NULL;
-+  RSA *rsa;
-+  BIGNUM *bn;
-+
-+  rsa = RSA_new();
-+  bn = BN_new();
-+  if (!rsa || !bn)
-+	goto out;
-+  if (!BN_set_word(bn, RSA_F4))
-+	goto out;
- 
-   mutex_enter (xenc_keys_mtx);
-   if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-       SQLR_NEW_KEY_EXIST_ERROR (name);
-     }
- 
--  rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
--  if (rsa == NULL)
--    {
--      sqlr_new_error ("42000", "XENC06", "RSA generation error");
--    }
-+  if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+	  mutex_leave (xenc_keys_mtx);
-+	  goto out;
-+  }
-+  BN_free(bn);
- 
-   k->xek_rsa = RSAPublicKey_dup (rsa);
-   k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- 
-   mutex_leave (xenc_keys_mtx);
-   return NULL;
-+out:
-+  if (bn)
-+	  BN_free(bn);
-+  if (rsa)
-+	  RSA_free(rsa);
-+  sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+  return NULL;
- }
- 
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
-     SQLR_NEW_KEY_ERROR (name);
- 
-   RAND_poll ();
--  dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+  dsa = DSA_new();
-+  if (dsa) {
-+	  if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+		  DSA_free(dsa);
-+		  dsa = NULL;
-+	  }
-+  }
-   if (dsa == NULL)
-     {
-       sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
-   if (NULL == pkey)
-     SQLR_NEW_KEY_ERROR (name);
- 
--  dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+  dh = DH_new();
-+  if (dh) {
-+	  if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+		  DH_free(dh);
-+		  dh = NULL;
-+	  }
-+  }
-   if (!dh)
-     {
-       sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-     {
-       in = BIO_new_mem_buf (key_base64, len);
-       pkey = d2i_PUBKEY_bio (in, NULL);
--      if (pkey && pkey->type == EVP_PKEY_RSA)
--	p = pkey->pkey.rsa;
-+      if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+	p = EVP_PKEY_get0_RSA(pkey);
-       BIO_reset (in);
-       pkkey = d2i_PrivateKey_bio (in, NULL);
--      if (pkkey && pkkey->type == EVP_PKEY_RSA)
--	r = pkkey->pkey.rsa;
-+      if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+	r = EVP_PKEY_get0_RSA(pkkey);
-       BIO_free (in);
-     }
-   else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- 
-   if (!p)
-     {
-+      const BIGNUM *n, *e;
-+
-+      RSA_get0_key(r, &n, &e, NULL);
-       p = RSA_new ();
--      p->n = BN_dup (r->n);
--      p->e = BN_dup (r->e);
-+      RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
-     }
- 
-   mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
-   p = RSA_new ();
-   n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
-   e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
--  p->n = n;
--  p->e = e;
-+  RSA_set0_key(p, n, e, NULL);
-   if (pexp)
-     {
-       pk = RSA_new ();
--      pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
--      pk->n = BN_dup (n);
--      pk->e = BN_dup (e);
-+      RSA_set0_key(p, BN_dup(n),
-+		      BN_dup(e),
-+		      BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
-     }
-   mutex_enter (xenc_keys_mtx);
-   k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
- 
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
-  char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
-  char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
-   caddr_t ** array;
-   if (key->xek_type == DSIG_KEY_RSA)
-     {
-+      const BIGNUM *rsa_n, *rsa_e;
-+
-+      RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
-       xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
-       xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
-       xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
- 
--      xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
--      xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+      xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+      xenc_tag_add_child_BN (rsaexponent, rsa_e);
- 
-       xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
-       xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
-       xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
-       xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
-       DSA * dsa = key->ki.dsa.dsa_st;
-+      const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
- 
-+      DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+      DSA_get0_key(dsa, &dsa_pub_key, NULL);
- 
--      xenc_tag_add_child_BN (p, dsa->p);
--      xenc_tag_add_child_BN (p, dsa->q);
--      xenc_tag_add_child_BN (p, dsa->g);
--      xenc_tag_add_child_BN (p, dsa->pub_key);
-+      xenc_tag_add_child_BN (p, dsa_p);
-+      xenc_tag_add_child_BN (p, dsa_q);
-+      xenc_tag_add_child_BN (p, dsa_g);
-+      xenc_tag_add_child_BN (p, dsa_pub_key);
- 
-       xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
-       xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
- 
-   ret = dk_alloc_box (ikeyid->length, DV_BIN);
-   memcpy (ret, ikeyid->data, ikeyid->length);
--  M_ASN1_OCTET_STRING_free(ikeyid);
-+  ASN1_STRING_free(ikeyid);
-   return ret;
- }
- 
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
- 
-   ret = dk_alloc_box (ikeyid->length, DV_BIN);
-   memcpy (ret, ikeyid->data, ikeyid->length);
--  M_ASN1_OCTET_STRING_free(ikeyid);
-+  ASN1_STRING_free(ikeyid);
-   return ret;
- }
- 
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- 	sk_X509_EXTENSION_push(st_exts, ex);
-     }
-   X509_REQ_add_extensions(x, st_exts);
--  if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+  if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
-     {
-       pk = NULL; /* keep one in the xenc_key */
-       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
-       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
-       goto err;
-     }
--  switch (EVP_PKEY_type (cli_pk->type))
-+  switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
-     {
-       case EVP_PKEY_DSA:
- 	  sign_algoname = DSIG_DSA_SHA1_ALGO;
- 	  enc_algoname = XENC_DSA_ALGO;
--	  dsa = cli_pk->pkey.dsa;
-+	  dsa = EVP_PKEY_get0_DSA(cli_pk);
- 	  break;
-       case EVP_PKEY_RSA:
- 	  sign_algoname = DSIG_RSA_SHA1_ALGO;
- 	  enc_algoname = XENC_RSA_ALGO;
--	  rsa = cli_pk->pkey.rsa;
-+	  rsa = EVP_PKEY_get0_RSA(cli_pk);
- 	  break;
-       default:
- 	  *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
-   if (export_chain)
-     {
-       int i;
--      X509_STORE_CTX store_ctx;
--      X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
--      if (X509_verify_cert (&store_ctx) > 0)
--	chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+      X509_STORE_CTX *ctx;
-+      X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+      if (X509_verify_cert (ctx) > 0)
-+	chain = X509_STORE_CTX_get1_chain (ctx);
-       else
- 	{
- 	  const char *err_str;
--	  err_str = X509_verify_cert_error_string (store_ctx.error);
-+	  err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- 	  *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
--	  X509_STORE_CTX_cleanup (&store_ctx);
-+	  X509_STORE_CTX_cleanup (ctx);
- 	  goto err;
- 	}
--      X509_STORE_CTX_cleanup (&store_ctx);
-+      X509_STORE_CTX_cleanup (ctx);
-       if (chain)
- 	{
- 	  certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA *x = EVP_PKEY_get0_RSA(k);
- 	  PEM_write_bio_RSA_PUBKEY (b, x);
- 	}
- #endif
- #ifdef EVP_PKEY_DSA
--      if (k->type == EVP_PKEY_DSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- 	{
--	  DSA * x = k->pkey.dsa;
-+	  DSA * x = EVP_PKEY_get0_DSA(k);
- 	  PEM_write_bio_DSA_PUBKEY (b, x);
- 	}
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA * x = EVP_PKEY_get0_RSA(k);
- 	  i2d_RSA_PUBKEY_bio (b, x);
- 	}
- #endif
- #ifdef EVP_PKEY_DSA
--      if (k->type == EVP_PKEY_DSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- 	{
--	  DSA * x = k->pkey.dsa;
-+	  DSA * x = EVP_PKEY_get0_DSA(k);
- 	  i2d_DSA_PUBKEY_bio (b, x);
- 	}
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
- 
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
-   size_t buf_len, n;
-   caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
-   caddr_t ret;
--  caddr_t n = BN2binbox (x->n); /* modulus */
--  caddr_t e = BN2binbox (x->e); /* public exponent */
-+  caddr_t n;
-+  caddr_t e;
-+  const BIGNUM *rsa_n, *rsa_e;
-+
-+  RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+  n = BN2binbox (rsa_n); /* modulus */
-+  e = BN2binbox (rsa_e); /* public exponent */
-+
-   n = xenc_encode_base64_binbox (n, 1);
-   e = xenc_encode_base64_binbox (e, 1);
-   ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA * x = EVP_PKEY_get0_RSA(k);
- 	  ret = xenc_rsa_pub_magic (x);
- 	}
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
-   static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+  const BIGNUM *rsa_n, *rsa_e;
-   caddr_t ret;
-   int len, pos;
--  caddr_t n = BN2binbox (x->n); /* modulus */
--  caddr_t e = BN2binbox (x->e); /* public exponent */
-+  caddr_t n;
-+  caddr_t e;
-+
-+  RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+  n = BN2binbox (rsa_n); /* modulus */
-+  e = BN2binbox (rsa_e); /* public exponent */
-+
-   len = 11 + 8 + box_length (n) + box_length (e);
-   if (n[0] & 0x80)
-     len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA * x = EVP_PKEY_get0_RSA(k);
- 	  ret = xenc_rsa_pub_ssh_export (x);
- 	}
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
-       return NULL;
-     }
-   pk = NETSCAPE_SPKI_get_pubkey (spki);
--  if (!pk || pk->type != EVP_PKEY_RSA)
-+  if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
-     {
-       NETSCAPE_SPKI_free (spki);
-       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
-   sec_check_dba ((QI*)qst, me);
-   in = BIO_new (BIO_s_mem ());
-   mutex_enter (xenc_keys_mtx);
--  certs = CA_certs->objs;
-+  certs = X509_STORE_get0_objects(CA_certs);
-   len = sk_X509_OBJECT_num (certs);
-   for (i = 0; i < len; i++)
-     {
-       X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
--      if (obj->type == X509_LU_X509)
-+      if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- 	{
--	  X509 *x = obj->data.x509;
-+	  X509 *x = X509_OBJECT_get0_X509(obj);
- 	  caddr_t itm;
- 	  int blen;
- 	  BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
- 
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
- 
- extern dk_mutex_t * xenc_keys_mtx;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+	HMAC_CTX *p;
-+
-+	p = calloc(1, sizeof(HMAC_CTX));
-+	if (!p)
-+		return p;
-+	HMAC_CTX_init(p);
-+	return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+	HMAC_CTX_cleanup(ctx);
-+	free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+				const BIGNUM **e, const BIGNUM **d)
-+{
-+	if (n != NULL)
-+		*n = r->n;
-+	if (e != NULL)
-+		*e = r->e;
-+	if (d != NULL)
-+		*d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+				    const BIGNUM **q)
-+{
-+	if (p != NULL)
-+		*p = r->p;
-+	if (q != NULL)
-+		*q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+	if (pkey->type != EVP_PKEY_RSA)
-+		return NULL;
-+	return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+			       const BIGNUM **priv_key)
-+{
-+	if (pub_key != NULL)
-+		*pub_key = dh->pub_key;
-+	if (priv_key != NULL)
-+		*priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+			       const BIGNUM **g)
-+{
-+	if (p != NULL)
-+		*p = dh->p;
-+	if (q != NULL)
-+		*q = dh->q;
-+	if (g != NULL)
-+		*g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+	if (pkey->type != EVP_PKEY_DSA)
-+		return NULL;
-+	return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+	/* If the fields p and g in d are NULL, the corresponding input
-+	 * parameters MUST be non-NULL.  q may remain NULL.
-+	 */
-+	if ((dh->p == NULL && p == NULL)
-+	    || (dh->g == NULL && g == NULL))
-+		return 0;
-+
-+	if (p != NULL) {
-+		BN_free(dh->p);
-+		dh->p = p;
-+	}
-+	if (q != NULL) {
-+		BN_free(dh->q);
-+		dh->q = q;
-+	}
-+	if (g != NULL) {
-+		BN_free(dh->g);
-+		dh->g = g;
-+	}
-+
-+	if (q != NULL) {
-+		dh->length = BN_num_bits(q);
-+	}
-+
-+	return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+	/* If the fields n and e in r are NULL, the corresponding input
-+	 * parameters MUST be non-NULL for n and e.  d may be
-+	 * left NULL (in case only the public key is used).
-+	 */
-+	if ((r->n == NULL && n == NULL)
-+	    || (r->e == NULL && e == NULL))
-+		return 0;
-+
-+	if (n != NULL) {
-+		BN_free(r->n);
-+		r->n = n;
-+	}
-+	if (e != NULL) {
-+		BN_free(r->e);
-+		r->e = e;
-+	}
-+	if (d != NULL) {
-+		BN_free(r->d);
-+		r->d = d;
-+	}
-+
-+	return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+				const BIGNUM **q, const BIGNUM **g)
-+{
-+	if (p != NULL)
-+		*p = d->p;
-+	if (q != NULL)
-+		*q = d->q;
-+	if (g != NULL)
-+		*g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+				const BIGNUM **priv_key)
-+{
-+	if (pub_key != NULL)
-+		*pub_key = d->pub_key;
-+	if (priv_key != NULL)
-+		*priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+	return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+	return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+	return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+	return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+	if (a == NULL || a->type != X509_LU_X509)
-+		return NULL;
-+	return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
- 
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
-   unsigned char * data;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char key_data[32 * 8];
-   unsigned char md [SHA256_DIGEST_LENGTH + 1];
-   unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
-       default:
- 	  return 0;
-     }
--
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
- 
-   if (hmac_len != SHA256_DIGEST_LENGTH)
-     GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char * data;
-   unsigned char key_data[3 * 8];
-   unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- 	  return 0;
-     }
- 
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
-   dk_free_box ((box_t) data);
- 
-   len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
-   unsigned char * data;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char key_data[32 * 8];
-   unsigned char md [SHA_DIGEST_LENGTH + 1];
-   unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- 	  return 0;
-     }
- 
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
- 
-   if (hmac_len != SHA_DIGEST_LENGTH)
-     GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char * data;
-   unsigned char key_data[3 * 8];
-   unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- 	  return 0;
-     }
- 
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
-   dk_free_box ((box_t) data);
- 
-   len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
-   caddr_t outbuf_beg;
-   int len;
-   caddr_t encoded_out;
--  EVP_CIPHER_CTX ctx;
-+  EVP_CIPHER_CTX *ctx;
-   unsigned char * ivec = &key->ki.aes.iv[0];
- 
-   CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
-   END_READ_FAIL (ses_in);
- 
- #if 1
--  EVP_CIPHER_CTX_init(&ctx);
-+  ctx = EVP_CIPHER_CTX_new();
-   outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
-   memcpy (outbuf_beg, ivec, 16);
-   outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
-   switch (key->ki.aes.bits)
-     {
-     case 128:
--      EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+      EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-       break;
-     case 192:
--      EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+      EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-       break;
-     case 256:
--      EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+      EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-       break;
-     default:
-       GPF_T1 ("Unsupported key size");
-     }
--  if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+  if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-     {
--      EVP_CIPHER_CTX_cleanup(&ctx);
-       dk_free_box (text);
-       dk_free_box (outbuf_beg);
-       xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
-       xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
-       } */
-   /* outlen += tmplen; */
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+  EVP_CIPHER_CTX_free(ctx);
- 
- #else
-   outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
-   int len = 0;
-   int keysize;
-   RSA * rsa = key->xek_private_rsa;
-+  const BIGNUM *p, *q;
- 
-   if (!seslen)
-     {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
-       xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
-       return 0;
-     }
-+  RSA_get0_factors(rsa, &p, &q);
-   if (!rsa ||
--      !rsa->p ||
--      !rsa->q)
-+      !p || !q)
-     {
-       if (key->xek_x509_KI)
- 	key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
--  CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+	CRYPTO_malloc_init ();
-+#else
-+	OPENSSL_malloc_init();
-+#endif
-   ERR_load_crypto_strings();
-   OpenSSL_add_all_algorithms();
- 
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- 		  log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- 		  break;
- 		}
--	      CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+	      X509_up_ref(k->xek_x509);
-               tok = strtok_r (NULL, ",", &tok_s);
- 	    }
- 	  dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
-   }
- #endif
- 
--  SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+  SSLeay_add_all_algorithms();
-+#else
-+  OpenSSL_add_all_algorithms();
-+#endif
-   PKCS12_PBE_add ();		/* stub */
- 
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
-       else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- 	opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
-       else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- 	opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
-       else if (!strcasecmp (name, "ALL"))
- 	opt = SSL_PROTOCOL_ALL;
-       else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c	2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c	2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
-       if (!ses2->ses_file->ses_max_blocks_in_mem)
- 	{
- 	  char fname[PATH_MAX + 1];
-+          int fd;
- 	  snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
--	  mktemp (fname);
-+	  fd = mkstemp (fname);
-+          close (fd);
- 
- #if defined (WIN32)
- # define OPEN_FLAGS  	  O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..263ce542d8df 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,19 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.10
+revision=1
 archs="x86_64* aarch64* ppc64le*"
 build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+configure_args="--without-internal-zlib --with-readline --with-layout=debian"
+hostmakedepends="automake libtool flex gperf net-tools which"
 makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl wget"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
+license="GPL-2.0-only"
+homepage="https://vos.openlinksw.com/owiki/wiki/VOS/"
 distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz"
-checksum=3e4807e94098b8265f8cf00867d1215bb1e9d0d274878e59a420742d2de471c2
+checksum=0379c60cb2ea4fed70ee3ac3f808e5cc9298e48ddcd8d0f4d8cd92711a43e7e5
 # cannot execute binary file: Exec format error
 nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
 
@@ -31,9 +32,7 @@ pre_configure() {
 }
 
 do_configure() {
-	./configure ${configure_args} --without-internal-zlib --with-readline \
-		--with-layout=debian \
-		--program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
+	./configure ${configure_args} --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
 }
 
 post_install() {
@@ -45,8 +44,6 @@ post_install() {
 	rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
 	rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
 	rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
-	# remove static libs.
-	rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
 }
 
 virtuoso-base_package() {
@@ -61,7 +58,7 @@ virtuoso-base_package() {
 			install -Dm755 ${wrksrc}/binsrc/tests/$bin \
 				${PKGDESTDIR}/usr/bin/${bin}-vt
 		done
-		# Remove static libs and libtool archives.
-		rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+		# Remove libtool archives
+		rm -f ${PKGDESTDIR}/usr/lib/*.la
 	}
 }

From fb8ac7a2b0d8427dfe521054b34433e6b3d62398 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 01:04:41 +0530
Subject: [PATCH 1343/1853] clojure: update to 1.11.1.1347.

---
 srcpkgs/clojure/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 7259f25e6e34..9050c50adcaf 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.11.1.1273
+version=1.11.1.1347
 revision=1
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=5f8bafcf24bd148ac9bcbe60a8e7b8093c9ed8eb8e0f387199770e38f0e40ce6
+checksum=d5e6c03e4eb8b49b7f0a9b77a4a7cc4cde7460004a3df96a1b4e797f842ebfe3
 
 do_install() {
 	vmkdir /usr/lib/clojure

From a0fb19440a5fc864d7d493f7bef1341611fca14a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 01:11:41 +0530
Subject: [PATCH 1344/1853] python3-keyring: update to 24.2.0.

---
 srcpkgs/python3-keyring/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 24eb8790ee38..6280ed9d4a2e 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=24.0.1
+version=24.2.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://pypi.org/project/keyring/"
 changelog="https://raw.githubusercontent.com/jaraco/keyring/main/NEWS.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=f77da625a448baa77906b099be9feaa29aa90979547506ac1ec422926085cee0
+checksum=ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509
 make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
 
 pre_check() {

From 2e88f3e2b55502de7f600a06619667ac2c5ebc46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 23:27:50 +0200
Subject: [PATCH 1345/1853] python3-openpyxl: update to 3.1.2.

---
 srcpkgs/python3-openpyxl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-openpyxl/template b/srcpkgs/python3-openpyxl/template
index af6944c3614c..a37d80f18407 100644
--- a/srcpkgs/python3-openpyxl/template
+++ b/srcpkgs/python3-openpyxl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-openpyxl'
 pkgname=python3-openpyxl
-version=3.0.10
+version=3.1.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="MIT"
 homepage="https://openpyxl.readthedocs.io/"
 distfiles="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${version}/openpyxl-${version}.tar.bz2"
-checksum=265ae51674a0b30d5394a437a2c96c520c6cfcaf479a4d3e0f75d829d172664e
+checksum=421e13e7004f6fee7cf84c1b9fa738615bf409ff2b57e2227be75452f7608c12
 
 post_install() {
 	vlicense LICENCE.rst

From 9fc0083d53b121daf496a72d5c48c5658f0b2b69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 23:31:43 +0200
Subject: [PATCH 1346/1853] python3-openai: update to 0.27.8.

---
 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 22adf52a0000..685bbde3e4bc 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.27.5
+version=0.27.8
 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="549c2dab52a49ee074b13edef672ed872915bf5d8852a2750377937380c45285"
+checksum=eef6c823200e2dd5ad8e4c020c1054559dd1c41cc308e146db886543abe79dd1
 make_check=extended # Requires valid API key
 
 post_install() {

From 544275709dadf65da66d1e78ac18e02532ed16d7 Mon Sep 17 00:00:00 2001
From: firefly-cpp <iztok@iztok-jr-fister.eu>
Date: Tue, 23 May 2023 15:00:44 +0200
Subject: [PATCH 1347/1853] New package: python3-niapy-2.0.5

Closes: https://github.com/void-linux/void-packages/pull/44042
---
 srcpkgs/python3-niapy/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-niapy/template

diff --git a/srcpkgs/python3-niapy/template b/srcpkgs/python3-niapy/template
new file mode 100644
index 000000000000..6dfecf858417
--- /dev/null
+++ b/srcpkgs/python3-niapy/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-niapy'
+pkgname=python3-niapy
+version=2.0.5
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-numpy python3-openpyxl python3-pandas python3-matplotlib"
+checkdepends="python3-pytest $depends"
+short_desc="Python microframework for building nature-inspired algorithms"
+maintainer="firefly-cpp <iztok@iztok-jr-fister.eu>"
+license="MIT"
+homepage="https://github.com/NiaOrg/NiaPy"
+distfiles="https://github.com/NiaOrg/NiaPy/archive/${version}.tar.gz"
+checksum=965b2ef884a24bbd17c3f1218a1ffc9b052c0201638dafb12a9e6452d99057c2
+
+post_install() {
+	vlicense LICENSE
+}

From da8c0940a4a209c731a070755809739eb50020e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 23:42:49 +0200
Subject: [PATCH 1348/1853] srcpkgs: orphan packages from inactive maintainer

---
 srcpkgs/arandr/template  | 2 +-
 srcpkgs/httrack/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template
index cc4961dc9915..0d87dbe6e04e 100644
--- a/srcpkgs/arandr/template
+++ b/srcpkgs/arandr/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext python3-setuptools python3-docutils"
 depends="python3-gobject gtk+3 xrandr"
 checkdepends="${depends}"
 short_desc="Graphical frontend for XRandR"
-maintainer="mid-kid <esteve.varela@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://christian.amsuess.com/tools/arandr/"
 distfiles="https://christian.amsuess.com/tools/arandr/files/arandr-${version}.tar.gz"
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 31dcf7ebe1e9..c8cb9300c79d 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 makedepends="zlib-devel openssl-devel"
 short_desc="Free and easy-to-use offline browser utility"
-maintainer="mid-kid <esteve.varela@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"

From e487cd8afa948aeb63cab76436054aa2416fa09d Mon Sep 17 00:00:00 2001
From: AnErrupTion <anerruption@disroot.org>
Date: Sun, 25 Jun 2023 23:18:03 +0200
Subject: [PATCH 1349/1853] bochs: update to 2.7.

Closes: #44632 [via git-merge-pr]
---
 srcpkgs/bochs/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/bochs/template b/srcpkgs/bochs/template
index da32042567aa..a6420800900c 100644
--- a/srcpkgs/bochs/template
+++ b/srcpkgs/bochs/template
@@ -1,17 +1,21 @@
 # Template file for 'bochs'
 pkgname=bochs
-version=2.6.11
+version=2.7
 revision=1
 build_style=gnu-configure
-configure_args="--enable-debugger --enable-disasm --disable-readline"
+configure_args="--with-sdl2 --enable-all-optimizations --enable-e1000
+ --disable-readline --enable-x86-64 --enable-smp --enable-avx --enable-evex
+ --enable-x86-debugger --enable-usb --enable-usb-ohci --enable-usb-ehci
+ --enable-usb-xhci --enable-debugger --enable-debugger-gui"
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libXrandr-devel gtk+-devel"
-short_desc="Highly portable open source IA-32 (x86) PC emulator"
-maintainer="mid-kid <esteve.varela@gmail.com>"
+makedepends="libX11-devel libXrandr-devel SDL2-devel"
+short_desc="Highly portable open source x86(_64) PC emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
-homepage="http://bochs.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/bochs/bochs-${version}.tar.gz"
-checksum=63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862
+homepage="https://bochs.sourceforge.net/"
+changelog="https://raw.githubusercontent.com/bochs-emu/Bochs/master/bochs/CHANGES"
+distfiles="${SOURCEFORGE_SITE}/bochs/bochs-${version}.tar.gz"
+checksum=a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a
 
 pre_build() {
 	vsed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile

From f0e0516efbe7f3b1f13a8380c8d538a05cb44364 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 16:11:16 -0400
Subject: [PATCH 1350/1853] spdx-licenses-list: update to 3.21.

---
 common/scripts/check-custom-licenses |  9 +++++++++
 common/travis/license.lst            | 28 ++++++++++++++++++++++++++++
 srcpkgs/spdx-licenses-list/template  |  7 ++++---
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 common/scripts/check-custom-licenses

diff --git a/common/scripts/check-custom-licenses b/common/scripts/check-custom-licenses
new file mode 100755
index 000000000000..da21c58abdd0
--- /dev/null
+++ b/common/scripts/check-custom-licenses
@@ -0,0 +1,9 @@
+#!/bin/bash
+# checks for licenses that are no longer custom in packages
+
+mapfile -t licenses < common/travis/license.lst
+
+for lic in "${licenses[@]}"; do
+	grep -rl "custom:$lic"'[,"]' --include=template srcpkgs \
+		| cut -d/ -f2 | xargs -rn1 printf "%s: $lic is no longer custom\n"
+done
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 649728a15e51..aab1ca5f69d6 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -22,6 +22,8 @@ APSL-1.0
 APSL-1.1
 APSL-1.2
 APSL-2.0
+ASWF-Digital-Assets-1.0
+ASWF-Digital-Assets-1.1
 Abstyles
 AdaCore-doc
 Adobe-2006
@@ -37,9 +39,11 @@ Artistic-1.0-Perl
 Artistic-1.0-cl8
 Artistic-1.0
 Artistic-2.0
+Asterisk-exception
 Autoconf-exception-2.0
 Autoconf-exception-3.0
 Autoconf-exception-generic
+Autoconf-exception-macro
 BSD-1-Clause
 BSD-2-Clause-Patent
 BSD-2-Clause-Views
@@ -75,6 +79,7 @@ BitTorrent-1.1
 Bitstream-Charter
 Bitstream-Vera
 BlueOak-1.0.0
+Boehm-GC
 Bootloader-exception
 Borceux
 Brian-Gladman-3-Clause
@@ -129,6 +134,7 @@ CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
 CC-BY-SA-3.0-DE
+CC-BY-SA-3.0-IGO
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -234,6 +240,7 @@ GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
 GPL-2.0-or-later
+GPL-3.0-interface-exception
 GPL-3.0-linking-exception
 GPL-3.0-linking-source-exception
 GPL-3.0-only
@@ -265,6 +272,7 @@ ISC
 ImageMagick
 Imlib2
 Info-ZIP
+Inner-Net-2.0
 Intel-ACPI
 Intel
 Interbase-1.0
@@ -286,6 +294,7 @@ LGPL-3.0-linking-exception
 LGPL-3.0-only
 LGPL-3.0-or-later
 LGPLLR
+LLGPL
 LLVM-exception
 LOOP
 LPL-1.0
@@ -298,6 +307,7 @@ LPPL-1.3c
 LZMA-SDK-9.11-to-9.20
 LZMA-SDK-9.22
 LZMA-exception
+Latex2e-translated-notice
 Latex2e
 Leptonica
 LiLiQ-P-1.1
@@ -306,10 +316,14 @@ LiLiQ-Rplus-1.1
 Libpng
 Libtool-exception
 Linux-OpenIB
+Linux-man-pages-1-para
+Linux-man-pages-copyleft-2-para
+Linux-man-pages-copyleft-var
 Linux-man-pages-copyleft
 Linux-syscall-note
 MIT-0
 MIT-CMU
+MIT-Festival
 MIT-Modern-Variant
 MIT-Wu
 MIT-advertising
@@ -344,6 +358,7 @@ NGPL
 NICTA-1.0
 NIST-PD-fallback
 NIST-PD
+NIST-Software
 NLOD-1.0
 NLOD-2.0
 NLPL
@@ -398,8 +413,10 @@ OLDAP-2.5
 OLDAP-2.6
 OLDAP-2.7
 OLDAP-2.8
+OLFL-1.3
 OML
 OPL-1.0
+OPL-UK-3.0
 OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
@@ -443,6 +460,7 @@ SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
+SGP4
 SHL-0.5
 SHL-0.51
 SHL-2.0
@@ -482,6 +500,7 @@ TPL-1.0
 TTWL
 TU-Berlin-1.0
 TU-Berlin-2.0
+TermReadKey
 UCAR
 UCL-1.0
 UPL-1.0
@@ -489,6 +508,7 @@ Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
 Universal-FOSS-exception-1.0
+UnixCrypt
 Unlicense
 VOSTROM
 VSL-1.0
@@ -498,13 +518,16 @@ W3C-20150513
 W3C
 WTFPL
 Watcom-1.0
+Widget-Workshop
 Wsuipa
 WxWindows-exception-3.1
 X11-distribute-modifications-variant
 X11
 XFree86-1.1
 XSkat
+Xdebug-1.03
 Xerox
+Xfig
 Xnet
 YPL-1.0
 YPL-1.1
@@ -521,6 +544,7 @@ bzip2-1.0.6
 checkmk
 copyleft-next-0.3.0
 copyleft-next-0.3.1
+cryptsetup-OpenSSL-exception
 curl
 deprecated_AGPL-1.0
 deprecated_AGPL-3.0
@@ -554,6 +578,7 @@ deprecated_bzip2-1.0.5
 deprecated_eCos-2.0
 deprecated_wxWindows
 diffmark
+dtoa
 dvipdfm
 eCos-exception-2.0
 eGenix
@@ -565,9 +590,11 @@ gnuplot
 i2p-gpl-java-exception
 iMatix
 libpng-2.0
+libpri-OpenH323-exception
 libselinux-1.0
 libtiff
 libutil-David-Nugent
+metamail
 mif-exception
 mpi-permissive
 mpich2
@@ -577,6 +604,7 @@ psfrag
 psutils
 snprintf
 u-boot-exception-2.0
+vsftpd-openssl-exception
 w3m
 x11vnc-openssl-exception
 xinetd
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index 2fc2aba58140..bf5ec7b0f9c8 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -1,15 +1,16 @@
 # Template file for 'spdx-licenses-list'
-
 # common/travis/license.lst should be updated in sync with this package
+# run common/scripts/check-custom-licenses after updating to find
+# license fields in packages that can have 'custom:' removed
 pkgname=spdx-licenses-list
-version=3.20
+version=3.21
 revision=1
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=fba795a26f8d646340b0cef2d22c3fa490158809636b225c7a0c2214a91c156f
+checksum=7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149
 
 do_install() {
 	vmkdir usr/share/spdx

From ee43178d8233b3e5d3439f8706fbaefaee829f5a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 16:11:40 -0400
Subject: [PATCH 1351/1853] tk: TCL license is no longer custom

---
 srcpkgs/tk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
index c40db4cc081e..c91a50aa97d6 100644
--- a/srcpkgs/tk/template
+++ b/srcpkgs/tk/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends="zlib-devel tcl-devel libXext-devel libXScrnSaver-devel libXft-devel"
 short_desc="TK graphical user interface toolkit for TCL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:TCL"
+license="TCL"
 homepage="http://www.tcl.tk"
 distfiles="${SOURCEFORGE_SITE}/tcl/tk${version}-src.tar.gz"
 checksum=2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675

From 49255955d91430d3da795e7bf529e09ae0d822f9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 16:12:26 -0400
Subject: [PATCH 1352/1853] kwallet-cli: MirOS license is no longer custom

---
 srcpkgs/kwallet-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwallet-cli/template b/srcpkgs/kwallet-cli/template
index 563e8eeb7bb7..4da38a361a2c 100644
--- a/srcpkgs/kwallet-cli/template
+++ b/srcpkgs/kwallet-cli/template
@@ -9,7 +9,7 @@ makedepends="kwallet-devel qt5-devel"
 depends="mksh"
 short_desc="Command-line interface to the KDE Wallet"
 maintainer="Louis Dupré Bertoni <contact@louis.xyz>"
-license="custom:MirOS, LGPL-3.0-or-later"
+license="MirOS, LGPL-3.0-or-later"
 homepage="https://www.mirbsd.org/kwalletcli.htm"
 distfiles="http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-${version}.tar.gz"
 checksum=f228e5b179f6eb92289b9635382e676990dd58cd193ce42b61d3150c8a06b12d

From 7d2642f72ab7546128856b3e674f62bd2664f938 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 6 Feb 2021 20:22:15 -0800
Subject: [PATCH 1353/1853] New package: fenrir-1.9.8

Closes: #44417 [via git-merge-pr]
---
 srcpkgs/fenrir/files/fenrir/run |  4 ++++
 srcpkgs/fenrir/template         | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/fenrir/files/fenrir/run
 create mode 100644 srcpkgs/fenrir/template

diff --git a/srcpkgs/fenrir/files/fenrir/run b/srcpkgs/fenrir/files/fenrir/run
new file mode 100644
index 000000000000..5b1548310477
--- /dev/null
+++ b/srcpkgs/fenrir/files/fenrir/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec fenrir ${OPTS}
diff --git a/srcpkgs/fenrir/template b/srcpkgs/fenrir/template
new file mode 100644
index 000000000000..1a728e130e81
--- /dev/null
+++ b/srcpkgs/fenrir/template
@@ -0,0 +1,19 @@
+# Template file for 'fenrir'
+pkgname=fenrir
+version=1.9.8
+revision=1
+build_style=python3-module
+hostmakedepends="python3 python3-setuptools"
+depends="python3-evdev python3-daemonize python3-dbus python3-pyudev
+ python3-pexpect python3-pyte python3-xdg"
+checkdepends="python3-pip ${depends}"
+short_desc="User space console screen reader written in python3"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
+license="LGPL-3.0-only"
+homepage="https://github.com/chrys87/fenrir"
+distfiles="https://github.com/chrys87/fenrir/archive/refs/tags/${version}.tar.gz"
+checksum=08732583eb15eb2b6003f259dfb62e75959106271e28f9d24144830e743527b1
+
+post_install() {
+	vsv fenrir
+}

From 5194ce906afd5d9e007e2d1732448261fabdbd3a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 26 Jun 2023 00:58:44 +0300
Subject: [PATCH 1354/1853] New package: text-engine-0.1.1

---
 common/shlibs                                 |  1 +
 srcpkgs/text-engine-demo                      |  1 +
 srcpkgs/text-engine-devel                     |  1 +
 .../patches/meson-set-soversion.patch         | 23 ++++++++++++++
 srcpkgs/text-engine/template                  | 31 +++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/text-engine-demo
 create mode 120000 srcpkgs/text-engine-devel
 create mode 100644 srcpkgs/text-engine/patches/meson-set-soversion.patch
 create mode 100644 srcpkgs/text-engine/template

diff --git a/common/shlibs b/common/shlibs
index 1cc1b6815e7f..39c868b03148 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4278,3 +4278,4 @@ libgsoapssl++-2.8.124.so gsoap-2.8.124_1
 libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
+libtext-engine-0.1.so.0 text-engine-0.1.1_1
diff --git a/srcpkgs/text-engine-demo b/srcpkgs/text-engine-demo
new file mode 120000
index 000000000000..272d32cfd5a0
--- /dev/null
+++ b/srcpkgs/text-engine-demo
@@ -0,0 +1 @@
+text-engine
\ No newline at end of file
diff --git a/srcpkgs/text-engine-devel b/srcpkgs/text-engine-devel
new file mode 120000
index 000000000000..272d32cfd5a0
--- /dev/null
+++ b/srcpkgs/text-engine-devel
@@ -0,0 +1 @@
+text-engine
\ No newline at end of file
diff --git a/srcpkgs/text-engine/patches/meson-set-soversion.patch b/srcpkgs/text-engine/patches/meson-set-soversion.patch
new file mode 100644
index 000000000000..6935d0c0b9ea
--- /dev/null
+++ b/srcpkgs/text-engine/patches/meson-set-soversion.patch
@@ -0,0 +1,23 @@
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 20 Apr 2022 12:39:45 -0400
+Subject: meson: set soversion
+
+This sets up the symlinked shared library as expected
+
+https://github.com/mjakeman/text-engine/pull/9
+---
+ src/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/meson.build b/src/meson.build
+index faff7ad..92e0a0b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -47,6 +47,7 @@ text_engine_deps = [
+ text_engine_lib = shared_library('text-engine-' + api_version,
+   text_engine_sources,
+   dependencies: text_engine_deps,
++  soversion: 0,
+   install: true,
+ )
+ 
diff --git a/srcpkgs/text-engine/template b/srcpkgs/text-engine/template
new file mode 100644
index 000000000000..fe201dfd92f3
--- /dev/null
+++ b/srcpkgs/text-engine/template
@@ -0,0 +1,31 @@
+# Template file for 'text-engine'
+pkgname=text-engine
+version=0.1.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="libadwaita-devel"
+short_desc="Lightweight rich text framework for GTK"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/mjakeman/text-engine"
+distfiles="https://github.com/mjakeman/text-engine/archive/v${version}.tar.gz"
+checksum=cf540d2c0150a46e8ec81c4532550357707c5d07b6116dc52e3869b1902f515f
+
+text-engine-devel_package() {
+	depends="gtk4-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+text-engine-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/text-engine-demo
+	}
+}

From 3f84baf4b947ad1c52c3a6be2f011001a9dc02ac Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 26 Jun 2023 01:00:11 +0300
Subject: [PATCH 1355/1853] New package: extension-manager-0.4.2

---
 .../patches/disable-backtrace.patch           | 198 ++++++++++++++++++
 srcpkgs/extension-manager/template            |  21 ++
 2 files changed, 219 insertions(+)
 create mode 100644 srcpkgs/extension-manager/patches/disable-backtrace.patch
 create mode 100644 srcpkgs/extension-manager/template

diff --git a/srcpkgs/extension-manager/patches/disable-backtrace.patch b/srcpkgs/extension-manager/patches/disable-backtrace.patch
new file mode 100644
index 000000000000..9f67a043388a
--- /dev/null
+++ b/srcpkgs/extension-manager/patches/disable-backtrace.patch
@@ -0,0 +1,198 @@
+diff -ru a/src/main.c b/src/main.c
+--- a/src/main.c	2023-05-02 04:01:31.000000000 +0300
++++ b/src/main.c	2023-05-25 03:19:55.506674695 +0300
+@@ -17,77 +17,21 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-#include <signal.h>
+ 
+ #include "exm-config.h"
+ #include "exm-application.h"
+ 
+-#include "exm-backtrace.h"
+-#include "exm-error-dialog.h"
+-
+-#define APP_URL "https://github.com/mjakeman/extension-manager"
+-
+-static int pipe_fd[2];
+-
+-void
+-handler (int sig)
+-{
+-    const char *backtrace;
+-
+-    g_print ("A fatal error has occurred.\n");
+-    g_print ("Please report this to '%s' and attach the following crash report:\n\n", APP_URL);
+-
+-    g_print ("START BACKTRACE\n\n");
+-    backtrace = exm_backtrace_print ();
+-    g_print ("%s\n", backtrace);
+-    g_print ("END BACKTRACE\n\n");
+-
+-    if (backtrace)
+-    {
+-        // Send backtrace string over pipe
+-        write (pipe_fd[1], backtrace, strlen (backtrace));
+-    }
+-
+-    close (pipe_fd[1]);
+-
+-    // Terminate process
+-    signal (sig, SIG_DFL);
+-    kill (getpid (), sig);
+-}
+-
+-static void
+-run_crash_reporter (const char *error_text)
+-{
+-    adw_init ();
+-
+-    // Setup CSS
+-    GdkDisplay *display = gdk_display_get_default ();
+-    GtkCssProvider *provider = gtk_css_provider_new ();
+-    gtk_css_provider_load_from_resource (provider, "/com/mattjakeman/ExtensionManager/style.css");
+-    gtk_style_context_add_provider_for_display (display, GTK_STYLE_PROVIDER (provider),
+-                                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+-
+-    // Show error dialog with provided string
+-	ExmErrorDialog *err_dialog;
+-    err_dialog = exm_error_dialog_new (error_text);
+-
+-    gtk_window_present (GTK_WINDOW (err_dialog));
+-
+-    // Iterate main loop until closed
+-    while (g_list_model_get_n_items (gtk_window_get_toplevels ()) > 0)
+-        g_main_context_iteration (NULL, TRUE);
+-}
+-
+-static int
+-run_app (int   argc,
+-         char *argv[])
++int
++main (int   argc,
++      char *argv[])
+ {
+ 	g_autoptr(ExmApplication) app = NULL;
+-    int ret;
++	int ret;
+ 
+-    /* Setup backtrace service */
+-    exm_backtrace_init (argv[0]);
+-    signal (SIGSEGV, handler);
++	/* Set up gettext translations */
++	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
++	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++	textdomain (GETTEXT_PACKAGE);
+ 
+ 	/*
+ 	 * Create a new GtkApplication. The application manages our main loop,
+@@ -110,74 +54,3 @@
+ 
+ 	return ret;
+ }
+-
+-int
+-main (int   argc,
+-      char *argv[])
+-{
+-    gboolean use_crash_reporter;
+-    int pid;
+-
+-    // Either side of the pipe
+-
+-    use_crash_reporter = TRUE;
+-
+-	// Set up gettext translations
+-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+-	textdomain (GETTEXT_PACKAGE);
+-
+-    // Attempt to create the pipe
+-    if (pipe (pipe_fd) == -1)
+-        use_crash_reporter = FALSE;
+-
+-    // Run app normally
+-    if (!use_crash_reporter)
+-        return run_app (argc, argv);
+-
+-    // Run the GUI as a subprocess of the crash reporter. Depending
+-    // on the exit code, we can display the crash dialog.
+-    pid = fork();
+-
+-    // Child process
+-    if (pid == 0)
+-    {
+-        // Close reading end of pipe
+-        close (pipe_fd[0]);
+-
+-        // Run app normally
+-        return run_app (argc, argv);
+-    }
+-
+-    // Parent process
+-    else
+-    {
+-        char ch;
+-        GString *string_builder;
+-        char *error_text;
+-
+-        // Close the writing end of pipe
+-        close (pipe_fd [1]);
+-
+-        string_builder = g_string_new ("");
+-
+-        while (read (pipe_fd[0], &ch, 1) != 0)
+-            g_string_append_c (string_builder, ch);
+-
+-        // Wait for child to finish
+-        waitpid (pid, 0, 0);
+-        close (pipe_fd[0]);
+-
+-        error_text = g_string_free (string_builder, FALSE);
+-
+-        if (strlen (error_text) > 0)
+-        {
+-            // An error has occurred
+-            run_crash_reporter (error_text);
+-            g_free (error_text);
+-            return -1;
+-        }
+-
+-        return 0;
+-    }
+-}
+diff -ru a/src/meson.build b/src/meson.build
+--- a/src/meson.build	2023-05-02 04:01:31.000000000 +0300
++++ b/src/meson.build	2023-05-25 03:13:52.478385702 +0300
+@@ -24,12 +24,12 @@
+   'exm-upgrade-assistant.c',
+   'exm-upgrade-result.c',
+   'exm-install-button.c',
+-  'exm-backtrace.c',
++  #'exm-backtrace.c',
+   'exm-utils.c'
+ ]
+ 
+ cc = meson.get_compiler('c')
+-libbacktrace_dep = cc.find_library('backtrace', required: true)
++#libbacktrace_dep = cc.find_library('backtrace', required: true)
+ 
+ exm_deps = [
+   dependency('gtk4'),
+@@ -38,7 +38,7 @@
+   dependency('json-glib-1.0'),
+   dependency('libsoup-3.0'),
+   dependency('text-engine-0.1'),
+-  libbacktrace_dep
++  #libbacktrace_dep
+ ]
+ 
+ gnome = import('gnome')
+@@ -78,4 +78,4 @@
+ executable('extension-manager', exm_sources,
+   dependencies: exm_deps,
+   install: true,
+-)
+\ No newline at end of file
++)
diff --git a/srcpkgs/extension-manager/template b/srcpkgs/extension-manager/template
new file mode 100644
index 000000000000..34d373819941
--- /dev/null
+++ b/srcpkgs/extension-manager/template
@@ -0,0 +1,21 @@
+# Template file for 'extension-manager'
+pkgname=extension-manager
+version=0.4.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils
+ glib-devel gtk-update-icon-cache"
+makedepends="libadwaita-devel text-engine-devel"
+short_desc="Utility for browsing and installing GNOME Shell Extensions"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mjakeman/extension-manager"
+changelog="https://raw.githubusercontent.com/mjakeman/extension-manager/master/NEWS"
+distfiles="https://github.com/mjakeman/extension-manager/archive/v${version}.tar.gz"
+checksum=c9443755aab4340b6bb31b9ab18d49fdf65d14391bce80e6262cc7ba27e5eab0
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		export GI_TYPELIB_PATH="${XBPS_CROSS_BASE}/usr/lib/girepository-1.0"
+	fi
+}

From 3bebc6a0eee1ecd7f5cb247394ae020a670ad4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 30 May 2023 14:11:21 -0300
Subject: [PATCH 1356/1853] singular: update to 4.3.2p2.

---
 ...773d6c9e2f1d2593a28bc68b7eeab54ed529.patch | 39 +++++++++++++++++++
 srcpkgs/singular/template                     |  6 +--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch

diff --git a/srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch b/srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch
new file mode 100644
index 000000000000..425f2c659a9f
--- /dev/null
+++ b/srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch
@@ -0,0 +1,39 @@
+From 8d54773d6c9e2f1d2593a28bc68b7eeab54ed529 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+Date: Mon, 5 Jun 2023 16:40:16 +0200
+Subject: [PATCH] use DESTDIR for "make install"
+
+---
+ Makefile.am | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 922b21b734..2f1e5a7ec8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,17 +16,17 @@ bin_SCRIPTS = libsingular-config
+ 
+ install-data-local:
+ 	if test -e $(srcdir)/doc/doc.tbz2; then\
+-	   test -e $(prefix)$(datadir) || mkdir -p $(prefix)$(datadir);\
+-	   test -e $(prefix)$(datadir)/info || mkdir $(prefix)$(datadir)/info;\
+-	   test -e $(prefix)$(datadir)/singular || mkdir $(prefix)$(datadir)/singular;\
+-	   test -e $(prefix)$(htmldir) || mkdir -p $(prefix)$(htmldir);\
+-	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(prefix)$(htmldir);tar -jx --no-same-owner -f -));\
+-	   mv  $(prefix)$(htmldir)/singular.info  $(prefix)$(datadir)/info/.;\
+-	   mv  $(prefix)$(htmldir)/singular.idx  $(prefix)$(datadir)/singular/.;\
++	   test -e $(DESTDIR)$(datadir) || mkdir -p $(DESTDIR)$(datadir);\
++	   test -e $(DESTDIR)$(datadir)/info || mkdir $(DESTDIR)$(datadir)/info;\
++	   test -e $(DESTDIR)$(datadir)/singular || mkdir $(DESTDIR)$(datadir)/singular;\
++	   test -e $(DESTDIR)$(htmldir) || mkdir -p $(DESTDIR)$(htmldir);\
++	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(htmldir);tar -jx --no-same-owner -f -));\
++	   mv  $(DESTDIR)$(htmldir)/singular.info  $(DESTDIR)$(datadir)/info/.;\
++	   mv  $(DESTDIR)$(htmldir)/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
+ 	fi
+ 
+ uninstall-local:
+-	-(cd $(prefix)$(datadir); rm -rf singular info/singular.info)
++	-(cd $(prefix); rm -rf singular info/singular.info)
+ 
+ configheaderdir = ${includedir}/singular
+ nodist_configheader_HEADERS = singularconfig.h
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index 0481f6cb1e11..1beb36297a03 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,6 +1,6 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.2
+version=4.3.2p2
 revision=1
 _majver=${version%p*}
 build_style=gnu-configure
@@ -13,14 +13,14 @@ configure_args="--with-readline=ncurses
  --without-python
  --with-libparse
  ac_cv_lib_cddgmp_dd_free_global_constants=yes"
-hostmakedepends="perl tar doxygen"
+hostmakedepends="perl tar doxygen automake"
 makedepends="flintlib-devel cddlib-devel readline-devel graphviz"
 short_desc="Computer algebra system for polynomial computations"
 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=3fd565d1bd4265fa8ba7cc189137a36d9daf9939b5bb411466c2028d9191f6db
+checksum=660ae93ace79db4209203770d93baf16b5b741dc26b6bae06c9b2c98ad188df1
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"

From 841bc98d55aa4000e6507ea58fdb177c9c91cf4c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 25 Jun 2023 13:19:10 +0200
Subject: [PATCH 1357/1853] element-desktop: update to 1.11.34.

---
 ...web_0001-remove-dependency-on-sentry.patch | 34 ++++++-------------
 srcpkgs/element-desktop/template              |  6 ++--
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index e64a3bbb6b37..9919c3963c09 100644
--- a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,47 +1,38 @@
-From 83e08eeed782ba5f0b63f10b27829d031aec74d1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 11 Dec 2021 21:22:44 +0100
-Subject: [PATCH] remove dependency on sentry
-
-This is unused and breaks ppc64 because it downlaods binaries.
----
- package.json      |  1 -
- webpack.config.js | 11 -----------
- 2 files changed, 12 deletions(-)
-
 diff --git a/package.json b/package.json
-index 6d740b00b..e94240911 100644
+index 02a59ee45..b5dd89a2f 100644
 --- a/package.json
 +++ b/package.json
-@@ -87,7 +87,6 @@
+@@ -101,7 +101,6 @@
          "@babel/runtime": "^7.12.5",
          "@casualbot/jest-sonar-reporter": "^2.2.5",
          "@principalstudio/html-webpack-inject-preload": "^1.2.7",
--        "@sentry/webpack-plugin": "^1.18.1",
+-        "@sentry/webpack-plugin": "^2.0.0",
          "@svgr/webpack": "^5.5.0",
          "@testing-library/react": "^12.1.5",
-         "@types/flux": "^3.1.9",
+         "@types/jest": "^29.0.0",
 diff --git a/webpack.config.js b/webpack.config.js
-index 28d60af8a..0018dcdd4 100644
+index 514bf32d0..a17a561b7 100644
 --- a/webpack.config.js
 +++ b/webpack.config.js
 @@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
  const TerserPlugin = require("terser-webpack-plugin");
  const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
  const HtmlWebpackInjectPreload = require("@principalstudio/html-webpack-inject-preload");
--const SentryCliPlugin = require("@sentry/webpack-plugin");
+-const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");
  const crypto = require("crypto");
  
  // XXX: mangle Crypto::createHash to replace md4 with sha256, output.hashFunction is insufficient as multiple bits
-@@ -656,16 +655,6 @@ module.exports = (env, argv) => {
+@@ -658,18 +657,6 @@ module.exports = (env, argv) => {
                  files: [{ match: /.*Inter.*\.woff2$/ }],
              }),
  
 -            // upload to sentry if sentry env is present
 -            process.env.SENTRY_DSN &&
--                new SentryCliPlugin({
+-                sentryWebpackPlugin({
 -                    release: process.env.VERSION,
--                    include: "./webapp/bundles",
+-                    sourcemaps: {
+-                        paths: "./webapp/bundles/**",
+-                    },
 -                    errorHandler: (err, invokeErr, compilation) => {
 -                        compilation.warnings.push("Sentry CLI Plugin: " + err.message);
 -                        console.log(`::warning title=Sentry error::${err.message}`);
@@ -50,6 +41,3 @@ index 28d60af8a..0018dcdd4 100644
              new webpack.EnvironmentPlugin(["VERSION"]),
          ].filter(Boolean),
  
--- 
-2.39.2
-
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 884a022da7f5..9eb59cc50721 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.11.33
+version=1.11.34
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -17,8 +17,8 @@ homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
 distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
-checksum="ac657d25576c6151f4a96ce067363d27bbc0ed940b3c16d79eee5fafc5ce0024
- 4015804125d448065c68e1f9e8673c1fea9f11a2e937159edbdc64113c564d45"
+checksum="5163d11740bb9f9660c919a28c5a6fe2828660849088ce1e6b40b558736afd18
+ 54bfef3484f18135408b427ff253496e36a6ad3788b1df3c6c7ba0655e23e21b"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 29930d7af04051a76b47260e4262174a8ea2f502 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 16 Feb 2023 18:51:22 +0530
Subject: [PATCH 1358/1853] New package: git-delete-merged-branches-7.4.0

---
 srcpkgs/git-delete-merged-branches/template | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/git-delete-merged-branches/template

diff --git a/srcpkgs/git-delete-merged-branches/template b/srcpkgs/git-delete-merged-branches/template
new file mode 100644
index 000000000000..a98dd7cfc047
--- /dev/null
+++ b/srcpkgs/git-delete-merged-branches/template
@@ -0,0 +1,24 @@
+# Template file for 'git-delete-merged-branches'
+pkgname=git-delete-merged-branches
+version=7.4.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-colorama python3-prompt_toolkit"
+checkdepends="${depends} python3-parameterized python3-pytest"
+short_desc="CLI tool to delete merged git branches"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/hartwork/git-delete-merged-branches"
+changelog="https://github.com/hartwork/git-delete-merged-branches/releases"
+distfiles="${PYPI_SITE}/g/git-delete-merged-branches/git-delete-merged-branches-${version}.tar.gz"
+checksum=b976b7b2210a1dab728e654e1b023f8e5309d98dc14730bfb613e893604847e5
+make_check_pre="env PATH=/usr/libexec/chroot-git:${PATH}"
+
+post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/git_delete_merged_branches/tests
+
+	# resolve conflicts against git-extras
+	rm ${DESTDIR}/usr/bin/git-delete-merged-branches
+	rm ${DESTDIR}/usr/share/man/man1/git-delete-merged-branches.1
+}

From 2c0d3461df6bcb6ac670924a8a72e6f2559434f6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Fri, 16 Jun 2023 09:36:53 +0700
Subject: [PATCH 1359/1853] inkscape: update to 1.2.2

closes #35454
---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 .../inkscape-1.2.1-poppler-22.09.0.patch      |  53 -------
 srcpkgs/inkscape/template                     |  25 +--
 5 files changed, 13 insertions(+), 287 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
 delete mode 100644 srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch b/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch
deleted file mode 100644
index 36d4192c862f..000000000000
--- a/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2f3101417a04721c42b6b101dde07fa961a56f1b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@cmpct.info>
-Date: Tue, 6 Sep 2022 10:10:25 +0000
-Subject: [PATCH] Fix build with Poppler 22.09.0
-
-Adapt to changes in Poppler's getLineDash/setLineDash interface to allow building with Poppler 22.09.0.
----
- src/extension/internal/pdfinput/pdf-parser.cpp  | 4 ++++
- src/extension/internal/pdfinput/svg-builder.cpp | 9 ++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index cca1e84096..80d64c9b86 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
-       _POPPLER_FREE(obj);
-     }
-   }
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+  state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
-+#else
-   state->setLineDash(dash, length, args[1].getNum());
-+#endif
-   builder->updateStyle(state);
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 12f71dd921..9fc56fe63c 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
-     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
- 
-     // Line dash
--    double *dash_pattern;
-     int dash_length;
-     double dash_start;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+    const double *dash_pattern;
-+    const std::vector<double> &dash = state->getLineDash(&dash_start);
-+    dash_pattern = dash.data();
-+    dash_length = dash.size();
-+#else
-+    double *dash_pattern;
-     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-+#endif
-     if ( dash_length > 0 ) {
-         Inkscape::CSSOStringStream os_array;
-         for ( int i = 0 ; i < dash_length ; i++ ) {
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b1c642e98abc..aa1ab218a442 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,26 +1,27 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=9
+version=1.2.2
+revision=1
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
 make_check_target=check
-hostmakedepends="automake pkg-config libtool intltool gettext
- glib-devel perl-XML-Parser which"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
- double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
- poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
- aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
-checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
+hostmakedepends="automake gettext glib-devel intltool libmagick-devel libtool
+ perl-XML-Parser pkg-config which"
+makedepends="aspell-devel cairomm-devel double-conversion-devel gc-devel
+ gdl-devel gsl-devel gspell-devel gtkmm-devel gtkspell3-devel harfbuzz-devel
+ hunspell-devel libatomic_ops-devel libcdr-devel libgomp-devel libsoup-devel
+ libvisio-devel libwpd-devel libwpd-devel libwpg-devel libxslt-devel pango-devel
+ poppler-devel poppler-glib-devel potrace-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-Pillow python3-appdirs
+ python3-cssselect python3-lxml python3-numpy python3-requests python3-scour"
+checkdepends="$depends ImageMagick cantarell-fonts gtest-devel"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From dfc737de00223ef398475afd653a7a66a5ca8335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 17:30:20 -0300
Subject: [PATCH 1360/1853] common/build-style: check if go_import_path matches
 go.mod.

Without this check, calling `go install` with a wrong go_import_path
might end up downloading the source code for said package (using git,
for example), instead of building from the provided tarball. The first
line of go.mod should be "module $go_import_path" for Go to not try and
download source code instead of using what it has locally.

Fixes #27690.
---
 common/build-style/go.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index 1315473f9600..f1808b3311a4 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,6 +32,11 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+		# Check if go_import_path matches module
+		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
+		fi
+
 		if [ -z "${go_mod_mode}" ] && [ -d vendor ]; then
 			msg_normal "Using vendor dir for $pkgname Go dependencies.\n"
 			go_mod_mode=vendor

From 3d2f6adfeacf2e9481abf43e590da96073a49089 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:54:42 +0200
Subject: [PATCH 1361/1853] docker-compose: update to 2.19.0.

---
 srcpkgs/docker-compose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 7271843da8cf..772cbb1e0f18 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=2.18.1
+version=2.19.0
 revision=1
 build_style=go
 go_import_path="github.com/docker/compose/v2/cmd"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 changelog="https://github.com/docker/compose/releases"
 distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=192c47c177d9bfd8492ed0c49214af0c740586da6db0b7e9c9a07da37c9dc722
+checksum=0be3fd713ef84985f63d76de4c58451401aed1dfbeb235127dd77a57d1890996
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins

From 9343e64592148fa84a23d6a4dcbf1c66aaa120cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 26 Jun 2023 05:17:53 -0400
Subject: [PATCH 1362/1853] docker-compose: fix for go.mod mismatch

---
 srcpkgs/docker-compose/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 772cbb1e0f18..280cca8333d0 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,10 +1,11 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.19.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/docker/compose/v2/cmd"
-go_ldflags="-X github.com/docker/compose/v2/internal.Version=v${version}"
+go_import_path="github.com/docker/compose/v2"
+go_package="${go_import_path}/cmd"
+go_ldflags="-X ${go_import_path}/internal.Version=v${version}"
 depends="docker-cli"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -15,7 +16,7 @@ distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.g
 checksum=0be3fd713ef84985f63d76de4c58451401aed1dfbeb235127dd77a57d1890996
 
 post_install() {
-	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins
+	vmkdir usr/libexec/docker/cli-plugins
 	mv ${DESTDIR}/usr/bin/cmd ${DESTDIR}/usr/libexec/docker/cli-plugins/docker-compose
 	ln -s /usr/libexec/docker/cli-plugins/docker-compose ${DESTDIR}/usr/bin/docker-compose
 }

From 2c4e94cf94ce75daac3eb73fdcba74c99f75cd03 Mon Sep 17 00:00:00 2001
From: Murray <murray.calavera@protonmail.com>
Date: Tue, 20 Jun 2023 10:09:15 +0100
Subject: [PATCH 1363/1853] librepcb: update to 0.1.7.

closes #44535
---
 srcpkgs/librepcb/patches/zlib.patch | 18 ++++++++++++++++++
 srcpkgs/librepcb/template           | 15 ++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/librepcb/patches/zlib.patch

diff --git a/srcpkgs/librepcb/patches/zlib.patch b/srcpkgs/librepcb/patches/zlib.patch
new file mode 100644
index 000000000000..9937d0fe5295
--- /dev/null
+++ b/srcpkgs/librepcb/patches/zlib.patch
@@ -0,0 +1,18 @@
+--- a/libs/quazip/CMakeLists.txt
++++ b/libs/quazip/CMakeLists.txt
+@@ -64,13 +64,8 @@ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
+ 
+-find_package(Qt${QUAZIP_QT_MAJOR_VERSION} OPTIONAL_COMPONENTS Zlib)
+-if (Qt${QUAZIP_QT_MAJOR_VERSION}Zlib_FOUND)
+-	set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} Qt${QUAZIP_QT_MAJOR_VERSION}::Zlib)
+-else()
+-	find_package(ZLIB REQUIRED)
+-	set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ZLIB::ZLIB)
+-endif()
++find_package(ZLIB REQUIRED)
++set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ZLIB::ZLIB)
+ 
+ add_subdirectory(quazip)
+ 
diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index d51ca101381c..207da8137ed0 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -1,15 +1,16 @@
 # Template file for 'librepcb'
 pkgname=librepcb
-version=0.1.5
-revision=2
-build_style=qmake
-configure_args="-r librepcb.pro"
+version=0.1.7
+revision=1
+build_style=cmake
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-svg-devel zlib-devel"
+makedepends="zlib-devel qt5-devel qt5-tools-devel qt5-plugin-mysql
+ qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ qt5-svg-devel occt-devel glu-devel openssl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://librepcb.org"
-distfiles="https://download.librepcb.org/releases/${version}/${pkgname}-${version}-source.zip"
-checksum=f956dfa5b9ad1faffcab7f5dd03f158c2b97a7c82cfc9a09dc4066cbcf0db76a
+distfiles="https://download.librepcb.org/releases/${version}/librepcb-${version}-source.zip"
+checksum=4c9e90ca61c94e537cab0632e684350873673d693f1c8837c916001d8896a6ad

From fecdb2321deae75d6e2504493a10113723d0bd31 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sun, 30 Apr 2023 12:54:55 +0100
Subject: [PATCH 1364/1853] New package: seer-2.0

Closes: #43682 [via git-merge-pr]
---
 srcpkgs/seer/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/seer/template

diff --git a/srcpkgs/seer/template b/srcpkgs/seer/template
new file mode 100644
index 000000000000..317fc41c5442
--- /dev/null
+++ b/srcpkgs/seer/template
@@ -0,0 +1,28 @@
+# Template file for 'seer'
+pkgname=seer
+version=2.0
+revision=1
+build_style=cmake
+configure_args="-DQTVERSION=QT5"
+build_wrksrc="src"
+hostmakedepends="pkg-config"
+makedepends="qt5-devel qt5-charts-devel"
+depends="gdb"
+short_desc="GUI frontend to gdb"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/epasveer/seer"
+changelog="https://raw.githubusercontent.com/epasveer/seer/main/CHANGELOG.md"
+distfiles="https://github.com/epasveer/seer/archive/v${version}.tar.gz"
+checksum=050df5f356ddbae386617aa92edbac5acef254fa10f4ff5cccabe6c5033e8ff5
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for x in 32x32 64x64 128x128 256x256 512x512; do
+		vinstall "resources/seergdb_${x}.png" 644 "usr/share/icons/hicolor/${x}/apps"
+	done
+	vinstall resources/seergdb.desktop 644 usr/share/applications
+}

From 23bde112d142ed9122a1fa6c04dfac654f83d0d5 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 6 Jan 2023 06:29:47 +0200
Subject: [PATCH 1365/1853] New package: vmaf-2.3.1

---
 common/shlibs         |  1 +
 srcpkgs/vmaf-devel    |  1 +
 srcpkgs/vmaf/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/vmaf-devel
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index 39c868b03148..525c08a30424 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
+libvmaf.so.1 vmaf-2.3.1_1
diff --git a/srcpkgs/vmaf-devel b/srcpkgs/vmaf-devel
new file mode 120000
index 000000000000..61c973c1c892
--- /dev/null
+++ b/srcpkgs/vmaf-devel
@@ -0,0 +1 @@
+vmaf
\ No newline at end of file
diff --git a/srcpkgs/vmaf/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..9a2861f63066
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,30 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=2.3.1
+revision=1
+build_wrksrc=libvmaf
+build_style=meson
+hostmakedepends="nasm xxd"
+short_desc="Perceptual video quality assessment algorithm developed by Netflix"
+maintainer="Eugen Zagorodniy <zag@disroot.org>"
+license=BSD-2-Clause-Patent
+homepage="https://github.com/Netflix/vmaf"
+distfiles="https://github.com/Netflix/vmaf/archive/refs/tags/v${version}.tar.gz"
+checksum=8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2
+
+post_install() {
+	vlicense ../LICENSE
+	# Obsolete compute_vmaf() used by ffmpeg-4.4.3 requires non-built-in models
+	vcopy ../model usr/share/vmaf
+}
+
+vmaf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 1432c4b38f423624450eef8020c3bf685fb57a5e Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 6 Jan 2023 20:50:38 +0200
Subject: [PATCH 1366/1853] ffmpeg: enable vmaf support

Closes: #41489 [via git-merge-pr]
---
 ...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 +++++++++++++++++++
 srcpkgs/ffmpeg/template                       |  8 ++--
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff

diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
new file mode 100644
index 000000000000..aa948f7a8a2d
--- /dev/null
+++ b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
@@ -0,0 +1,40 @@
+#==================================================================================================
+# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
+# From: Christopher Degawa <christopher.degawa@intel.com>
+# Date: Thu, 20 Oct 2022 22:55:27 -0500
+# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
+#
+# compressed_ten_bit_format has been deprecated upstream and has no effect
+# and can be removed. Plus, technically it was never used in the first place
+# since it would require the app (ffmpeg) to set it and do additional
+# processing of the input frames.
+#
+# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
+#
+# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
+#==================================================================================================
+--- a/libavcodec/libsvtav1.c
++++ b/libavcodec/libsvtav1.c
+@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
+ 
+ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
+ {
+-    const int    pack_mode_10bit =
+-        (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
+-    const size_t luma_size_8bit  =
+-        config->source_width * config->source_height * (1 << pack_mode_10bit);
+-    const size_t luma_size_10bit =
+-        (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
++    const size_t luma_size = config->source_width * config->source_height *
++        (config->encoder_bit_depth > 8 ? 2 : 1);
+ 
+     EbSvtIOFormat *in_data;
+ 
+-    svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
++    svt_enc->raw_size = luma_size * 3 / 2;
+ 
+     // allocate buffer for in and out
+     svt_enc->in_buf           = av_mallocz(sizeof(*svt_enc->in_buf));
+-- 
+GitLab
+
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index df4179d1963a..aa058aab9ca9 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.4
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
  speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
- libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel)
+ libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)
  $(vopt_if fdk_aac fdk-aac-devel) $(vopt_if vpx libvpx-devel)
@@ -69,6 +69,8 @@ post_patch() {
 		ppc64le*) ;;
 		ppc*) _apply_patch -p1 ${FILESDIR}/altivec.patch ;;
 	esac
+
+	vsed -i libavfilter/vf_libvmaf.c -e 's!/usr/local/share/model/\(vmaf_v0.6.1\).pkl!/usr/share/vmaf/\1.json!'
 }
 
 do_configure() {
@@ -113,7 +115,7 @@ do_configure() {
 		$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libopenjpeg \
-		--enable-postproc --enable-opencl ${_args} \
+		--enable-postproc --enable-opencl --enable-libvmaf ${_args} \
 		$(vopt_enable x265 libx265) \
 		$(vopt_enable v4l2 libv4l2) \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \

From 574c5f009f5d5075f4de09514fe58d7f0f739653 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 23 Jun 2023 22:12:46 +0200
Subject: [PATCH 1367/1853] linux5.10: update to 5.10.185.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 97c063d99aa2..4d75acd2a144 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.181
+version=5.10.185
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
- c04019da6ab852a66bad81382fd9ba1d3a30d1d1fd784f8a0ca4565516b36098"
+ 46a321e7422e7a20646524f7b3ac883143419096f7d1aa24d0597a9d9c7b2de7"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From b949e3bf3ac4c0f76d07d0dcc092a0d25904c850 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Jun 2023 00:39:54 +0200
Subject: [PATCH 1368/1853] parallel: update to 20230622.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 248f83964721..7b3dfcb07982 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20230522
+version=20230622
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=1af46b7605023b14360bb968845de6413db24bf0f951f5e0208d23803cb64202
+checksum=c03fc076c541efbc98e3148f8c516437567020f8811f043c93d91c0412856f09
 
 pre_configure() {
 	# no html and pdf doc

From 6940edc10c5848bf67e2e3717d56d85e9b2969af Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sun, 25 Jun 2023 09:51:33 +0200
Subject: [PATCH 1369/1853] weechat: update to 4.0.0

---
 srcpkgs/weechat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 30b08a1534c2..ffcbf8b9e5be 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.8
-revision=2
+version=4.0.0
+revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=f7cb65c200f8c090c56f2cf98c0b184051e516e5f7099a4308cacf86f174bf28
+checksum=5bd75ee15f3392a0ad174ee7c54518daece3878477670c07f10d6ebf988240f9
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From 1f76e45726f7dfe70b94b9555e03d0fb9c06557c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 26 Jun 2023 10:16:56 +0200
Subject: [PATCH 1370/1853] dbeaver: update to 23.1.1.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index de239d96902c..a2366c0ed0c8 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=23.1.0
+version=23.1.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://dbeaver.io"
 changelog="https://dbeaver.io/news/"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=85df98086b9984c4379382077f90bee60231fd04e1ccde120e9422e29a462218
+checksum=489dd2dc7b531564f54f915ccdae8ea37889ab8538abead4dba752fbe57623a3
 nopie=true
 
 do_build() {

From 42b27004f4aed8808380d53718ccaaf199af8279 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 26 Jun 2023 14:06:47 +0200
Subject: [PATCH 1371/1853] bmake: update to 20230622.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index b0bb26e6daf0..d928b7526251 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20230601
+version=20230622
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=8d0b2e593946539065530a241040b0b0525ebb2b924ed67fc497ad17845a5a09
+checksum=b404c99d60289d78362d0ba0468f541d8a9b4215befee2fbe5750534849cec00
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From b4c3eab4b91e1ef7afd5fda879fceb0ef746e955 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 26 Jun 2023 14:31:53 +0200
Subject: [PATCH 1372/1853] parallel: fix checksum.

---
 srcpkgs/parallel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 7b3dfcb07982..a17eb481e640 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c03fc076c541efbc98e3148f8c516437567020f8811f043c93d91c0412856f09
+checksum=de3a24ad702198a642115ceb9b280625fd49c6dd8842b08685ff057c6b84238e
 
 pre_configure() {
 	# no html and pdf doc

From 697ef37516954160a6a2e7eedbe9426edcafe66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 1 Jun 2023 16:12:06 -0300
Subject: [PATCH 1373/1853] maxima: update to 5.47.0.

---
 srcpkgs/maxima/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index f67b469e3dda..04f732dbb0fe 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,6 +1,6 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.46.0
+version=5.47.0
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
 changelog="https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${version%.*}.md?format=raw"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07
+checksum=9104021b24fd53e8c03a983509cb42e937a925e8c0c85c335d7709a14fd40f7a
 nocross=yes
 
 # maxima-sbcl is nopie and should NOT be stripped or it won't work

From 2220617b958989a9ad89323716b53ae0bbacb7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 1 Jun 2023 20:38:14 -0300
Subject: [PATCH 1374/1853] sagemath: patch and rebuild for maxima 5.47.0

Also:
 - patch for singular 4.3.2p2
 - patch for numpy 1.25.0
 - patch for setuptools 68.0.0
---
 .../patches/35619-maxima_5.46.0.patch         |  29 +-
 .../patches/35707-maxima_5.47.0.patch         | 879 ++++++++++++++++++
 .../patches/35825-singular_4.3.2p2.patch      |  24 +
 .../sagemath/patches/35826-numpy_1.25.0.patch |  83 ++
 .../patches/35831-setuptools_68.0.0.patch     |  13 +
 srcpkgs/sagemath/patches/get_patches          |  12 +-
 srcpkgs/sagemath/template                     |   2 +-
 7 files changed, 1033 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch
 create mode 100644 srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch

diff --git a/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
index 0220b4300c30..970de6e5beb6 100644
--- a/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
+++ b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
@@ -48,7 +48,7 @@ index ee1667aec16..72083337942 100644
  
  sdh_configure $SAGE_CONFIGURE_GMP \
 diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4
-index 5859e35f12e..b677184b7be 100644
+index 5859e35f12e..53e3a8301cd 100644
 --- a/build/pkgs/giac/spkg-configure.m4
 +++ b/build/pkgs/giac/spkg-configure.m4
 @@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([giac], [
@@ -56,10 +56,17 @@ index 5859e35f12e..b677184b7be 100644
         AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
           AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
 -            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
-+            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n -1)
++            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n 1)
              AS_IF([test -n "$giac_version"], [
                  AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
                      AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [
+diff --git a/build/pkgs/info/distros/fedora.txt b/build/pkgs/info/distros/fedora.txt
+index 283aa462f74..c0d8f74e0ad 100644
+--- a/build/pkgs/info/distros/fedora.txt
++++ b/build/pkgs/info/distros/fedora.txt
+@@ -1 +1 @@
+-texinfo
++texinfo info
 diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
 index 0980a4b8ef8..85fe1ea4731 100644
 --- a/build/pkgs/info/spkg-configure.m4
@@ -108,6 +115,16 @@ index a804c7b831f..0f594389fe6 100644
 +md5=3c01f1daa6936e11d8713fef7751d3fe
 +cksum=2420393096
  upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
+diff --git a/build/pkgs/maxima/dependencies b/build/pkgs/maxima/dependencies
+index fffb89e2050..55c7e0d8d14 100644
+--- a/build/pkgs/maxima/dependencies
++++ b/build/pkgs/maxima/dependencies
+@@ -1,4 +1,4 @@
+-ecl
++ecl info
+ 
+ ----------
+ All lines of this file are ignored except the first.
 diff --git a/build/pkgs/maxima/distros/arch.txt b/build/pkgs/maxima/distros/arch.txt
 index 6400290f44d..6ac052fa62b 100644
 --- a/build/pkgs/maxima/distros/arch.txt
@@ -198,7 +215,7 @@ index 74db62e7f9f..00000000000
 - 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
 diff --git a/build/pkgs/maxima/spkg-configure.m4 b/build/pkgs/maxima/spkg-configure.m4
 new file mode 100644
-index 00000000000..dc54525320e
+index 00000000000..86de8c1dfc1
 --- /dev/null
 +++ b/build/pkgs/maxima/spkg-configure.m4
 @@ -0,0 +1,46 @@
@@ -209,7 +226,7 @@ index 00000000000..dc54525320e
 +    dnl we still use pexpect to communicate with it in a few places.
 +    AC_CACHE_CHECK([for Maxima >= $SAGE_MAXIMA_MINVER], [ac_cv_path_MAXIMA], [
 +        AC_PATH_PROGS_FEATURE_CHECK([MAXIMA], [maxima], [
-+            maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n -1\
++            maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n 1\
 +                | $SED -n -e 's/Maxima *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
 +            AS_IF([test -n "$maxima_version"], [
 +                AX_COMPARE_VERSION([$maxima_version], [ge], [SAGE_MAXIMA_MINVER], [
@@ -282,7 +299,7 @@ index 3ae6382f9ba..cdb6fbf2069 100644
  
  sdh_make
 diff --git a/build/pkgs/tox/spkg-configure.m4 b/build/pkgs/tox/spkg-configure.m4
-index 7d8ade4c14b..3de0b9b710d 100644
+index 7d8ade4c14b..5a260439cdd 100644
 --- a/build/pkgs/tox/spkg-configure.m4
 +++ b/build/pkgs/tox/spkg-configure.m4
 @@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([tox], [
@@ -290,7 +307,7 @@ index 7d8ade4c14b..3de0b9b710d 100644
         AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [
           AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [
 -            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -1)
-+            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n -1)
++            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n 1)
              AS_IF([test -n "$tox_version"], [
                  AX_COMPARE_VERSION([$tox_version], [lt], [4], [
                      AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [
diff --git a/srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch b/srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch
new file mode 100644
index 000000000000..de10df8cb73c
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch
@@ -0,0 +1,879 @@
+diff --git a/src/doc/de/tutorial/interfaces.rst b/src/doc/de/tutorial/interfaces.rst
+index edb4f383363..d83225b5315 100644
+--- a/src/doc/de/tutorial/interfaces.rst
++++ b/src/doc/de/tutorial/interfaces.rst
+@@ -272,8 +272,8 @@ deren :math:`i,j` Eintrag gerade :math:`i/j` ist, für :math:`i,j=1,\ldots,4`.
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Hier ein anderes Beispiel:
+ 
+@@ -332,12 +332,9 @@ Und der letzte ist die berühmte Kleinsche Flasche:
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:     '[plot_format, openmath]')
+diff --git a/src/doc/de/tutorial/tour_algebra.rst b/src/doc/de/tutorial/tour_algebra.rst
+index baba2553a25..59eed8f1888 100644
+--- a/src/doc/de/tutorial/tour_algebra.rst
++++ b/src/doc/de/tutorial/tour_algebra.rst
+@@ -209,9 +209,12 @@ Lösung: Berechnen Sie die Laplace-Transformierte der ersten Gleichung
+ 
+ ::
+ 
+-    sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Das ist schwierig zu lesen, es besagt jedoch, dass
+ 
+@@ -226,8 +229,8 @@ Laplace-Transformierte der zweiten Gleichung:
+ ::
+ 
+     sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: lde2 = de2.laplace("t","s"); lde2.sage()
++    s^2*laplace(y(t), t, s) - s*y(0) - 2*laplace(x(t), t, s) + 2*laplace(y(t), t, s) - D[0](y)(0)
+ 
+ Dies besagt
+ 
+diff --git a/src/doc/en/constructions/linear_algebra.rst b/src/doc/en/constructions/linear_algebra.rst
+index 8894de9a5fd..4e76c65ad0a 100644
+--- a/src/doc/en/constructions/linear_algebra.rst
++++ b/src/doc/en/constructions/linear_algebra.rst
+@@ -277,8 +277,8 @@ Another approach is to use the interface with Maxima:
+ 
+     sage: A = maxima("matrix ([1, -4], [1, -1])")
+     sage: eig = A.eigenvectors()
+-    sage: eig
+-    [[[-sqrt(3)*%i,sqrt(3)*%i],[1,1]], [[[1,(sqrt(3)*%i+1)/4]],[[1,-(sqrt(3)*%i-1)/4]]]]
++    sage: eig.sage()
++    [[[-I*sqrt(3), I*sqrt(3)], [1, 1]], [[[1, 1/4*I*sqrt(3) + 1/4]], [[1, -1/4*I*sqrt(3) + 1/4]]]]
+ 
+ This tells us that :math:`\vec{v}_1 = [1,(\sqrt{3}i + 1)/4]` is
+ an eigenvector of :math:`\lambda_1 = - \sqrt{3}i` (which occurs
+diff --git a/src/doc/en/tutorial/interfaces.rst b/src/doc/en/tutorial/interfaces.rst
+index b0e55345669..19c28f636d4 100644
+--- a/src/doc/en/tutorial/interfaces.rst
++++ b/src/doc/en/tutorial/interfaces.rst
+@@ -267,8 +267,8 @@ whose :math:`i,j` entry is :math:`i/j`, for
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Here's another example:
+ 
+@@ -320,8 +320,8 @@ The next plot is the famous Klein bottle (do not type the ``....:``)::
+ 
+     sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+     5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
++    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)").sage()
++    -5*(cos(1/2*x)*cos(y) + sin(1/2*x)*sin(2*y) + 3.0)*sin(x)
+     sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]",  # not tested
+diff --git a/src/doc/en/tutorial/tour_algebra.rst b/src/doc/en/tutorial/tour_algebra.rst
+index 2e872cc9059..225606a729f 100644
+--- a/src/doc/en/tutorial/tour_algebra.rst
++++ b/src/doc/en/tutorial/tour_algebra.rst
+@@ -216,9 +216,12 @@ the notation :math:`x=x_{1}`, :math:`y=x_{2}`):
+ 
+ ::
+ 
+-    sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ This is hard to read, but it says that
+ 
+@@ -232,8 +235,8 @@ Laplace transform of the second equation:
+ ::
+ 
+     sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: lde2 = de2.laplace("t","s"); lde2.sage()
++    s^2*laplace(y(t), t, s) - s*y(0) - 2*laplace(x(t), t, s) + 2*laplace(y(t), t, s) - D[0](y)(0)
+ 
+ This says
+ 
+diff --git a/src/doc/es/tutorial/tour_algebra.rst b/src/doc/es/tutorial/tour_algebra.rst
+index dc1a7a96719..42c818fe8d7 100644
+--- a/src/doc/es/tutorial/tour_algebra.rst
++++ b/src/doc/es/tutorial/tour_algebra.rst
+@@ -197,8 +197,8 @@ la notación :math:`x=x_{1}`, :math:`y=x_{2}`):
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ El resultado puede ser difícil de leer, pero significa que
+ 
+@@ -211,9 +211,12 @@ Toma la transformada de Laplace de la segunda ecuación:
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Esto dice
+ 
+diff --git a/src/doc/fr/tutorial/interfaces.rst b/src/doc/fr/tutorial/interfaces.rst
+index 1cd662f3083..2cb14e772eb 100644
+--- a/src/doc/fr/tutorial/interfaces.rst
++++ b/src/doc/fr/tutorial/interfaces.rst
+@@ -273,8 +273,8 @@ pour :math:`i,j=1,\ldots,4`.
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Un deuxième exemple :
+ 
+@@ -334,12 +334,9 @@ Et la fameuse bouteille de Klein (n'entrez pas les ``....:``):
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:     '[plot_format, openmath]')
+diff --git a/src/doc/fr/tutorial/tour_algebra.rst b/src/doc/fr/tutorial/tour_algebra.rst
+index 658894b2e8b..267bd1dd4f9 100644
+--- a/src/doc/fr/tutorial/tour_algebra.rst
++++ b/src/doc/fr/tutorial/tour_algebra.rst
+@@ -182,8 +182,8 @@ Solution : Considérons la transformée de Laplace de la première équation
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ La réponse n'est pas très lisible, mais elle signifie que
+ 
+@@ -196,9 +196,12 @@ la seconde équation :
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Ceci signifie
+ 
+diff --git a/src/doc/it/tutorial/tour_algebra.rst b/src/doc/it/tutorial/tour_algebra.rst
+index 5a5311e9b1c..cde427d3090 100644
+--- a/src/doc/it/tutorial/tour_algebra.rst
++++ b/src/doc/it/tutorial/tour_algebra.rst
+@@ -183,8 +183,8 @@ la notazione :math:`x=x_{1}`, :math:`y=x_{2}`:
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Questo è di difficile lettura, ma dice che
+ 
+@@ -197,9 +197,12 @@ trasformata di Laplace della seconda equazione:
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ che significa
+ 
+diff --git a/src/doc/ja/tutorial/interfaces.rst b/src/doc/ja/tutorial/interfaces.rst
+index 9c16b2eba08..892fc6f852f 100644
+--- a/src/doc/ja/tutorial/interfaces.rst
++++ b/src/doc/ja/tutorial/interfaces.rst
+@@ -239,8 +239,8 @@ Sage/Maximaインターフェイスの使い方を例示するため,ここで
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ 
+ 使用例をもう一つ示す:
+@@ -299,11 +299,8 @@ Sage/Maximaインターフェイスの使い方を例示するため,ここで
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]",  # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]", '[plot_format, openmath]')
+diff --git a/src/doc/ja/tutorial/tour_algebra.rst b/src/doc/ja/tutorial/tour_algebra.rst
+index 784fd0d5c40..746cbb4475c 100644
+--- a/src/doc/ja/tutorial/tour_algebra.rst
++++ b/src/doc/ja/tutorial/tour_algebra.rst
+@@ -213,8 +213,8 @@ Sageを使って常微分方程式を研究することもできる. :math:`x'
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ この出力は読みにくいけれども,意味しているのは
+ 
+@@ -226,9 +226,12 @@ Sageを使って常微分方程式を研究することもできる. :math:`x'
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ 意味するところは
+ 
+diff --git a/src/doc/pt/tutorial/interfaces.rst b/src/doc/pt/tutorial/interfaces.rst
+index 386ef6456e5..5badb31ab35 100644
+--- a/src/doc/pt/tutorial/interfaces.rst
++++ b/src/doc/pt/tutorial/interfaces.rst
+@@ -269,8 +269,8 @@ entrada :math:`i,j` é :math:`i/j`, para :math:`i,j=1,\ldots,4`.
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Aqui vai outro exemplo:
+ 
+@@ -330,13 +330,10 @@ E agora a famosa garrafa de Klein:
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)"
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)"
+     ....:        "- 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:               "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:               '[plot_format, openmath]')
+diff --git a/src/doc/pt/tutorial/tour_algebra.rst b/src/doc/pt/tutorial/tour_algebra.rst
+index baeb37b1c71..170e0d8a367 100644
+--- a/src/doc/pt/tutorial/tour_algebra.rst
++++ b/src/doc/pt/tutorial/tour_algebra.rst
+@@ -205,8 +205,8 @@ equação (usando a notação :math:`x=x_{1}`, :math:`y=x_{2}`):
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ O resultado é um pouco difícil de ler, mas diz que
+ 
+@@ -219,9 +219,12 @@ calcule a transformada de Laplace da segunda equação:
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ O resultado significa que
+ 
+diff --git a/src/doc/ru/tutorial/interfaces.rst b/src/doc/ru/tutorial/interfaces.rst
+index ea84527f478..061818ca4a5 100644
+--- a/src/doc/ru/tutorial/interfaces.rst
++++ b/src/doc/ru/tutorial/interfaces.rst
+@@ -264,8 +264,8 @@ gnuplot, имеет методы решения и манипуляции мат
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Вот другой пример:
+ 
+@@ -323,12 +323,9 @@ gnuplot, имеет методы решения и манипуляции мат
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:     '[plot_format, openmath]')
+diff --git a/src/doc/ru/tutorial/tour_algebra.rst b/src/doc/ru/tutorial/tour_algebra.rst
+index 9f08c41d118..bc0d4926f83 100644
+--- a/src/doc/ru/tutorial/tour_algebra.rst
++++ b/src/doc/ru/tutorial/tour_algebra.rst
+@@ -199,8 +199,8 @@ Sage может использоваться для решения диффер
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Данный результат тяжело читаем, однако должен быть понят как
+ 
+@@ -210,9 +210,12 @@ Sage может использоваться для решения диффер
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Результат:
+ 
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index c707530b9f1..f7ce8b95727 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -783,7 +783,7 @@ def nintegral(ex, x, a, b,
+     Now numerically integrating, we see why the answer is wrong::
+ 
+         sage: f.nintegrate(x,0,1)
+-        (-480.0000000000001, 5.32907051820075...e-12, 21, 0)
++        (-480.000000000000..., 5.32907051820075...e-12, 21, 0)
+ 
+     It is just because every floating point evaluation of return -480.0
+     in floating point.
+@@ -1336,7 +1336,7 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+         sage: limit(floor(x), x=0, dir='+')
+         0
+         sage: limit(floor(x), x=0)
+-        und
++        ...nd
+ 
+     Maxima gives the right answer here, too, showing
+     that :trac:`4142` is fixed::
+diff --git a/src/sage/calculus/desolvers.py b/src/sage/calculus/desolvers.py
+index e0c31925f44..6e91f7e2bb4 100644
+--- a/src/sage/calculus/desolvers.py
++++ b/src/sage/calculus/desolvers.py
+@@ -295,7 +295,7 @@ def desolve(de, dvar, ics=None, ivar=None, show_method=False, contrib_ode=False,
+     Clairaut equation: general and singular solutions::
+ 
+         sage: desolve(diff(y,x)^2+x*diff(y,x)-y==0,y,contrib_ode=True,show_method=True)
+-        [[y(x) == _C^2 + _C*x, y(x) == -1/4*x^2], 'clairault']
++        [[y(x) == _C^2 + _C*x, y(x) == -1/4*x^2], 'clairau...']
+ 
+     For equations involving more variables we specify an independent variable::
+ 
+@@ -1325,7 +1325,7 @@ def desolve_rk4(de, dvar, ics=None, ivar=None, end_points=None, step=0.1, output
+ 
+         sage: x,y = var('x,y')
+         sage: desolve_rk4(x*y*(2-y),y,ics=[0,1],end_points=1,step=0.5)
+-        [[0, 1], [0.5, 1.12419127424558], [1.0, 1.461590162288825]]
++        [[0, 1], [0.5, 1.12419127424558], [1.0, 1.46159016228882...]]
+ 
+     Variant 1 for input - we can pass ODE in the form used by
+     desolve function In this example we integrate backwards, since
+@@ -1333,7 +1333,7 @@ def desolve_rk4(de, dvar, ics=None, ivar=None, end_points=None, step=0.1, output
+ 
+         sage: y = function('y')(x)
+         sage: desolve_rk4(diff(y,x)+y*(y-1) == x-2,y,ics=[1,1],step=0.5, end_points=0)
+-        [[0.0, 8.904257108962112], [0.5, 1.909327945361535], [1, 1]]
++        [[0.0, 8.904257108962112], [0.5, 1.90932794536153...], [1, 1]]
+ 
+     Here we show how to plot simple pictures. For more advanced
+     applications use list_plot instead. To see the resulting picture
+diff --git a/src/sage/functions/bessel.py b/src/sage/functions/bessel.py
+index 95405c3d72f..48607c49f56 100644
+--- a/src/sage/functions/bessel.py
++++ b/src/sage/functions/bessel.py
+@@ -293,9 +293,6 @@ class Function_Bessel_J(BuiltinFunction):
+         sage: f = bessel_J(2, x)
+         sage: f.integrate(x)
+         1/24*x^3*hypergeometric((3/2,), (5/2, 3), -1/4*x^2)
+-        sage: m = maxima(bessel_J(2, x))
+-        sage: m.integrate(x)
+-        (hypergeometric([3/2],[5/2,3],-_SAGE_VAR_x^2/4)*_SAGE_VAR_x^3)/24
+ 
+     Visualization (set plot_points to a higher value to get more detail)::
+ 
+@@ -1118,11 +1115,11 @@ def Bessel(*args, **kwds):
+     Conversion to other systems::
+ 
+         sage: x,y = var('x,y')
+-        sage: f = maxima(Bessel(typ='K')(x,y))
+-        sage: f.derivative('_SAGE_VAR_x')
+-        (%pi*csc(%pi*_SAGE_VAR_x) *('diff(bessel_i(-_SAGE_VAR_x,_SAGE_VAR_y),_SAGE_VAR_x,1) -'diff(bessel_i(_SAGE_VAR_x,_SAGE_VAR_y),_SAGE_VAR_x,1))) /2 -%pi*bessel_k(_SAGE_VAR_x,_SAGE_VAR_y)*cot(%pi*_SAGE_VAR_x)
+-        sage: f.derivative('_SAGE_VAR_y')
+-        -(bessel_k(_SAGE_VAR_x+1,_SAGE_VAR_y)+bessel_k(_SAGE_VAR_x-1, _SAGE_VAR_y))/2
++        sage: f = Bessel(typ='K')(x,y)
++        sage: expected = f.derivative(y)
++        sage: actual = maxima(f).derivative('_SAGE_VAR_y').sage()
++        sage: bool(actual == expected)
++        True
+ 
+     Compute the particular solution to Bessel's Differential Equation that
+     satisfies `y(1) = 1` and `y'(1) = 1`, then verify the initial conditions
+diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py
+index 752b8422fc6..fc2fb5875ce 100644
+--- a/src/sage/functions/hypergeometric.py
++++ b/src/sage/functions/hypergeometric.py
+@@ -19,8 +19,11 @@
+     sage: sum(((2*I)^x/(x^3 + 1)*(1/4)^x), x, 0, oo)
+     hypergeometric((1, 1, -1/2*I*sqrt(3) - 1/2, 1/2*I*sqrt(3) - 1/2),...
+     (2, -1/2*I*sqrt(3) + 1/2, 1/2*I*sqrt(3) + 1/2), 1/2*I)
+-    sage: sum((-1)^x/((2*x + 1)*factorial(2*x + 1)), x, 0, oo)
++    sage: res = sum((-1)^x/((2*x + 1)*factorial(2*x + 1)), x, 0, oo)
++    sage: res  # not tested - depends on maxima version
+     hypergeometric((1/2,), (3/2, 3/2), -1/4)
++    sage: res in [hypergeometric((1/2,), (3/2, 3/2), -1/4), sin_integral(1)]
++    True
+ 
+ Simplification (note that ``simplify_full`` does not yet call
+ ``simplify_hypergeometric``)::
+diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py
+index 7398c763971..6127f5d9490 100644
+--- a/src/sage/functions/orthogonal_polys.py
++++ b/src/sage/functions/orthogonal_polys.py
+@@ -974,7 +974,7 @@ def __init__(self):
+             sage: chebyshev_U(x, x)._sympy_()
+             chebyshevu(x, x)
+             sage: maxima(chebyshev_U(2,x, hold=True))
+-            3*((-(8*(1-_SAGE_VAR_x))/3)+(4*(1-_SAGE_VAR_x)^2)/3+1)
++            3*(...-...(8*(1-_SAGE_VAR_x))/3)+(4*(1-_SAGE_VAR_x)^2)/3+1)
+             sage: maxima(chebyshev_U(n,x, hold=True))
+             chebyshev_u(_SAGE_VAR_n,_SAGE_VAR_x)
+         """
+diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
+index 3e2570e889e..5a0f06a27f8 100644
+--- a/src/sage/functions/other.py
++++ b/src/sage/functions/other.py
+@@ -498,10 +498,10 @@ def __init__(self):
+             <class 'sage.rings.integer.Integer'>
+             sage: var('x')
+             x
+-            sage: a = floor(5.4 + x); a
+-            floor(x + 5.40000000000000)
++            sage: a = floor(5.25 + x); a
++            floor(x + 5.25000000000000)
+             sage: a.simplify()
+-            floor(x + 0.4000000000000004) + 5
++            floor(x + 0.25) + 5
+             sage: a(x=2)
+             7
+ 
+diff --git a/src/sage/functions/special.py b/src/sage/functions/special.py
+index faa6a73cc7e..d72e780836a 100644
+--- a/src/sage/functions/special.py
++++ b/src/sage/functions/special.py
+@@ -455,9 +455,8 @@ class EllipticE(BuiltinFunction):
+         sage: z = var("z")
+         sage: elliptic_e(z, 1)
+         elliptic_e(z, 1)
+-        sage: # this is still wrong: must be abs(sin(z)) + 2*round(z/pi)
+-        sage: elliptic_e(z, 1).simplify()
+-        2*round(z/pi) + sin(z)
++        sage: elliptic_e(z, 1).simplify() # not tested - gives wrong answer with maxima < 5.47
++        2*round(z/pi) - sin(pi*round(z/pi) - z)
+         sage: elliptic_e(z, 0)
+         z
+         sage: elliptic_e(0.5, 0.1)  # abs tol 2e-15
+diff --git a/src/sage/interfaces/interface.py b/src/sage/interfaces/interface.py
+index 6baa4eb597c..f8237d3ad94 100644
+--- a/src/sage/interfaces/interface.py
++++ b/src/sage/interfaces/interface.py
+@@ -1579,20 +1579,20 @@ def _mul_(self, right):
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)') # not a function!
++            sage: g = maxima('cos(x)') # not a function!
+             sage: f*g
+-            -cos(x)*sin(x)
++            cos(x)*sin(x)
+             sage: _(2)
+-            -cos(2)*sin(2)
++            cos(2)*sin(2)
+ 
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)')
++            sage: g = maxima('cos(x)')
+             sage: g*f
+-            -cos(x)*sin(x)
++            cos(x)*sin(x)
+             sage: _(2)
+-            -cos(2)*sin(2)
++            cos(2)*sin(2)
+             sage: 2*f
+             2*sin(x)
+         """
+@@ -1612,20 +1612,20 @@ def _div_(self, right):
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)')
++            sage: g = maxima('cos(x)')
+             sage: f/g
+-            -sin(x)/cos(x)
++            sin(x)/cos(x)
+             sage: _(2)
+-            -sin(2)/cos(2)
++            sin(2)/cos(2)
+ 
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)')
++            sage: g = maxima('cos(x)')
+             sage: g/f
+-            -cos(x)/sin(x)
++            cos(x)/sin(x)
+             sage: _(2)
+-            -cos(2)/sin(2)
++            cos(2)/sin(2)
+             sage: 2/f
+             2/sin(x)
+         """
+diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py
+index 4829560f98b..959e75459a2 100644
+--- a/src/sage/interfaces/maxima.py
++++ b/src/sage/interfaces/maxima.py
+@@ -49,9 +49,14 @@
+ 
+ ::
+ 
++    sage: x,y = SR.var('x,y')
+     sage: F = maxima.factor('x^5 - y^5')
+-    sage: F
+-    -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    sage: F # not tested - depends on maxima version
++    -((y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4))
++    sage: actual = F.sage()
++    sage: expected = -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    sage: bool(actual == expected)
++    True
+     sage: type(F)
+     <class 'sage.interfaces.maxima.MaximaElement'>
+ 
+@@ -71,18 +76,19 @@
+ 
+ ::
+ 
++    sage: F = maxima('x * y')
+     sage: repr(F)
+-    '-(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)'
++    'x*y'
+     sage: F.str()
+-    '-(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)'
++    'x*y'
+ 
+ The ``maxima.eval`` command evaluates an expression in
+ maxima and returns the result as a *string* not a maxima object.
+ 
+ ::
+ 
+-    sage: print(maxima.eval('factor(x^5 - y^5)'))
+-    -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    sage: print(maxima.eval('factor(x^5 - 1)'))
++    (x-1)*(x^4+x^3+x^2+x+1)
+ 
+ We can create the polynomial `f` as a Maxima polynomial,
+ then call the factor method on it. Notice that the notation
+@@ -91,11 +97,11 @@
+ 
+ ::
+ 
+-    sage: f = maxima('x^5 - y^5')
++    sage: f = maxima('x^5 + y^5')
+     sage: f^2
+-    (x^5-y^5)^2
++    (y^5+x^5)^2
+     sage: f.factor()
+-    -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    (y+x)*(y^4-x*y^3+x^2*y^2-x^3*y+x^4)
+ 
+ Control-C interruption works well with the maxima interface,
+ because of the excellent implementation of maxima. For example, try
+@@ -161,20 +167,20 @@
+ 
+     sage: eqn = maxima(['a+b*c=1', 'b-a*c=0', 'a+b=5'])
+     sage: s = eqn.solve('[a,b,c]'); s
+-    [[a = -(sqrt(79)*%i-11)/4,b = (sqrt(79)*%i+9)/4, c = (sqrt(79)*%i+1)/10], [a = (sqrt(79)*%i+11)/4,b = -(sqrt(79)*%i-9)/4, c = -(sqrt(79)*%i-1)/10]]
++    [[a = -...(sqrt(79)*%i-11)/4...,b = (sqrt(79)*%i+9)/4, c = (sqrt(79)*%i+1)/10], [a = (sqrt(79)*%i+11)/4,b = -...(sqrt(79)*%i-9)/4..., c = -...(sqrt(79)*%i-1)/10...]]
+ 
+ Here is an example of solving an algebraic equation::
+ 
+     sage: maxima('x^2+y^2=1').solve('y')
+     [y = -sqrt(1-x^2),y = sqrt(1-x^2)]
+     sage: maxima('x^2 + y^2 = (x^2 - y^2)/sqrt(x^2 + y^2)').solve('y')
+-    [y = -sqrt(((-y^2)-x^2)*sqrt(y^2+x^2)+x^2), y = sqrt(((-y^2)-x^2)*sqrt(y^2+x^2)+x^2)]
++    [y = -sqrt((...-y^2...-x^2)*sqrt(y^2+x^2)+x^2), y = sqrt((...-y^2...-x^2)*sqrt(y^2+x^2)+x^2)]
+ 
+ 
+ You can even nicely typeset the solution in latex::
+ 
+     sage: latex(s)
+-    \left[ \left[ a=-{{\sqrt{79}\,i-11}\over{4}} , b={{\sqrt{79}\,i+9  }\over{4}} , c={{\sqrt{79}\,i+1}\over{10}} \right]  , \left[ a={{  \sqrt{79}\,i+11}\over{4}} , b=-{{\sqrt{79}\,i-9}\over{4}} , c=-{{  \sqrt{79}\,i-1}\over{10}} \right]  \right]
++    \left[ \left[ a=-...{{\sqrt{79}\,i-11}\over{4}}... , b={{...\sqrt{79}\,i+9...}\over{4}} , c={{\sqrt{79}\,i+1}\over{10}} \right]  , \left[ a={{...\sqrt{79}\,i+11}\over{4}} , b=-...{{\sqrt{79}\,i-9...}\over{4}}... , c=-...{{...\sqrt{79}\,i-1}\over{10}}... \right]  \right]
+ 
+ To have the above appear onscreen via ``xdvi``, type
+ ``view(s)``. (TODO: For OS X should create pdf output
+@@ -200,7 +206,7 @@
+     sage: f.diff('x')
+     k*x^3*%e^(k*x)*sin(w*x)+3*x^2*%e^(k*x)*sin(w*x)+w*x^3*%e^(k*x) *cos(w*x)
+     sage: f.integrate('x')
+-    (((k*w^6+3*k^3*w^4+3*k^5*w^2+k^7)*x^3 +(3*w^6+3*k^2*w^4-3*k^4*w^2-3*k^6)*x^2+((-18*k*w^4)-12*k^3*w^2+6*k^5)*x-6*w^4 +36*k^2*w^2-6*k^4) *%e^(k*x)*sin(w*x) +(((-w^7)-3*k^2*w^5-3*k^4*w^3-k^6*w)*x^3 +(6*k*w^5+12*k^3*w^3+6*k^5*w)*x^2+(6*w^5-12*k^2*w^3-18*k^4*w)*x-24*k*w^3 +24*k^3*w) *%e^(k*x)*cos(w*x)) /(w^8+4*k^2*w^6+6*k^4*w^4+4*k^6*w^2+k^8)
++    (((k*w^6+3*k^3*w^4+3*k^5*w^2+k^7)*x^3 +(3*w^6+3*k^2*w^4-3*k^4*w^2-3*k^6)*x^2+(...-...18*k*w^4)-12*k^3*w^2+6*k^5)*x-6*w^4 +36*k^2*w^2-6*k^4) *%e^(k*x)*sin(w*x) +((...-w^7...-3*k^2*w^5-3*k^4*w^3-k^6*w)*x^3...+(6*k*w^5+12*k^3*w^3+6*k^5*w)*x^2...+(6*w^5-12*k^2*w^3-18*k^4*w)*x-24*k*w^3 +24*k^3*w) *%e^(k*x)*cos(w*x)) /(w^8+4*k^2*w^6+6*k^4*w^4+4*k^6*w^2+k^8)
+ 
+ ::
+ 
+@@ -234,7 +240,7 @@
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+     sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-...4/3...]],[[1,2,3,4]]]]
+ 
+ We can also compute the echelon form in Sage::
+ 
+@@ -287,12 +293,12 @@
+ ::
+ 
+     sage: maxima("laplace(diff(x(t),t,2),t,s)")
+-    (-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s
++    ...-...%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s
+ 
+ It is difficult to read some of these without the 2d
+ representation::
+ 
+-    sage: print(maxima("laplace(diff(x(t),t,2),t,s)"))
++    sage: print(maxima("laplace(diff(x(t),t,2),t,s)")) # not tested - depends on maxima version
+                              !
+                     d        !          2
+                  (- -- (x(t))!     ) + s  laplace(x(t), t, s) - x(0) s
+@@ -396,7 +402,7 @@
+ 
+     sage: g = maxima('exp(3*%i*x)/(6*%i) + exp(%i*x)/(2*%i) + c')
+     sage: latex(g)
+-    -{{i\,e^{3\,i\,x}}\over{6}}-{{i\,e^{i\,x}}\over{2}}+c
++    -...{{i\,e^{3\,i\,x}}\over{6}}...-{{i\,e^{i\,x}}\over{2}}+c
+ 
+ Long Input
+ ----------
+@@ -684,7 +690,7 @@ def _expect_expr(self, expr=None, timeout=None):
+             sage: maxima.assume('a>0')
+             [a > 0]
+             sage: maxima('integrate(1/(x^3*(a+b*x)^(1/3)),x)')
+-            (-(b^2*log((b*x+a)^(2/3)+a^(1/3)*(b*x+a)^(1/3)+a^(2/3)))/(9*a^(7/3))) +(2*b^2*atan((2*(b*x+a)^(1/3)+a^(1/3))/(sqrt(3)*a^(1/3))))/(3^(3/2)*a^(7/3)) +(2*b^2*log((b*x+a)^(1/3)-a^(1/3)))/(9*a^(7/3)) +(4*b^2*(b*x+a)^(5/3)-7*a*b^2*(b*x+a)^(2/3)) /(6*a^2*(b*x+a)^2-12*a^3*(b*x+a)+6*a^4)
++            ...-...(b^2*log((b*x+a)^(2/3)+a^(1/3)*(b*x+a)^(1/3)+a^(2/3)))/(9*a^(7/3))) +(2*b^2*atan((2*(b*x+a)^(1/3)+a^(1/3))/(sqrt(3)*a^(1/3))))/(3^(3/2)*a^(7/3)) +(2*b^2*log((b*x+a)^(1/3)-a^(1/3)))/(9*a^(7/3)) +(4*b^2*(b*x+a)^(5/3)-7*a*b^2*(b*x+a)^(2/3)) /(6*a^2*(b*x+a)^2-12*a^3*(b*x+a)+6*a^4)
+             sage: maxima('integrate(x^n,x)')
+             Traceback (most recent call last):
+             ...
+diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py
+index 4f6306ba4fc..aecfcba5e23 100644
+--- a/src/sage/interfaces/maxima_abstract.py
++++ b/src/sage/interfaces/maxima_abstract.py
+@@ -856,9 +856,9 @@ def de_solve(self, de, vars, ics=None):
+             sage: maxima.de_solve('diff(y,x,2) + 3*x = y', ['x','y'])
+             y = %k1*%e^x+%k2*%e^-x+3*x
+             sage: maxima.de_solve('diff(y,x) + 3*x = y', ['x','y'])
+-            y = (%c-3*((-x)-1)*%e^-x)*%e^x
++            y = (%c-3*(...-x...-1)*%e^-x)*%e^x
+             sage: maxima.de_solve('diff(y,x) + 3*x = y', ['x','y'],[1,1])
+-            y = -%e^-1*(5*%e^x-3*%e*x-3*%e)
++            y = -...%e^-1*(5*%e^x-3*%e*x-3*%e)...
+         """
+         if not isinstance(vars, str):
+             str_vars = '%s, %s'%(vars[1], vars[0])
+@@ -1572,8 +1572,9 @@ def integral(self, var='x', min=None, max=None):
+ 
+         ::
+ 
+-            sage: f = maxima('exp(x^2)').integral('x',0,1); f
+-            -(sqrt(%pi)*%i*erf(%i))/2
++            sage: f = maxima('exp(x^2)').integral('x',0,1)
++            sage: f.sage()
++            -1/2*I*sqrt(pi)*erf(I)
+             sage: f.numer()
+             1.46265174590718...
+         """
+diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
+index bba8504aa92..cd1be891872 100644
+--- a/src/sage/interfaces/maxima_lib.py
++++ b/src/sage/interfaces/maxima_lib.py
+@@ -134,10 +134,11 @@
+ else:
+     ecl_eval("(require 'maxima)")
+ ecl_eval("(in-package :maxima)")
+-ecl_eval("(setq $nolabels t))")
+-ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
+ ecl_eval("(set-locale-subdir)")
+ 
++# This workaround has to happen before any call to (set-pathnames).
++# To be safe please do not call anything other than
++# (set-locale-subdir) before this block.
+ try:
+     ecl_eval("(set-pathnames)")
+ except RuntimeError:
+@@ -154,6 +155,8 @@
+     # Call `(set-pathnames)` again to complete its job.
+     ecl_eval("(set-pathnames)")
+ 
++ecl_eval("(initialize-runtime-globals)")
++ecl_eval("(setq $nolabels t))")
+ 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/src/sage/matrix/matrix1.pyx b/src/sage/matrix/matrix1.pyx
+index f38c429d994..47df9fc80a5 100644
+--- a/src/sage/matrix/matrix1.pyx
++++ b/src/sage/matrix/matrix1.pyx
+@@ -248,7 +248,7 @@ cdef class Matrix(Matrix0):
+             sage: a = maxima(m); a
+             matrix([0,1,2],[3,4,5],[6,7,8])
+             sage: a.charpoly('x').expand()
+-            (-x^3)+12*x^2+18*x
++            ...-x^3...+12*x^2+18*x
+             sage: m.charpoly()
+             x^3 - 12*x^2 - 18*x
+         """
+diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx
+index 0532ea0c9bd..6ea2bd4473d 100644
+--- a/src/sage/modules/free_module_element.pyx
++++ b/src/sage/modules/free_module_element.pyx
+@@ -4053,7 +4053,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
+             sage: t=var('t')
+             sage: r=vector([t,t^2,sin(t)])
+             sage: vec,answers=r.nintegral(t,0,1)
+-            sage: vec
++            sage: vec # abs tol 1e-15
+             (0.5, 0.3333333333333334, 0.4596976941318602)
+             sage: type(vec)
+             <class 'sage.modules.vector_real_double_dense.Vector_real_double_dense'>
+diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
+index a72ab547c76..51dcaf8d847 100644
+--- a/src/sage/symbolic/relation.py
++++ b/src/sage/symbolic/relation.py
+@@ -657,7 +657,7 @@ def solve(f, *args, **kwds):
+     equations, at times approximations will be given by Maxima, due to the
+     underlying algorithm::
+ 
+-        sage: sols = solve([x^3==y,y^2==x], [x,y]); sols[-1], sols[0]
++        sage: sols = solve([x^3==y,y^2==x], [x,y]); sols[-1], sols[0] # abs tol 1e-15
+         ([x == 0, y == 0],
+          [x == (0.3090169943749475 + 0.9510565162951535*I),
+           y == (-0.8090169943749475 - 0.5877852522924731*I)])
diff --git a/srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch b/srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch
new file mode 100644
index 000000000000..4d01eeabee6c
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
+index ea027e8a716..a1fe036917e 100644
+--- a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
++++ b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
+@@ -1251,7 +1251,7 @@ def leinartas_decomposition(self):
+             sage: H = R(f.denominator())
+             sage: ff = FFPD(G, H.factor())
+             sage: decomp = ff.leinartas_decomposition()
+-            sage: decomp
++            sage: decomp  # random - non canonical depends on singular version
+             (0, []) +
+             (-(x*y^2*sin(x) + x^2*y + x*y + y*sin(x) + x)*y, [(y, 1)]) +
+             ((x*y^2*sin(x) + x^2*y + x*y + y*sin(x) + x)*x*y, [(x*y + 1, 1)]) +
+@@ -1611,9 +1611,7 @@ def asymptotics(self, p, alpha, N, asy_var=None, numerical=0,
+             (-16, [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 2)])
+             sage: alpha = [3, 3, 2]
+             sage: decomp = F.asymptotic_decomposition(alpha); decomp
+-            (0, []) +
+-            (16*r*(3/x - 2/z) + 16/x - 16/z,
+-             [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 1)])
++            (0, []) + (..., [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 1)])
+             sage: F1 = decomp[1]
+             sage: p = {x: 1, y: 1, z: 1}
+             sage: asy = F1.asymptotics(p, alpha, 2, verbose=True) # long time
diff --git a/srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch b/srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch
new file mode 100644
index 000000000000..426f841ebbab
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch
@@ -0,0 +1,83 @@
+diff --git a/src/sage/calculus/desolvers.py b/src/sage/calculus/desolvers.py
+index 55ed3a0fe10..4cfa22a97e4 100644
+--- a/src/sage/calculus/desolvers.py
++++ b/src/sage/calculus/desolvers.py
+@@ -1598,7 +1598,7 @@ def desolve_odeint(des, ics, times, dvars, ivar=None, compute_jac=False, args=()
+         sage: ic=epsilon
+         sage: t=srange(0,2/epsilon,1)
+         sage: sol=desolve_odeint(f,ic,t,y,rtol=1e-9,atol=1e-10,compute_jac=True)
+-        sage: p=points(zip(t,sol))
++        sage: p=points(zip(t,sol[:,0]))
+         sage: p.show()
+ 
+     Another stiff system with some optional parameters with no
+@@ -1637,7 +1637,7 @@ def desolve_odeint_inner(ivar):
+                 J = fast_float(J, dvar, ivar)
+ 
+                 def Dfun(y, t):
+-                    return [J(y, t)]
++                    return [J(y.item(), t)]
+ 
+         # n-dimensional systems:
+         else:
+diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx
+index d5402d5c3b0..a00912951c5 100644
+--- a/src/sage/matrix/matrix2.pyx
++++ b/src/sage/matrix/matrix2.pyx
+@@ -430,12 +430,12 @@ cdef class Matrix(Matrix1):
+             try:
+                 return self.transpose().solve_right(B, check=check)
+             except ValueError as e:
+-                raise ValueError(str(e).replace('row', 'column'))
++                raise e.__class__(str(e).replace('row', 'column'))
+         else:
+             try:
+                 return self.transpose().solve_right(B.transpose(), check=check).transpose()
+             except ValueError as e:
+-                raise ValueError(str(e).replace('row', 'column'))
++                raise e.__class__(str(e).replace('row', 'column'))
+ 
+     def solve_right(self, B, check=True):
+         r"""
+diff --git a/src/sage/matrix/matrix_numpy_dense.pyx b/src/sage/matrix/matrix_numpy_dense.pyx
+index 5b75ed133ff..17867f9a65c 100644
+--- a/src/sage/matrix/matrix_numpy_dense.pyx
++++ b/src/sage/matrix/matrix_numpy_dense.pyx
+@@ -382,8 +382,9 @@ cdef class Matrix_numpy_dense(Matrix_dense):
+             sage: m = matrix(RDF,[[1,2],[3,4]])
+             sage: n = m.numpy()
+             sage: import numpy
+-            sage: numpy.linalg.eig(n)
+-            (array([-0.37228132,  5.37228132]), array([[-0.82456484, -0.41597356],
++            sage: tuple(numpy.linalg.eig(n))
++            (array([-0.37228132,  5.37228132]),
++             array([[-0.82456484, -0.41597356],
+                    [ 0.56576746, -0.90937671]]))
+             sage: m = matrix(RDF, 2, range(6)); m
+             [0.0 1.0 2.0]
+diff --git a/src/sage/plot/plot3d/list_plot3d.py b/src/sage/plot/plot3d/list_plot3d.py
+index d64b766001e..0158f856dbb 100644
+--- a/src/sage/plot/plot3d/list_plot3d.py
++++ b/src/sage/plot/plot3d/list_plot3d.py
+@@ -602,7 +602,7 @@ def g(x, y):
+         from .parametric_surface import ParametricSurface
+ 
+         def g(x, y):
+-            z = f([x, y])
++            z = f([x, y]).item()
+             return (x, y, z)
+         G = ParametricSurface(g, (list(numpy.r_[xmin:xmax:num_points * j]),
+                                   list(numpy.r_[ymin:ymax:num_points * j])),
+diff --git a/src/sage/plot/plot3d/plot3d.py b/src/sage/plot/plot3d/plot3d.py
+index e9bbfaa8370..9ba89595d70 100644
+--- a/src/sage/plot/plot3d/plot3d.py
++++ b/src/sage/plot/plot3d/plot3d.py
+@@ -378,7 +378,7 @@ def to_cartesian(self, func, params=None):
+             ....: [ 0.16763356,  0.19993708,  0.31403568,  0.47359696, 0.55282422],
+             ....: [ 0.16763356,  0.25683223,  0.16649297,  0.10594339, 0.55282422]])
+             sage: import scipy.interpolate
+-            sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r)
++            sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev
+             sage: spherical_plot3d(f,(0,2*pi),(0,pi))
+             Graphics3d Object
+ 
diff --git a/srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch b/srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch
new file mode 100644
index 000000000000..dec7851e027d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sage/all__sagemath_repl.py b/src/sage/all__sagemath_repl.py
+index 6800eb9a27b..8d0b43679ca 100644
+--- a/src/sage/all__sagemath_repl.py
++++ b/src/sage/all__sagemath_repl.py
+@@ -44,7 +44,7 @@
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+     message='pkg_resources is deprecated as an API|'
+             'Deprecated call to `pkg_resources.declare_namespace(.*)`',
+-    module='pkg_resources')
++    module='pkg_resources|setuptools.sandbox')
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+     message='msvccompiler is deprecated and slated to be removed',
+     module='distutils.msvccompiler')
diff --git a/srcpkgs/sagemath/patches/get_patches b/srcpkgs/sagemath/patches/get_patches
index 049694826d20..888c66f779e0 100755
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@@ -18,10 +18,18 @@ get_pr() {
 # run from patches dir
 cd $(dirname "$0")
 
-# positive review
+# merged in 10.0.beta0
 get_pr 35584 "networkx 3.1"
+
+# merged in 10.0.beta1
 get_pr 35612 "linbox 1.7.0"
 get_pr 35635 "sympy 1.12"
+get_pr 35619 "maxima 5.46.0"
+
+# positive review
+get_pr 35707 "maxima 5.47.0"
+get_pr 35831 "setuptools 68.0.0"
 
 # needs review
-get_pr 35619 "maxima 5.46.0"
+get_pr 35825 "singular 4.3.2p2"
+get_pr 35826 "numpy 1.25.0"
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 6fc7c3b2b4a8..2491d77dbc8d 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=10.0
-revision=1
+revision=2
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
 _bindir=/usr/lib/sagemath/$version/bin

From 7ce370c11f500525e824687ce538c84d13381433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 19 Jun 2023 23:21:53 -0300
Subject: [PATCH 1375/1853] python3-numpy: update to 1.25.0.

---
 .../patches/fix-pytest-warning.patch          |  8 +++++
 srcpkgs/python3-numpy/template                | 35 ++++++++++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/python3-numpy/patches/fix-pytest-warning.patch

diff --git a/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch b/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
new file mode 100644
index 000000000000..990ab8019754
--- /dev/null
+++ b/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
@@ -0,0 +1,8 @@
+--- a/pytest.ini	2023-06-16 22:48:37.211072200 -0300
++++ b/pytest.ini	2023-06-19 22:52:00.230063231 -0300
+@@ -27,3 +27,5 @@
+     ignore:\n\n  `numpy.distutils`:DeprecationWarning
+ # Ignore mypy >= 0.971 DeprecationWarnings
+     ignore:path is deprecated\. Use files\(\) instead:DeprecationWarning:mypy
++# Ignore warning raised when importing setuptools.command.
++    ignore:pkg_resources is deprecated as an API:DeprecationWarning
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 30e5ca3a3e58..a0a479ac89da 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,21 +1,21 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.24.3
+version=1.25.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
 makedepends="python3-devel
  $(vopt_if openblas 'openblas-devel' 'lapack-devel cblas-devel')"
 depends="python3-setuptools"
+checkdepends="python3-pytest-xdist python3-hypothesis python3-pytz"
 short_desc="Fast and sophisticated array facility to Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
-distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=0d78333b35bd704826892a56e2af71af69139ee02fa155c8c83aeec58bee4744
+changelog="https://numpy.org/doc/stable/release.html"
+distfiles="${PYPI_SITE}/n/numpy/numpy-${version}.tar.gz"
+checksum=f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19
 alternatives="numpy:f2py:/usr/bin/f2py3"
-# Tests do not function propery in a build directory
-make_check="no"
 
 build_options="openblas"
 
@@ -67,6 +67,31 @@ pre_build() {
 	done
 }
 
+do_check() {
+	local testjobs="-n $XBPS_MAKEJOBS"
+	local _skip
+
+	case $XBPS_TARGET_MACHINE in
+		# this triggers a known bug in musl libm, fixed in:
+		# https://git.musl-libc.org/cgit/musl/commit/?id=aa2d23e57c9c95f0ffeb80cb035e5a5be52d8ef0
+		*-musl) _skip+="or(test_against_cmath)" ;;
+	esac
+
+	if [ ${XBPS_TARGET_MACHINE%-musl} = "i686" ]; then
+		# see: https://github.com/numpy/numpy/issues/18388
+		_skip+="or(test_float_remainder_overflow)"
+		_skip+="or(test_identityless_reduction_huge_array)"
+		_skip+="or((TestKind)and(test_int))"
+		# these 3 fail in CI but not locally
+		_skip+="or(test_einsum_sums_int8)"
+		_skip+="or(test_einsum_sums_uint8)"
+		_skip+="or(test_einsum_sums_int16)"
+	fi
+
+	echo python3 runtests.py -- ${testjobs} ${_skip+-k "not(${_skip#or})"}
+	python3 runtests.py -- ${testjobs} ${_skip+-k "not(${_skip#or})"}
+}
+
 post_install() {
 	rm ${DESTDIR}/usr/bin/f2py
 

From b451ea788e53afabfc5a693dd3c3c6b5b870eb0f Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Mon, 26 Jun 2023 15:18:18 +0000
Subject: [PATCH 1376/1853] ZMusic: update to version 1.1.12.

---
 srcpkgs/ZMusic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index 8a66744e49cd..e35e9cb5bc61 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,6 +1,6 @@
 # Template file for 'ZMusic'
 pkgname=ZMusic
-version=1.1.10
+version=1.1.12
 revision=1
 build_style=cmake
 configure_args="-DDYN_SNDFILE=OFF -DDYN_FLUIDSYNTH=OFF -DDYN_MPG123=OFF"
@@ -10,8 +10,8 @@ short_desc="GZDoom's music system"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/coelckers/ZMusic"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=378435b35f02a3123ee9e01b5e7990017f9bc1244b788e3bf54b37b34a2985ba
+distfiles="https://github.com/coelckers/ZMusic/archive/${version}.tar.gz"
+checksum=da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel"

From 65ffcefcc2e279a29a6f1d1553439f3e3750281c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Jun 2023 12:58:36 -0400
Subject: [PATCH 1377/1853] linux5.10: fix config for arm64

---
 srcpkgs/linux5.10/files/arm64-dotconfig | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index d545af941df9..4c08cd766b1e 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,12 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.159 Kernel Configuration
+# Linux/arm64 5.10.185 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120200
 CONFIG_LD_VERSION=239000000
 CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23900
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -79,8 +81,6 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
-CONFIG_CONTEXT_TRACKING=y
-# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
@@ -92,8 +92,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 #
 # CPU/Task time and stats accounting
 #
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_SCHED_THERMAL_PRESSURE=y
@@ -1660,7 +1659,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1735,7 +1733,6 @@ CONFIG_NET_SCH_ETS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2571,7 +2568,6 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -2744,6 +2740,7 @@ CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
@@ -4363,7 +4360,6 @@ CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
@@ -6724,7 +6720,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_RCAR_DW_HDMI=m
-CONFIG_DRM_RCAR_LVDS=m
+# CONFIG_DRM_RCAR_USE_LVDS is not set
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y

From 25e033517bdc13456f852dd9e4a044f451cabfcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Jun 2023 19:39:35 +0200
Subject: [PATCH 1378/1853] ocl-icd: update to 2.3.2.

fixes a FTBFS due to opencl2-headers-2023.04.17_1
---
 srcpkgs/ocl-icd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
index 552b0618f78b..829692e27dbf 100644
--- a/srcpkgs/ocl-icd/template
+++ b/srcpkgs/ocl-icd/template
@@ -1,6 +1,6 @@
 # Template file for 'ocl-icd'
 pkgname=ocl-icd
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="ruby xmlto asciidoc automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://forge.imag.fr/projects/ocl-icd/"
 distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=a32b67c2d52ffbaf490be9fc18b46428ab807ab11eff7664d7ff75e06cfafd6d
+checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
 
 provides="libOpenCL-1.2_1"
 replaces="libOpenCL>=0"

From 79e28b9ececa510ab8d98cded766c75d13232d1d Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Mon, 26 Jun 2023 13:26:47 -0400
Subject: [PATCH 1379/1853] tea: add update file

---
 srcpkgs/tea/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/tea/update

diff --git a/srcpkgs/tea/update b/srcpkgs/tea/update
new file mode 100644
index 000000000000..07e104e7333e
--- /dev/null
+++ b/srcpkgs/tea/update
@@ -0,0 +1,2 @@
+site=https://gitea.com/gitea/tea/tags
+pkgname=v

From e5277a6faa49caedc766917083598345dac36e6f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 26 Jun 2023 13:49:34 -0400
Subject: [PATCH 1380/1853] azote: update to 1.12.1, adopt

---
 srcpkgs/azote/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 319a5f5b3ad8..463489ff115a 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,17 +1,17 @@
 # Template file for 'azote'
 pkgname=azote
-version=1.12.0
+version=1.12.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="gtk+3 libappindicator python3 python3-cairo python3-gobject
  python3-Pillow python3-send2trash python3-yaml"
 short_desc="Wallpaper & color manager for Sway, i3 and other WMs"
-maintainer="Piotr Miller <nwg.piotr@gmail.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/azote"
 distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/v${version}.tar.gz"
-checksum=f36962755f266ab3adf21fe997ad0df7ff4c372b6d9e7437d6c815e75ad479dc
+checksum=dd47f2d954446fbb344b5c458b43ce8a9432bab4581ec78d7816449e731489a4
 make_check=no # no tests provided
 
 post_install() {

From b2bdf40a0b8fd5a9580764e98d5fd70bc6f810e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Jun 2023 14:10:35 -0400
Subject: [PATCH 1381/1853] python3-pyopencl: update to 2023.1.1.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 4b76973a5312..572ea9213bf5 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2023.1
+version=2023.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=d9de607272919a507a9c24c3dfeeeafe72c05f7cd6c9e37b2119e8ee3c53a891
+checksum=0ad92578a94a0be0dedd5ca4fcb6e27b5a75de4e5fac757f04c9044bd9d42444
 # Tests require a working OpenCL platform
 make_check=no
 

From 6576c29384fb7ddf31f4377a656fa512c12f7cb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Jun 2023 14:10:51 -0400
Subject: [PATCH 1382/1853] python3-redis: update to 4.6.0.

---
 srcpkgs/python3-redis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index 8df9f112be2e..214b7c421e9a 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-redis'
 pkgname=python3-redis
-version=4.5.5
+version=4.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/redis/redis-py"
 changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES"
 distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880
+checksum=585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d
 replaces="python3-aioredis<=2.0.1_1"
 make_check=no # tests require a running redis server
 

From 56c70546aa1f4b7d2d20475f41d6974bf3f52f11 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 19:20:12 +0530
Subject: [PATCH 1383/1853] *: orphan packages by k4leg

---
 srcpkgs/autopep8/template                   | 2 +-
 srcpkgs/exfatprogs/template                 | 2 +-
 srcpkgs/kgpg/template                       | 2 +-
 srcpkgs/python3-binaryornot/template        | 2 +-
 srcpkgs/python3-boolean.py/template         | 2 +-
 srcpkgs/python3-debian/template             | 2 +-
 srcpkgs/python3-license-expression/template | 2 +-
 srcpkgs/python3-parameterized/template      | 2 +-
 srcpkgs/python3-platformdirs/template       | 2 +-
 srcpkgs/python3-tokenize-rt/template        | 2 +-
 srcpkgs/reuse/template                      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/autopep8/template b/srcpkgs/autopep8/template
index e110c4f1587e..9cd4a3d944a3 100644
--- a/srcpkgs/autopep8/template
+++ b/srcpkgs/autopep8/template
@@ -9,7 +9,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-pycodestyle"
 checkdepends="python3-pytest $depends"
 short_desc="Automatically formats Python code to conform to the PEP 8 style guide"
-maintainer="k4leg <d0xi@inbox.ru>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/hhatto/autopep8"
 changelog="https://github.com/hhatto/autopep8/releases"
diff --git a/srcpkgs/exfatprogs/template b/srcpkgs/exfatprogs/template
index 6277c079ba50..4e259e11490c 100644
--- a/srcpkgs/exfatprogs/template
+++ b/srcpkgs/exfatprogs/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 build_style=gnu-configure
 short_desc="Tools to create, check and label exFAT filesystems"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/exfatprogs/exfatprogs"
 changelog="https://raw.githubusercontent.com/exfatprogs/exfatprogs/master/NEWS"
diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
index 0c551394f9f1..6523169a182d 100644
--- a/srcpkgs/kgpg/template
+++ b/srcpkgs/kgpg/template
@@ -13,7 +13,7 @@ makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel
 depends="gnupg"
 checkdepends="gnupg"
 short_desc="Simple interface for GnuPG, a powerful encryption utility"
-maintainer="k4leg <d0xi@inbox.ru>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.kgpg"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kgpg"
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
index e247e5dd23a3..7009d0373881 100644
--- a/srcpkgs/python3-binaryornot/template
+++ b/srcpkgs/python3-binaryornot/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-chardet"
 checkdepends="python3-hypothesis $depends"
 short_desc="Pure Python package to check if a file is binary or text"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/audreyfeldroy/binaryornot"
 changelog="https://raw.githubusercontent.com/audreyfeldroy/binaryornot/master/HISTORY.rst"
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
index 5d295b5d8dcd..57be72b1cd46 100644
--- a/srcpkgs/python3-boolean.py/template
+++ b/srcpkgs/python3-boolean.py/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Small library implementing a boolean algebra"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/bastikr/boolean.py"
 changelog="https://raw.githubusercontent.com/bastikr/boolean.py/master/CHANGELOG.rst"
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
index f2a8388a361b..0f25ebc788df 100644
--- a/srcpkgs/python3-debian/template
+++ b/srcpkgs/python3-debian/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-chardet"
 checkdepends="${depends} dpkg tar python3-pytest"
 short_desc="Python modules work with Debian-related data formats"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pypi.org/project/python-debian"
 changelog="https://salsa.debian.org/python-debian-team/python-debian/raw/master/debian/changelog"
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
index e6064d349a3a..13e57606dd20 100644
--- a/srcpkgs/python3-license-expression/template
+++ b/srcpkgs/python3-license-expression/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-setuptools_scm"
 depends="python3-boolean.py"
 checkdepends="python3-pytest $depends"
 short_desc="Library to parse, normalize and compare license expressions"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/nexB/license-expression"
 changelog="https://raw.githubusercontent.com/nexB/license-expression/master/CHANGELOG.rst"
diff --git a/srcpkgs/python3-parameterized/template b/srcpkgs/python3-parameterized/template
index 713a11c570e6..2536cba37950 100644
--- a/srcpkgs/python3-parameterized/template
+++ b/srcpkgs/python3-parameterized/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-mock python3-nose"
 short_desc="Parameterized testing with any Python test framework"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause-Views"
 homepage="https://github.com/wolever/parameterized"
 changelog="https://raw.githubusercontent.com/wolever/parameterized/master/CHANGELOG.txt"
diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index c9f34973027b..9aa52606afdb 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -7,7 +7,7 @@ hostmakedepends="hatchling hatch-vcs"
 depends="python3"
 checkdepends="python3-appdirs python3-pytest python3-pytest-mock"
 short_desc="Library to determine platform-specific system directories"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
diff --git a/srcpkgs/python3-tokenize-rt/template b/srcpkgs/python3-tokenize-rt/template
index 1253a28ff309..37253ddac20e 100644
--- a/srcpkgs/python3-tokenize-rt/template
+++ b/srcpkgs/python3-tokenize-rt/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Wrapper around the stdlib \`tokenize\` which roundtrips"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pypi.org/project/tokenize-rt"
 # Don't use PyPI because tests are missing.
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
index 375ff79fed94..be82ae7323cb 100644
--- a/srcpkgs/reuse/template
+++ b/srcpkgs/reuse/template
@@ -12,7 +12,7 @@ depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
  python3-license-expression python3-requests python3-setuptools"
 checkdepends="python3-pytest $depends git mercurial"
 short_desc="Helper tool for compliance with REUSE Specification"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0, Apache-2.0, CC-BY-SA-4.0"
 homepage="https://reuse.software"
 changelog="https://raw.githubusercontent.com/fsfe/reuse-tool/master/CHANGELOG.md"

From 081d7a3c7670258fde4c92c7a017ab5f47637fab Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:20:36 +0200
Subject: [PATCH 1384/1853] duktape: fix update-check

---
 srcpkgs/duktape/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/duktape/update

diff --git a/srcpkgs/duktape/update b/srcpkgs/duktape/update
new file mode 100644
index 000000000000..94aec26a2143
--- /dev/null
+++ b/srcpkgs/duktape/update
@@ -0,0 +1 @@
+site="https://duktape.org/download.html"

From 48c72007edfe6a19c60f376d4195f1db84e2a1c6 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:29:45 +0200
Subject: [PATCH 1385/1853] exempi: fix update-check

---
 srcpkgs/exempi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template
index d664f7dc4d80..bb3758f029e4 100644
--- a/srcpkgs/exempi/template
+++ b/srcpkgs/exempi/template
@@ -8,7 +8,7 @@ makedepends="zlib-devel expat-devel boost-devel"
 short_desc="Library for easy parsing of XMP metadata"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://libopenraw.freedesktop.org/wiki/Exempi"
+homepage="https://libopenraw.freedesktop.org/exempi/"
 distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2"
 checksum=4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d
 

From d12e239a12acc7e372d377b1b9e5097af1db09f1 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:32:54 +0200
Subject: [PATCH 1386/1853] expat: fix update-check

---
 srcpkgs/expat/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/expat/update b/srcpkgs/expat/update
index 86244456f40c..79a0b1dff130 100644
--- a/srcpkgs/expat/update
+++ b/srcpkgs/expat/update
@@ -1 +1 @@
-site='https://github.com/libexpat/libexpat/releases'
+pattern='R_\K[\d_]+'

From b2049cc727c30f326f5b6e3690b514dcf50a6446 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:37:16 +0200
Subject: [PATCH 1387/1853] font-alef: fix update-check

---
 srcpkgs/font-alef/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/font-alef/update

diff --git a/srcpkgs/font-alef/update b/srcpkgs/font-alef/update
new file mode 100644
index 000000000000..85d038ef823c
--- /dev/null
+++ b/srcpkgs/font-alef/update
@@ -0,0 +1 @@
+pkgname="alef"

From d25f1bbd7fc562ab0b6ef6b785e9a84ec8983772 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:46:47 +0200
Subject: [PATCH 1388/1853] glibc: fix update-check

---
 srcpkgs/glibc/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/glibc/update

diff --git a/srcpkgs/glibc/update b/srcpkgs/glibc/update
new file mode 100644
index 000000000000..37c14e80bba9
--- /dev/null
+++ b/srcpkgs/glibc/update
@@ -0,0 +1 @@
+pattern='\K[\d.]+(?= released)'

From 48ecee199e2ce3f51ba7bffc8808bb35c1926bb6 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:01:53 +0200
Subject: [PATCH 1389/1853] libcloudproviders: fix update-check

---
 srcpkgs/libcloudproviders/template | 2 +-
 srcpkgs/libcloudproviders/update   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/libcloudproviders/update

diff --git a/srcpkgs/libcloudproviders/template b/srcpkgs/libcloudproviders/template
index 65b920a0cc2a..3b429a93b378 100644
--- a/srcpkgs/libcloudproviders/template
+++ b/srcpkgs/libcloudproviders/template
@@ -10,7 +10,7 @@ makedepends="libglib-devel"
 short_desc="DBus API for cloud storage sync clients to expose their services"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/Incubator/libcloudproviders"
+homepage="https://gitlab.gnome.org/World/libcloudproviders"
 distfiles="${homepage}/-/archive/${version}/libcloudproviders-${version}.tar.gz"
 checksum=bd00e7b85d84d201bd36f6e460555d8ba41246d63d5f3607ff7542a257f27236
 
diff --git a/srcpkgs/libcloudproviders/update b/srcpkgs/libcloudproviders/update
deleted file mode 100644
index f176e54e6b9d..000000000000
--- a/srcpkgs/libcloudproviders/update
+++ /dev/null
@@ -1 +0,0 @@
-site=https://gitlab.gnome.org/Incubator/libcloudproviders/tags

From 4d1000ff58b9690a7448e557e7f99abc2a6fe36a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:15:26 +0200
Subject: [PATCH 1390/1853] libnl3: fix update-check

---
 srcpkgs/libnl3/update | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libnl3/update b/srcpkgs/libnl3/update
index d33f5a4a1ec1..1c19d54f2795 100644
--- a/srcpkgs/libnl3/update
+++ b/srcpkgs/libnl3/update
@@ -1,2 +1 @@
-site=https://github.com/thom311/libnl/releases
-pattern="libnl-\K[\d.]*(?=\.tar\.gz)"
+pattern="libnl\K[\d_]+"

From cf321af2e37be0d1c4b36958fc4f37328ce019a8 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:17:33 +0200
Subject: [PATCH 1391/1853] libopenal: fix update-check

---
 srcpkgs/libopenal/update | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libopenal/update b/srcpkgs/libopenal/update
index fdfad4e3c438..616d2425c8d8 100644
--- a/srcpkgs/libopenal/update
+++ b/srcpkgs/libopenal/update
@@ -1,2 +1 @@
 pkgname=openal-soft
-site=https://github.com/kcat/openal-soft/releases

From e5ae18a6eb26ddb0dfa60ae6394d751233da491f Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:26:11 +0200
Subject: [PATCH 1392/1853] libsamplerate: fix update-check

---
 srcpkgs/libsamplerate/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/libsamplerate/update

diff --git a/srcpkgs/libsamplerate/update b/srcpkgs/libsamplerate/update
deleted file mode 100644
index 8ccb86344234..000000000000
--- a/srcpkgs/libsamplerate/update
+++ /dev/null
@@ -1 +0,0 @@
-site="${homepage}/download.html"

From eb3a8a662b2718b68b8b91ea625c1aae0f56d1e1 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:28:48 +0200
Subject: [PATCH 1393/1853] libupnp: fix update-check

---
 srcpkgs/libupnp/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/libupnp/update

diff --git a/srcpkgs/libupnp/update b/srcpkgs/libupnp/update
new file mode 100644
index 000000000000..1f149c440447
--- /dev/null
+++ b/srcpkgs/libupnp/update
@@ -0,0 +1 @@
+pkgname="release"

From daa0729357fe2f029e1488e4a6ec77e7f2b79b73 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:33:59 +0200
Subject: [PATCH 1394/1853] libxcvt: fix update-check

---
 srcpkgs/libxcvt/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/libxcvt/update

diff --git a/srcpkgs/libxcvt/update b/srcpkgs/libxcvt/update
new file mode 100644
index 000000000000..fb7e1c566b6c
--- /dev/null
+++ b/srcpkgs/libxcvt/update
@@ -0,0 +1,2 @@
+site="https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/tags"
+pattern="libxcvt-\K[\d.]+(?=</a>)"

From 5b286db91712bf48e8d622b4491c6f573074e08a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:39:47 +0200
Subject: [PATCH 1395/1853] lm_sensors: fix update-check

---
 srcpkgs/lm_sensors/template | 2 +-
 srcpkgs/lm_sensors/update   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lm_sensors/update

diff --git a/srcpkgs/lm_sensors/template b/srcpkgs/lm_sensors/template
index f03b80aa45bf..6e5091c9f9be 100644
--- a/srcpkgs/lm_sensors/template
+++ b/srcpkgs/lm_sensors/template
@@ -10,7 +10,7 @@ depends="perl"
 short_desc="Utilities to read temperature/voltage/fan sensors"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://github.com/lm-sensors/lm-sensors"
+homepage="https://hwmon.wiki.kernel.org/lm_sensors"
 distfiles="https://github.com/lm-sensors/lm-sensors/archive/V${version//./-}.tar.gz"
 checksum=0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197
 
diff --git a/srcpkgs/lm_sensors/update b/srcpkgs/lm_sensors/update
new file mode 100644
index 000000000000..2900125842b6
--- /dev/null
+++ b/srcpkgs/lm_sensors/update
@@ -0,0 +1 @@
+pattern='V\K[\d-]+(?=</a>)'

From f16370e4680355e5046f5bfb1ec90ad48853c32a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:44:31 +0200
Subject: [PATCH 1396/1853] ocl-icd: fix update-check

---
 srcpkgs/ocl-icd/template | 2 +-
 srcpkgs/ocl-icd/update   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/ocl-icd/update

diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
index 829692e27dbf..2581cd299929 100644
--- a/srcpkgs/ocl-icd/template
+++ b/srcpkgs/ocl-icd/template
@@ -8,7 +8,7 @@ makedepends="opencl2-headers"
 short_desc="Generic OpenCL ICD loader/demultiplexer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://forge.imag.fr/projects/ocl-icd/"
+homepage="https://github.com/OCL-dev/ocl-icd"
 distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
 checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
 
diff --git a/srcpkgs/ocl-icd/update b/srcpkgs/ocl-icd/update
deleted file mode 100644
index fdf6b37ed231..000000000000
--- a/srcpkgs/ocl-icd/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern=$pkgname' \K[\d.]+'

From 5d2737e4551998f35ac815ae4da544506c0a5874 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:23:17 +0200
Subject: [PATCH 1397/1853] soundtouch: fix update-check

---
 srcpkgs/soundtouch/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/soundtouch/update

diff --git a/srcpkgs/soundtouch/update b/srcpkgs/soundtouch/update
new file mode 100644
index 000000000000..4de4fc8fe297
--- /dev/null
+++ b/srcpkgs/soundtouch/update
@@ -0,0 +1,2 @@
+site="https://codeberg.org/soundtouch/soundtouch/tags"
+pattern='/soundtouch/soundtouch/archive/\K[\d.]+(?=tar.gz)'

From e6eedf361247049863847a0e7df31bebbd78477a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:24:54 +0200
Subject: [PATCH 1398/1853] source-sans-pro: fix update-check

---
 srcpkgs/source-sans-pro/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/source-sans-pro/update

diff --git a/srcpkgs/source-sans-pro/update b/srcpkgs/source-sans-pro/update
deleted file mode 100644
index 9166ab654134..000000000000
--- a/srcpkgs/source-sans-pro/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="source-sans-pro/archive/\K[.\d]+"

From 66e1b157be697717f67f5e218cd35d9a306d0bc3 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:29:23 +0200
Subject: [PATCH 1399/1853] usbredir: fix update-check

---
 srcpkgs/usbredir/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/usbredir/update

diff --git a/srcpkgs/usbredir/update b/srcpkgs/usbredir/update
new file mode 100644
index 000000000000..24b023face73
--- /dev/null
+++ b/srcpkgs/usbredir/update
@@ -0,0 +1 @@
+pkgname="usbredir-usbredir"

From cbb035fe94f88ad3ba1e8ef5f5eea46aaccbc5b5 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:39:34 +0200
Subject: [PATCH 1400/1853] wayland-protocols: fix update-check

---
 srcpkgs/wayland-protocols/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/wayland-protocols/update

diff --git a/srcpkgs/wayland-protocols/update b/srcpkgs/wayland-protocols/update
deleted file mode 100644
index 264a5c715ffc..000000000000
--- a/srcpkgs/wayland-protocols/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/wayland-project/wayland-protocols/releases
-pkgname=

From 01ecc9b5d27ef4d2332ff4ae54e89262716f90d1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 Jan 2023 23:59:17 +0000
Subject: [PATCH 1401/1853] black: ignore alpha and beta releases.

---
 srcpkgs/black/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/black/update

diff --git a/srcpkgs/black/update b/srcpkgs/black/update
new file mode 100644
index 000000000000..e957dc43055f
--- /dev/null
+++ b/srcpkgs/black/update
@@ -0,0 +1 @@
+ignore="*a* *b*"

From 376d4d42ff24bd01daf14105705d06e7caaf060a Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 14 Jun 2023 01:00:44 -0400
Subject: [PATCH 1402/1853] srcpkgs/*: remove all cryptocurrency/blockchain
 packages

---
 CONTRIBUTING.md                               |   1 +
 common/shlibs                                 |   1 -
 srcpkgs/Electron-Cash/template                |  28 -----
 srcpkgs/bitcoin-devel                         |   1 -
 srcpkgs/bitcoin-qt                            |   1 -
 srcpkgs/bitcoin/patches/fix-test.patch        |  22 ----
 srcpkgs/bitcoin/template                      |  74 ------------
 srcpkgs/bitcoin/update                        |   2 -
 srcpkgs/cointop/template                      |  12 --
 srcpkgs/cpuminer/template                     |  13 ---
 srcpkgs/electrum-ltc/patches/no-certifi.patch |  97 ----------------
 srcpkgs/electrum-ltc/template                 |  19 ----
 srcpkgs/electrum/files/README.voidlinux       |   3 -
 srcpkgs/electrum/template                     |  31 -----
 srcpkgs/electrum/update                       |   3 -
 srcpkgs/geth                                  |   1 -
 srcpkgs/go-ethereum/template                  |  27 -----
 srcpkgs/libbitcoin-secp256k1-devel            |   1 -
 srcpkgs/libbitcoin-secp256k1/template         |  35 ------
 srcpkgs/litecoin/patches/fix-include.patch    |  61 ----------
 srcpkgs/litecoin/template                     |  34 ------
 srcpkgs/monero-devel                          |   1 -
 srcpkgs/monero-gui/INSTALL.msg                |   4 -
 srcpkgs/monero-gui/files                      |   1 -
 srcpkgs/monero-gui/template                   | 106 ------------------
 srcpkgs/monero-gui/update                     |   2 -
 srcpkgs/monero/files/monerod/run              |   3 -
 srcpkgs/monero/patches/easylogging.patch      |  11 --
 srcpkgs/monero/patches/fix-include.patch      |  29 -----
 srcpkgs/monero/patches/march_cross.patch      |  13 ---
 srcpkgs/monero/patches/system-miniupnpc.patch | 106 ------------------
 srcpkgs/monero/template                       |  94 ----------------
 srcpkgs/monero/update                         |   2 -
 srcpkgs/namecoin/patches/boost-1.80.patch     |  57 ----------
 srcpkgs/namecoin/patches/fix-include.patch    |  77 -------------
 srcpkgs/namecoin/template                     |  32 ------
 srcpkgs/namecoin/update                       |   1 -
 srcpkgs/nxt/files/bin/nxt                     |   2 -
 srcpkgs/nxt/files/bin/nxt-tor                 |   2 -
 srcpkgs/nxt/files/nxt-tor/run                 |   4 -
 srcpkgs/nxt/files/nxt/run                     |   3 -
 srcpkgs/nxt/template                          |  25 -----
 srcpkgs/removed-packages/template             |  19 +++-
 srcpkgs/swarm/template                        |  13 ---
 44 files changed, 19 insertions(+), 1055 deletions(-)
 delete mode 100644 srcpkgs/Electron-Cash/template
 delete mode 120000 srcpkgs/bitcoin-devel
 delete mode 120000 srcpkgs/bitcoin-qt
 delete mode 100644 srcpkgs/bitcoin/patches/fix-test.patch
 delete mode 100644 srcpkgs/bitcoin/template
 delete mode 100644 srcpkgs/bitcoin/update
 delete mode 100644 srcpkgs/cointop/template
 delete mode 100644 srcpkgs/cpuminer/template
 delete mode 100644 srcpkgs/electrum-ltc/patches/no-certifi.patch
 delete mode 100644 srcpkgs/electrum-ltc/template
 delete mode 100644 srcpkgs/electrum/files/README.voidlinux
 delete mode 100644 srcpkgs/electrum/template
 delete mode 100644 srcpkgs/electrum/update
 delete mode 120000 srcpkgs/geth
 delete mode 100644 srcpkgs/go-ethereum/template
 delete mode 120000 srcpkgs/libbitcoin-secp256k1-devel
 delete mode 100644 srcpkgs/libbitcoin-secp256k1/template
 delete mode 100644 srcpkgs/litecoin/patches/fix-include.patch
 delete mode 100644 srcpkgs/litecoin/template
 delete mode 120000 srcpkgs/monero-devel
 delete mode 100644 srcpkgs/monero-gui/INSTALL.msg
 delete mode 120000 srcpkgs/monero-gui/files
 delete mode 100644 srcpkgs/monero-gui/template
 delete mode 100644 srcpkgs/monero-gui/update
 delete mode 100644 srcpkgs/monero/files/monerod/run
 delete mode 100644 srcpkgs/monero/patches/easylogging.patch
 delete mode 100644 srcpkgs/monero/patches/fix-include.patch
 delete mode 100644 srcpkgs/monero/patches/march_cross.patch
 delete mode 100644 srcpkgs/monero/patches/system-miniupnpc.patch
 delete mode 100644 srcpkgs/monero/template
 delete mode 100644 srcpkgs/monero/update
 delete mode 100644 srcpkgs/namecoin/patches/boost-1.80.patch
 delete mode 100644 srcpkgs/namecoin/patches/fix-include.patch
 delete mode 100644 srcpkgs/namecoin/template
 delete mode 100644 srcpkgs/namecoin/update
 delete mode 100644 srcpkgs/nxt/files/bin/nxt
 delete mode 100644 srcpkgs/nxt/files/bin/nxt-tor
 delete mode 100644 srcpkgs/nxt/files/nxt-tor/run
 delete mode 100644 srcpkgs/nxt/files/nxt/run
 delete mode 100644 srcpkgs/nxt/template
 delete mode 100644 srcpkgs/swarm/template

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bc9ff3e9d5d3..a8f58bbb3744 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,6 +20,7 @@ while not meeting any of the following requirements, is a good candidate for the
 In particular, new themes are highly unlikely to be accepted.
 Simple shell scripts are unlikely to be accepted unless they provide considerable value to a broad user base.
 New fonts may be accepted if they provide value beyond aesthetics (e.g. they contain glyphs for a script missing in already packaged fonts).
+Packages related to cryptocurrencies (wallets, miners, nodes, etc) are not accepted.
 
 Browser forks, including those based on Chromium and Firefox, are generally not accepted.
 Such forks require heavy patching, maintenance and hours of build time.
diff --git a/common/shlibs b/common/shlibs
index 525c08a30424..754c2aa23049 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3671,7 +3671,6 @@ libdwarves_emit.so.1 pahole-1.12_1
 libdwarves_reorganize.so.1 pahole-1.12_1
 libclthreads.so.2 clthreads-2.4.2_1
 libclxclient.so.3 clxclient-3.9.2_1
-libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1
 libltc.so.11 libltc-1.3.1_1
 libvpd-2.2.so.2 libvpd-2.2.6_1
 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
deleted file mode 100644
index 38ca3449b093..000000000000
--- a/srcpkgs/Electron-Cash/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'Electron-Cash'
-pkgname=Electron-Cash
-version=4.2.10
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
-depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil
- python3-jsonrpclib python3-protobuf
- python3-dnspython python3-requests python3-pysocks python3-stem
- python3-ecdsa python3-pyaes python3-pycryptodomex libbitcoin-secp256k1 libzbar
- python3-cryptography>=2.6 python3-pathvalidate python3-psutil"
-short_desc="Lightweight Bitcoin Cash client"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://electroncash.org"
-distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz"
-checksum=2c77258c0e8ccdc42d16cd9bdbc26b47f94b92d9ba8a86d63c25a17ec832b324
-make_check=no # Depends on unpackaged SimpleWebSocketServer
-
-post_install() {
-	# TODO: build these binaries instead of having to remove pre-built ones
-	rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor"
-
-	for lib in zbar secp256k1; do
-		rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
-	done
-	vlicense LICENCE
-}
diff --git a/srcpkgs/bitcoin-devel b/srcpkgs/bitcoin-devel
deleted file mode 120000
index f3c13956326c..000000000000
--- a/srcpkgs/bitcoin-devel
+++ /dev/null
@@ -1 +0,0 @@
-bitcoin
\ No newline at end of file
diff --git a/srcpkgs/bitcoin-qt b/srcpkgs/bitcoin-qt
deleted file mode 120000
index f3c13956326c..000000000000
--- a/srcpkgs/bitcoin-qt
+++ /dev/null
@@ -1 +0,0 @@
-bitcoin
\ No newline at end of file
diff --git a/srcpkgs/bitcoin/patches/fix-test.patch b/srcpkgs/bitcoin/patches/fix-test.patch
deleted file mode 100644
index 0004fd7358a5..000000000000
--- a/srcpkgs/bitcoin/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: bitcoin-22.0/src/wallet/test/init_tests.cpp
-===================================================================
---- bitcoin-22.0.orig/src/wallet/test/init_tests.cpp
-+++ bitcoin-22.0/src/wallet/test/init_tests.cpp
-@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(walletinit_verify_w
-     BOOST_CHECK(result == true);
-     fs::path walletdir = gArgs.GetArg("-walletdir", "");
-     fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
--    BOOST_CHECK_EQUAL(walletdir, expected_path);
-+    BOOST_TEST(fs::equivalent(walletdir, expected_path));
- }
- 
- BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_no_trailing2)
-@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(walletinit_verify_w
-     BOOST_CHECK(result == true);
-     fs::path walletdir = gArgs.GetArg("-walletdir", "");
-     fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
--    BOOST_CHECK_EQUAL(walletdir, expected_path);
-+    BOOST_TEST(fs::equivalent(walletdir, expected_path));
- }
- 
- BOOST_AUTO_TEST_SUITE_END()
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
deleted file mode 100644
index cf464ce35c46..000000000000
--- a/srcpkgs/bitcoin/template
+++ /dev/null
@@ -1,74 +0,0 @@
-# Template file for 'bitcoin'
-pkgname=bitcoin
-version=22.0
-revision=5
-build_style=gnu-configure
-configure_args="--with-incompatible-bdb --disable-ccache --disable-static
- --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
-hostmakedepends="automake libtool pkg-config yasm"
-makedepends="db-devel boost-devel miniupnpc-devel qt5-tools-devel
- libevent-devel qrencode-devel libatomic-devel sqlite-devel"
-short_desc="Bitcoin is a peer-to-peer network based digital currency"
-maintainer="Daniel A. Maierhofer <git@damadmai.at>"
-license="MIT"
-homepage="https://bitcoin.org/"
-distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
- https://raw.githubusercontent.com/bitcoin-core/packaging/${version%.*}.x/debian/bitcoin-qt.desktop
- https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
-checksum="d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b
- 0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
- ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
-conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
-skip_extraction="bitcoin-qt.desktop bitcoin128.png"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools"
-fi
-
-pre_configure() {
-	autoreconf -fi
-	case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		CFLAGS=${CFLAGS/armv8-a/armv8-a+crc+crypto}
-		CXXFLAGS=${CXXFLAGS/armv8-a/armv8-a+crc+crypto}
-		;;
-	esac
-}
-
-pre_build() {
-	export BITCOIN_GENBUILD_NO_GIT=1
-}
-
-post_install() {
-	rm "${DESTDIR}"/usr/bin/{test,bench}_bitcoin
-
-	for b in bitcoind bitcoin-cli bitcoin-tx; do
-		vcompletion contrib/${b}.bash-completion bash $b
-	done
-
-	vlicense COPYING
-}
-
-bitcoin-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vdoc doc/shared-libraries.md # Provides information on libbitcoinconsensus
-	}
-}
-
-bitcoin-qt_package() {
-	depends="desktop-file-utils"
-	short_desc+=" - QT GUI"
-	pkg_install() {
-		vmove usr/bin/bitcoin-qt
-		vmove usr/share/man/man1/bitcoin-qt.1
-		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin-qt.desktop 644 usr/share/applications
-		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin128.png 644 usr/share/pixmaps
-		vlicense COPYING
-		rm "${DESTDIR}"/usr/bin/test_bitcoin-qt
-	}
-}
diff --git a/srcpkgs/bitcoin/update b/srcpkgs/bitcoin/update
deleted file mode 100644
index b28ea45c0898..000000000000
--- a/srcpkgs/bitcoin/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitcoin.org/bin/"
-pattern='bitcoin-core-\K[\d.]+'
diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
deleted file mode 100644
index 343f2ad20a49..000000000000
--- a/srcpkgs/cointop/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'cointop'
-pkgname=cointop
-version=1.6.10
-revision=1
-build_style=go
-go_import_path="github.com/cointop-sh/cointop"
-short_desc="Terminal based application for tracking cryptocurrencies"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/cointop-sh/cointop"
-distfiles="https://github.com/cointop-sh/cointop/archive/v${version}.tar.gz"
-checksum=18da0d25288deec7156ddd1d6923960968ab4adcdc917f85726b97d555d9b1b7
diff --git a/srcpkgs/cpuminer/template b/srcpkgs/cpuminer/template
deleted file mode 100644
index 8afb7a5c4877..000000000000
--- a/srcpkgs/cpuminer/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'cpuminer'
-pkgname=cpuminer
-version=2.5.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config yasm"
-makedepends="libcurl-devel ncurses-devel jansson-devel"
-short_desc="Multi-threaded CPU miner for Litecoin and Bitcoin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/pooler/cpuminer"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/pooler-${pkgname}-${version}.tar.gz"
-checksum=337f04fdb32f34b85819d09d59f6d3cf62991ac2e656735c43661dd3d4c57631
diff --git a/srcpkgs/electrum-ltc/patches/no-certifi.patch b/srcpkgs/electrum-ltc/patches/no-certifi.patch
deleted file mode 100644
index 9d68378996ba..000000000000
--- a/srcpkgs/electrum-ltc/patches/no-certifi.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/electrum_ltc/interface.py b/electrum_ltc/interface.py
-index b5eac439c..14bbd7ab9 100644
---- a/electrum_ltc/interface.py
-+++ b/electrum_ltc/interface.py
-@@ -40,7 +40,6 @@ from aiorpcx import RPCSession, Notification, NetAddress
- from aiorpcx.curio import timeout_after, TaskTimeout
- from aiorpcx.jsonrpc import JSONRPC, CodeMessageError
- from aiorpcx.rawsocket import RSClient
--import certifi
- 
- from .util import ignore_exceptions, log_exceptions, bfh, SilentTaskGroup
- from . import util
-@@ -57,7 +56,7 @@ if TYPE_CHECKING:
-     from .network import Network
- 
- 
--ca_path = certifi.where()
-+ca_path = '/etc/ssl/certs/ca-certificates.crt'
- 
- BUCKET_NAME_OF_ONION_SERVERS = 'onion'
- 
-diff --git a/electrum_ltc/paymentrequest.py b/electrum_ltc/paymentrequest.py
-index 149065bf3..9580c8d48 100644
---- a/electrum_ltc/paymentrequest.py
-+++ b/electrum_ltc/paymentrequest.py
-@@ -29,7 +29,6 @@ import traceback
- import json
- from typing import Optional
- 
--import certifi
- import urllib.parse
- import aiohttp
- 
-@@ -54,7 +53,7 @@ _logger = get_logger(__name__)
- REQUEST_HEADERS = {'Accept': 'application/litecoin-paymentrequest', 'User-Agent': 'Electrum'}
- ACK_HEADERS = {'Content-Type':'application/litecoin-payment','Accept':'application/litecoin-paymentack','User-Agent':'Electrum'}
- 
--ca_path = certifi.where()
-+ca_path = '/etc/ssl/certs/ca-certificates.crt'
- ca_list = None
- ca_keyID = None
- 
-diff --git a/electrum_ltc/util.py b/electrum_ltc/util.py
-index bc69800dc..9c32a195a 100644
---- a/electrum_ltc/util.py
-+++ b/electrum_ltc/util.py
-@@ -44,7 +44,6 @@ import ssl
- import aiohttp
- from aiohttp_socks import SocksConnector, SocksVer
- from aiorpcx import TaskGroup
--import certifi
- 
- from .i18n import _
- from .logging import get_logger, Logger
-@@ -62,7 +61,7 @@ def inv_dict(d):
-     return {v: k for k, v in d.items()}
- 
- 
--ca_path = certifi.where()
-+ca_path = '/etc/ssl/certs/ca-certificates.crt'
- 
- 
- base_units = {'LTC':8, 'mLTC':5, 'uLTC':2, 'sat':0}
-diff --git a/electrum_ltc/x509.py b/electrum_ltc/x509.py
-index c38edc77a..e745e4878 100644
---- a/electrum_ltc/x509.py
-+++ b/electrum_ltc/x509.py
-@@ -343,7 +343,6 @@ def load_certificates(ca_path):
- 
- 
- if __name__ == "__main__":
--    import certifi
- 
--    ca_path = certifi.where()
-+    ca_path = '/etc/ssl/certs/ca-certificates.crt'
-     ca_list, ca_keyID = load_certificates(ca_path)
-diff --git a/run_electrum b/run_electrum
-index 978e5fb2f..e8fc3888c 100755
---- a/run_electrum
-+++ b/run_electrum
-@@ -58,7 +58,6 @@ def check_imports():
-         import dns
-         import pyaes
-         import ecdsa
--        import certifi
-         import qrcode
-         import google.protobuf
-         import jsonrpclib
-@@ -72,7 +71,7 @@ def check_imports():
-     from google.protobuf import descriptor_pb2
-     from jsonrpclib import SimpleJSONRPCServer
-     # make sure that certificates are here
--    assert os.path.exists(certifi.where())
-+    assert os.path.exists('/etc/ssl/certs/ca-certificates.crt')
- 
- 
- if not is_android:
diff --git a/srcpkgs/electrum-ltc/template b/srcpkgs/electrum-ltc/template
deleted file mode 100644
index f476e2de0ed6..000000000000
--- a/srcpkgs/electrum-ltc/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'electrum-ltc'
-pkgname=electrum-ltc
-version=3.3.8.1
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
-depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
- python3-dnspython python3-ecdsa python3-jsonrpclib python3-protobuf
- python3-pyaes python3-pycryptodome python3-PyQt5 python3-qrcode"
-short_desc="Lightweight Litecoin port of the Electrum Bitcoin wallet"
-maintainer="Young Jin Park <youngjinpark20@gmail.com>"
-license="MIT"
-homepage="https://electrum-ltc.org/"
-distfiles="https://github.com/pooler/electrum-ltc/archive/${version}.tar.gz"
-checksum="6f4049abacfdb125b968e841ec9bc01e386e475f3fac8534103ffea1257b0f0f"
-
-post_install() {
-	vlicense LICENCE
-}
diff --git a/srcpkgs/electrum/files/README.voidlinux b/srcpkgs/electrum/files/README.voidlinux
deleted file mode 100644
index 9ba377487dac..000000000000
--- a/srcpkgs/electrum/files/README.voidlinux
+++ /dev/null
@@ -1,3 +0,0 @@
-Some optional packages must be installed for additional functionality:
-
-- python3-matplotlib: plot transaction history in graphical mode
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
deleted file mode 100644
index dcabed755423..000000000000
--- a/srcpkgs/electrum/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'electrum'
-pkgname=electrum
-version=4.2.0
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
-depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
- python3-bitstring python3-dnspython python3-ecdsa python3-jsonrpclib
- python3-protobuf python3-pyaes python3-pycryptodomex python3-PyQt5
- python3-qrcode python3-socks python3-cryptography libbitcoin-secp256k1
- python3-certifi"
-# Optional dependencies:
-#  btchip - BTChip hardware wallet support
-#  trezor - TREZOR hardware wallet support
-#  keepkey - KeepKey hardware wallet support
-#  qdarkstyle - Dark theme
-checkdepends="$depends python3-pytest"
-short_desc="Lightweight Bitcoin wallet"
-maintainer="Charles E. Lehner <cel@celehner.com>"
-license="MIT"
-homepage="https://electrum.org/"
-distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=3a24c7ed7a2bb47888f308380b8624a3fff3cf3882fd63d904cd9c3ec543fb3b
-
-post_install() {
-	vsed -i -e 's|electrum %u|electrum|' \
-		-e 's|testnet %u|testnet|' \
-		${DESTDIR}/usr/share/applications/electrum.desktop
-	vlicense LICENCE
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/electrum/update b/srcpkgs/electrum/update
deleted file mode 100644
index 4b1b69c33225..000000000000
--- a/srcpkgs/electrum/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://download.electrum.org"
-pattern='<a href="\K[\d.]+(?=/">)'
-
diff --git a/srcpkgs/geth b/srcpkgs/geth
deleted file mode 120000
index 643fd89ff2c6..000000000000
--- a/srcpkgs/geth
+++ /dev/null
@@ -1 +0,0 @@
-go-ethereum
\ No newline at end of file
diff --git a/srcpkgs/go-ethereum/template b/srcpkgs/go-ethereum/template
deleted file mode 100644
index 1377f4c3ac3f..000000000000
--- a/srcpkgs/go-ethereum/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'go-ethereum'
-pkgname=go-ethereum
-version=1.10.1
-revision=2
-build_style=go
-go_import_path=github.com/ethereum/go-ethereum
-go_package="${go_import_path}/cmd/abigen
- ${go_import_path}/cmd/bootnode
- ${go_import_path}/cmd/evm
- ${go_import_path}/cmd/geth
- ${go_import_path}/cmd/puppeth
- ${go_import_path}/cmd/rlpdump
- ${go_import_path}/cmd/clef"
-depends="geth"
-short_desc="Full suite of Go Ethereum utilities"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="GPL-3.0-only"
-homepage="https://github.com/ethereum/go-ethereum"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=485ff7b9e5a34457ab424d7e2cb8d377dc571e8daf666e065a0a327b9e413cab
-
-geth_package() {
-	short_desc="Official Go implementation of the Ethereum protocol"
-	pkg_install() {
-		vmove usr/bin/geth
-	}
-}
diff --git a/srcpkgs/libbitcoin-secp256k1-devel b/srcpkgs/libbitcoin-secp256k1-devel
deleted file mode 120000
index 527eb8d59d7e..000000000000
--- a/srcpkgs/libbitcoin-secp256k1-devel
+++ /dev/null
@@ -1 +0,0 @@
-libbitcoin-secp256k1
\ No newline at end of file
diff --git a/srcpkgs/libbitcoin-secp256k1/template b/srcpkgs/libbitcoin-secp256k1/template
deleted file mode 100644
index 42f5ad1ded0e..000000000000
--- a/srcpkgs/libbitcoin-secp256k1/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'libbitcoin-secp256k1'
-pkgname=libbitcoin-secp256k1
-version=0.1.0.13
-revision=1
-build_style=gnu-configure
-configure_args="--disable-benchmark --disable-coverage --disable-jni
- --disable-openssl-tests --enable-exhaustive-tests --enable-module-recovery
- --enable-tests --with-gnu-ld"
-hostmakedepends="autoconf automake libtool m4 pkg-config"
-short_desc="Optimized C library for EC operations on curve secp256k1"
-maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
-license="MIT"
-homepage="https://github.com/libbitcoin/secp256k1"
-distfiles="https://github.com/libbitcoin/secp256k1/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=9e48dbc88d0fb5646d40ea12df9375c577f0e77525e49833fb744d3c2a69e727
-
-pre_configure() {
-	./autogen.sh
-}
-
-post_install() {
-	vlicense COPYING
-	vdoc README.md
-}
-
-libbitcoin-secp256k1-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/litecoin/patches/fix-include.patch b/srcpkgs/litecoin/patches/fix-include.patch
deleted file mode 100644
index b540db326b87..000000000000
--- a/srcpkgs/litecoin/patches/fix-include.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: litecoin-0.18.1/src/bench/block_assemble.cpp
-===================================================================
---- litecoin-0.18.1.orig/src/bench/block_assemble.cpp
-+++ litecoin-0.18.1/src/bench/block_assemble.cpp
-@@ -20,7 +20,9 @@
- 
- #include <boost/thread.hpp>
- 
-+#include <array>
- #include <list>
-+#include <memory>
- #include <vector>
- 
- static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey)
-Index: litecoin-0.18.1/src/net_processing.cpp
-===================================================================
---- litecoin-0.18.1.orig/src/net_processing.cpp
-+++ litecoin-0.18.1/src/net_processing.cpp
-@@ -30,7 +30,9 @@
- #include <util/moneystr.h>
- #include <util/strencodings.h>
- 
-+#include <array>
- #include <memory>
-+#include <utility>
- 
- #if defined(NDEBUG)
- # error "Litecoin cannot be compiled without assertions."
-Index: litecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-===================================================================
---- litecoin-0.18.1.orig/src/qt/sendcoinsdialog.cpp
-+++ litecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-@@ -32,6 +32,8 @@
- #include <QSettings>
- #include <QTextDocument>
- 
-+#include <array>
-+
- static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
- int getConfTargetForIndex(int index) {
-     if (index+1 > static_cast<int>(confTargets.size())) {
---- a/src/httpserver.cpp	2019-04-08 09:28:20.000000000 +0200
-+++ b/src/httpserver.cpp	2019-04-08 09:28:20.000000000 +0200
-@@ -17,6 +17,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <deque>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
---- a/src/qt/trafficgraphwidget.cpp	2019-04-08 09:28:20.000000000 +0200
-+++ b/src/qt/trafficgraphwidget.cpp	2019-04-08 09:28:20.000000000 +0200
-@@ -6,6 +6,7 @@
- #include <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
deleted file mode 100644
index a7ed18603c20..000000000000
--- a/srcpkgs/litecoin/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'litecoin'
-pkgname=litecoin
-version=0.18.1
-revision=11
-build_style=gnu-configure
-configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-openssl"
-hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
- qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
-short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://www.litecoin.org/"
-distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"
-checksum=2d67cba11adc5890b9698ccddeb68dd3c2ff6af19bf3ed0f1c719348b914042f
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools protobuf"
-	configure_args+=" --with-boost=${XBPS_CROSS_BASE}"
-fi
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	vsconf share/examples/litecoin.conf
-	vman doc/man/litecoind.1 litecoind.1
-	vlicense COPYING
-	vmkdir usr/share/bash-completion/completions/${pkgname}
-	vcopy contrib/*.bash-completion usr/share/bash-completion/completions/${pkgname}
-}
diff --git a/srcpkgs/monero-devel b/srcpkgs/monero-devel
deleted file mode 120000
index 772084db0203..000000000000
--- a/srcpkgs/monero-devel
+++ /dev/null
@@ -1 +0,0 @@
-monero
\ No newline at end of file
diff --git a/srcpkgs/monero-gui/INSTALL.msg b/srcpkgs/monero-gui/INSTALL.msg
deleted file mode 100644
index 06ac937bb78f..000000000000
--- a/srcpkgs/monero-gui/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-For monero-gui to connect to the network, it needs access to a monero node.
-You may either enter a remote node in the application itself or provide
-a locally running node for it to work with. The necessary daemon software
-to run a local node is available in the 'monero' package.
diff --git a/srcpkgs/monero-gui/files b/srcpkgs/monero-gui/files
deleted file mode 120000
index 0dc85055cb8b..000000000000
--- a/srcpkgs/monero-gui/files
+++ /dev/null
@@ -1 +0,0 @@
-../monero/patches
\ No newline at end of file
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
deleted file mode 100644
index 0f4e06d5c55f..000000000000
--- a/srcpkgs/monero-gui/template
+++ /dev/null
@@ -1,106 +0,0 @@
-# Template file for 'monero-gui'
-pkgname=monero-gui
-version=0.18.1.2
-revision=4
-_monero_version=0.18.1.2
-# the revision monero uses as a submodule for the specific version
-_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
-_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
-build_style=cmake
-configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
-hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
- qt5-svg-devel qtchooser"
-makedepends="boost-devel libunwind-devel miniupnpc-devel
-qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
- qt5-svg-devel libgcrypt-devel zeromq-devel"
-depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
-short_desc="GUI for the core Monero implementation"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://getmonero.org"
-distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
- https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
- https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
- https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
- https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz
- https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz>quirc-${_quirc_gitrev}.tar.gz"
-checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
- f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
- 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
- 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
- b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
- c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz RandomX-${_randomx_gitrev}.tar.gz quirc-${_quirc_gitrev}.tar.gz"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	CFLAGS+=" -latomic"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" -DSTACK_TRACE=OFF"
-esac
-
-case "$XBPS_TARGET_MACHINE" in
-	armv7*) configure_args+=" -DARCH=armv7" ;;
-	armv6*) configure_args+=" -DARCH=armv6" ;;
-	armv5*) configure_args+=" -DARCH=armv5" ;;
-	aarch64*) configure_args+=" -DARCH=aarch64" ;;
-	mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" ;;
-	ppc64le*) configure_args+=" -DARCH=ppc64le" ;;
-	ppc64*) configure_args+=" -DARCH=ppc64" ;;
-	ppc*) configure_args+=" -DARCH=ppc"     ;;
-	*) configure_args+=" -DARCH=default" ;;
-esac
-
-post_extract() {
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/quirc-${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
-}
-
-post_patch() {
-	cd monero
-	for f in "${FILESDIR}"/*.patch; do
-		echo "Applying $f"
-		patch -Np1 -i "$f"
-	done
-}
-
-pre_configure() {
-	echo "var GUI_VERSION = \"${version}\"" > version.js
-	echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i monero/CMakeLists.txt -e \
-			'/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
-	fi
-}
-
-pre_build() {
-	cd src/zxcvbn-c
-	cmake .
-	cd ../..
-	if [ "$CROSS_BUILD" ]; then
-		# The dictgen binary is executed during the build to generate code
-		# but is not included in the binary package. It thus needs to be
-		# built for the host
-		CXX=${CXX_host} CXXFLAGS="${XBPS_CXXFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make ${makejobs} -C src/zxcvbn-c
-		# The generate_translations_header binary is executed during the build
-		# but is not included in the binary package. It thus needs to be
-		# built for the host
-		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			ninja -C build ${makejobs} generate_translations_header
-
-	fi
-	make ${makejobs} -C src/zxcvbn-c
-}
-
-do_install() {
-	vbin build/bin/monero-wallet-gui
-	vlicense LICENSE
-}
diff --git a/srcpkgs/monero-gui/update b/srcpkgs/monero-gui/update
deleted file mode 100644
index 5254358a1411..000000000000
--- a/srcpkgs/monero-gui/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/monero-project/monero-gui/tags"
-pattern='/archive/refs/tags/(v?|\Qmonero-gui\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/monero/files/monerod/run b/srcpkgs/monero/files/monerod/run
deleted file mode 100644
index f485e63659fa..000000000000
--- a/srcpkgs/monero/files/monerod/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec chpst -u monero:monero /usr/bin/monerod --non-interactive --config-file /etc/monerod.conf
diff --git a/srcpkgs/monero/patches/easylogging.patch b/srcpkgs/monero/patches/easylogging.patch
deleted file mode 100644
index 5e611672aa71..000000000000
--- a/srcpkgs/monero/patches/easylogging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/external/easylogging++/easylogging++.h	2020-05-23 09:03:47.678880438 +0200
-+++ b/external/easylogging++/easylogging++.h	2020-05-23 09:04:31.757371549 +0200
-@@ -221,7 +221,7 @@
- #  define ELPP_INTERNAL_INFO(lvl, msg)
- #endif  // (defined(ELPP_DEBUG_INFO))
- #if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
--#  if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
-+#  if ( __has_include(<execinfo.h>) && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
- #    define ELPP_STACKTRACE 1
- #  else
- #    define ELPP_STACKTRACE 0
diff --git a/srcpkgs/monero/patches/fix-include.patch b/srcpkgs/monero/patches/fix-include.patch
deleted file mode 100644
index f5ba9fa25d08..000000000000
--- a/srcpkgs/monero/patches/fix-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: monero-0.18.1.2/src/common/dns_utils.cpp
-===================================================================
---- monero-0.18.1.2.orig/src/common/dns_utils.cpp
-+++ monero-0.18.1.2/src/common/dns_utils.cpp
-@@ -38,6 +38,12 @@
- #include <boost/algorithm/string/join.hpp>
- #include <boost/optional.hpp>
- #include <boost/utility/string_ref.hpp>
-+
-+#include <deque>
-+#include <map>
-+#include <set>
-+#include <string>
-+
- using namespace epee;
- 
- #undef MONERO_DEFAULT_LOG_CATEGORY
-Index: monero-0.18.1.2/src/common/threadpool.h
-===================================================================
---- monero-0.18.1.2.orig/src/common/threadpool.h
-+++ monero-0.18.1.2/src/common/threadpool.h
-@@ -31,6 +31,7 @@
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
- #include <cstddef>
-+#include <deque>
- #include <functional>
- #include <utility>
- #include <vector>
diff --git a/srcpkgs/monero/patches/march_cross.patch b/srcpkgs/monero/patches/march_cross.patch
deleted file mode 100644
index 20c3ae90c477..000000000000
--- a/srcpkgs/monero/patches/march_cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index 953707657..394e8cb32 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -581,7 +581,7 @@ else()
-     set_default_arch()
-   endif()
-   message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
--  if(ARCH STREQUAL "default")
-+  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
-     set(ARCH_FLAG "")
-   elseif(PPC64LE)
-     set(ARCH_FLAG "-mcpu=power8")
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
deleted file mode 100644
index 6da9a92d491e..000000000000
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b05c087cf..4f1a20101 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- add_subdirectory(external)
- 
-+# Final setup for miniupnpc
-+if(UPNP_STATIC OR IOS)
-+  add_definitions("-DUPNP_STATIC")
-+else()
-+  add_definitions("-DUPNP_DYNAMIC")
-+  include_directories(${UPNP_INCLUDE})
-+endif()
-+
- # Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE_DIR})
- 
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 5b7f69a56..00ef3f43d 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -34,24 +34,47 @@
- # We always compile if we are building statically to reduce static dependency issues...
- # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
- # others.
-+if(NOT IOS)
-+    find_package(Miniupnpc QUIET)
-+endif()
- 
--find_package(Miniupnpc REQUIRED)
--
--message(STATUS "Using in-tree miniupnpc")
- set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
--if(MSVC)
--  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
--elseif(NOT MSVC)
--  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-+# If we have the correct shared version and we're not building static, use it
-+if(STATIC OR IOS)
-+ set(USE_SHARED_MINIUPNPC false)
-+elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+ set(USE_SHARED_MINIUPNPC true)
- endif()
-+
-+
-+if(USE_SHARED_MINIUPNPC)
-+  message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}")
-+
-+  set(UPNP_STATIC false PARENT_SCOPE)
-+  set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
-+  set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
-+else()
-+  if(STATIC)
-+    message(STATUS "Using miniupnpc from local source tree for static build")
-+  else()
-+    message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)")
-+  endif()
-+  add_subdirectory(miniupnp/miniupnpc)
-+
-+  set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-+  if(MSVC)
-+    set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-+  elseif(NOT MSVC)
-+    set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-+  endif()
-+
- if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
- 	set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
- endif()
- 
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+  set(UPNP_STATIC true PARENT_SCOPE)
-+  set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+endif()
- 
- find_package(Unbound)
- 
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index f33ce977d..87d23a1e1 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -60,9 +60,16 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
- 
--#include <miniupnp/miniupnpc/miniupnpc.h>
--#include <miniupnp/miniupnpc/upnpcommands.h>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+  #include <miniupnp/miniupnpc/miniupnpc.h>
-+  #include <miniupnp/miniupnpc/upnpcommands.h>
-+  #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+  #include "miniupnpc.h"
-+  #include "upnpcommands.h"
-+  #include "upnperrors.h"
-+#endif
- 
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
deleted file mode 100644
index 93a3c82fe4d6..000000000000
--- a/srcpkgs/monero/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'monero'
-pkgname=monero
-version=0.18.1.2
-revision=4
-# the revision monero uses as a submodule for the specific version
-_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
-_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-build_style=cmake
-conf_files="/etc/monerod.conf"
-make_dirs="
- /var/lib/monero 0750 monero monero
- /var/log/monero 0755 monero monero"
-hostmakedepends="pkg-config"
-makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
- readline-devel unbound-devel miniupnpc-devel expat-devel
- cppzmq czmq-devel libsodium-devel"
-short_desc="Private, secure, untraceable, decentralised digital currency"
-maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
-license="BSD-3-Clause"
-homepage="https://getmonero.org"
-distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
- https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
- https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
- https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz"
-checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
- 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
- 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
- b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="RandomX-${_randomx_gitrev}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz"
-system_accounts="monero"
-
-case "$XBPS_TARGET_MACHINE" in
-	armv7*) configure_args+=" -DARCH=armv7" ;;
-	armv6*) configure_args+=" -DARCH=armv6" ;;
-	armv5*) configure_args+=" -DARCH=armv5" ;;
-	aarch64*) configure_args+=" -DARCH=aarch64" ;;
-	mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" ;;
-	ppc64le*) configure_args+=" -DARCH=ppc64le" ;;
-	ppc64*) configure_args+=" -DARCH=ppc64" ;;
-	ppc*) configure_args+=" -DARCH=ppc"	;;
-	*) configure_args+=" -DARCH=default" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	CFLAGS+=" -latomic"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" -DSTACK_TRACE=OFF"
-esac
-
-post_extract() {
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz \
-		--strip-components=1 -C ${wrksrc}/external/randomx
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz \
-		--strip-components=1 -C ${wrksrc}/external/rapidjson
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz \
-		--strip-components=1 -C ${wrksrc}/external/supercop
-}
-
-pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		sed -i CMakeLists.txt -e \
-			'/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# The generate_translations_header binary is executed during the build
-		# but is not included in the binary package. It thus needs to be
-		# built for the host
-		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			ninja -C build ${makejobs} generate_translations_header
-	fi
-}
-
-post_install() {
-	vlicense LICENSE
-	vbin build/bin/monero-blockchain-import
-	vbin build/bin/monero-blockchain-export
-	vinstall utils/conf/monerod.conf 644 etc
-	vsv monerod
-}
-
-monero-devel_package() {
-	short_desc+=" - development files"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/monero/update b/srcpkgs/monero/update
deleted file mode 100644
index 2f68aaf68b71..000000000000
--- a/srcpkgs/monero/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/monero-project/monero/tags"
-pattern='/archive/refs/tags/(v?|\Qmonero\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/namecoin/patches/boost-1.80.patch b/srcpkgs/namecoin/patches/boost-1.80.patch
deleted file mode 100644
index 5a250af68487..000000000000
--- a/srcpkgs/namecoin/patches/boost-1.80.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/names/main.cpp
-+++ b/src/names/main.cpp
-@@ -365,12 +365,14 @@ ConflictTrackerNotifyEntryRemoved (CName
- CNameConflictTracker::CNameConflictTracker (CTxMemPool &p)
-   : txNameConflicts(std::make_shared<std::vector<CTransactionRef>>()), pool(p)
- {
-+  using namespace boost::placeholders;
-   pool.NotifyEntryRemoved.connect (
-     boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2));
- }
- 
- CNameConflictTracker::~CNameConflictTracker ()
- {
-+  using namespace boost::placeholders;
-   pool.NotifyEntryRemoved.disconnect (
-     boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2));
- }
---- a/src/wallet/test/init_test_fixture.cpp
-+++ b/src/wallet/test/init_test_fixture.cpp
-@@ -29,7 +29,7 @@ InitWalletDirTestingSetup::InitWalletDir
-     fs::create_directories(m_walletdir_path_cases["default"]);
-     fs::create_directories(m_walletdir_path_cases["custom"]);
-     fs::create_directories(m_walletdir_path_cases["relative"]);
--    std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
-+    std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
-     f.close();
- }
- 
-@@ -41,4 +41,4 @@ InitWalletDirTestingSetup::~InitWalletDi
- void InitWalletDirTestingSetup::SetWalletDir(const fs::path& walletdir_path)
- {
-     gArgs.ForceSetArg("-walletdir", walletdir_path.string());
--}
-\ No newline at end of file
-+}
---- a/src/wallet/test/db_tests.cpp
-+++ b/src/wallet/test/db_tests.cpp
-@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
-     std::string test_name = "test_name.dat";
-     fs::path datadir = SetDataDir("tempdir");
-     fs::path file_path = datadir / test_name;
--    std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
-+    std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
-     f.close();
- 
-     std::string filename;
---- a/src/fs.cpp
-+++ b/src/fs.cpp
-@@ -206,7 +206,7 @@ void ofstream::close()
- }
- #else // __GLIBCXX__
- 
--static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
-+static_assert(sizeof(BOOST_FILESYSTEM_C_STR(*fs::path())) == sizeof(wchar_t),
-     "Warning: This build is using boost::filesystem ofstream and ifstream "
-     "implementations which will fail to open paths containing multibyte "
-     "characters. You should delete this static_assert to ignore this warning, "
diff --git a/srcpkgs/namecoin/patches/fix-include.patch b/srcpkgs/namecoin/patches/fix-include.patch
deleted file mode 100644
index b923004ffa7a..000000000000
--- a/srcpkgs/namecoin/patches/fix-include.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: namecoin-0.18.1/src/bench/block_assemble.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/bench/block_assemble.cpp
-+++ namecoin-0.18.1/src/bench/block_assemble.cpp
-@@ -20,7 +20,9 @@
- 
- #include <boost/thread.hpp>
- 
-+#include <array>
- #include <list>
-+#include <memory>
- #include <vector>
- 
- static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey)
-Index: namecoin-0.18.1/src/net_processing.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/net_processing.cpp
-+++ namecoin-0.18.1/src/net_processing.cpp
-@@ -30,7 +30,9 @@
- #include <util/moneystr.h>
- #include <util/strencodings.h>
- 
-+#include <array>
- #include <memory>
-+#include <utility>
- 
- #if defined(NDEBUG)
- # error "Bitcoin cannot be compiled without assertions."
-Index: namecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/qt/sendcoinsdialog.cpp
-+++ namecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-@@ -32,6 +32,8 @@
- #include <QSettings>
- #include <QTextDocument>
- 
-+#include <array>
-+
- static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
- int getConfTargetForIndex(int index) {
-     if (index+1 > static_cast<int>(confTargets.size())) {
-Index: namecoin-0.18.1/src/qt/trafficgraphwidget.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/qt/trafficgraphwidget.cpp
-+++ namecoin-0.18.1/src/qt/trafficgraphwidget.cpp
-@@ -6,6 +6,7 @@
- #include <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
-Index: namecoin-0.18.1/src/httpserver.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/httpserver.cpp
-+++ namecoin-0.18.1/src/httpserver.cpp
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <deque>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: namecoin-0.18.1/src/test/cuckoocache_tests.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/test/cuckoocache_tests.cpp
-+++ namecoin-0.18.1/src/test/cuckoocache_tests.cpp
-@@ -7,6 +7,7 @@
- #include <test/test_bitcoin.h>
- #include <random.h>
- #include <thread>
-+#include <deque>
- 
- /** Test Suite for CuckooCache
-  *
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
deleted file mode 100644
index 5a77aabf8e5a..000000000000
--- a/srcpkgs/namecoin/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'namecoin'
-pkgname=namecoin
-version=0.18.1
-revision=9
-build_style=gnu-configure
-configure_args="--with-incompatible-bdb --disable-static
- --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config yasm automake libtool which"
-makedepends="libevent-devel db-devel protobuf-devel boost-devel
- miniupnpc-devel qrencode-devel"
-short_desc="Distributed key/value database"
-maintainer="ananteris <ananteris@protonmail.ch>"
-license="MIT"
-homepage="https://namecoin.org"
-distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz"
-checksum=7117a0a0b8f48d49e4abf3577660f8a4eb9a4dea753281d19d9470725fc75d8e
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-pre_configure() {
-	./autogen.sh
-	sed -i src/compat.h -e "s;<sys/fcntl.h>;<fcntl.h>;"
-}
-
-post_install() {
-	vlicense COPYING
-	# They don't bother to rename from bitcoin
-	rm -rf $DESTDIR/usr/share/man/man1
-}
diff --git a/srcpkgs/namecoin/update b/srcpkgs/namecoin/update
deleted file mode 100644
index 10eae03a7eb4..000000000000
--- a/srcpkgs/namecoin/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/(nc|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/nxt/files/bin/nxt b/srcpkgs/nxt/files/bin/nxt
deleted file mode 100644
index efc4319206d2..000000000000
--- a/srcpkgs/nxt/files/bin/nxt
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd /usr/lib/nxt && bash run.sh
diff --git a/srcpkgs/nxt/files/bin/nxt-tor b/srcpkgs/nxt/files/bin/nxt-tor
deleted file mode 100644
index 4b4104ceca97..000000000000
--- a/srcpkgs/nxt/files/bin/nxt-tor
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd /usr/lib/nxt && bash run-tor.sh
diff --git a/srcpkgs/nxt/files/nxt-tor/run b/srcpkgs/nxt/files/nxt-tor/run
deleted file mode 100644
index c14f448c4950..000000000000
--- a/srcpkgs/nxt/files/nxt-tor/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv check tor >/dev/null || exit 1
-exec nxt-tor > /dev/null
diff --git a/srcpkgs/nxt/files/nxt/run b/srcpkgs/nxt/files/nxt/run
deleted file mode 100644
index a3479cc97b11..000000000000
--- a/srcpkgs/nxt/files/nxt/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec nxt > /dev/null
diff --git a/srcpkgs/nxt/template b/srcpkgs/nxt/template
deleted file mode 100644
index fb6f3eb9f121..000000000000
--- a/srcpkgs/nxt/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nxt'
-pkgname=nxt
-version=1.12.2
-revision=1
-hostmakedepends="unzip"
-depends="virtual?java-runtime"
-short_desc="Client for the NXT cryptocurrency"
-maintainer="Fabio Krapohl <Krapohl.f@gmx.de>"
-license="custom:Jelurida Public License 1.1"
-homepage="https://nxt.org"
-distfiles="https://bitbucket.org/Jelurida/${pkgname}/downloads/${pkgname}-client-${version}.zip"
-checksum=83689f6d85e59be44920328d99aa934bb8998f4b5c7ea8088c83ab4503b49a42
-
-do_install() {
-	vbin ${FILESDIR}/bin/${pkgname}
-	vbin ${FILESDIR}/bin/${pkgname}-tor
-
-	vsv ${pkgname}
-	vsv ${pkgname}-tor
-
-	vlicense LICENSE.txt
-
-	vmkdir usr/lib/${pkgname}
-	vcopy . usr/lib/${pkgname}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2e2535fa1cc3..eca6eb49018e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230516
+version=0.1.20230618
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -10,6 +10,7 @@ homepage="https://voidlinux.org"
 
 replaces="
  6cord<=9.6_1
+ Electron-Cash<=4.2.10_3
  FeedReader<=2.11.0_2
  ImageMagick6<=6.9.12.12_2
  Lidarr<=0.5.0.583_1
@@ -39,6 +40,7 @@ replaces="
  avogadro<=1.2.0_9
  beignet<=1.3.2_10
  bgc<=1.0.1_1
+ bitcoin<=22.0_5
  bokken<=1.8_3
  bomi<=0.9.11_17
  burp-client<=1.4.40_13
@@ -58,6 +60,8 @@ replaces="
  cgminer<=4.11.1_1
  clamz<=0.5_4
  clementine-spotify<=1.4.0rc1-343-gb49afcc5b
+ cpuminer<=2.5.1_1
+ cointop<=1.6.10_1
  compton-conf<=0.15.0_1
  couchdb<=1.7.1_2
  couchpotato<=3.0.1_3
@@ -101,6 +105,8 @@ replaces="
  electron13<=13.6.7_1
  electron7<=7.3.3_1
  electron9<=9.4.1_1
+ electrum<=4.2.0_3
+ electrum-ltc<=3.3.8.1_4
  emacs-gtk2<=27.2_1
  empathy<=3.12.14_4
  enventor<=1.0.0_2
@@ -122,6 +128,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gespeaker<=0.8.6_3
+ geth<=1.10.1_2
  getmail<=5.14_2
  gfbgraph<=0.2.5_1
  giti<=1.0.0_1
@@ -141,6 +148,7 @@ replaces="
  gnome-twitch<=0.4.2_2
  go-gdm<=1.4_7
  go-langserver<=2.0.0_1
+ go-ethereum<=1.10.1_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -289,6 +297,8 @@ replaces="
  libbitcoin-node<=3.6.0_10
  libbitcoin-protocol-devel<=3.6.0_10
  libbitcoin-protocol<=3.6.0_10
+ libbitcoin-secp256k1-devel<=0.1.0.13_1
+ libbitcoin-secp256k1<=0.1.0.13_1
  libbitcoin-server-devel<=3.6.0_10
  libbitcoin-server<=3.6.0_10
  libbitcoin-system-devel<=3.6.0_10
@@ -342,6 +352,7 @@ replaces="
  libxnoise<=0.2.21_4
  libxslt-python<=1.1.34_5
  libzapojit<=0.0.3_10
+ litecoin<=0.18.1_11
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
@@ -359,6 +370,9 @@ replaces="
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1
+ monero<=0.18.1.2_4
+ monero-devel<=0.18.1.2_4
+ monero-gui<=0.18.1.2_4
  mongroup<=0.4.1_2
  mopidy-spotify<=4.0.1_5
  mozjs68<=68.11.0_1
@@ -368,6 +382,7 @@ replaces="
  mpir-devel<=3.0.0_1
  mpir<=3.0.0_1
  mutagen<=1.43.0_3
+ namecoin<=0.18.1_9
  nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5
@@ -376,6 +391,7 @@ replaces="
  nvidia340-libs<=340.108_4
  nvidia340-opencl<=340.108_4
  nvidia340<=340.108_4
+ nxt<=1.12.2_1
  ocaml-lablgtk2-gnomecanvas<=2.18.10_5
  ocaml-lablgtk2-gtksourceview2<=2.18.10_5
  ocaml-lablgtk2-gtkspell<=2.18.10_5
@@ -545,6 +561,7 @@ replaces="
  sqlite-replication<=3.32.3_2
  srw<=0.7_1
  steam-fonts<=1.0.0_5
+ swarm<=0.5.7_2
  tagainijisho<=1.0.3_1
  taizen<=0.0.0.20180808_4
  terminal_markdown_viewer<=1.6.3_4
diff --git a/srcpkgs/swarm/template b/srcpkgs/swarm/template
deleted file mode 100644
index fcc7dc54c098..000000000000
--- a/srcpkgs/swarm/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'swarm'
-pkgname=swarm
-version=0.5.7
-revision=2
-build_style=go
-go_import_path=github.com/ethersphere/swarm
-go_package="${go_import_path}/cmd/swarm"
-short_desc="Censorship resistant storage and communication infrastructure"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="GPL-3.0-only"
-homepage="https://swarm.ethereum.org"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=027521fc7eec4d579406edefdd6c37b3af5009295bae24597bb26fc1f6844ce7

From 0f848dea547eff38338a49ce7cbe1b17d0b00f12 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 26 Jun 2023 14:53:26 +0200
Subject: [PATCH 1403/1853] bottom: update to 0.9.3.

---
 srcpkgs/bottom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index 14ba5d3219cc..0f41e6bf5e05 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 changelog="https://raw.githubusercontent.com/ClementTsang/bottom/master/CHANGELOG.md"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=c6b1f6eefa814607cbc6f1ebf6358a070293413d09583963970d650b724a3b3a
+checksum=53a1466c3d2ed8f38401e8929cf2da796e703e4d70339d215f855b2304c07f72
 
 pre_build() {
 	export BTM_GENERATE=true

From b015d4e47c8af524b6816b70f452a11dc921e16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 22 Jun 2023 22:48:23 +0200
Subject: [PATCH 1404/1853] scrcpy: update to 2.1.

---
 srcpkgs/scrcpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index ee6e698e387f..06208c389ca9 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=2.0
+version=2.1
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="https://github.com/Genymobile/scrcpy/archive/v${version}.tar.gz
  https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="a256241dd178ab103e4a119d0387f348c10ac513f25a7ca4859bd53ca5e7d43f
- 9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2"
+checksum="57a277238d19d3471f37003d0d567bb8cde0a2b487b5cf91416129b463d9e8d5
+ 5b8bf1940264b930c71a1c614c57da2247f52b2d4240bca865cc6d366dff6688"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From 76ec5b233e4250363877d4cecf053e38a4113da0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 27 Jun 2023 02:14:35 +0530
Subject: [PATCH 1405/1853] python3-platformdirs: update to 3.8.0.

Adopt.
---
 srcpkgs/python3-platformdirs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index 9aa52606afdb..723be614b2b9 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.6.0
+version=3.8.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
 depends="python3"
 checkdepends="python3-appdirs python3-pytest python3-pytest-mock"
 short_desc="Library to determine platform-specific system directories"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640
+checksum=b0cabcb11063d21a0b261d557acb0a9d2126350e63b70cdf7db6347baea456dc
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From 7a5c44c21674cef6a567c30f8e2d9541cedfe4cb Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 16:56:39 +0100
Subject: [PATCH 1406/1853] removed-packages: add versioned libpoppler
 packages.

closes #44592
---
 srcpkgs/removed-packages/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index eca6eb49018e..5b2a3dc26088 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230618
+version=0.1.20230626
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -60,11 +60,11 @@ replaces="
  cgminer<=4.11.1_1
  clamz<=0.5_4
  clementine-spotify<=1.4.0rc1-343-gb49afcc5b
- cpuminer<=2.5.1_1
  cointop<=1.6.10_1
  compton-conf<=0.15.0_1
  couchdb<=1.7.1_2
  couchpotato<=3.0.1_3
+ cpuminer<=2.5.1_1
  cracklib-python<=2.9.7_1
  crystal<=0.34.0_4
  csync-devel<=0.50.0_5
@@ -105,8 +105,8 @@ replaces="
  electron13<=13.6.7_1
  electron7<=7.3.3_1
  electron9<=9.4.1_1
- electrum<=4.2.0_3
  electrum-ltc<=3.3.8.1_4
+ electrum<=4.2.0_3
  emacs-gtk2<=27.2_1
  empathy<=3.12.14_4
  enventor<=1.0.0_2
@@ -146,9 +146,9 @@ replaces="
  gnome-recipes<=2.0.4_2
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_2
+ go-ethereum<=1.10.1_2
  go-gdm<=1.4_7
  go-langserver<=2.0.0_1
- go-ethereum<=1.10.1_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -326,6 +326,14 @@ replaces="
  libpipewire0.2-devel<=0.2.7_2
  libpipewire0.2<=0.2.7_2
  libpng12<=1.2.59_1
+ libpoppler102<=20.09.0_1
+ libpoppler110<=21.05.0_1
+ libpoppler83<=0.72.0_1
+ libpoppler84<=0.73.0_1
+ libpoppler85<=0.74.0_1
+ libpoppler86<=0.75.0_1
+ libpoppler87<=0.76.0_1
+ libpoppler89<=0.80.0_1
  libproxy-python<=0.4.18_1
  libpyside-python3<=5.15.0_2
  libqmatrixclient-devel<=0.5.3.2_1
@@ -370,9 +378,9 @@ replaces="
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1
- monero<=0.18.1.2_4
  monero-devel<=0.18.1.2_4
  monero-gui<=0.18.1.2_4
+ monero<=0.18.1.2_4
  mongroup<=0.4.1_2
  mopidy-spotify<=4.0.1_5
  mozjs68<=68.11.0_1

From 20379c26fd0244588178f3c9b0bd4bbf62f76f6b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 27 Jun 2023 02:12:47 +0530
Subject: [PATCH 1407/1853] cargo-modules: update to 0.9.0.

---
 srcpkgs/cargo-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-modules/template b/srcpkgs/cargo-modules/template
index e5b5e5428650..7461ac595a0e 100644
--- a/srcpkgs/cargo-modules/template
+++ b/srcpkgs/cargo-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-modules'
 pkgname=cargo-modules
-version=0.8.0
+version=0.9.0
 revision=1
 build_style=cargo
 short_desc="Cargo plugin to render crate's module/item structure as a tree or graph"
@@ -9,4 +9,4 @@ license="MPL-2.0"
 homepage="https://github.com/regexident/cargo-modules"
 changelog="https://raw.githubusercontent.com/regexident/cargo-modules/main/CHANGELOG.md"
 distfiles="https://github.com/regexident/cargo-modules/archive/refs/tags/${version}.tar.gz"
-checksum=998132b0953bf8f2a0c998c2a9542996e035b8a535c0742da1f04ad0af96bcb7
+checksum=06605e1c0e7e0764bcfab473290ac55590737299695af1f0858b1544a57d632e

From f4a574ef20ed6308f24d0b607227b28ee76d0584 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 01:06:31 +0530
Subject: [PATCH 1408/1853] moar: update to 1.15.2.

---
 srcpkgs/moar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index 381454967d4e..63dcb738e2ae 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,6 +1,6 @@
 # Template file for 'moar'
 pkgname=moar
-version=1.13.0
+version=1.15.2
 revision=1
 build_style=go
 go_import_path=github.com/walles/moar
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/walles/moar"
 changelog="https://github.com/waller/moar/releases"
 distfiles="https://github.com/walles/moar/archive/refs/tags/v${version}.tar.gz"
-checksum=65eac0d4f8a40f0198a93f0888a60a28e8466b2ee9d0437f143db5c25d5e9319
+checksum=45374ead069d9aa797b329a633241e3de07625242d951be49dbdd959c6c60153
 conflicts="MoarVM"
 
 post_install() {

From b36ae8c66912af751d4c716e0c76cf17d5cde0b7 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Thu, 22 Jun 2023 21:16:10 -0500
Subject: [PATCH 1409/1853] mesa: update to 23.1.3.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 2ebb1cff2013..b07f38864ea8 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=23.1.2
+version=23.1.3
 revision=1
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e
+checksum=2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9
 
 build_options="wayland"
 build_options_default="wayland"

From 0c9f715794f1889d7b4ce7c1fc76b2cab11dcbaf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 01:46:03 -0400
Subject: [PATCH 1410/1853] stdm: fix checksum, lockfile

---
 srcpkgs/stdm/patches/cargo.lock.patch | 11 +++++++++++
 srcpkgs/stdm/template                 |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/stdm/patches/cargo.lock.patch

diff --git a/srcpkgs/stdm/patches/cargo.lock.patch b/srcpkgs/stdm/patches/cargo.lock.patch
new file mode 100644
index 000000000000..f628f9f14e17
--- /dev/null
+++ b/srcpkgs/stdm/patches/cargo.lock.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -148,7 +148,7 @@
+ 
+ [[package]]
+ name = "stdm"
+-version = "0.1.0"
++version = "0.1.1"
+ dependencies = [
+  "dialoguer",
+  "glob",
diff --git a/srcpkgs/stdm/template b/srcpkgs/stdm/template
index 40f6fe5d763c..65867468ba82 100644
--- a/srcpkgs/stdm/template
+++ b/srcpkgs/stdm/template
@@ -1,14 +1,14 @@
 # Template file for 'stdm'
 pkgname=stdm
 version=0.1.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Simple terminal display manager"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="AGPL-3.0-only"
 homepage="https://git.jcg.re/jcgruenhage/stdm"
 distfiles="https://git.jcg.re/jcgruenhage/stdm/archive/v${version}.tar.gz"
-checksum=c70ac589898199e68bf69f8d361accdc50e9fc3e3d7e530fc3a790315af2f489
+checksum=7570b30d50081d4438aff731fba4fdc3f268cb65f9c61d1fa93352d89bc52f2f
 
 post_install() {
 	vmkdir etc/profile.d

From 9a5a6f7eaade825f56acb811052ca473b82bb380 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:12:41 -0400
Subject: [PATCH 1411/1853] ntdsextract2: generate missing lockfile

---
 srcpkgs/ntdsextract2/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index d30f0463ac07..abee7376d1ad 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,7 +1,7 @@
 # Template file for 'ntdsextract2'
 pkgname=ntdsextract2
 version=0.9.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Display contents of Active Directory database files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -9,3 +9,8 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/janstarke/ntdsextract2"
 distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
 checksum=75b3731dac5e3d2f6d3149f60f4336d3bd2732a1843bfff6e1fcb8d1cc46fc45
+
+post_patch() {
+	# https://github.com/janstarke/ntdsextract2/pull/8
+	cargo generate-lockfile
+}

From 6cda11311c3966b22f194526e6dbb13d7791d4c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:16:31 -0400
Subject: [PATCH 1412/1853] openpgp-ca: fix lockfile

---
 srcpkgs/openpgp-ca/patches/cargo.lock.patch | 11 +++++++++++
 srcpkgs/openpgp-ca/template                 |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/openpgp-ca/patches/cargo.lock.patch

diff --git a/srcpkgs/openpgp-ca/patches/cargo.lock.patch b/srcpkgs/openpgp-ca/patches/cargo.lock.patch
new file mode 100644
index 000000000000..3982458637e5
--- /dev/null
+++ b/srcpkgs/openpgp-ca/patches/cargo.lock.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1697,7 +1697,7 @@
+ 
+ [[package]]
+ name = "openpgp-ca-restd"
+-version = "0.12.0-pre"
++version = "0.12.0"
+ dependencies = [
+  "anyhow",
+  "chrono",
diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
index 8ed3249de058..9c0d92a12aa1 100644
--- a/srcpkgs/openpgp-ca/template
+++ b/srcpkgs/openpgp-ca/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgp-ca'
 pkgname=openpgp-ca
 version=0.12.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path openpgp-ca-bin"
 hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"

From 87dc558ff4b7a60f40408a2b69e758dd10f2e839 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:19:59 -0400
Subject: [PATCH 1413/1853] sandboxfs: generate missing lockfile

---
 srcpkgs/sandboxfs/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/sandboxfs/template b/srcpkgs/sandboxfs/template
index 143416c325e5..0f0684eef7e8 100644
--- a/srcpkgs/sandboxfs/template
+++ b/srcpkgs/sandboxfs/template
@@ -1,7 +1,7 @@
 # Template file for 'sandboxfs'
 pkgname=sandboxfs
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="fuse-devel"
@@ -12,6 +12,11 @@ homepage="https://github.com/bazelbuild/sandboxfs"
 distfiles="https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-${version}.tar.gz"
 checksum=bff68e7d33ae56a3f34a79a74b2576599f5ccc381a237bbc10b5a3c3ea106b60
 
+post_patch() {
+	# https://github.com/bazelbuild/sandboxfs/pull/115
+	cargo generate-lockfile
+}
+
 post_install() {
 	vman man/sandboxfs.1
 }

From 9748c3c86902cad9dbb3069c29e563c5763f5046 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:28:05 -0400
Subject: [PATCH 1414/1853] openpgp-card-tools: fix checksum, generate missing
 lockfile

closes #43482
---
 srcpkgs/openpgp-card-tools/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openpgp-card-tools/template b/srcpkgs/openpgp-card-tools/template
index 4aabb1f4e847..2b913a0c399c 100644
--- a/srcpkgs/openpgp-card-tools/template
+++ b/srcpkgs/openpgp-card-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgp-card-tools'
 pkgname=openpgp-card-tools
 version=0.9.2
-revision=1
+revision=2
 build_wrksrc="tools"
 build_style=cargo
 hostmakedepends="pkg-config llvm clang"
@@ -11,8 +11,13 @@ short_desc="Tools for inspecting, configuring and using OpenPGP cards"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://gitlab.com/openpgp-card/openpgp-card"
-distfiles="${homepage}/-/archive/tools/v${version}/${wrksrc}.tar.gz"
-checksum=a0276c4fb73cd4b8411963eb4ac8f74956ccbe6f8fc1900e38e20c6e917028d0
+distfiles="https://gitlab.com/openpgp-card/openpgp-card/-/archive/tools/v${version}/openpgp-card-tools-v${version}.tar.gz"
+checksum=33c27b011aebf57ee1b660f65868bfcb8ffea28c89809414c8654004d4e16706
+
+post_patch() {
+	# https://gitlab.com/openpgp-card/openpgp-card/-/issues/63
+	cargo generate-lockfile
+}
 
 post_install() {
 	vlicense "../LICENSES/MIT.txt"

From a6fc9f01e3b57ca91db175aeba02bdb723443b8c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 03:05:40 -0400
Subject: [PATCH 1415/1853] ntdsextract2: fix build

if only we had a lock file...
---
 srcpkgs/ntdsextract2/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index abee7376d1ad..ce95b7a42748 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -13,4 +13,5 @@ checksum=75b3731dac5e3d2f6d3149f60f4336d3bd2732a1843bfff6e1fcb8d1cc46fc45
 post_patch() {
 	# https://github.com/janstarke/ntdsextract2/pull/8
 	cargo generate-lockfile
+	cargo update --package libesedb@0.1.4 --precise 0.1.3
 }

From e35e08ada02e2d382e5a3398a43d66c4f8519243 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 27 Jun 2023 00:33:57 +0200
Subject: [PATCH 1416/1853] transmission: don't use deprecated --log-error

Also link to system libraries when possible
---
 srcpkgs/transmission/files/transmission-daemon/run | 2 +-
 srcpkgs/transmission/template                      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/transmission/files/transmission-daemon/run b/srcpkgs/transmission/files/transmission-daemon/run
index ed988af16556..6cdb40001497 100755
--- a/srcpkgs/transmission/files/transmission-daemon/run
+++ b/srcpkgs/transmission/files/transmission-daemon/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -u transmission:transmission transmission-daemon -f --log-error
+exec chpst -u transmission:transmission transmission-daemon -f --log-level=error
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 3b9dc2e0cb7e..2e83bcdc11a3 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,13 +1,14 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=4.0.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF"
 hostmakedepends="autoconf automake intltool glib-devel
  libtool pkg-config qt5-host-tools qt5-qmake"
 makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel
- libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel"
+ libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel
+ libdeflate-devel miniupnpc-devel"
 short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"

From caeaf9dcbaaf18afa728a96cb1b878d0749ef162 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 27 Jun 2023 08:29:29 +0100
Subject: [PATCH 1417/1853] python3-greenlet: ignore alphas and release
 candidates.

---
 srcpkgs/python3-greenlet/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/python3-greenlet/update

diff --git a/srcpkgs/python3-greenlet/update b/srcpkgs/python3-greenlet/update
new file mode 100644
index 000000000000..f7dcfce5eacb
--- /dev/null
+++ b/srcpkgs/python3-greenlet/update
@@ -0,0 +1 @@
+ignore="*a* *rc*"

From 14ba351bc92747358089d9064db1f235785617d7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 11 Jun 2023 23:08:08 +0530
Subject: [PATCH 1418/1853] python3-SQLAlchemy2: update to 2.0.16.

---
 srcpkgs/python3-SQLAlchemy2/template | 4 ++--
 srcpkgs/python3-SQLAlchemy2/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-SQLAlchemy2/update

diff --git a/srcpkgs/python3-SQLAlchemy2/template b/srcpkgs/python3-SQLAlchemy2/template
index d445ccb52fe2..2f4d5d279601 100644
--- a/srcpkgs/python3-SQLAlchemy2/template
+++ b/srcpkgs/python3-SQLAlchemy2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-SQLAlchemy2'
 pkgname=python3-SQLAlchemy2
-version=2.0.9
+version=2.0.16
 revision=1
 build_style=python3-pep517
 make_install_target="dist/SQLAlchemy-${version}-*-*-*.whl"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.sqlalchemy.org"
 changelog="https://docs.sqlalchemy.org/en/20/changelog/"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=95719215e3ec7337b9f57c3c2eda0e6a7619be194a5166c07c1e599f6afc20fa
+checksum=1e2caba78e7d1f5003e88817b7a1754d4e58f4a8f956dc423bf8e304c568ab09
 
 conflicts="python3-SQLAlchemy"
 
diff --git a/srcpkgs/python3-SQLAlchemy2/update b/srcpkgs/python3-SQLAlchemy2/update
new file mode 100644
index 000000000000..bc4a3e03c20e
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy2/update
@@ -0,0 +1,2 @@
+pkgname="SQLAlchemy"
+ignore="*rc* *b* *a*"

From cc0cc44bd12bc53f601de5e3dbadafabf67c0d5f Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Tue, 23 May 2023 03:15:55 -0400
Subject: [PATCH 1419/1853] preload: generate manpage

this also adds psmisc to checkdepends
(the test script uses killall to end the tests)
---
 srcpkgs/preload/patches/qemu-help2man.patch | 30 +++++++++++++++++++++
 srcpkgs/preload/template                    |  6 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/preload/patches/qemu-help2man.patch

diff --git a/srcpkgs/preload/patches/qemu-help2man.patch b/srcpkgs/preload/patches/qemu-help2man.patch
new file mode 100644
index 000000000000..c2fa7068bb2d
--- /dev/null
+++ b/srcpkgs/preload/patches/qemu-help2man.patch
@@ -0,0 +1,30 @@
+--- preload-0.6.4/src/Makefile.in	2009-04-15 17:49:28.000000000 -0400
++++ preload-0.6.4.new/src/Makefile.in	2023-05-30 22:23:16.820648202 -0400
+@@ -222,6 +222,12 @@
+ dist_man_MANS = preload.8
+ RUNPREQ = preload preload.conf.debug
+ RUNCMD = ./preload -c preload.conf.debug -s preload.state -d $(ARGS)
++preload_binary = `if [ -n "$$CROSS_BUILD" ]; then \
++				 	echo "qemu-$$XBPS_TARGET_QEMU_MACHINE-static ./preload"; \
++				else \
++				 	echo './preload'; \
++				fi;`
++
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -678,11 +684,11 @@
+ 	@$(top_builddir)/missing --run \
+ 	   help2man --no-info --section=8 --include=preload.8.i \
+ 	   	    --help-option="-H" --output="$@.tmp" \
+-		    --name 'Adaptive readahead daemon' ./preload \
++		    --name 'Adaptive readahead daemon' "$(preload_binary)" \
+ 	 && mv "$@.tmp" "$@" \
+ 	  || ($(RM) "$@"; \
+-	      echo Failed to update preload.8, the man page may be outdated >&2; \
+-	      (test -f "$@" || echo help2man is required to generate this file. >> "$@"));
++	      echo Failed to create preload.8 >&2; \
++		  exit 1);
+ 
+ install-data-hook:
+ 	@cd "$(DESTDIR)$(man8dir)" && gzip -c preload.8 > preload.8.gz.tmp && mv preload.8.gz.tmp preload.8.gz && $(RM) preload.8
diff --git a/srcpkgs/preload/template b/srcpkgs/preload/template
index 9623aed0e6eb..2efe74d46b6c 100644
--- a/srcpkgs/preload/template
+++ b/srcpkgs/preload/template
@@ -1,10 +1,12 @@
 # Template file for 'preload'
 pkgname=preload
 version=0.6.4
-revision=11
+revision=12
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+build_helper=qemu
+hostmakedepends="pkg-config help2man"
 makedepends="libglib-devel"
+checkdepends="psmisc"
 short_desc="Adaptive readahead daemon"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="GPL-2.0-or-later"

From 31c87b855538675d1eedea6ed1406e74d7a014e3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Wed, 7 Jun 2023 17:36:51 +0200
Subject: [PATCH 1420/1853] pan: updated checksum, enabled libsecret

---
 srcpkgs/pan/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template
index ea773b31bb01..db9204cd0770 100644
--- a/srcpkgs/pan/template
+++ b/srcpkgs/pan/template
@@ -1,12 +1,12 @@
 # Template file for 'pan'
 pkgname=pan
 version=0.154
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gnutls --enable-libnotify --enable-gkr"
 hostmakedepends="gettext pkg-config yelp-tools autoconf gettext-devel-tools automake libtool"
 makedepends="gmime3-devel gnutls-devel gtk+3-devel libsecret-devel gtkspell3-devel libnotify-devel
- glib-devel enchant2-devel"
+ glib-devel enchant2-devel gcr-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Usenet newsreader that's good at both text and binaries"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,7 +14,7 @@ license="GFDL-1.1-or-later, GPL-2.0-only"
 homepage="http://pan.rebelbase.com"
 changelog="https://gitlab.gnome.org/GNOME/pan/-/raw/master/NEWS"
 distfiles="https://gitlab.gnome.org/GNOME/pan/-/archive/v${version}/pan-v${version}.tar.bz2"
-checksum=87721838dfa59f05f5c2c2fec8742606dad13d920f9fa8884497c4513a8d72b9
+checksum=440317954df7217689100df3dfb68865770f5aed1b8ed2b45432d771bb80a8c9
 
 if [ -n "$CROSS_BUILD" ]; then
 		hostmakedepends+=" gdk-pixbuf-devel"

From 7af0aefdb8c6103567377bb96cf94c66f0ffab87 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 4 Apr 2023 14:08:44 +0200
Subject: [PATCH 1421/1853] python3-docstring-to-markdown: update to 0.12.

---
 srcpkgs/python3-docstring-to-markdown/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-docstring-to-markdown/template b/srcpkgs/python3-docstring-to-markdown/template
index e932bde7357f..fd06c23f1385 100644
--- a/srcpkgs/python3-docstring-to-markdown/template
+++ b/srcpkgs/python3-docstring-to-markdown/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-docstring-to-markdown'
 pkgname=python3-docstring-to-markdown
-version=0.11
+version=0.12
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3"
-short_desc="Python implementation of the Language Server Protocol"
+short_desc="On the fly conversion of Python docstrings to markdown"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/docstring-to-markdown/"
 changelog="https://github.com/python-lsp/docstring-to-markdown/releases"
 distfiles="${PYPI_SITE}/d/docstring-to-markdown/docstring-to-markdown-${version}.tar.gz"
-checksum=5b1da2c89d9d0d09b955dec0ee111284ceadd302a938a03ed93f66e09134f9b5
+checksum=40004224b412bd6f64c0f3b85bb357a41341afd66c4b4896709efa56827fb2bb

From 04e6a87a11f73b838da4cd80631abf4390fa5503 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 18 Mar 2023 02:24:33 -0400
Subject: [PATCH 1422/1853] LGOGDownloader: update to 3.11

---
 .../LGOGDownloader/patches/curl-7.87.patch    | 90 -------------------
 srcpkgs/LGOGDownloader/template               |  6 +-
 2 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 srcpkgs/LGOGDownloader/patches/curl-7.87.patch

diff --git a/srcpkgs/LGOGDownloader/patches/curl-7.87.patch b/srcpkgs/LGOGDownloader/patches/curl-7.87.patch
deleted file mode 100644
index 02f17429663e..000000000000
--- a/srcpkgs/LGOGDownloader/patches/curl-7.87.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Force destruction of downloader before curl_global_cleanup
-See: https://github.com/Sude-/lgogdownloader/commit/6ce6aeb1dc06f8af1508c5ce6ee71775b8d188b3
-Index: LGOGDownloader-3.9/main.cpp
-===================================================================
---- LGOGDownloader-3.9.orig/main.cpp
-+++ LGOGDownloader-3.9/main.cpp
-@@ -607,9 +607,10 @@ int main(int argc, char *argv[])
-         std::cerr << std::endl;
-     }
- 
-+    int res = 0;
-     // Init curl globally
-     curl_global_init(CURL_GLOBAL_ALL);
--
-+    {
-     Downloader downloader;
- 
-     int iLoginTries = 0;
-@@ -636,8 +637,8 @@ int main(int argc, char *argv[])
-     // Login failed, cleanup
-     if (!bLoginOK && !bIsLoggedin)
-     {
--        curl_global_cleanup();
--        return 1;
-+        res = 1;
-+        goto end;
-     }
- 
-     // Make sure that config file and cookie file are only readable/writable by owner
-@@ -699,15 +700,14 @@ int main(int argc, char *argv[])
-                 Util::setFilePermissions(Globals::globalConfig.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
-             if (Globals::globalConfig.bSaveConfig)
-             {
--                curl_global_cleanup();
--                return 0;
-+                goto end;
-             }
-         }
-         else
-         {
-             std::cerr << "Failed to create config: " << Globals::globalConfig.sConfigFilePath << std::endl;
--            curl_global_cleanup();
--            return 1;
-+            res = 1;
-+            goto end;
-         }
-     }
-     else if (Globals::globalConfig.bResetConfig)
-@@ -719,26 +719,23 @@ int main(int argc, char *argv[])
-             if (!Globals::globalConfig.bRespectUmask)
-                 Util::setFilePermissions(Globals::globalConfig.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
- 
--            curl_global_cleanup();
--            return 0;
-+            goto end;
-         }
-         else
-         {
-             std::cerr << "Failed to create config: " << Globals::globalConfig.sConfigFilePath << std::endl;
--            curl_global_cleanup();
--            return 1;
-+            res = 1;
-+            goto end;
-         }
-     }
- 
-     bool bInitOK = downloader.init();
-     if (!bInitOK)
-     {
--        curl_global_cleanup();
--        return 1;
-+        res = 1;
-+        goto end;
-     }
- 
--    int res = 0;
--
-     if (Globals::globalConfig.bShowWishlist)
-         downloader.showWishlist();
-     else if (Globals::globalConfig.bUpdateCache)
-@@ -801,7 +798,8 @@ int main(int argc, char *argv[])
-     // Orphan check was called at the same time as download. Perform it after download has finished
-     if (!Globals::globalConfig.sOrphanRegex.empty() && Globals::globalConfig.bDownload)
-         downloader.checkOrphans();
--
-+    }
-+end:
-     curl_global_cleanup();
- 
-     return res;
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index f9d281820035..2284da4a3747 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
-version=3.9
-revision=5
+version=3.11
+revision=1
 build_style=cmake
 configure_args="$(vopt_bool qt USE_QT_GUI)"
 hostmakedepends="pkg-config"
@@ -14,7 +14,7 @@ maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"
 homepage="https://github.com/Sude-/lgogdownloader"
 distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
-checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1
+checksum=01c9556287d5f49662c2219365b9d306482e8efadc805c3dbb9381d5110df719
 
 build_options="qt"
 desc_option_qt="Include QT WebEngine to support solving captchas"

From e5be58edcde63d95d6deddc54083575ceb55008a Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 21 Feb 2023 18:23:42 +0100
Subject: [PATCH 1423/1853] python3-pikepdf: update to 7.2.0.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index b960df1c63f0..ff8be484aea1 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=7.0.0
+version=7.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-wheel"
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 changelog="https://raw.githubusercontent.com/pikepdf/pikepdf/master/docs/releasenotes/version${version%%.*}.rst"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=5d812d4777a9eb86f19db3484adb34620e31880838dcbe1ce8d60305f9d46710
+checksum=ad82b836faed0376c725e19d0f8a7c7bef389e8c46683c11bbfc70410bc2e3ee
 
 pre_check() {
 	cp -r src/pikepdf.egg-info "$(cd build/lib* && pwd)"

From f80dc171ced252602ed5ba4de456a9f3ae64fb7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 20 Jun 2023 18:16:31 -0700
Subject: [PATCH 1424/1853] gnome-shell: add gnome-menus dependency

This fixes translations for the default folders i.e. X-GNOME-Utilities.
---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3fc7eb89d17d..0ea458bb66dd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=44.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false -Dtests=false"
@@ -12,8 +12,8 @@ makedepends="gnome-control-center-devel at-spi2-atk-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
  gnome-bluetooth-devel pipewire-devel gstreamer1-devel gcr4-devel"
-depends="elogind gnome-control-center gsettings-desktop-schemas upower
- gstreamer1-pipewire gst-plugins-good1"
+depends="elogind gnome-control-center gsettings-desktop-schemas gnome-menus
+ upower gstreamer1-pipewire gst-plugins-good1"
 checkdepends="xvfb-run mesa-dri $depends"
 short_desc="GNOME core user interface"
 maintainer="Michal Vasilek <michal@vasilek.cz>"

From 5588a775a83224269d3f9d3911fa560d79517359 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 20 Jun 2023 18:23:39 -0700
Subject: [PATCH 1425/1853] gnome-menus: remove unused intltool dependency

https://gitlab.gnome.org/GNOME/gnome-menus/-/commit/b3f51d8577cf7ed00f5a53569b4f022b9ff30fda
---
 srcpkgs/gnome-menus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index e787fb8de6bc..f2e65f8fa580 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config gettext-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel"
 short_desc="GNOME menu specifications"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2019dc9a6e7c284f7999b4b6df6ab9c1df2f3d12 Mon Sep 17 00:00:00 2001
From: Gabriel Hondet <gabriel.hondet@tweag.io>
Date: Thu, 16 Feb 2023 16:57:48 +0100
Subject: [PATCH 1426/1853] nix: increase open files limit

---
 srcpkgs/nix/files/nix-daemon/run | 2 +-
 srcpkgs/nix/template             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/files/nix-daemon/run b/srcpkgs/nix/files/nix-daemon/run
index 052cf9d45a8d..1a57c15efdc2 100644
--- a/srcpkgs/nix/files/nix-daemon/run
+++ b/srcpkgs/nix/files/nix-daemon/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec nix-daemon
+exec prlimit --nofile=1048576 nix-daemon
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index ee2f9f148354..20eb0d85fdaf 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.11.0
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper=qemu
 # Use /nix/var as suggested by the official Manual.

From 0252c2576e859174f20d8cc0ac1d1de6b5618a26 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 27 Jun 2023 11:13:40 +0200
Subject: [PATCH 1427/1853] lesspass: add python3-requests dependency

---
 srcpkgs/lesspass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lesspass/template b/srcpkgs/lesspass/template
index 5194852fe64c..edec1927f8e5 100644
--- a/srcpkgs/lesspass/template
+++ b/srcpkgs/lesspass/template
@@ -1,11 +1,11 @@
 # Template file for 'lesspass'
 pkgname=lesspass
 version=10.2.1
-revision=1
+revision=2
 build_wrksrc="cli"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3-requests"
 checkdepends="python3-pexpect python3-mock python3-requests"
 short_desc="Stateless password generator"
 maintainer="Eloi Torrents <eloitor@disroot.org>"

From 7bb3fa0481481bea3d89e634c43f05814efe5c87 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 14 May 2023 17:42:50 -0400
Subject: [PATCH 1428/1853] New package: hyprpicker-0.1.1

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: #43873 [via git-merge-pr]
---
 srcpkgs/hyprpicker/patches/build-no-git.patch | 53 +++++++++++++++++++
 srcpkgs/hyprpicker/patches/fix-musl.patch     | 10 ++++
 srcpkgs/hyprpicker/template                   | 24 +++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 srcpkgs/hyprpicker/patches/build-no-git.patch
 create mode 100644 srcpkgs/hyprpicker/patches/fix-musl.patch
 create mode 100644 srcpkgs/hyprpicker/template

diff --git a/srcpkgs/hyprpicker/patches/build-no-git.patch b/srcpkgs/hyprpicker/patches/build-no-git.patch
new file mode 100644
index 000000000000..b7007d8fd593
--- /dev/null
+++ b/srcpkgs/hyprpicker/patches/build-no-git.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,31 +7,6 @@
+ 
+ message(STATUS "Configuring hyprpicker!")
+ 
+-# Get git info
+-# hash and branch
+-execute_process(
+-    COMMAND git rev-parse --abbrev-ref HEAD
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_BRANCH
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-execute_process(
+-    COMMAND git rev-parse HEAD
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_COMMIT_HASH
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-execute_process(
+-    COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1"
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_COMMIT_MESSAGE
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-execute_process(
+-    COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\""
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_DIRTY
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+ #
+ #
+ 
+@@ -47,11 +22,6 @@
+ 
+ add_executable(hyprpicker ${SRCFILES})
+ 
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_MESSAGE=\"${GIT_COMMIT_MESSAGE}\"")
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_DIRTY=\"${GIT_DIRTY}\"")
+-
+ target_link_libraries(hyprpicker rt)
+ 
+ set(CPACK_PROJECT_NAME ${PROJECT_NAME})
+@@ -75,4 +45,4 @@
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin")
+     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin")
+     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin")
+-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+\ No newline at end of file
++ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
diff --git a/srcpkgs/hyprpicker/patches/fix-musl.patch b/srcpkgs/hyprpicker/patches/fix-musl.patch
new file mode 100644
index 000000000000..f25bb702b187
--- /dev/null
+++ b/srcpkgs/hyprpicker/patches/fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/src/includes.hpp
++++ b/src/includes.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#include <sys/types.h>
++
+ #include <vector>
+ #include <deque>
+ #include <iostream>
diff --git a/srcpkgs/hyprpicker/template b/srcpkgs/hyprpicker/template
new file mode 100644
index 000000000000..27143133a14a
--- /dev/null
+++ b/srcpkgs/hyprpicker/template
@@ -0,0 +1,24 @@
+# Template file for 'hyprpicker'
+pkgname=hyprpicker
+version=0.1.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config cmake ninja wayland-devel"
+makedepends="wayland-devel wayland-protocols cairo-devel pango-devel libjpeg-turbo-devel wlroots-devel"
+short_desc="wlroots-compatible Wayland color picker that does not suck"
+maintainer="RAR27 <rar27@tuta.io>"
+license="BSD-3-Clause"
+homepage="https://github.com/hyprwm/hyprpicker"
+changelog="https://github.com/hyprwm/hyprpicker/releases"
+distfiles="https://github.com/hyprwm/hyprpicker/archive/refs/tags/v${version}.tar.gz"
+checksum=f6a5e57dc69e3b0499a34f4533583bd7d7770f5a1a9834f521b532f0d1ec26e0
+
+pre_build() {
+	make protocols
+}
+
+do_install() {
+	vbin build/hyprpicker
+	vman doc/hyprpicker.1
+	vlicense LICENSE
+}

From 973cf85126282cf58571d7eb37e83ef2d95b7fdf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Jun 2023 13:08:25 +0200
Subject: [PATCH 1429/1853] passwdqc: update to 2.0.3.

---
 srcpkgs/passwdqc/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index d5ec411bd2ae..180af752b570 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,6 +1,6 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
-version=2.0.2
+version=2.0.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"
 homepage="http://www.openwall.com/passwdqc/"
 distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab
+checksum=53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4
 
 do_build() {
 	make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
@@ -25,6 +25,8 @@ passwdqc-devel_package() {
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
 	}
 }

From f667e5f0a3b4b2a72d29396c5cbd24fd61888506 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 27 Jun 2023 13:09:41 +0200
Subject: [PATCH 1430/1853] knot: update to 3.2.8.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index bfb53410c2e2..42d474ab4e8f 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.2.7
+version=3.2.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -21,7 +21,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b
+checksum=ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 9087cc6dd9487d66426fa373ca5c994c8d0a59a6 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 12 Oct 2022 02:08:04 -0400
Subject: [PATCH 1431/1853] usbguard: update to 1.1.2.

---
 srcpkgs/usbguard/patches/musl.patch | 73 -----------------------------
 srcpkgs/usbguard/template           |  8 ++--
 2 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 6ce934444841..cc2190720595 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,18 +1,5 @@
 --- a/src/CLI/usbguard.cpp	2019-06-13 11:51:53.787863657 +0000
 +++ b/src/CLI/usbguard.cpp	2019-08-23 01:52:34.233056882 +0000
-@@ -26,10 +26,8 @@
- #include <map>
- #include <iostream>
- 
--#ifndef _GNU_SOURCE
--  #define _GNU_SOURCE
--#endif
--#include <cstring> /* GNU version of basename(3) */
-+#include <cstring>
-+#include <libgen.h>
- 
- #include "usbguard.hpp"
- #include "usbguard-get-parameter.hpp"
 @@ -99,7 +97,7 @@
  
    static int usbguard_cli(int argc, char* argv[])
@@ -22,63 +9,3 @@
  
      if (argc == 1) {
        showTopLevelHelp();
---- a/src/CLI/usbguard-rule-parser.cpp	2019-06-13 11:51:53.783863704 +0000
-+++ b/src/CLI/usbguard-rule-parser.cpp	2019-08-23 01:52:34.234056870 +0000
-@@ -24,10 +24,8 @@
- #include "RuleParser.hpp"
- 
- #include <iostream>
--#ifndef _GNU_SOURCE
--  #define _GNU_SOURCE
--#endif
- #include <cstring>
-+#include <libgen.h>
- #include <fstream>
- 
- #include <getopt.h>
-@@ -43,8 +41,10 @@
- 
- static void showHelp(std::ostream& stream, const char* usbguard_arg0)
- {
--  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
--  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
-+  char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
-+  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
-+  free(usbguard_arg0_copy);
-   stream << std::endl;
-   stream << " Options:" << std::endl;
-   stream << "  -f, --file       Interpret the argument as a path to a file that should be parsed." << std::endl;
---- a/src/DBus/gdbus-server.cpp	2019-06-28 08:45:27.616687137 +0000
-+++ b/src/DBus/gdbus-server.cpp	2019-08-23 01:52:34.274056367 +0000
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <getopt.h>
-+#include <libgen.h>
- #include "DBusBridge.hpp"
- 
- static usbguard::DBusBridge* dbus_bridge = nullptr;
-@@ -208,7 +209,9 @@
- 
- static void showHelp(std::ostream& stream)
- {
--  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
-+  char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
-+  free(usbguard_arg0_copy);
-   stream << std::endl;
-   stream << " Options:" << std::endl;
-   stream << "  -s, --system   Listen on the system bus." << std::endl;
---- a/src/Library/public/usbguard/Exception.hpp	2019-06-28 08:45:27.620687089 +0000
-+++ b/src/Library/public/usbguard/Exception.hpp	2019-08-23 01:52:34.323055751 +0000
-@@ -116,7 +116,8 @@
-     static std::string reasonFromErrno(const int errno_value)
-     {
-       char buffer[1024];
--      return std::string(strerror_r(errno_value, buffer, sizeof buffer));
-+      strerror_r(errno_value, buffer, sizeof buffer);
-+      return std::string(buffer);
-     }
-   };
- 
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f6671163b6c4..8625c80a7eda 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
 # Template file for 'usbguard'
 pkgname=usbguard
-version=1.0.0
-revision=8
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
 conf_files="/etc/usbguard/*"
@@ -14,11 +14,13 @@ short_desc="Tool for whitelisting and blacklisting USB devices"
 maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://usbguard.github.io"
+changelog="https://raw.githubusercontent.com/USBGuard/usbguard/main/CHANGELOG.md"
 distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
-checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
+checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934
 
 post_install() {
 	vsv usbguard
+	vcompletion scripts/usbguard-zsh-completion zsh
 }
 
 usbguard-devel_package() {

From f0b9ca4a844308c7dc494eda39606272961e8c6a Mon Sep 17 00:00:00 2001
From: Karl R Grose <karlgrose@gromar.org>
Date: Tue, 10 Jan 2023 23:22:00 -0800
Subject: [PATCH 1432/1853] 1password: update to 8.10.7.

---
 srcpkgs/1password/INSTALL    |  6 ++++
 srcpkgs/1password/files/EULA |  1 +
 srcpkgs/1password/template   | 61 +++++++++++++++++++++++-------------
 3 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 srcpkgs/1password/files/EULA

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
index 131b1fae2096..3a8529a27e3c 100644
--- a/srcpkgs/1password/INSTALL
+++ b/srcpkgs/1password/INSTALL
@@ -7,5 +7,11 @@ post)
 	chmod g+s opt/1Password/1Password-KeyringHelper
 	chown :_onepassword opt/1Password/1Password-BrowserSupport
 	chmod g+s opt/1Password/1Password-BrowserSupport
+	export POLICY_OWNERS
+	POLICY_OWNERS="$(cut -d: -f1,3 etc/passwd | grep -E ':[0-9]{4}$' | cut -d: -f1 | head -n 10 | sed 's/^/unix-user:/' | tr '\n' ' ')"
+	eval "cat <<EOF
+$(cat opt/1Password/com.1password.1Password.policy.tpl)
+EOF" > opt/1Password/com.1password.1Password.policy
+	install -Dm0644 opt/1Password/com.1password.1Password.policy -t usr/share/polkit-1/actions/
 	;;
 esac
diff --git a/srcpkgs/1password/files/EULA b/srcpkgs/1password/files/EULA
new file mode 100644
index 000000000000..1d939047fedc
--- /dev/null
+++ b/srcpkgs/1password/files/EULA
@@ -0,0 +1 @@
+The current version can be found at: https://1password.com/legal/terms-of-service/
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index 293ac7dc4461..e4a929e497ae 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,34 @@
 # Template file for '1password'
 pkgname=1password
-version=8.4.1
+version=8.10.7
 revision=1
-archs="x86_64"
-hostmakedepends="w3m gnupg"
+archs="x86_64 aarch64"
+hostmakedepends="gnupg"
 short_desc="Password manager"
 maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
 license="custom:Proprietary"
 homepage="https://www.1password.com"
-distfiles="https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz
- https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz.sig"
-checksum="f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
- 0739424395377f56c9528c1169ef72d6a941e21f1bc9d728481bf5de8563bf01"
-_filename="1password-${version}.x64.tar.gz"
+
+case "${XBPS_TARGET_MACHINE}" in
+	aarch64)
+		_arch="arm64"
+		checksum="4e6a1ffa66b54893104525754f97e52de5df7ba5b56b6536998ce2f8caf1bc93
+ 31dd56227da961b346c5e00aebfe44b065cecb06314c144c3572033777d5c6d0"
+		;;
+
+	x86_64)
+		_arch="x64"
+		checksum="e4a300cecb683e636015e8e9db547c3dc76b994b645f7ab11d85f7ad5e49ab21
+ 572508224d18cceb7efe66ed2db3c52f2cfd7f572c7e107e9d7b8439340d17ac"
+		;;
+esac
+
+distfiles="https://downloads.1password.com/linux/tar/stable/${XBPS_TARGET_MACHINE}/1password-${version}.${_arch}.tar.gz
+ https://downloads.1password.com/linux/tar/stable/${XBPS_TARGET_MACHINE}/1password-${version}.${_arch}.tar.gz.sig"
+_filename="1password-${version}.${_arch}.tar.gz"
 _1passworddir="${_filename%.tar.*}"
-_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
 _gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
 system_groups="_onepassword"
 repository=nonfree
 restricted=yes
@@ -33,24 +46,28 @@ post_extract() {
 	then
 		msg_error "gpg verify failed\n"
 	fi
-
-	# verify EULA
-	$XBPS_FETCH_CMD -o eula https://1password.com/legal/terms-of-service/
-	cat eula |
-		w3m -dump -I utf-8 -T text/html |
-		sed -n '/Service Agreement for 1Password/,/We clarified what happens if we part ways./p' > EULA
-	filesum="$($XBPS_DIGEST_CMD EULA)"
-	if [ "$filesum" != "$_license_checksum" ]; then
-		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
-	fi
 }
 
 do_install() {
 	vmkdir opt/1Password
-	vlicense EULA
-	rm -f EULA eula
+	vlicense ${FILESDIR}/EULA
 	vcopy "*" opt/1Password
-	vinstall com.1password.1Password.policy 644 usr/share/polkit-1/actions/
+
+	# Install the icons
+	for _s in 32 64 256 512; do
+		# Create xdg directory
+		vmkdir usr/share/icons/hicolor/${_s}x${_s}/apps
+
+		# Copy the 1Password icon
+		mv  ${DESTDIR}/${_resources}/icons/hicolor/${_s}x${_s}/apps/1password.png \
+		    ${DESTDIR}/usr/share/icons/hicolor/${_s}x${_s}/apps/1password.png
+	done
+
+	# Install the .desktop file
+	vmkdir usr/share/applications
+	mv ${DESTDIR}/${_resources}/1password.desktop \
+	   ${DESTDIR}/usr/share/applications/1password.desktop
+
 	vinstall resources/custom_allowed_browsers 644 usr/share/doc/1password/examples/
 	vbin "${FILESDIR}/1password"
 }

From 2e764a495630df890d99e0fe6a6eaa7b3fa98090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 20 Feb 2023 22:53:33 +0100
Subject: [PATCH 1433/1853] i2pd: update to 2.48.0.

Closes: #42385 [via git-merge-pr]
---
 srcpkgs/i2pd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 68bfd051faee..f4e21928b9dc 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,18 +1,18 @@
 # Template file for 'i2pd'
 pkgname=i2pd
-version=2.46.0
-revision=3
+version=2.48.0
+revision=1
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
 makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
-maintainer="Obosob <obosob@riseup.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://i2pd.website/"
 changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog"
 distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"
-checksum=daa5e47bb2b80fbdaa3836b209e869017893421f5225dfe019e5d43d3f8a86d4
+checksum=ccf417aa66ce37f72ea15b7fbcff4c71e823566ea74bda696b9c1e19aae08739
 
 conf_files="
  /etc/i2pd/i2pd.conf

From f9cbf2c5b4fb3822d00830e72b092c03be1fd555 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Sun, 5 Feb 2023 13:42:32 -0500
Subject: [PATCH 1434/1853] New package: media-downloader-3.1.0

Closes: #42095 [via git-merge-pr]
---
 srcpkgs/media-downloader/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/media-downloader/template

diff --git a/srcpkgs/media-downloader/template b/srcpkgs/media-downloader/template
new file mode 100644
index 000000000000..0d2193b3b001
--- /dev/null
+++ b/srcpkgs/media-downloader/template
@@ -0,0 +1,14 @@
+# Template file for 'media-downloader'
+pkgname=media-downloader
+version=3.1.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel"
+short_desc="Qt/C++ frontend to youtube-dl"
+maintainer="Owen Law <owenlaw222@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/mhogomchungu/media-downloader"
+changelog="https://github.com/mhogomchungu/media-downloader/blob/main/changelog"
+distfiles="https://github.com/mhogomchungu/media-downloader/archive/refs/tags/${version}.tar.gz"
+checksum=72c677d8974cbd20ae2ff2085ce2e45c75c057f4e0097848fed55521ca3a3437

From 627ee1892c17d70f2a1a513e9b17771e3fcc5df2 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sat, 14 Jan 2023 09:06:48 +0900
Subject: [PATCH 1435/1853] xastir: update to 2.1.8.

---
 srcpkgs/xastir/patches/fix-mutex.patch | 15 +++++++++++++++
 srcpkgs/xastir/template                | 14 ++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/xastir/patches/fix-mutex.patch

diff --git a/srcpkgs/xastir/patches/fix-mutex.patch b/srcpkgs/xastir/patches/fix-mutex.patch
new file mode 100644
index 000000000000..129cd38b4d11
--- /dev/null
+++ b/srcpkgs/xastir/patches/fix-mutex.patch
@@ -0,0 +1,15 @@
+--- a/src/util.c	2019-07-15 00:30:31.000000000 +0200
++++ b/src/util.c	2019-08-31 15:56:13.580212122 +0200
+@@ -5457,10 +5457,10 @@
+   // NON_LSB VERSION
+   // Check first for newer pthread function
+ #  ifdef HAVE_PTHREAD_MUTEXATTR_SETTYPE
+-  (void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
++  (void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+ #  else
+   // Use older, deprecated pthread function
+-  (void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
++  (void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_ERRORCHECK);
+ #  endif  // HAVE_PTHREAD_MUTEXATTR_SETTYPE
+ # endif  // __LSB__
+ 
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index f3a315e821cd..e32b98690a2b 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -1,15 +1,21 @@
 # Template file for 'xastir'
 pkgname=xastir
-version=2.1.6
+version=2.1.8
 revision=1
-archs="i686 x86_64 ppc64le"
 build_style=gnu-configure
-makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel motif-devel libax25-devel"
+configure_args="ac_cv_file__usr_bin_gm_exe=no ac_cv_file__usr_bin_convert_exe=no"
+hostmakedepends="autoconf automake"
+makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel
+ motif-devel libax25-devel"
 short_desc="X Amateur Station Tracking and Information Reporting"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xastir.org"
 distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
-checksum=5a71af2936d4d237c779b1c3a519211f8e3cd03b9873a260c849ddc8950e1a3e
+checksum=aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	./bootstrap.sh
+}

From 329ddbd7847333f37a4aa53617ede111438a3eeb Mon Sep 17 00:00:00 2001
From: g33k <68657906+geekdiop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 18:50:29 +0100
Subject: [PATCH 1436/1853] liferea: update to 1.14.5.

---
 srcpkgs/liferea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/liferea/template b/srcpkgs/liferea/template
index bc903237928e..4c42fa49fe03 100644
--- a/srcpkgs/liferea/template
+++ b/srcpkgs/liferea/template
@@ -1,6 +1,6 @@
 # Template file for 'liferea'
 pkgname=liferea
-version=1.12.9
+version=1.14.5
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://lzone.de/liferea/"
 changelog="https://raw.githubusercontent.com/lwindolf/liferea/master/ChangeLog"
 distfiles="https://github.com/lwindolf/liferea/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=d8180695f0d378ad2799b36230bc8662916667d8a09b2e7144393a2a79c8cb1b
+checksum=2244e78d8f6b6e28f411a3554d61496a012d5fe1392fe1b475978ecfd8c61177
 lib32disabled=yes
 
 build_options="gir"

From 4244a8de5ca348d76def1711af54a2873a82e89b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sat, 11 Mar 2023 20:10:15 +0100
Subject: [PATCH 1437/1853] New package: graphwar-1.0.0

---
 srcpkgs/graphwar/files/graphwar              |  2 ++
 srcpkgs/graphwar/files/graphwar-globalServer |  2 ++
 srcpkgs/graphwar/files/graphwar-roomServer   |  2 ++
 srcpkgs/graphwar/template                    | 24 ++++++++++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/graphwar/files/graphwar
 create mode 100644 srcpkgs/graphwar/files/graphwar-globalServer
 create mode 100644 srcpkgs/graphwar/files/graphwar-roomServer
 create mode 100644 srcpkgs/graphwar/template

diff --git a/srcpkgs/graphwar/files/graphwar b/srcpkgs/graphwar/files/graphwar
new file mode 100644
index 000000000000..7cbd7e668554
--- /dev/null
+++ b/srcpkgs/graphwar/files/graphwar
@@ -0,0 +1,2 @@
+#! /bin/sh
+java -jar /usr/share/java/graphwar/graphwar.jar "$@"
diff --git a/srcpkgs/graphwar/files/graphwar-globalServer b/srcpkgs/graphwar/files/graphwar-globalServer
new file mode 100644
index 000000000000..ac962e012d71
--- /dev/null
+++ b/srcpkgs/graphwar/files/graphwar-globalServer
@@ -0,0 +1,2 @@
+#! /bin/sh
+java -jar /usr/share/java/graphwar/globalServer.jar "$@"
diff --git a/srcpkgs/graphwar/files/graphwar-roomServer b/srcpkgs/graphwar/files/graphwar-roomServer
new file mode 100644
index 000000000000..23d885fa24de
--- /dev/null
+++ b/srcpkgs/graphwar/files/graphwar-roomServer
@@ -0,0 +1,2 @@
+#! /bin/sh
+java -jar /usr/share/java/graphwar/roomServer.jar "$@"
diff --git a/srcpkgs/graphwar/template b/srcpkgs/graphwar/template
new file mode 100644
index 000000000000..91dbc1b6f021
--- /dev/null
+++ b/srcpkgs/graphwar/template
@@ -0,0 +1,24 @@
+# Template file for 'graphwar'
+pkgname=graphwar
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="openjdk11"
+depends="virtual?java-environment"
+short_desc="Hit your enemies using mathematical functions"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="http://www.graphwar.com/"
+distfiles="https://github.com/catabriga/graphwar/archive/refs/tags/${version}.tar.gz"
+checksum=53011a55adf3577d22dd2a190356d7fff7dc1379e4b8736dfd4933b47ab1e4e9
+
+do_install() {
+	vmkdir usr/share/java
+	vmkdir usr/share/java/${pkgname}
+	vinstall globalServer.jar 644 usr/share/java/${pkgname}
+	vinstall graphwar.jar 644 usr/share/java/${pkgname}
+	vinstall roomServer.jar 644 usr/share/java/${pkgname}
+	vbin "${FILESDIR}/${pkgname}"
+	vbin "${FILESDIR}/${pkgname}-globalServer"
+	vbin "${FILESDIR}/${pkgname}-roomServer"
+}

From 174935c968f5d143ee811465181a60e5c612ca2d Mon Sep 17 00:00:00 2001
From: Lunar Starstrum <lunar@forsaken-borders.net>
Date: Wed, 1 Mar 2023 01:32:52 -0600
Subject: [PATCH 1438/1853] New package: libdpp-10.0.23_1

Closes: https://github.com/void-linux/void-packages/pull/42521
---
 srcpkgs/dpp-devel    |  1 +
 srcpkgs/dpp/template | 26 ++++++++++++++++++++++++++
 srcpkgs/dpp/update   |  2 ++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/dpp-devel
 create mode 100644 srcpkgs/dpp/template
 create mode 100644 srcpkgs/dpp/update

diff --git a/srcpkgs/dpp-devel b/srcpkgs/dpp-devel
new file mode 120000
index 000000000000..cb34bf275a0a
--- /dev/null
+++ b/srcpkgs/dpp-devel
@@ -0,0 +1 @@
+dpp
\ No newline at end of file
diff --git a/srcpkgs/dpp/template b/srcpkgs/dpp/template
new file mode 100644
index 000000000000..4b01e0342af4
--- /dev/null
+++ b/srcpkgs/dpp/template
@@ -0,0 +1,26 @@
+# Template file for 'dpp'
+pkgname=dpp
+version=10.0.23
+revision=1
+build_style=cmake
+configure_args="-DDPP_USE_EXTERNAL_JSON=ON"
+cmake_builddir=build
+hostmakedepends="pkg-config"
+makedepends="libsodium-devel opus-devel zlib-devel openssl-devel json-c++"
+short_desc="C++ Discord API Library for Bots"
+maintainer="Lunar Starstrum <lunar@forsaken-borders.net>"
+license=Apache-2.0
+homepage="https://dpp.dev"
+distfiles="https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${version}.tar.gz"
+checksum=8f9db61c3586a492ada378235300c509e3bc2fc090cef32de0a8241741038df0
+
+dpp-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/dpp/update b/srcpkgs/dpp/update
new file mode 100644
index 000000000000..f88d641f9275
--- /dev/null
+++ b/srcpkgs/dpp/update
@@ -0,0 +1,2 @@
+site="https://github.com/brainboxdotcc/DPP/tags"
+pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'

From 1e612c1f3202753e7e0a8723a26a2c484615c246 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sat, 1 Apr 2023 22:06:10 +0200
Subject: [PATCH 1439/1853] New package: caph-1.1

Closes: #43234 [via git-merge-pr]
---
 srcpkgs/caph/files/caph.desktop |  8 ++++++++
 srcpkgs/caph/template           | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/caph/files/caph.desktop
 create mode 100644 srcpkgs/caph/template

diff --git a/srcpkgs/caph/files/caph.desktop b/srcpkgs/caph/files/caph.desktop
new file mode 100644
index 000000000000..a2141b58899f
--- /dev/null
+++ b/srcpkgs/caph/files/caph.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Caph
+Comment=Drawing and physics sandbox game
+Comment[ca]=Trencaclosques de dibuix i física
+Exec=caph
+Icon=caph.png
+Categories=Game;LogicGame;
diff --git a/srcpkgs/caph/template b/srcpkgs/caph/template
new file mode 100644
index 000000000000..a0d6f8211a03
--- /dev/null
+++ b/srcpkgs/caph/template
@@ -0,0 +1,29 @@
+# Template file for 'caph'
+pkgname=caph
+version=1.1
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="-f caph.mk"
+hostmakedepends="which pkg-config"
+makedepends="SDL-devel libpng-devel"
+short_desc="Drawing and physics sandbox game"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://caphgame.sourceforge.net/"
+changelog="https://sourceforge.net/p/caphgame/code/ci/master/tree/doc/caph/CHANGELOG?format=raw"
+distfiles="https://sourceforge.net/projects/caphgame/files/caph/caphgame-${version}/caph-${version}.tar.bz2"
+checksum=6415970e7d32aefc6da2740f931052be8741d3f6663910a36962400b7b9a7ae8
+
+do_configure() {
+	./confg
+}
+
+do_install() {
+	vbin caph
+	vmkdir usr/share/caph
+	vcopy ../share/caph usr/share
+	vinstall ../share/caph/brush.png 644 usr/share/pixmaps caph.png
+	vinstall "${FILESDIR}/caph.desktop" 644 usr/share/applications
+}

From 15857db79cdde8e644658e15f7355816da6a7a98 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Apr 2023 11:00:11 -0400
Subject: [PATCH 1440/1853] New package: trurl-0.8

---
 srcpkgs/trurl/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/trurl/template

diff --git a/srcpkgs/trurl/template b/srcpkgs/trurl/template
new file mode 100644
index 000000000000..8dba44303254
--- /dev/null
+++ b/srcpkgs/trurl/template
@@ -0,0 +1,19 @@
+# Template file for 'trurl'
+pkgname=trurl
+version=0.8
+revision=1
+build_style=gnu-makefile
+make_check_target="test"
+makedepends="libcurl-devel"
+checkdepends="python3"
+short_desc="Command line tool for URL parsing and manipulation"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/curl/trurl"
+changelog="https://raw.githubusercontent.com/curl/trurl/master/RELEASE-NOTES"
+distfiles="https://github.com/curl/trurl/archive/refs/tags/trurl-${version}.tar.gz"
+checksum=7baccde1620062cf8c670121125480269b41bdc81bd4015b7aabe33debb022c6
+
+post_install() {
+	vlicense COPYING
+}

From 269b363d4434a47432d487ef40c63eb15dc16a32 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Tue, 27 Jun 2023 14:06:50 +0200
Subject: [PATCH 1441/1853] shotgun: update to 2.5.1

---
 srcpkgs/shotgun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shotgun/template b/srcpkgs/shotgun/template
index dcefbb2cccb4..f1723b3c8cb8 100644
--- a/srcpkgs/shotgun/template
+++ b/srcpkgs/shotgun/template
@@ -1,6 +1,6 @@
 # Template file for 'shotgun'
 pkgname=shotgun
-version=2.5.0
+version=2.5.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ maintainer="Emil Miler <em@0x45.cz>"
 license="MPL-2.0"
 homepage="https://github.com/nexromancers/shotgun"
 distfiles="https://github.com/neXromancers/shotgun/archive/refs/tags/v${version}.tar.gz"
-checksum=862b9d6f1c418181d37375153e3ceadf87b738f5a48fcbd7257e07cd78b622a0
+checksum=4f95fd9d97c50bfd17228b5f59c7ed69b42ed6b50ae45b0a15d202ec1e89a1c6
 
 post_extract() {
 	rm build.rs

From 3f42cab08f011e583e9c975fa169dd55b4063960 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 27 Jun 2023 15:21:57 +0200
Subject: [PATCH 1442/1853] github-cli: split go_import_path into go_package

---
 srcpkgs/github-cli/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 89ffc67e39fe..343c399b5213 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -4,7 +4,8 @@ version=2.31.0
 revision=1
 build_style=go
 build_helper=qemu
-go_import_path="github.com/cli/cli/v2/cmd/gh"
+go_import_path="github.com/cli/cli/v2"
+go_package="${go_import_path}/cmd/gh"
 go_ldflags="-X github.com/cli/cli/v2/internal/build.Version=v${version}"
 short_desc="GitHub CLI tool"
 maintainer="shizonic <realtiaz@gmail.com>"

From aa3022b5b03e6e2d836c3a00933d65300b1f4bb3 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Thu, 16 Mar 2023 02:52:49 -0300
Subject: [PATCH 1443/1853] New package: rogue-5.4.4

---
 srcpkgs/rogue/patches/desktop-icon.patch | 15 +++++++++++++++
 srcpkgs/rogue/template                   | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/rogue/patches/desktop-icon.patch
 create mode 100644 srcpkgs/rogue/template

diff --git a/srcpkgs/rogue/patches/desktop-icon.patch b/srcpkgs/rogue/patches/desktop-icon.patch
new file mode 100644
index 000000000000..7bb78c25c98a
--- /dev/null
+++ b/srcpkgs/rogue/patches/desktop-icon.patch
@@ -0,0 +1,15 @@
+diff --git a/rogue.desktop b/rogue.desktop
+index 74f9518..34b02f4 100644
+--- a/rogue.desktop
++++ b/rogue.desktop
+@@ -2,9 +2,9 @@
+ Encoding=UTF-8
+ Name=Rogue
+ GenericName=Rogue
+ Comment=The original curses-based adventure game
+ Exec=rogue
+-Icon=rogue.png
++Icon=rogue
+ Terminal=true
+ Type=Application
+ Categories=Game;RolePlaying;
diff --git a/srcpkgs/rogue/template b/srcpkgs/rogue/template
new file mode 100644
index 000000000000..98ad61b87990
--- /dev/null
+++ b/srcpkgs/rogue/template
@@ -0,0 +1,19 @@
+# Template file for 'rogue'
+pkgname=rogue
+version=5.4.4
+revision=1
+build_style=gnu-configure
+configure_args="--enable-scorefile=/var/games/rogue/rogue.scr"
+makedepends="ncurses-devel"
+short_desc="Dungeon crawl game from the 80s"
+maintainer="sirkhancision <jsantiago12tone@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://rogue.rogueforge.net/"
+distfiles="https://gitlab.com/philhsmith/rogue/-/archive/v${version}/rogue-v${version}.tar.gz"
+checksum=df9f837817ceeededb77395ba990d83894f992ed7f534f3baab2ca4a80921b63
+
+post_install() {
+	vinstall rogue.desktop 644 usr/share/applications
+	vinstall rogue.png 644 usr/share/pixmaps
+	vlicense LICENSE.TXT
+}

From 070f70979341a9dceca0ef16104ce55ee9cd9f81 Mon Sep 17 00:00:00 2001
From: Jason Elswick <jason@jasondavid.tv>
Date: Tue, 27 Jun 2023 08:49:32 -0500
Subject: [PATCH 1444/1853] unflac: update to 1.1.

---
 srcpkgs/unflac/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 1c7dba20f527..37af4634493b 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,16 +1,16 @@
 # Template file for 'unflac'
 pkgname=unflac
-version=1.0
-revision=2
+version=1.1
+revision=1
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"
 short_desc="Command line tool for audio image + cue sheet splitting"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Jason Elswick <jason@jasondavid.tv>"
 license="MIT"
 homepage="https://git.sr.ht/~ft/unflac"
 distfiles="https://git.sr.ht/~ft/${pkgname}/archive/${version}.tar.gz"
-checksum=a09c54d04127707c3f556836590de5d2ae6a78bf17a99472b602ef983f89b7b4
+checksum=a79aa3625bae55286f382909a899f6304d71e7ce206e0234c40d944c74932caf
 
 post_install() {
 	vlicense LICENSE

From 0b00c4c614703427b0aba7f32e9a2b245dfc12e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Feb 2023 09:41:50 -0500
Subject: [PATCH 1445/1853] python3-scipy: update to 1.11.0, build with meson

---
 .../python3-scipy/patches/numpy-version.patch | 14 ++++
 srcpkgs/python3-scipy/template                | 72 +++++++++++--------
 2 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/python3-scipy/patches/numpy-version.patch

diff --git a/srcpkgs/python3-scipy/patches/numpy-version.patch b/srcpkgs/python3-scipy/patches/numpy-version.patch
new file mode 100644
index 000000000000..74f9b4a919b0
--- /dev/null
+++ b/srcpkgs/python3-scipy/patches/numpy-version.patch
@@ -0,0 +1,14 @@
+There doesn't seem to be a valid reason for this restriction, and it doesn't
+impede building anyway.
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -40,7 +40,7 @@
+     # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6
+     # (see oldest-supported-numpy issues gh-28 and gh-45)
+     "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'",
+-    "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'",
++    "numpy>=1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'",
+ 
+     # For Python versions which aren't yet officially supported,
+     # we specify an unpinned NumPy which allows source distributions
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 1871a8a30a9c..e0e0fdec2aa8 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,26 +1,35 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.10.1
+version=1.11.0
 revision=1
-build_style=python3-module
-build_helper="numpy"
-make_check_args="--force"
-hostmakedepends="gcc-fortran python3-setuptools
- pythran python3-Cython python3-pybind11"
-makedepends="python3-devel python3-pybind11
+build_style=meson
+build_helper="python3"
+hostmakedepends="python3-build python3-installer python3-meson-python
+ python3-wheel python3-Cython python3-pybind11 pythran python3-numpy
+ gcc-fortran pkg-config"
+makedepends="python3-devel python3-pybind11 python3-numpy pythran
  $(vopt_if openblas openblas-devel lapack-devel)"
 depends="python3-numpy"
-checkdepends="python3-pytest-xdist python3-pooch"
 short_desc="Scientific library for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
-distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.gz"
-checksum=2cf9dfb80a7b4589ba4c40ce7588986d6d5cebc5457cad2c2880f6bc2d42f3a5
-make_check="ci-skip" # Tests require downloaded data and take a long time
+distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz"
+checksum=f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d
+make_check="no" # Tests need an installed copy to run and meson makes this tough
 
 build_options="openblas"
 
+if [ "$CROSS_BUILD" ]; then
+	_pybind11_dir="${py3_sitelib}/pybind11"
+	configure_args="--cross-file=python.cross"
+	export PKG_CONFIG_PATH="${XBPS_CROSS_BASE}/${_pybind11_dir}/share/pkgconfig"
+	# pybind11 uses a path relative to the pkgconfig file to set $prefix,
+	# which causes the wrapper to double-include $XBPS_CROSS_BASE; override
+	# so that the wrapper properly points to the right location
+	export PKG_CONFIG_PYBIND11_PREFIX="/${_pybind11_dir}"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
 		# Prefer accelerated routines where available
@@ -36,29 +45,34 @@ if [ "$build_option_openblas" ]; then
 	esac
 fi
 
-# Tell numpy to build in parallel
-export NPY_NUM_BUILD_JOBS="${XBPS_MAKEJOBS}"
+pre_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		# Meson can't tolerate $CC with arguments as set by the build helper
+		CC="${XBPS_CROSS_TRIPLET}-gcc"
+		# CXX needs to know where to find Python headers
+		CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+}
 
-pre_build() {
-	# Find the right linear algebra subroutines on the target arch
-	: > site.cfg
-	for _blaslib in $(vopt_if openblas openblas "lapack blas"); do
-		cat >> site.cfg <<-EOF
-		[$_blaslib]
-		libraries = ${_blaslib}
-		include_dirs = ${XBPS_CROSS_BASE}/usr/include
-		library_dirs = ${XBPS_CROSS_BASE}/usr/lib
-		runtime_library_dirs = ${XBPS_CROSS_BASE}/usr/lib
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}"
+		cat > python.cross <<-EOF
+		[properties]
+		numpy-include-dir = '${_xpy}/numpy/core/include'
+		pythran-include-dir = '${_xpy}/pythran'
 		EOF
-	done
+	fi
 }
 
-do_check() {
-	touch .coveragerc
-	python3 ./runtests.py --verbose ${makejobs}
+do_build() {
+	# Use the build directory already configured by xbps-src for meson
+	python3 -m build --no-isolation --wheel \
+		-Cbuilddir="./build" -Ccompile-args="${makejobs}" .
 }
 
-post_install() {
-	rm ${DESTDIR}/${py3_sitelib}/scipy/*.txt
+do_install() {
+	python3 -m installer --destdir "${DESTDIR}" \
+		--no-compile-bytecode dist/*.whl
 	vlicense LICENSE.txt
 }

From d2ac5b12e2b54e2a0ebdd4adcf6ee09aa2c5461c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:36:34 +0200
Subject: [PATCH 1446/1853] ImageMagick: update to 7.1.1.12.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index dbfcc264cae7..bbf69e216155 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
-version=7.1.1.11
+version=7.1.1.12
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -20,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=98bb2783da7d5b06e7543529bd07b50d034fba611ff15e8817a0f4f73957d934
+checksum=51567d11fcbca5bd591d191ce9fdf821e2ed1b12c1ad8bc2a2f13da5c6313f33
 
 subpackages="libmagick libmagick-devel"
 

From a89e2bd410bf41a7fbb84d57c76bc6d2c99f696a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:41:45 +0200
Subject: [PATCH 1447/1853] php8.0-imagick: revbump for ImageMagick-7.1.1.12

---
 srcpkgs/php8.0-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
index ae1823ab75d2..88d260b973d3 100644
--- a/srcpkgs/php8.0-imagick/template
+++ b/srcpkgs/php8.0-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0-imagick'
 pkgname=php8.0-imagick
 version=3.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.0"

From af3a0563b4fc655b78b99ab073d1df5b435f0cba Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:41:45 +0200
Subject: [PATCH 1448/1853] php8.1-imagick: revbump for ImageMagick-7.1.1.12

---
 srcpkgs/php8.1-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index dbf7cae1d74a..b2faf0ba9402 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1-imagick'
 pkgname=php8.1-imagick
 version=3.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.1"

From 7e76f892c13fa81d6db358595b4cd7e0b60b319f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:41:45 +0200
Subject: [PATCH 1449/1853] php8.2-imagick: revbump for ImageMagick-7.1.1.12

---
 srcpkgs/php8.2-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2-imagick/template b/srcpkgs/php8.2-imagick/template
index 09b11989c52a..ef7a78f70771 100644
--- a/srcpkgs/php8.2-imagick/template
+++ b/srcpkgs/php8.2-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2-imagick'
 pkgname=php8.2-imagick
 version=3.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.2"

From 764074ebf81d970490585d1013ec208b41ed3ef7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 27 Jun 2023 12:26:00 +0200
Subject: [PATCH 1450/1853] topgrade: update to 12.0.0

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index a62587dcb8de..2808df268529 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=11.0.2
+version=12.0.0
 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=29cd1d870dafbfa46d07c4056ba229a98755660a2e37804f12e1507fdde7d237
+checksum=c99bb88995da5e7d86055d10eced8950740fa2ed986f0b9b159e64a22a0842ed
 
 post_install() {
 	local topgrade="${DESTDIR}/usr/bin/topgrade"

From b68351627706959e6cd481f446e2d0ced5597d76 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 15:26:33 -0400
Subject: [PATCH 1451/1853] *: orphan st3r4g's packages

---
 srcpkgs/intel-gmmlib/template       | 2 +-
 srcpkgs/intel-media-driver/template | 2 +-
 srcpkgs/libglvnd/template           | 2 +-
 srcpkgs/python3-pycdio/template     | 2 +-
 srcpkgs/python3-pytaglib/template   | 2 +-
 srcpkgs/whipper/template            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index 8ed6ed3cf56c..04e407b1de4d 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -14,7 +14,7 @@ build_style=cmake
 # compilers flag in use.
 configure_args="-Wno-dev"
 short_desc="Intel Graphics Memory Management Library"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/intel/gmmlib"
 distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz"
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 1ca94569e117..a5bab06ac947 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -8,7 +8,7 @@ configure_args="-Wno-dev -DENABLE_NONFREE_KERNELS=$(vopt_if nonfree ON OFF)"
 hostmakedepends="pkg-config"
 makedepends="libva-devel libX11-devel intel-gmmlib-devel libpciaccess-devel"
 short_desc="Intel Media Driver for VAAPI (Broadwell+)"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
diff --git a/srcpkgs/libglvnd/template b/srcpkgs/libglvnd/template
index a2522106cfd6..93983d36cd45 100644
--- a/srcpkgs/libglvnd/template
+++ b/srcpkgs/libglvnd/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libXext-devel libX11-devel xorgproto"
 checkdepends="xvfb-run"
 short_desc="GL Vendor-Neutral Dispatch library"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-alike"
 homepage="https://gitlab.freedesktop.org/glvnd/libglvnd"
 distfiles="https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v${version}/libglvnd-v${version}.tar.gz"
diff --git a/srcpkgs/python3-pycdio/template b/srcpkgs/python3-pycdio/template
index cfaca61046d4..6fdcf7503980 100644
--- a/srcpkgs/python3-pycdio/template
+++ b/srcpkgs/python3-pycdio/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools pkg-config swig"
 makedepends="libcdio-devel python3-devel"
 depends="python3"
 short_desc="Python OO interface to libcdio (CD Input and Control library)"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libcdio"
 distfiles="${GNU_SITE}/libcdio/pycdio-${version}.tar.gz"
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f1d9db569131..ebbdc90cf28f 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel taglib-devel"
 depends="python3"
 short_desc="Python bindings for the TagLib C++ library"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/supermihi/pytaglib"
 distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index cd7f851f8c4d..256c7d83ef80 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -10,7 +10,7 @@ depends="libcdio-paranoia cdrdao python3-gobject python3-musicbrainzngs
  python3-setuptools python3-ruamel.yaml flac sox"
 checkdepends="$depends python3-pytest python3-Twisted"
 short_desc="Python CD-DA ripper preferring accuracy over speed"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/whipper-team/whipper"
 distfiles="https://github.com/whipper-team/whipper/archive/v${version}.tar.gz"

From 13ecb5a50dffd7fe4a6bbbc485187e0bf7ea6b6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Jun 2023 15:32:42 -0400
Subject: [PATCH 1452/1853] python3-scipy: fix homepage, builds without
 openblas

---
 srcpkgs/python3-scipy/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index e0e0fdec2aa8..c5a8e1f212bd 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -8,12 +8,12 @@ hostmakedepends="python3-build python3-installer python3-meson-python
  python3-wheel python3-Cython python3-pybind11 pythran python3-numpy
  gcc-fortran pkg-config"
 makedepends="python3-devel python3-pybind11 python3-numpy pythran
- $(vopt_if openblas openblas-devel lapack-devel)"
+ $(vopt_if openblas openblas-devel "lapack-devel cblas-devel")"
 depends="python3-numpy"
 short_desc="Scientific library for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
-homepage="https://scipy.org/scipylib/"
+homepage="https://scipy.org/"
 distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz"
 checksum=f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d
 make_check="no" # Tests need an installed copy to run and meson makes this tough
@@ -43,6 +43,8 @@ if [ "$build_option_openblas" ]; then
 		ppc64*) ;;
 		ppc*) broken="numpy can't be built with openblas";;
 	esac
+else
+	configure_args+=" -Dblas=blas -Dlapack=lapack"
 fi
 
 pre_patch() {

From 2a3d9d4c6a50d87eb60e787e8029616e39d6e7a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 15:38:05 -0400
Subject: [PATCH 1453/1853] *: orphan RinsedSloth's packages

---
 srcpkgs/python3-hjson/template | 2 +-
 srcpkgs/qmk/template           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hjson/template b/srcpkgs/python3-hjson/template
index 9ee5fb90dbe1..2c1841424d7b 100644
--- a/srcpkgs/python3-hjson/template
+++ b/srcpkgs/python3-hjson/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="User interface for JSON"
-maintainer="RinsedSloth <afernandezh@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/hjson/hjson-py"
 distfiles="${PYPI_SITE}/h/hjson/hjson-${version}.tar.gz"
diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template
index 5067857b53f3..5c1bc5ecda2e 100644
--- a/srcpkgs/qmk/template
+++ b/srcpkgs/qmk/template
@@ -11,7 +11,7 @@ depends="avr-gcc avrdude cross-arm-none-eabi dfu-programmer dfu-util
  python3-dotty-dict python3-hid python3-hjson python3-jsonschema python3-milc
  python3-nose2 python3-usb python3-yapf"
 short_desc="CLI tool for working with QMK firmware of mechanical keyboards"
-maintainer="RinsedSloth <afernandezh@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/qmk/qmk_cli"
 distfiles="${PYPI_SITE}/q/qmk/qmk-${version}.tar.gz"

From 30e42ca023759be2b7ee2d34f45d7e7b78f69847 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 00:51:09 +0530
Subject: [PATCH 1454/1853] python3-yapf: update to 0.40.1.

Adopt.
---
 srcpkgs/python3-yapf/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template
index 7dbea9f8cf77..81fa11d73539 100644
--- a/srcpkgs/python3-yapf/template
+++ b/srcpkgs/python3-yapf/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-yapf'
 pkgname=python3-yapf
-version=0.33.0
-revision=2
+version=0.40.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-tomli"
+depends="python3-importlib_metadata python3-platformdirs python3-tomli"
+checkdepends="${depends} python3-pytest"
 short_desc="Formatter for Python code"
-maintainer="RinsedSloth <afernandezh@protonmail.com>"
+maintainer="icp <pangolin@vivaldi.net>"
 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=da62bdfea3df3673553351e6246abed26d9fe6780e548a5af9e70f6d2b4f5b9a
+checksum=958587eb5c8ec6c860119a9c25d02addf30a44f75aa152a4220d30e56a98037c
 
 post_install() {
 	chmod -R a+r "${DESTDIR}/${py3_sitelib}/yapf-${version}-py${py3_ver}.egg-info/"

From 12f94ccc02bc8104cb6d6ace8413b0d4b7e325a6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 15:43:58 -0400
Subject: [PATCH 1455/1853] pipewire: update to 0.3.72, adopt

---
 .../patches/jack-fix-notify-skip.patch        | 50 -------------------
 srcpkgs/pipewire/template                     | 14 +++---
 2 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
deleted file mode 100644
index fed37727a636..000000000000
--- a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 18 May 2023 09:59:26 +0200
-Subject: [PATCH] jack: update bufsize and samplerate when skipping notify
-
-When we skip the notify because we are not active or we don't have a
-callback, still update the buffer_size and sample_rate fields or else
-we will keep on trying forever.
-
-Fixes #3226
----
- pipewire-jack/src/pipewire-jack.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
-index 0c8363ea3..20feb2462 100644
---- a/pipewire-jack/src/pipewire-jack.c
-+++ b/pipewire-jack/src/pipewire-jack.c
-@@ -1027,8 +1027,6 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
- 	struct notify *notify;
- 	bool emit = false;;
- 
--	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
--		return 0;
- 	switch (type) {
- 	case NOTIFY_TYPE_REGISTRATION:
- 		emit = c->registration_callback != NULL && o != NULL;
-@@ -1060,8 +1058,18 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
- 	default:
- 		break;
- 	}
-+	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
-+		emit = false;
- 	if (!emit) {
--		pw_log_debug("%p: skip notify %d", c, type);
-+		switch (type) {
-+		case NOTIFY_TYPE_BUFFER_FRAMES:
-+			c->buffer_frames = arg1;
-+			break;
-+		case NOTIFY_TYPE_SAMPLE_RATE:
-+			c->sample_rate = arg1;
-+			break;
-+		}
-+		pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active);
- 		if (o != NULL && arg1 == 0 && o->removing) {
- 			o->removing = false;
- 			free_object(c, o);
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 3e0cffb69a3c..5320cb07f6a4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.71
-revision=3
+version=0.3.72
+revision=1
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -16,6 +16,7 @@ configure_args="
  -Dbluez5-codec-lc3plus=disabled
  -Dsession-managers=[]
  -Drlimits-match=@_pipewire
+ -Dlibffado=$(vopt_if ffado enabled disabled)
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -23,22 +24,23 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel opus-devel"
+ libmysofa-devel opus-devel $(vopt_if ffado libffado-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
-maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
+checksum=eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
-build_options="sdl2"
+build_options="ffado sdl2"
+desc_option_ffado="Enable support for FireWire based audio devices"
 
 replaces="libpulseaudio-pipewire>=0"
 

From f87ce1c4bab8272fd89f5cc6431a400435182107 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 00:40:44 +0530
Subject: [PATCH 1456/1853] memray: update to 1.8.1.

---
 srcpkgs/memray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/memray/template b/srcpkgs/memray/template
index 8c73d35d25e0..f84c81b3a174 100644
--- a/srcpkgs/memray/template
+++ b/srcpkgs/memray/template
@@ -1,6 +1,6 @@
 # Template file for 'memray'
 pkgname=memray
-version=1.7.0
+version=1.8.1
 revision=1
 build_style=python3-pep517
 make_check_target="tests/unit"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://bloomberg.github.io/memray/"
 changelog="https://bloomberg.github.io/memray/changelog.html"
 distfiles="https://github.com/bloomberg/memray/archive/refs/tags/v${version}.tar.gz"
-checksum=0c735753d6d8a9050c9313c55ee41bfca271c3dec7cc37d2ed01eba5d358a7d6
+checksum=523792161623c80934904a7ff80eac53be6256f530cff179f834c6e33192fd54
 make_check_pre="env PYTHONPATH=src"
 
 pre_build() {

From 3841712cc5b60852c045a820fe961dab2660ac43 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Sat, 17 Jun 2023 12:01:00 +0200
Subject: [PATCH 1457/1853] libasr: remove, discontinued upstream and unused

closes #44487
---
 common/shlibs                     |  1 -
 srcpkgs/libasr-devel              |  1 -
 srcpkgs/libasr/template           | 34 -------------------------------
 srcpkgs/removed-packages/template |  4 +++-
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 120000 srcpkgs/libasr-devel
 delete mode 100644 srcpkgs/libasr/template

diff --git a/common/shlibs b/common/shlibs
index 754c2aa23049..8e97f561bae8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2210,7 +2210,6 @@ libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
-libasr.so.0 libasr-1.0.0_1
 libssr-glinject.so ssr-0.3.1_1
 libgdict-1.0.so.10 gnome-dictionary-3.18.1_1
 libasignify.so.1 asignify-1.0_1
diff --git a/srcpkgs/libasr-devel b/srcpkgs/libasr-devel
deleted file mode 120000
index 213782918378..000000000000
--- a/srcpkgs/libasr-devel
+++ /dev/null
@@ -1 +0,0 @@
-libasr
\ No newline at end of file
diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
deleted file mode 100644
index fdd5986a740b..000000000000
--- a/srcpkgs/libasr/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'libasr'
-pkgname=libasr
-version=1.0.4
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool"
-short_desc="Simple and portable asynchronous resolver library"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-Clause"
-homepage="https://www.opensmtpd.org/"
-distfiles="https://github.com/OpenSMTPD/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=19fb6bed10d15c9775c8d008cd1130155917ae4e801c729fe85e6d88a545dab4
-
-if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
-	CFLAGS="-DHAVE_RES_RANDOMID"
-fi
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense LICENCE
-}
-
-libasr-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5b2a3dc26088..d138d1155589 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230626
+version=0.1.20230627
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -281,6 +281,8 @@ replaces="
  libantimicrox-devel<=3.1.3_1
  libantimicrox<=3.1.3_1
  libapp<=20140527_2
+ libasr-devel<=1.0.4_1
+ libasr<=1.0.4_1
  libbitcoin-blockchain-devel<=3.6.0_10
  libbitcoin-blockchain<=3.6.0_10
  libbitcoin-client-devel<=3.6.0_10

From eef142f65dfda734d38835ff806ca219dbb2661c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 16:44:13 -0400
Subject: [PATCH 1458/1853] *: orphan kruceter's packages

---
 srcpkgs/ipsvd/template         | 2 +-
 srcpkgs/socklog-ucspi/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipsvd/template b/srcpkgs/ipsvd/template
index c1e118fb4c40..fd68cef65da5 100644
--- a/srcpkgs/ipsvd/template
+++ b/srcpkgs/ipsvd/template
@@ -4,7 +4,7 @@ version=1.0.0
 revision=1
 build_wrksrc="${pkgname}-${version}"
 short_desc="Set of internet protocol service daemons for Unix"
-maintainer="Krul Ceter <kruceter@proton.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://smarden.org/ipsvd"
 distfiles="http://smarden.org/ipsvd/ipsvd-${version}.tar.gz"
diff --git a/srcpkgs/socklog-ucspi/template b/srcpkgs/socklog-ucspi/template
index 6fa8a209f0dc..288397041365 100644
--- a/srcpkgs/socklog-ucspi/template
+++ b/srcpkgs/socklog-ucspi/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meta
 depends="socklog ipsvd"
 short_desc="UCSPI-TCP services for socklog"
-maintainer="Krul Ceter <kruceter@proton.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="http://smarden.org/socklog"
 

From 001052f076ccb7f6e4e2df3ee79c1909c395dd02 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 15 Jun 2023 11:41:24 +0200
Subject: [PATCH 1459/1853] coreboot-utils: update to 4.20.1.

---
 .../coreboot-utils/patches/ectool-musl.patch  | 11 ----------
 .../patches/inteltool-musl-2.patch            | 10 ---------
 .../patches/inteltool-musl.patch              | 11 ----------
 .../patches/nvramtool-musl-2.patch            | 11 ----------
 .../patches/nvramtool-musl.patch              | 11 ----------
 .../patches/superiotool-musl.patch            | 22 -------------------
 srcpkgs/coreboot-utils/template               |  7 +++---
 7 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/coreboot-utils/patches/ectool-musl.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/superiotool-musl.patch

diff --git a/srcpkgs/coreboot-utils/patches/ectool-musl.patch b/srcpkgs/coreboot-utils/patches/ectool-musl.patch
deleted file mode 100644
index 85abc55c428c..000000000000
--- a/srcpkgs/coreboot-utils/patches/ectool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/ectool/Makefile	2020-05-20 15:20:52.396213112 +0200
-+++ b/util/ectool/Makefile	2020-05-20 15:20:52.396213112 +0200
-@@ -15,6 +15,8 @@
- LDFLAGS = -l$(shell uname -p)
- endif
- 
-+LDFLAGS = -lgcc
-+
- all: $(PROGRAM)
- 
- $(PROGRAM): ec.o ectool.o
diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
deleted file mode 100644
index a27523bc9734..000000000000
--- a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/arch/x86/include/arch/mmio.h	2020-05-20 14:43:31.750138013 +0200
-+++ b/src/arch/x86/include/arch/mmio.h	2020-05-20 14:43:13.438137399 +0200
-@@ -4,6 +4,7 @@
- #define __ARCH_MMIO_H__
-
- #include <stdint.h>
-+#define __always_inline  inline __attribute__((always_inline))
-
- static __always_inline uint8_t read8(
- 	const volatile void *addr)
diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch
deleted file mode 100644
index 509d2dcb6077..000000000000
--- a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/inteltool/inteltool.h	2018-08-27 12:35:48.049321340 +0200
-+++ b/util/inteltool/inteltool.h	2018-08-27 12:30:27.434969376 +0200
-@@ -21,7 +21,7 @@
- 
- #include <stdint.h>
- 
--#if defined(__GLIBC__)
-+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) ||defined(__NetBSD__) || defined(__DARWIN__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
deleted file mode 100644
index e6142739cfee..000000000000
--- a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/nvramtool/Makefile	2020-05-20 15:19:20.652210037 +0200
-+++ b/util/nvramtool/Makefile	2020-05-20 15:19:20.652210037 +0200
-@@ -34,6 +34,8 @@
- CFLAGS += -D__GLIBC__
- endif
- 
-+LDFLAGS = -lgcc
-+
- all: dep $(PROGRAM)
- 
- $(PROGRAM): $(OBJS)
diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
deleted file mode 100644
index a3e6c7c17835..000000000000
--- a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/nvramtool/accessors/cmos-hw-unix.c	2018-08-27 12:20:14.139599118 +0200
-+++ b/util/nvramtool/accessors/cmos-hw-unix.c	2018-08-27 12:19:45.558280906 +0200
-@@ -11,7 +11,7 @@
- #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); })
- #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); })
- #else
--#if defined(__GLIBC__) && (defined(__i386__) || defined(__x86_64__))
-+#if (defined(__i386__) || defined(__x86_64__)) && !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch
deleted file mode 100644
index 195660c8c602..000000000000
--- a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/util/superiotool/Makefile	2018-05-16 21:00:17.000000000 +0200
-+++ b/util/superiotool/Makefile	2018-08-27 12:56:28.070741476 +0200
-@@ -25,7 +25,7 @@
- VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
- 
- CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
--         -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
-+         -Werror-implicit-function-declaration -pedantic $(VERSION)
- LDFLAGS += -lz
- 
- OBJS = superiotool.o serverengines.o ali.o exar.o fintek.o ite.o nsc.o \
---- a/util/superiotool/superiotool.h	2018-05-16 21:00:17.000000000 +0200
-+++ b/util/superiotool/superiotool.h	2018-08-27 12:50:25.627387315 +0200
-@@ -25,7 +25,7 @@
- #include <stdint.h>
- #include <string.h>
- #include <getopt.h>
--#if defined(__GLIBC__)
-+#if  !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index d01eb38b29c9..f91a0f0c7f87 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
-version=4.17
-revision=2
+version=4.20.1
+revision=1
 archs="i686* x86_64*"
 build_wrksrc="util"
 build_style=gnu-makefile
@@ -11,7 +11,8 @@ maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://coreboot.org"
 distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz"
-checksum=95da11d1c6a450385101a68799258a398ce965f4e46cce6fe8d5ebd74e50c125
+checksum=b41539a8c2eab2fec752157eb4acbd0e2a637a7203530c12e66b43a5c3c3a931
+CFLAGS="-D_GNU_SOURCE"
 
 do_build() {
 	for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \

From 52cded5efcc9e585e88d1ae973be495cfed82022 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 27 Jun 2023 01:42:46 +0530
Subject: [PATCH 1460/1853] rust-analyzer: update to 2023.06.26.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 6c417b01509d..6ae7cd38d4fb 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.06.19
+version=2023.06.26
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=3365b6a8de1929a73af198520f3169f146ab882b47b41146045ea8217fcdcd61
+checksum=2a22d552e98820dacf34aa84816dff1d83e9c56c997470e917c9d77f150069b4
 # tests require Rust source code
 make_check=no
 

From 9c212141ea50d038eb6a422345335fa80e8658b7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 00:45:45 +0530
Subject: [PATCH 1461/1853] hurl: update to 3.0.1.

---
 srcpkgs/hurl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hurl/template b/srcpkgs/hurl/template
index 77634e4f2065..5881b444a7af 100644
--- a/srcpkgs/hurl/template
+++ b/srcpkgs/hurl/template
@@ -1,6 +1,6 @@
 # Template file for 'hurl'
 pkgname=hurl
-version=3.0.0
+version=3.0.1
 revision=1
 build_style=cargo
 make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://hurl.dev"
 changelog="https://raw.githubusercontent.com/Orange-OpenSource/hurl/master/CHANGELOG.md"
 distfiles="https://github.com/Orange-OpenSource/hurl/archive/refs/tags/${version}.tar.gz"
-checksum=7ad9a1043129edb4850727c085a83010b916b3515c2af5afddd0809c1e2bd85c
+checksum=551a730ed23150bc0a120781abe8c36b2989abc03c97c3e79191eea87cca5632
 
 if [[ "$XBPS_WORDSIZE" -eq 32 ]]; then
 	make_check=no # https://github.com/Orange-OpenSource/hurl/issues/1220

From 4478ea4e60a44f777e0f5e0a4ca89b15e30d5052 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 17:59:12 -0400
Subject: [PATCH 1462/1853] *: orphan Ulf's packages

inactive since 2021
---
 srcpkgs/Thunar/template                         | 2 +-
 srcpkgs/gphoto2/template                        | 2 +-
 srcpkgs/hidapi/template                         | 2 +-
 srcpkgs/io.elementary.videos/template           | 2 +-
 srcpkgs/lxtask/template                         | 2 +-
 srcpkgs/lxterminal/template                     | 2 +-
 srcpkgs/mobile-broadband-provider-info/template | 2 +-
 srcpkgs/pianobar/template                       | 2 +-
 srcpkgs/python3-chromecast/template             | 2 +-
 srcpkgs/qsynth/template                         | 2 +-
 srcpkgs/rooster/template                        | 2 +-
 srcpkgs/xfce4-taskmanager/template              | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 91ef58fa0a17..dde94cfe4d1e 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config intltool glib-devel"
 makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Thunar File Manager"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
diff --git a/srcpkgs/gphoto2/template b/srcpkgs/gphoto2/template
index 73b706b7a99f..97f03f9097e7 100644
--- a/srcpkgs/gphoto2/template
+++ b/srcpkgs/gphoto2/template
@@ -8,7 +8,7 @@ configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev
 hostmakedepends="automake gettext-devel libtool pkg-config"
 makedepends="libgphoto2-devel libjpeg-turbo-devel popt-devel readline-devel"
 short_desc="Digital camera CLI iinterface to libgphoto"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gphoto.org"
 distfiles="${SOURCEFORGE_SITE}/gphoto/gphoto2-${version}.tar.bz2"
diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index c9cef86a126c..365e8eac36ca 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libusb-devel"
 short_desc="Simple library for communicating with USB and Bluetooth HID devices"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/libusb/hidapi"
 changelog="https://github.com/libusb/hidapi/releases"
diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index d843b038a7da..d83a9ca928be 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext pkg-config vala AppStream"
 makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
  gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
 short_desc="Video player and library app designed for elementary OS"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template
index f35f9e772f4a..dcb7017e1715 100644
--- a/srcpkgs/lxtask/template
+++ b/srcpkgs/lxtask/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
 short_desc="LXDE Task Manager"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template
index 22cf17c65436..f7c44102a515 100644
--- a/srcpkgs/lxterminal/template
+++ b/srcpkgs/lxterminal/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel vte3-devel"
 depends="desktop-file-utils"
 short_desc="LXDE Terminal emulator"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 68c0a965ec48..dd2879934180 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libxslt"
 checkdepends="libxml2"
 short_desc="Database of mobile broadband service providers"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Creative Commons Public Domain"
 homepage="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/"
 distfiles="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/${version}/mobile-broadband-provider-info-${version}.tar.bz2"
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index a9b29e91993f..e3febb821a45 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
  libcurl-devel libgcrypt-devel"
 short_desc="Free/open-source, console-based client for Pandora radio"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://6xq.net/pianobar/"
 changelog="https://raw.githubusercontent.com/PromyLOPh/pianobar/master/ChangeLog"
diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index 982b2a72a7eb..ff32ad6f11f1 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-ca
 depends="python3-protobuf python3-zeroconf python3-casttube"
 checkdepends="python3-flake8 python3-pylint black"
 short_desc="Python3 library to communicate with Google Chromecast"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 1b8712148464..19f39132fc38 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"
 depends="fluidsynth jack desktop-file-utils hicolor-icon-theme"
 short_desc="Qt GUI Interface for FluidSynth"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://qsynth.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index 2dcfca0af324..281f32d3f531 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/rooster"
 distfiles="https://static.crates.io/crates/rooster/rooster-${version}.crate"
diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 85323727cb53..785abf6f7acd 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE task manager plugin"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-taskmanager/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"

From 2c2f2948acadc63727194c021d01b08728e50d33 Mon Sep 17 00:00:00 2001
From: cassaundra <cass@cassaundra.org>
Date: Tue, 7 Mar 2023 21:47:06 -0800
Subject: [PATCH 1463/1853] opentmpfiles: remove package

Upstream no longer maintained. Also has a privilege escalation vulnerability
that will likely not be fixed.

Not depended upon by any other packages.

See also: https://github.com/OpenRC/opentmpfiles/issues/19

closes #42655
---
 srcpkgs/opentmpfiles/template     | 16 ----------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/opentmpfiles/template

diff --git a/srcpkgs/opentmpfiles/template b/srcpkgs/opentmpfiles/template
deleted file mode 100644
index 2e5be496e00b..000000000000
--- a/srcpkgs/opentmpfiles/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'opentmpfiles'
-pkgname=opentmpfiles
-version=0.3.1
-revision=1
-build_style=meson
-configure_args="-Drootbindir=/usr/bin"
-short_desc="Standalone utility for handling systemd-style tmpfiles.d settings"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OpenRC/opentmpfiles"
-distfiles="https://github.com/OpenRC/opentmpfiles/archive/${version}.tar.gz"
-checksum=47d651ccda53a204463285044a9d34b1bd54d927509dac43994a9d6341be084a
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d138d1155589..bdd9a27b2906 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1.20230627
-revision=1
+revision=2
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -411,6 +411,7 @@ replaces="
  onionshare<=2.2_5
  opencl-clhpp<=2.0.15_1
  openlierox<=0.58.rc5_2
+ opentmpfiles<=0.3.1_1
  orage<=4.12.1_7
  parallel-rust<=0.11.3_2
  paraview<=5.8.1_3

From 819d486672dc68baeb37aeac316577961316e51e Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Tue, 7 Mar 2023 09:23:23 -0500
Subject: [PATCH 1464/1853] python3-pytest-qt: update to 4.2.0.

closes #42640
---
 srcpkgs/python3-pytest-qt/template | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index 6cef70df550d..5ba9ead78008 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,29 +1,18 @@
 # Template file for 'python3-pytest-qt'
 pkgname=python3-pytest-qt
-version=3.3.0
-revision=5
+version=4.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-pytest"
-checkdepends="$depends python3-pyside2 python3-PyQt5 python3-pytest-xvfb
- xdpyinfo"
 short_desc="Pytest support for PyQt and PySide applications"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pytest-qt"
+changelog="https://raw.githubusercontent.com/pytest-dev/pytest-qt/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-qt/pytest-qt-${version}.tar.gz"
-checksum=714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925
-
-do_check() {
-	# testing for some configuration in test_basics.py,
-	# isn't those 2 below tests are the real test for envvar
-	# Why does it run just fine?
-	local _skip='test_qapp_args or test_qt_api_ini_config or test_invalid_qt_api_envvar'
-	PYTHONPATH=$(pwd)/build/lib \
-		PYTEST_QT_API=pyside2 python3 -m pytest -k "not ($_skip)"
-	PYTHONPATH=$(pwd)/build/lib \
-		PYTEST_QT_API=pyqt5 python3 -m pytest -k "not ($_skip)"
-}
+checksum=00a17b586dd530b6d7a9399923a40489ca4a9a309719011175f55dc6b5dc8f41
+make_check=no # tests only run in a venv with tox, not useful for checking package correctness
 
 post_install() {
 	vlicense LICENSE

From a483ba19df9ddf91a038522bb202cd66eddd7892 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 17:35:55 +0200
Subject: [PATCH 1465/1853] openresolv: update distfiles url

closes #43790
---
 srcpkgs/openresolv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 3ed997c5fc58..1cdeff328ee7 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -9,8 +9,8 @@ short_desc="Management framework for resolv.conf"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/openresolv"
-distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
-checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
+distfiles="https://github.com/NetworkConfiguration/openresolv/archive/refs/tags/v${version}.tar.gz"
+checksum=f4c43bdfe20fddb56a5371647e7ae05bad3c1e089a1c5a056ab445f43dd2eb53
 conf_files="/etc/resolvconf.conf"
 
 post_install() {

From 64c0f6f9ecaa27f62123644d300398c2ed3a8286 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 14 Apr 2023 16:54:50 -0400
Subject: [PATCH 1466/1853] hardinfo: revbump for remove_linefeed fixes

---
 srcpkgs/hardinfo/patches/fix-runtime.patch | 36 +++++++++++++---------
 srcpkgs/hardinfo/template                  |  4 +--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/hardinfo/patches/fix-runtime.patch b/srcpkgs/hardinfo/patches/fix-runtime.patch
index 2d9afa04526c..b9c7a1d9c355 100644
--- a/srcpkgs/hardinfo/patches/fix-runtime.patch
+++ b/srcpkgs/hardinfo/patches/fix-runtime.patch
@@ -1,19 +1,19 @@
-diff --git hardinfo.h hardinfo.h
-index 9f52f63..aeb84d9 100644
---- a/hardinfo.h
-+++ b/hardinfo.h
-@@ -64,8 +64,8 @@ struct _ModuleAbout {
+--- a/hardinfo.h	2023-04-14 16:50:28.324202873 -0400
++++ b/hardinfo.h	2023-04-14 16:51:11.470129493 -0400
+@@ -64,9 +64,9 @@
  };
  
  /* String utility functions */
 -inline void  remove_quotes(gchar *str);
 -inline char *strend(gchar *str, gchar chr);
+-inline void  remove_linefeed(gchar *str);
 +void  remove_quotes(gchar *str);
 +char *strend(gchar *str, gchar chr);
- inline void  remove_linefeed(gchar *str);
++void  remove_linefeed(gchar *str);
  gchar       *strreplace(gchar *string, gchar *replace, gchar new_char);
  
-@@ -91,7 +91,7 @@ gpointer __idle_free(gpointer ptr, gchar *f, gint l);
+ /* Widget utility functions */
+@@ -91,7 +91,7 @@
  
  
  gchar	     *find_program(gchar *program_name);
@@ -22,11 +22,9 @@ index 9f52f63..aeb84d9 100644
  void          nonblock_sleep(guint msec);
  void          open_url(gchar *url);
  GSList	     *modules_load_selected(void);
-diff --git util.c util.c
-index 266ce4e..e6c81fd 100644
---- a/util.c
-+++ b/util.c
-@@ -111,7 +111,7 @@ gchar *seconds_to_string(unsigned int seconds)
+--- a/util.c 16:50:36.611380820 -0400
++++ b/util.c	2023-04-14 16:51:25.031420828 -0400
+@@ -111,7 +111,7 @@
  			   plural(hours), minutes, plural(minutes));
  }
  
@@ -35,7 +33,7 @@ index 266ce4e..e6c81fd 100644
  {
      if (size < KiB)
  	return g_strdup_printf("%.1f B", size);
-@@ -123,7 +123,7 @@ inline gchar *size_human_readable(gfloat size)
+@@ -123,7 +123,7 @@
      return g_strdup_printf("%.1f GiB", size / GiB);
  }
  
@@ -44,7 +42,7 @@ index 266ce4e..e6c81fd 100644
  {
      if (!str)
  	return NULL;
-@@ -135,7 +135,7 @@ inline char *strend(gchar * str, gchar chr)
+@@ -135,7 +135,7 @@
      return str;
  }
  
@@ -53,4 +51,12 @@ index 266ce4e..e6c81fd 100644
  {
      if (!str)
  	return;
-
+@@ -146,7 +146,7 @@
+     strend(str, '"');
+ }
+ 
+-inline void remove_linefeed(gchar * str)
++void remove_linefeed(gchar * str)
+ {
+     strend(str, '\n');
+ }
diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template
index 6c2745d675c3..087687bfa06c 100644
--- a/srcpkgs/hardinfo/template
+++ b/srcpkgs/hardinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'hardinfo'
 pkgname=hardinfo
 version=0.5.1
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config which"
 makedepends="gtk+-devel libsoup-devel desktop-file-utils"
@@ -9,7 +9,7 @@ depends="desktop-file-utils"
 short_desc="System information and benchmark tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://sourceforge.net/projects/hardinfo.berlios/"
+homepage="https://www.berlios.de/software/hardinfo/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.bz2"
 checksum=a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a
 lib32disabled=yes

From 4d086a580c2b454f368c7456444abca83139e89e Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Tue, 27 Jun 2023 20:16:20 -0300
Subject: [PATCH 1467/1853] bash-language-server: update to 4.10.1.

---
 srcpkgs/bash-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bash-language-server/template b/srcpkgs/bash-language-server/template
index 16a86de435aa..5705ecbaf6fc 100644
--- a/srcpkgs/bash-language-server/template
+++ b/srcpkgs/bash-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'bash-language-server'
 pkgname=bash-language-server
-version=4.9.2
+version=4.10.1
 revision=1
 hostmakedepends="jq yarn"
 depends="nodejs"
@@ -9,7 +9,7 @@ maintainer="sirkhancision <jsantiago12tone@gmail.com>"
 license="MIT"
 homepage="https://github.com/bash-lsp/bash-language-server"
 distfiles="https://github.com/bash-lsp/bash-language-server/archive/refs/tags/server-${version}.tar.gz"
-checksum=7d162baf072ba8807f4253d7fdbe7210507e5b0106e94cc0373668dd40a25fee
+checksum=f8c7fed6812e166dadefceb156ba8e1737e57914f9f06b4bba06f93bed7dc9b4
 
 do_build() {
 	yarn install

From d839a4da5a02267dadda080a3ebc2e06afffd3ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 25 Jun 2023 18:17:37 -0400
Subject: [PATCH 1468/1853] void-docs: update to 2023.06.28.

---
 srcpkgs/void-docs/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/void-docs/template b/srcpkgs/void-docs/template
index ee9e185c1aad..2d8b05ab6873 100644
--- a/srcpkgs/void-docs/template
+++ b/srcpkgs/void-docs/template
@@ -1,21 +1,21 @@
 # Template file for 'void-docs'
 pkgname=void-docs
-version=2021.10.06
+version=2023.06.28
 revision=1
-hostmakedepends="mdBook lowdown texlive perl perl-JSON librsvg-utils"
+hostmakedepends="mdBook lowdown texlive perl perl-JSON perl-File-Which librsvg-utils"
 short_desc="Documentation for Void Linux"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="CC-BY-SA-4.0"
 homepage="https://github.com/void-linux/void-docs"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5f3db259b20242642e607a6241fdc6d64e89fb4e3546080deaa9faf0fec99bb3
+distfiles="https://github.com/void-linux/void-docs/archive/refs/tags/${version}.tar.gz"
+checksum=2d0ba314a5ee9d8f13ddcf430580de1bd56bd7c46346111c8f3ca114d934f6cf
 
 do_build() {
 	PREFIX=/usr res/build.sh
 }
 
 do_install() {
-	PREFIX=/usr DESTDIR=$DESTDIR res/install.sh
+	PREFIX=/usr DESTDIR="$DESTDIR" res/install.sh
 }
 
 void-docs-browse_package() {

From eccfe345e05f5a7e3b848009cbab9bdefa5af472 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1469/1853] libcotp: update to 2.0.1, adopt

---
 common/shlibs                            |  2 +-
 srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
 srcpkgs/libcotp/template                 | 14 +++++++-------
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch

diff --git a/common/shlibs b/common/shlibs
index 8e97f561bae8..ef71bae3f9a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3558,7 +3558,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots0.15-0.15.1_1
 libwlroots.so.11 wlroots-0.16.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
- 
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
- 
- add_library(cotp SHARED ${SOURCE_FILES})
- 
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..2e1596e89fc4 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
 # Template file for 'libcotp'
 pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.1
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
 short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
 license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libcotp"
-distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+distfiles="https://github.com/paolostivanin/libcotp/archive/refs/tags/v${version}.tar.gz"
+checksum=b111d528bbde7c1a0a392f49293b25ae33e6e78fbcbe378e0cf8bc6d59743d11
 
 libcotp-devel_package() {
-	depends="libcotp-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ac55b6130d30714625580b319e779352ccf13db7 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 1470/1853] OTPClient: update to 3.1.8, adopt

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
 srcpkgs/OTPClient/template                 | 13 +++++++------
 2 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/CMakeLists.txt
-===================================================================
---- OTPClient-2.4.4.orig/CMakeLists.txt
-+++ OTPClient-2.4.4/CMakeLists.txt
-@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
- option(BUILD_CLI "Build the CLI" ON)
- 
- set(CMAKE_C_STANDARD 11)
--set(CMAKE_C_FLAGS "-Wall -Wextra -O2 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
- if(CMAKE_COMPILER_IS_GNUCC)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
- endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index a5f068ffa976..9d65d4e0794f 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.8
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
 short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Emil Miler <em@0x45.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
-distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+distfiles="https://github.com/paolostivanin/OTPClient/archive/refs/tags/v${version}.tar.gz"
+checksum=5b85aefa4bd10d96c7866a6b77264b416124f272b3082fb7b854e68762129c14

From 7f5178b59052d6d85fe7c85291f73f33456906a6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 9 Mar 2023 00:42:46 +0530
Subject: [PATCH 1471/1853] mps-youtube: rename to yewtube, update to 2.10.4.

---
 srcpkgs/mps-youtube          |  1 +
 srcpkgs/mps-youtube/template | 14 --------------
 srcpkgs/yewtube/template     | 26 ++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/mps-youtube
 delete mode 100644 srcpkgs/mps-youtube/template
 create mode 100644 srcpkgs/yewtube/template

diff --git a/srcpkgs/mps-youtube b/srcpkgs/mps-youtube
new file mode 120000
index 000000000000..9223c39c3000
--- /dev/null
+++ b/srcpkgs/mps-youtube
@@ -0,0 +1 @@
+yewtube
\ No newline at end of file
diff --git a/srcpkgs/mps-youtube/template b/srcpkgs/mps-youtube/template
deleted file mode 100644
index 92b190949861..000000000000
--- a/srcpkgs/mps-youtube/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'mps-youtube'
-pkgname=mps-youtube
-version=0.2.8
-revision=6
-build_style=python3-module
-pycompile_module="mps_youtube"
-hostmakedepends="python3-setuptools"
-depends="python3-pafy python3-setuptools"
-short_desc="Terminal based YouTube player and downloader"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/mps-youtube/mps-youtube/"
-distfiles="https://github.com/mps-youtube/${pkgname}/archive/v${version}.tar.gz"
-checksum=d5f2c4bc1f57f0566242c4a0a721a5ceaa6d6d407f9d6dd29009a714a0abec74
diff --git a/srcpkgs/yewtube/template b/srcpkgs/yewtube/template
new file mode 100644
index 000000000000..b8d240443863
--- /dev/null
+++ b/srcpkgs/yewtube/template
@@ -0,0 +1,26 @@
+# Template file for 'yewtube'
+pkgname=yewtube
+version=2.10.4
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-pyperclip python3-youtubesearch python3-pylast yt-dlp
+ python3-mutagen python3-pycryptodomex python3-websockets python3-Brotli python3-certifi"
+checkdepends="${depends} python3-pip python3-dbus python3-gobject python3-pytest-xdist"
+short_desc="Terminal based YouTube player and downloader"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mps-youtube/yewtube"
+changelog="https://raw.githubusercontent.com/mps-youtube/yewtube/master/CHANGELOG.md"
+distfiles="https://github.com/mps-youtube/yewtube/archive/refs/tags/v${version}.tar.gz"
+checksum=e7b93f3929f9266ecb32317d0c23acdd8966626f83015e361ef44cff1089fa32
+
+post_install() {
+	vbin yt
+}
+
+mps-youtube_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}

From 8b728543f070d7365341fe1d1eba526b2dafd4c5 Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Wed, 28 Jun 2023 13:06:03 +0530
Subject: [PATCH 1472/1853] google-chrome: update to 114.0.5735.198.

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ffef308cdec8..bc0562fe21ef 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=114.0.5735.133
+version=114.0.5735.198
 revision=1
 _channel=stable
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:chrome"
 homepage="https://www.google.com/chrome/"
 distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb"
-checksum=6f700ff90db3a0f72ed9fb7ccbce31bd2f937366ed9b80d3ee0dafab7ba0693e
+checksum=22f9403f4ebe8c814cfcf8343b6b6cae4629a7fd357ebdc008b29f2ff4d4c70c
 _license_checksum=8023b18fb5118ef65d586363e53909861bd1a9676e5eb83c20fd3ac6e33ea0be
 
 skiprdeps="/opt/google/chrome/libqt5_shim.so"

From f910dfb6dafebce490a7689fa0e397213fb243f2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 13:39:53 +0100
Subject: [PATCH 1473/1853] libuv: update to 1.45.0.

---
 srcpkgs/libuv/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index be3143e33156..3181808b90b3 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,31 +1,28 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.44.2
+version=1.45.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config"
 short_desc="Multi-platform support library with a focus on asynchronous I/O"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, CC-BY-SA-4.0"
+license="MIT, BSD-2-Clause, ISC"
 homepage="https://libuv.org/"
 changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
-distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz"
-checksum=e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da
+distfiles="https://dist.libuv.org/dist/v${version}/libuv-v${version}-dist.tar.gz"
+checksum=3793d8c0d6fa587721d010d0555b7e82443fd4e8b3c91e529eb6607592f52b87
 # the tests fail when run as root and as such break in the CI containers
-make_check="extended"
+make_check=ci-skip
 
 LDFLAGS="-pthread"
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 post_install() {
 	vlicense LICENSE
+	vlicense LICENSE-extra
 }
 
 libuv-devel_package() {
-	depends="libuv>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From b0d7452ea6c47d744ff4fc7f32a6f702b4e93724 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 28 Jun 2023 17:18:39 +0200
Subject: [PATCH 1474/1853] kdeconnect: add missing dep on kirigami-addons

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 89b073be13d3..48b0ff77038c 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
  qqc2-desktop-style-devel pulseaudio-qt-devel modemmanager-qt5-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols
- breeze-icons kpeoplevcard"
+ breeze-icons kpeoplevcard kirigami-addons"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
 maintainer="John <me@johnnynator.dev>"

From 062bcff85d1938c36556a4a1e645aec46b08afb3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 21:47:38 +0100
Subject: [PATCH 1475/1853] libbytesize: update to 2.8.

---
 srcpkgs/libbytesize/patches/musl-fix-test.diff | 17 +++++++++++++++++
 srcpkgs/libbytesize/template                   | 17 +++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libbytesize/patches/musl-fix-test.diff

diff --git a/srcpkgs/libbytesize/patches/musl-fix-test.diff b/srcpkgs/libbytesize/patches/musl-fix-test.diff
new file mode 100644
index 000000000000..51877fe68417
--- /dev/null
+++ b/srcpkgs/libbytesize/patches/musl-fix-test.diff
@@ -0,0 +1,17 @@
+diff --git a/tests/locale_utils.py b/tests/locale_utils.py
+index 7e4f369..c16f1bd 100644
+--- a/tests/locale_utils.py
++++ b/tests/locale_utils.py
+@@ -4,7 +4,11 @@ import subprocess
+ """Helper functions, decorators,... for working with locales"""
+ 
+ def get_avail_locales():
+-    return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()}
++    try:
++        return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()}
++    except FileNotFoundError:
++        # musl and some other libc's don't support locales beyond what POSIX requires.
++        return {"C.UTF-8"}
+ 
+ 
+ def missing_locales(required, available):
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 2aabc29dcc64..d1fa531256b3 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,9 +1,9 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
-version=2.7
+version=2.8
 revision=1
 build_style=gnu-configure
-hostmakedepends="gettext python3"
+hostmakedepends="pkg-config gettext python3"
 makedepends="mpfr-devel pcre2-devel"
 checkdepends="python3-six"
 short_desc="Library for operations with sizes in bytes"
@@ -12,9 +12,12 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libbytesize"
 changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
 distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz"
-checksum=8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e
-# checks fails in libbytesize_unittest.sh
-make_check=no
+checksum=d87aef5a37e189b1cc827530e0feafa6529331fcbe2aabf330a01ad8ec95e1a0
+
+pre_check() {
+	# Requires python3-pocketlint, which is not packaged yet.
+	vsed -e 's/canary_tests.sh$//g' -i tests/Makefile
+}
 
 libbytesize-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -30,6 +33,8 @@ libbytesize-python3_package() {
 	depends="python3-six ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Python3 bindings"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
+		# Requires the Python module.
+		vmove usr/bin/bscalc
 	}
 }

From 962e604141ddbffb207695d98fb8b5ad8074ebe5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 28 Jun 2023 18:00:39 +0200
Subject: [PATCH 1476/1853] xsnow: update to 3.7.5.

---
 srcpkgs/xsnow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 6c2fdbc25672..fe06007c0d12 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,6 +1,6 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=3.7.4
+version=3.7.5
 revision=1
 build_style=gnu-configure
 build_helper=qemu
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
-checksum=541d3d54add3c20f69069b1af4c2e974e3668a80de731ff0b89bd9093be9e657
+checksum=c1e086b9237ee2485a6faff09e7cba7a299fabf290238928d37b6d76fe38dda3
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then

From b58d332e61cf9f395c6c699ab92b1544fb90f4bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 28 Jun 2023 13:17:12 -0400
Subject: [PATCH 1477/1853] libbytesize: put bscalc man page in the same
 package as the script

---
 srcpkgs/libbytesize/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index d1fa531256b3..ca2593ee4bc4 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config gettext python3"
 makedepends="mpfr-devel pcre2-devel"
@@ -36,5 +36,6 @@ libbytesize-python3_package() {
 		vmove "usr/lib/python3*"
 		# Requires the Python module.
 		vmove usr/bin/bscalc
+		vmove usr/share/man/man1/bscalc.1
 	}
 }

From c22a8f2f380892763724082f43d9ca0fe9b35ce0 Mon Sep 17 00:00:00 2001
From: T0mstone <realt0mstone@gmail.com>
Date: Sat, 18 Mar 2023 22:36:22 +0100
Subject: [PATCH 1478/1853] New package: logiops-0.3.2

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: https://github.com/void-linux/void-packages/pull/42849
---
 srcpkgs/logiops/files/logid/run |  5 +++++
 srcpkgs/logiops/template        | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/logiops/files/logid/run
 create mode 100644 srcpkgs/logiops/template

diff --git a/srcpkgs/logiops/files/logid/run b/srcpkgs/logiops/files/logid/run
new file mode 100644
index 000000000000..610a27239ba4
--- /dev/null
+++ b/srcpkgs/logiops/files/logid/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+modprobe -q hid_logitech_hidpp || exit 1
+exec logid ${OPTS}
diff --git a/srcpkgs/logiops/template b/srcpkgs/logiops/template
new file mode 100644
index 000000000000..f0fdb5a4ec01
--- /dev/null
+++ b/srcpkgs/logiops/template
@@ -0,0 +1,29 @@
+# Template file for 'logiops'
+pkgname=logiops
+version=0.3.2
+revision=1
+_ipcgull_rev=4f22a43e3380dc1e9c0a490201f4d745390b623f
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libevdev-devel eudev-libudev-devel libconfig-devel libconfig++-devel
+ glib-devel"
+short_desc="Unofficial userspace driver for HID++ Logitech devices"
+maintainer="T0mstone <realt0mstone@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/PixlOne/logiops"
+changelog="https://github.com/PixlOne/logiops/releases/tag/v${version}"
+distfiles="https://github.com/PixlOne/logiops/archive/refs/tags/v${version}.tar.gz
+ https://github.com/PixlOne/ipcgull/archive/${_ipcgull_rev}.tar.gz"
+checksum="6c7210a84f9695a7530030dba9fff7e44765c971c7ef06461ff9c8646a64c036
+ 67068523dc0ea4750d501309d8041ca3511fa3e22fa1c453a3bc9f2ea5c95f45"
+skip_extraction="${_ipcgull_rev}.tar.gz"
+
+post_extract() {
+	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_ipcgull_rev.tar.gz" \
+		--strip-components=1 -C "$wrksrc/src/ipcgull"
+}
+
+post_install() {
+	vsconf logid.example.cfg logid.cfg
+	vsv logid
+}

From 3016cdc5305aa381cd110d4bb46327a8b6b6b5ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jun 2023 19:49:51 +0200
Subject: [PATCH 1479/1853] logiops: add missing patch

---
 srcpkgs/logiops/patches/musl-fixes.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/logiops/patches/musl-fixes.patch

diff --git a/srcpkgs/logiops/patches/musl-fixes.patch b/srcpkgs/logiops/patches/musl-fixes.patch
new file mode 100644
index 000000000000..5b8c7c027416
--- /dev/null
+++ b/srcpkgs/logiops/patches/musl-fixes.patch
@@ -0,0 +1,10 @@
+--- a/src/logid/config/types.h
++++ b/src/logid/config/types.h
+@@ -18,6 +18,7 @@
+ #ifndef LOGID_CONFIG_PRIMITIVE_H
+ #define LOGID_CONFIG_PRIMITIVE_H
+ 
++#include <sys/types.h>
+ #include <config/map.h>
+ #include <config/group.h>
+ #include <ipcgull/property.h>

From ec587046ce0db08446cff4e9d4b41ebefda35f4d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jun 2023 19:51:47 +0200
Subject: [PATCH 1480/1853] logiops: build with musl patch

---
 srcpkgs/logiops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/logiops/template b/srcpkgs/logiops/template
index f0fdb5a4ec01..fef28166c308 100644
--- a/srcpkgs/logiops/template
+++ b/srcpkgs/logiops/template
@@ -1,7 +1,7 @@
 # Template file for 'logiops'
 pkgname=logiops
 version=0.3.2
-revision=1
+revision=2
 _ipcgull_rev=4f22a43e3380dc1e9c0a490201f4d745390b623f
 build_style=cmake
 hostmakedepends="pkg-config"

From 918f8dd1af73179549a9598d575b1c427329d43b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 20:49:10 +0300
Subject: [PATCH 1481/1853] ghex: update to 44.1

---
 srcpkgs/ghex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index eb96a61631f3..adbff1a1bdfb 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,6 +1,6 @@
 # Template file for 'ghex'
 pkgname=ghex
-version=44.0
+version=44.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -16,7 +16,7 @@ license="GPL-2.0-only, GFDL-1.1-only"
 homepage="https://gitlab.gnome.org/GNOME/ghex"
 changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-44/NEWS"
 distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-${version}.tar.xz"
-checksum=58aa47cfdbed1280a3c131951c1a24596129404a0b0d347a3dbfffb6ff683976
+checksum=404bdf649eaa13922a80ae32f19fe40e71f0ee0f461c45edac72888a00ead6c2
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 4b307cab215045adcb508f2514210073a2f938ba Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 28 Jun 2023 19:32:46 +0300
Subject: [PATCH 1482/1853] nemo: update to 5.8.3.

---
 srcpkgs/nemo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index e54d98c677e5..25a7a6651cc9 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=5.8.2
+version=5.8.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 changelog="https://raw.githubusercontent.com/linuxmint/nemo/master/debian/changelog"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=6a53fb8cec225f08a364e551b442a3e4cfbbad8812ef4bd77494a0236544f387
+checksum=7d89eb3eaa3310b19bc7361f3214d3c60888b6e8fa1237ecc0d565f06c5a362c
 python_version=3
 # Requires xvfb-run and dbus-run-session
 make_check=no # can't be run inside chroot due to fusermount3

From d7cf5c171a5916f5bfbcbc918f2b4d19250d122c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 15:29:38 +0100
Subject: [PATCH 1483/1853] harfbuzz: update to 7.3.0.

---
 srcpkgs/harfbuzz/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 1114c37e82ce..29901df47ad2 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=7.1.0
-revision=2
+version=7.3.0
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
@@ -14,7 +14,13 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
+checksum=20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=enabled"
+else
+	configure_args+=" -Dtests=disabled"
+fi
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From 0638123a80750ef42b6a7c04ab31fa965f508650 Mon Sep 17 00:00:00 2001
From: Philip Linde <philip@text.garden>
Date: Tue, 13 Jun 2023 18:21:55 +0200
Subject: [PATCH 1484/1853] New package: cpmtools-2.23

Closes: #44412 [via git-merge-pr]
---
 srcpkgs/cpmtools/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/cpmtools/template

diff --git a/srcpkgs/cpmtools/template b/srcpkgs/cpmtools/template
new file mode 100644
index 000000000000..882eccd3975c
--- /dev/null
+++ b/srcpkgs/cpmtools/template
@@ -0,0 +1,12 @@
+# Template file for 'cpmtools'
+pkgname=cpmtools
+version=2.23
+revision=1
+build_style=gnu-configure
+makedepends="ncurses-devel"
+short_desc="CP/M file exchange tools"
+maintainer="Philip Linde <philip@text.garden>"
+license="GPL-3.0-or-later"
+homepage="http://www.moria.de/~michael/cpmtools/"
+distfiles="http://www.moria.de/~michael/cpmtools/files/cpmtools-${version}.tar.gz"
+checksum=7839b19ac15ba554e1a1fc1dbe898f62cf2fd4db3dcdc126515facc6b929746f

From 119b12939e0e75ac041ba8d3c3deed4dee494bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 28 Jun 2023 20:25:24 +0200
Subject: [PATCH 1485/1853] exiftool: update to 12.64.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b2524e18874b..90af830ac64f 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.63
+version=12.64
 revision=1
 build_style=perl-module
 short_desc="Reader and rewriter of EXIF information that supports raw files"
@@ -9,4 +9,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=15162912ac37cdc6a7018498435a8348b5e6d7a10385f38b75e053695c9b5658
+checksum=8368034ec7a984823e30a7df6fb980090098b2648dda69d8069f4b06283d9f43

From 83ef35f7bc6e6d579dcb88413de9c46d63cf2f3e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 21:05:58 +0300
Subject: [PATCH 1486/1853] gnome-chess: update to 43.2

---
 srcpkgs/gnome-chess/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 327de9bfac64..8c1985d06617 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-chess'
 pkgname=gnome-chess
-version=43.1
+version=43.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 changelog="https://gitlab.gnome.org/GNOME/gnome-chess/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-chess/${version%.*}/gnome-chess-${version}.tar.xz"
-checksum=734f092d95fc60409eeaca3427b5a48cb9b599da11995119d85baa99653e0292
+checksum=348508f8f6e7451c07344ffa7a09a990cf1d2883bccf533409dbe029268d49f2

From 92d44f680996e48beacfcf0b3584e9da5c5932ed Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Sun, 14 May 2023 22:27:15 +0200
Subject: [PATCH 1487/1853] New package: autorestic-1.7.7

---
 srcpkgs/autorestic/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/autorestic/template

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
new file mode 100644
index 000000000000..b97290c2a386
--- /dev/null
+++ b/srcpkgs/autorestic/template
@@ -0,0 +1,14 @@
+# Template file for 'autorestic'
+pkgname=autorestic
+version=1.7.7
+revision=1
+build_style=go
+go_import_path="github.com/cupcakearmy/autorestic"
+depends="restic"
+short_desc="Config driven, easy backup cli for restic"
+maintainer="Emil Miler <em@0x45.cz>"
+license="Apache-2.0"
+homepage="https://autorestic.vercel.app/"
+changelog="https://github.com/cupcakearmy/autorestic/blob/master/CHANGELOG.md"
+distfiles="https://github.com/cupcakearmy/autorestic/archive/refs/tags/v${version}.tar.gz"
+checksum=f2c38729882e7d0529347ab115e7ce068f6062677a63c92eb4bd0efc1ae67cbb

From 228d498a445210806b09fa2c8f7ab3422ff7b816 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Wed, 26 Apr 2023 08:05:55 +0700
Subject: [PATCH 1488/1853] New package: isoimagewriter-1.0.0

---
 srcpkgs/isoimagewriter/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/isoimagewriter/template

diff --git a/srcpkgs/isoimagewriter/template b/srcpkgs/isoimagewriter/template
new file mode 100644
index 000000000000..8af5fd6f3167
--- /dev/null
+++ b/srcpkgs/isoimagewriter/template
@@ -0,0 +1,17 @@
+# Template file for 'isoimagewriter'
+pkgname=isoimagewriter
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext kworkspace python3 qt5-host-tools
+ qt5-qmake"
+makedepends="gpgmepp-devel gpgmeqt-devel kcoreaddons-devel kcrash-devel
+ ki18n-devel kiconthemes-devel ksolid-devel kwidgetsaddons-devel qt5-devel"
+depends="gpgmeqt kiconthemes"
+short_desc="Program to write hybrid ISO files onto USB disks"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
+license="GPL-3.0-or-later"
+homepage="https://apps.kde.org/isoimagewriter"
+distfiles="${KDE_SITE}/isoimagewriter/${version}/isoimagewriter-${version}.tar.xz"
+checksum=a69022303ec1beb6b7b4f0d68e59e4199d3c9868767cb9eb23c6dd1999e06a5d
+python_version=3

From 32671c026490e11d4d87ea1614d46a0bec5be4a5 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Wed, 28 Jun 2023 07:07:43 +0100
Subject: [PATCH 1489/1853] clifm: update to 1.12.

---
 srcpkgs/clifm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clifm/template b/srcpkgs/clifm/template
index 824f00db336e..f122362a26be 100644
--- a/srcpkgs/clifm/template
+++ b/srcpkgs/clifm/template
@@ -1,6 +1,6 @@
 # Template file for 'clifm'
 pkgname=clifm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-makefile
 make_install_args="MANDIR=/usr/share/man"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/leo-arch/clifm"
 changelog="https://raw.githubusercontent.com/leo-arch/clifm/master/CHANGELOG"
 distfiles="https://github.com/leo-arch/clifm/releases/download/v${version}/clifm-${version}.tar.gz"
-checksum=32f69ab2215bfcf10e8fe3920c5b4ffd6e699a68463577b32c39f9189d5a9c56
+checksum=a4cd97d7aa184a60e3e42ff33e6a31161818149c80caa92282cd2118e73319eb

From f1589a111a15e08e323244cc80a86fa774e5e39a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:13:46 +0530
Subject: [PATCH 1490/1853] glab: update to 1.31.0.

---
 srcpkgs/glab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 377848060f69..5772901e6039 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
 # Template file for 'glab'
 pkgname=glab
-version=1.30.0
+version=1.31.0
 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=d3c1a9ba723d94a0be10fc343717cf7b61732644f5c42922f1c8d81047164b99
+checksum=5648e88e7d6cc993227f5a4e80238af189bed09c7aed1eb12be7408e9a042747
 
 post_install() {
 	for shell in bash fish zsh; do

From 4aff56f93546de3c9bf9958f3d308efdb9469b0b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Apr 2023 14:56:13 +0200
Subject: [PATCH 1491/1853] New package: fend-1.2.0

---
 srcpkgs/fend/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/fend/template

diff --git a/srcpkgs/fend/template b/srcpkgs/fend/template
new file mode 100644
index 000000000000..328a33b2e494
--- /dev/null
+++ b/srcpkgs/fend/template
@@ -0,0 +1,21 @@
+# Template file for 'fend'
+pkgname=fend
+version=1.2.0
+revision=1
+build_style=cargo
+make_install_args="--path cli"
+short_desc="Arbitrary-precision unit-aware calculator"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://printfn.github.io/fend/"
+changelog="https://raw.githubusercontent.com/printfn/fend/main/CHANGELOG.md"
+distfiles="https://github.com/printfn/fend/archive/refs/tags/v${version}.tar.gz
+ https://github.com/printfn/fend/releases/download/v${version}/fend.1"
+checksum="d2781dfdbaed22b38fabea6897ff2249ac804f9021c921cd67603f3b609994e2
+ 160310c64fa39ed677d22e905b6f6358dff2526e2f60dad6821be6517512d35f"
+skip_extraction="fend.1"
+
+post_install() {
+	vlicense LICENSE.md
+	vman ${XBPS_SRCDISTDIR}/${pkgname}-${version}/fend.1
+}

From 37027afef67a53b701bf01035e17dc80be031bd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jun 2023 21:52:10 +0200
Subject: [PATCH 1492/1853] wireshark: update to 4.0.6.

---
 srcpkgs/wireshark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index 759556a6fc7d..72ce6863fd39 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=4.0.4
+version=4.0.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 changelog="https://www.wireshark.org/news/"
 distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b
+checksum=0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884
 system_groups="wireshark"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"

From 5575b2525c4d49eb22ccf5784a4f3518b07aeba8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 3 Aug 2022 15:21:21 -0400
Subject: [PATCH 1493/1853] New package: pyotherside-1.6.0

---
 srcpkgs/pyotherside/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/pyotherside/template

diff --git a/srcpkgs/pyotherside/template b/srcpkgs/pyotherside/template
new file mode 100644
index 000000000000..97dc745b4d6c
--- /dev/null
+++ b/srcpkgs/pyotherside/template
@@ -0,0 +1,21 @@
+# Template file for 'pyotherside'
+pkgname=pyotherside
+version=1.6.0
+revision=1
+build_style=qmake
+configure_args="PYTHON_CONFIG=${XBPS_CROSS_BASE}/usr/bin/python3-config"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="python3-devel qt5-svg-devel qt5-declarative-devel"
+short_desc="Asynchronous Python 3 Bindings for Qt 5"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="ISC"
+homepage="https://thp.io/2011/pyotherside/"
+distfiles="https://github.com/thp/pyotherside/archive/${version}.tar.gz"
+checksum=ead71d0a549acb6664d72745fae5b1d4e433274c64be6a680ceeeef0754451ab
+
+post_install() {
+	vlicense LICENSE
+
+	# remove tests polluting /usr
+	rm ${DESTDIR}/usr/tests/qtquicktests/qtquicktests
+}

From 779e287b25cca77e96eff1774770f96a7efb38ff Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 31 May 2022 10:26:17 -0400
Subject: [PATCH 1494/1853] New package: modrana-0.57.3

---
 srcpkgs/modrana/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/modrana/template

diff --git a/srcpkgs/modrana/template b/srcpkgs/modrana/template
new file mode 100644
index 000000000000..1b168d867eb7
--- /dev/null
+++ b/srcpkgs/modrana/template
@@ -0,0 +1,30 @@
+# Template file for 'modrana'
+pkgname=modrana
+version=0.57.3
+revision=1
+# releases aren't tagged in git
+_version_commit=dbd558d407abe7a3a4a352c96b618147cade4bd9
+build_style=gnu-makefile
+build_helper=qmake
+make_build_target="VersionFile all rsync launcher"
+make_use_env=yes
+hostmakedepends="rsync qt5-qmake qt5-host-tools"
+makedepends="qt5-declarative-devel"
+depends="pyotherside qt5-quickcontrols2"
+short_desc="Flexible GPS navigation system for mobile devices"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://modrana.org"
+distfiles="https://github.com/M4rtinK/modrana/archive/${_version_commit}.tar.gz"
+checksum=7f93e4660997a8cba4194709c4566dec667da1c99ae45dd66ea6df71b8c637a6
+python_version=3
+disable_parallel_build=yes
+
+post_install() {
+	# not sure why the gtk binary is still here, only qt is supported/working
+	rm ${DESTDIR}/usr/bin/modrana-gtk
+	# broken, tries to invoke QT launcher with wrong path (/usr/modrana), just
+	# use modrana-qt5
+	rm ${DESTDIR}/usr/bin/modrana
+	rm ${DESTDIR}/usr/share/applications/modrana.desktop
+}

From 82c2d136b43ac860f86daa190a0a4053501ae89f Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 26 Apr 2023 14:57:46 +0200
Subject: [PATCH 1495/1853] New package: hydrus-525a

---
 srcpkgs/hydrus/template | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/hydrus/template

diff --git a/srcpkgs/hydrus/template b/srcpkgs/hydrus/template
new file mode 100644
index 000000000000..5b6b7f47572a
--- /dev/null
+++ b/srcpkgs/hydrus/template
@@ -0,0 +1,40 @@
+# Template file for 'hydrus'
+pkgname=hydrus
+version=525a
+revision=1
+pycompile_dirs="usr/lib/hydrus"
+hostmakedepends="python3"
+depends="python3 libopencv-python3 python3-BeautifulSoup4 python3-yaml python3-lz4
+ python3-numpy python3-Twisted python3-Pillow python3-pysocks python3-psutil
+ python3-send2trash python3-html5lib python3-requests python3-QtPy noto-fonts-emoji
+ python3-mpv python3-service_identity python3-PyQt5 fmt python3-pyside2 ffmpeg
+ miniupnpc desktop-file-utils python3-cloudscraper python3-openssl python3-packaging"
+short_desc="Danbooru-like image tagging and searching system for the desktop"
+maintainer="fanyx <fanyx+github@posteo.net>"
+license="WTFPL"
+homepage="https://hydrusnetwork.github.io/hydrus/"
+distfiles="https://github.com/hydrusnetwork/hydrus/archive/refs/tags/v${version}.tar.gz"
+checksum=67ee32f9ccb2ba5d1a8730d3033bb7850dc43b07628e2635847256e2820f9448
+
+python_version="3"
+
+do_install() {
+	vsed -i hydrus/core/HydrusConstants.py -e 's|^LICENSE_PATH.*|LICENSE_PATH = "/usr/share/licenses/hydrus/license.txt"|'
+	chmod +x server.py
+
+	vmkdir usr/lib/hydrus
+	vcopy hydrus usr/lib/hydrus/
+	vcopy static usr/lib/hydrus/
+	vcopy client.pyw usr/lib/hydrus/
+	vcopy server.py usr/lib/hydrus/
+
+	vmkdir usr/bin
+	ln -sf /usr/lib/hydrus/client.pyw ${DESTDIR}/usr/bin/hydrus-client
+	ln -sf /usr/lib/hydrus/server.py ${DESTDIR}/usr/bin/hydrus-server
+
+	vmkdir usr/share/applications
+	ln -sf /usr/lib/hydrus/static/hydrus.desktop ${DESTDIR}/usr/share/applications
+
+	vlicense COPYING
+	vlicense license.txt
+}

From 84b169291edeefe7865fd73710e0fb042066e20b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 01:14:33 +0530
Subject: [PATCH 1496/1853] qsv: update to 0.108.0.

---
 srcpkgs/qsv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index 068d261bbd0f..344cfd2060fb 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.107.0
+version=0.108.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,4 +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=628b18a3ea9ebd0b5e82e3fd9db05348c0c6aa32b43b32bdd12c0217443d88be
+checksum=6f191a72b9b6040805c27ec6dc1d2fa037088970eb4c42af950cf701fa2bdc8a

From 0b0c92a210143dd48190aeb3aef8ba3a516ebb36 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:26:13 +0530
Subject: [PATCH 1497/1853] pre-commit: update to 3.3.3.

---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 53c3d6716f24..4b96548b173b 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=3.3.2
+version=3.3.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pre-commit.com/"
 changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=66e37bec2d882de1f17f88075047ef8962581f83c234ac08da21a0c58953d1f0
+checksum=a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023
 make_check=no # unpackaged: pytest-env re-assert
 
 post_install() {

From f53770c917c97892e57c2693b5c76eafe3067192 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 28 Jun 2023 21:33:49 +0200
Subject: [PATCH 1498/1853] gspell: update to 1.12.1.

---
 srcpkgs/gspell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 751a09c4f129..06cc8718242f 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.12.0
-revision=2
+version=1.12.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gspell"
 changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad
+checksum=8ec44f32052e896fcdd4926eb814a326e39a5047e251eec7b9056fbd9444b0f1
 make_check_pre="xvfb-run"
 
 # Package build options

From 674bc688a97ee32327983909db4b2ad9786c8f7d Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 12:38:56 +0900
Subject: [PATCH 1499/1853] shake: fix build on musl

Closes: #44674 [via git-merge-pr]
---
 srcpkgs/shake/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/shake/template b/srcpkgs/shake/template
index 08790572f3c4..eccaccd75649 100644
--- a/srcpkgs/shake/template
+++ b/srcpkgs/shake/template
@@ -12,11 +12,11 @@ homepage="http://vleu.net/shake/"
 distfiles="https://github.com/unbrice/$pkgname/archive/v$version.tar.gz"
 checksum=ac5a57bd8d55e197734852bf66318ecf39b4c5c298e43a259ba1d8a4b7a2ced3
 
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
-	broken="musl does not provide error.h required by this package"
-	;;
-esac
+CFLAGS="-D_GNU_SOURCE"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" shake"

From f84bd10643a2b91b0d3ad68b43c391c9b3417436 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH 1500/1853] thrift: update to 0.18.1, patch out old tls and
 broken tests

---
 srcpkgs/thrift/patches/network-tests.patch    | 39 ++++++++++++++++
 .../thrift/patches/skip-old-tls-tests.patch   | 44 +++++++++++++++++++
 srcpkgs/thrift/template                       | 24 ++++++----
 3 files changed, 98 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thrift/patches/network-tests.patch
 create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch

diff --git a/srcpkgs/thrift/patches/network-tests.patch b/srcpkgs/thrift/patches/network-tests.patch
new file mode 100644
index 000000000000..49aa667752b7
--- /dev/null
+++ b/srcpkgs/thrift/patches/network-tests.patch
@@ -0,0 +1,39 @@
+From https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/thrift/files/thrift-0.16.0-network-tests.patch
+
+diff --git a/lib/cpp/test/ToStringTest.cpp b/lib/cpp/test/ToStringTest.cpp
+index 736b33c0a..f66909873 100644
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -41,31 +41,6 @@ BOOST_AUTO_TEST_CASE(base_types_to_string) {
+   BOOST_CHECK_EQUAL(to_string("abc"), "abc");
+ }
+ 
+-// NOTE: Currently (as of 2021.08.12) the locale-based tests do not work on
+-// Windows in the AppVeyor Thrift CI build correctly. Therefore disabled on
+-// Windows:
+-#ifndef _WIN32
+-BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+-#ifdef _WIN32
+-  std::locale::global(std::locale("en-US.UTF-8"));
+-#else
+-  std::locale::global(std::locale("en_US.UTF-8"));
+-#endif
+-  BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+-}
+-
+-BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+-#ifdef _WIN32
+-  std::locale::global(std::locale("de-DE.UTF-8"));
+-#else
+-  std::locale::global(std::locale("de_DE.UTF-8"));
+-#endif
+-  BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+-  BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+-  BOOST_CHECK_EQUAL(to_string(1.5L), "1.5");
+-}
+-#endif
+-
+ BOOST_AUTO_TEST_CASE(empty_vector_to_string) {
+   std::vector<int> l;
+   BOOST_CHECK_EQUAL(to_string(l), "[]");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+         }
+ #endif
+
++        if (si == 3 || ci == 3) {
++          // Skip all TLSv1_0 cases - protocol not supported
++          continue;
++        }
++
++        if (si == 4 || ci == 4) {
++          // Skip all TLSv1_1 cases - protocol not supported
++          continue;
++        }
++
+         boost::mutex::scoped_lock lock(mMutex);
+
+         BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+                 }
+ #endif
+
++                if (si == 3 || ci == 3)
++                {
++                    // Skip all TLSv1_0 cases - protocol not supported
++                    continue;
++                }
++
++                if (si == 4 || ci == 4)
++                {
++                    // Skip all TLSv1_1 cases - protocol not supported
++                    continue;
++                }
++
+                 boost::mutex::scoped_lock lock(mMutex);
+
+                 BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..1912cfb7ed33 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
 # Template file for 'thrift'
 pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.18.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
 makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=9cea30b9700153329ae1926cc05a20bbe3e8451ae270b0c8c5c5fe9929924cb3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --disable-tests --disable-tutorial"
+	configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
 fi
 
 post_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64*) ;;
 		ppc*)
-			sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+			vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
 			;;
 	esac
 }
@@ -35,8 +41,8 @@ thrift-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 	}
 }

From c6e5ee4b6e8d75ec758b9a38d2fd438862184d11 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 28 Jun 2023 20:36:47 -0400
Subject: [PATCH 1501/1853] python3-scipy: fix determinant regression and
 openblas option handling

---
 .../patches/determinant-fix.patch             | 74 +++++++++++++++++++
 srcpkgs/python3-scipy/template                |  7 +-
 2 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-scipy/patches/determinant-fix.patch

diff --git a/srcpkgs/python3-scipy/patches/determinant-fix.patch b/srcpkgs/python3-scipy/patches/determinant-fix.patch
new file mode 100644
index 000000000000..ed31163f8950
--- /dev/null
+++ b/srcpkgs/python3-scipy/patches/determinant-fix.patch
@@ -0,0 +1,74 @@
+From 61d892c9faa543ad80bd5e2d0bf69821188487e0 Mon Sep 17 00:00:00 2001
+From: Ilhan Polat <ilhanpolat@gmail.com>
+Date: Tue, 27 Jun 2023 12:00:38 +0200
+Subject: [PATCH] MAINT:linalg.det:Return scalars for singleton inputs (#18763)
+
+---
+ scipy/linalg/_basic.py           | 17 ++++++++++++-----
+ scipy/linalg/tests/test_basic.py | 17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/scipy/linalg/_basic.py b/scipy/linalg/_basic.py
+index 327ba1ca36ce..6faa3898f720 100644
+--- a/scipy/linalg/_basic.py
++++ b/scipy/linalg/_basic.py
+@@ -1001,7 +1001,8 @@ def det(a, overwrite_a=False, check_finite=True):
+     det : (...) float or complex
+         Determinant of `a`. For stacked arrays, a scalar is returned for each
+         (m, m) slice in the last two dimensions of the input. For example, an
+-        input of shape (p, q, m, m) will produce a result of shape (p, q).
++        input of shape (p, q, m, m) will produce a result of shape (p, q). If
++        all dimensions are 1 a scalar is returned regardless of ndim.
+ 
+     Notes
+     -----
+@@ -1066,11 +1067,17 @@ def det(a, overwrite_a=False, check_finite=True):
+ 
+     # Scalar case
+     if a1.shape[-2:] == (1, 1):
+-        if a1.dtype.char in 'dD':
+-            return np.squeeze(a1)
++        # Either ndarray with spurious singletons or a single element
++        if max(*a1.shape) > 1:
++            temp = np.squeeze(a1)
++            if a1.dtype.char in 'dD':
++                return temp
++            else:
++                return (temp.astype('d') if a1.dtype.char == 'f' else
++                        temp.astype('D'))
+         else:
+-            return (np.squeeze(a1).astype('d') if a1.dtype.char == 'f' else
+-                    np.squeeze(a1).astype('D'))
++            return (np.float64(a1.item()) if a1.dtype.char in 'fd' else
++                    np.complex128(a1.item()))
+ 
+     # Then check overwrite permission
+     if not _datacopied(a1, a):  # "a"  still alive through "a1"
+diff --git a/scipy/linalg/tests/test_basic.py b/scipy/linalg/tests/test_basic.py
+index 983530b63ff2..40308500ec4a 100644
+--- a/scipy/linalg/tests/test_basic.py
++++ b/scipy/linalg/tests/test_basic.py
+@@ -930,6 +930,23 @@ class TestDet:
+     def setup_method(self):
+         self.rng = np.random.default_rng(1680305949878959)
+ 
++    def test_1x1_all_singleton_dims(self):
++        a = np.array([[1]])
++        deta = det(a)
++        assert deta.dtype.char == 'd'
++        assert np.isscalar(deta)
++        assert deta == 1.
++        a = np.array([[[[1]]]], dtype='f')
++        deta = det(a)
++        assert deta.dtype.char == 'd'
++        assert np.isscalar(deta)
++        assert deta == 1.
++        a = np.array([[[1 + 3.j]]], dtype=np.complex64)
++        deta = det(a)
++        assert deta.dtype.char == 'D'
++        assert np.isscalar(deta)
++        assert deta == 1.+3.j
++
+     def test_1by1_stacked_input_output(self):
+         a = self.rng.random([4, 5, 1, 1], dtype=np.float32)
+         deta = det(a)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index c5a8e1f212bd..fdf39578fc9f 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,9 +1,10 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
 version=1.11.0
-revision=1
+revision=2
 build_style=meson
 build_helper="python3"
+configure_args="$(vopt_if openblas "" "-Dblas=blas -Dlapack=lapack")"
 hostmakedepends="python3-build python3-installer python3-meson-python
  python3-wheel python3-Cython python3-pybind11 pythran python3-numpy
  gcc-fortran pkg-config"
@@ -22,7 +23,7 @@ build_options="openblas"
 
 if [ "$CROSS_BUILD" ]; then
 	_pybind11_dir="${py3_sitelib}/pybind11"
-	configure_args="--cross-file=python.cross"
+	configure_args+=" --cross-file=python.cross"
 	export PKG_CONFIG_PATH="${XBPS_CROSS_BASE}/${_pybind11_dir}/share/pkgconfig"
 	# pybind11 uses a path relative to the pkgconfig file to set $prefix,
 	# which causes the wrapper to double-include $XBPS_CROSS_BASE; override
@@ -43,8 +44,6 @@ if [ "$build_option_openblas" ]; then
 		ppc64*) ;;
 		ppc*) broken="numpy can't be built with openblas";;
 	esac
-else
-	configure_args+=" -Dblas=blas -Dlapack=lapack"
 fi
 
 pre_patch() {

From 9654ac473e4ec38d7ea0f2d333de49d2d537c1fb Mon Sep 17 00:00:00 2001
From: lzcoder <lzcoder@proton.me>
Date: Thu, 29 Jun 2023 00:39:34 -0300
Subject: [PATCH 1502/1853] git-cola: Add python3-packaging to depends

---
 srcpkgs/git-cola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 383eb23f1b68..17e41aad7743 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,10 +1,10 @@
 # Template file for 'git-cola'
 pkgname=git-cola
 version=4.2.1
-revision=1
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
-depends="git qt5-svg python3-PyQt5-webkit python3-QtPy"
+depends="git qt5-svg python3-PyQt5-webkit python3-QtPy python3-packaging"
 short_desc="Highly caffeinated Git GUI"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"

From 382d61eda14df7b29e35dd89695f38df9e5c3a57 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 20:05:30 +0900
Subject: [PATCH 1503/1853] gogglesmm: update to 1.2.4.

---
 srcpkgs/gogglesmm/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 459e26041c51..0716a841d357 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,6 +1,6 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
-version=1.2.3
+version=1.2.4
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
@@ -15,13 +15,9 @@ license="GPL-3.0-or-later"
 homepage="https://gogglesmm.github.io/"
 changelog="https://raw.githubusercontent.com/gogglesmm/gogglesmm/master/ChangeLog"
 distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
-checksum=4315ea4d9894fa2c7f160c73e5464b91b7a00f22964910adb77e1e9b94273006
+checksum=e23a49ac1d7b4cf87a4c1730d06c816af2c540ad457148328b52702b8d347223
 nocross="Tries to execute compiled code"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="PTHREAD_RWLOCK_PREFER_WRITER_NP usage" ;;
-esac
-
 # this plugin has little endian only code
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	configure_args+=" -DWITH_MAD=OFF"

From 48742cb5fd5f2d1de15a72b49c611331ae5d3564 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 13:36:13 +0300
Subject: [PATCH 1504/1853] io.elementary.videos: update to 2.9.1

---
 srcpkgs/io.elementary.videos/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index d83a9ca928be..55bd6bc9e5a7 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.videos'
 pkgname=io.elementary.videos
-version=2.8.3
+version=2.9.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala AppStream"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
+checksum=11204b2bc4cedb8561dfb4d9906a2b9a747f551b25f88a0472436daf60e8d4e4

From 26b3fd3439d5e6eb1886e478eeaa53781597da1c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:22:26 +0530
Subject: [PATCH 1505/1853] dasel: update to 2.3.4.

---
 srcpkgs/dasel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index e45a61d3f874..ec258642a32f 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
 # Template file for 'dasel'
 pkgname=dasel
-version=2.2.0
+version=2.3.4
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://daseldocs.tomwright.me/"
 changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
 distfiles="https://github.com/TomWright/dasel/archive/refs/tags/v${version}.tar.gz"
-checksum=7d64e3e6e37b358948ccd3479b54610b87fbcc562049ca96c0bcb4fcefeea350
+checksum=7c9a2f41d02f4d1717dcf0d9fb4b977308da89c074d2abcf064adf00980e5d0d
 
 post_install() {
 	vlicense LICENSE

From ef43ea3a4154487d2c17817dc802d3edfc04ebb1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 28 Jun 2023 21:42:52 +0200
Subject: [PATCH 1506/1853] AppStream: update to 0.16.2.

---
 srcpkgs/AppStream/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 23a285497ad6..bee74dee2db8 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.16.1
+version=0.16.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=266c75a302064ad7e50905a365fa64537268c318cb1cf19dd003911a781d6797
+checksum=9a2ebe660704878ab795470a72cd53049408ddd9da6e9cb45232cf0ed6505660
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From b891831c3e34252e819ce149fc23967d15a91c47 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 23:37:19 +0300
Subject: [PATCH 1507/1853] gnome-nibbles: update to 3.38.3

---
 srcpkgs/gnome-nibbles/patches/vala.patch  | 178 ----------------------
 srcpkgs/gnome-nibbles/patches/vala2.patch |  66 --------
 srcpkgs/gnome-nibbles/template            |   7 +-
 3 files changed, 4 insertions(+), 247 deletions(-)
 delete mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch
 delete mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
deleted file mode 100644
index 48c565303196..000000000000
--- a/srcpkgs/gnome-nibbles/patches/vala.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 17 Mar 2021 11:25:05 +0100
-Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
- must be unowned
-
----
- src/controls.vala           | 20 ++++++++++----------
- src/nibbles-window.vala     | 26 +++++++++++++-------------
- src/players.vala            |  6 +++---
- src/preferences-dialog.vala | 30 +++++++++++++++---------------
- src/scoreboard.vala         |  6 +++---
- 5 files changed, 44 insertions(+), 44 deletions(-)
-
-diff --git a/src/controls.vala b/src/controls.vala
-index 584c9ff..f95d210 100644
---- a/src/controls.vala
-+++ b/src/controls.vala
-@@ -22,7 +22,7 @@ using Gtk;
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
- private class Controls : Box
- {
--    [GtkChild] private Box grids_box;
-+    [GtkChild] private unowned Box grids_box;
-     private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
- 
-     private Gdk.Pixbuf arrow_pixbuf;
-@@ -100,15 +100,15 @@ private class Controls : Box
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
- private class ControlsGrid : Button
- {
--    [GtkChild] private Label name_label;
--    [GtkChild] private Image arrow_up;
--    [GtkChild] private Image arrow_down;
--    [GtkChild] private Image arrow_left;
--    [GtkChild] private Image arrow_right;
--    [GtkChild] private Label move_up_label;
--    [GtkChild] private Label move_down_label;
--    [GtkChild] private Label move_left_label;
--    [GtkChild] private Label move_right_label;
-+    [GtkChild] private unowned Label name_label;
-+    [GtkChild] private unowned Image arrow_up;
-+    [GtkChild] private unowned Image arrow_down;
-+    [GtkChild] private unowned Image arrow_left;
-+    [GtkChild] private unowned Image arrow_right;
-+    [GtkChild] private unowned Label move_up_label;
-+    [GtkChild] private unowned Label move_down_label;
-+    [GtkChild] private unowned Label move_left_label;
-+    [GtkChild] private unowned Label move_right_label;
- 
-     internal WormProperties worm_props;
-     internal ulong external_handler;
-diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
-index 6961326..6bfb74a 100644
---- a/src/nibbles-window.vala
-+++ b/src/nibbles-window.vala
-@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
-     private int window_height;
- 
-     /* Main widgets */
--    [GtkChild] private Stack main_stack;
--    [GtkChild] private Overlay overlay;
-+    [GtkChild] private unowned Stack main_stack;
-+    [GtkChild] private unowned Overlay overlay;
- 
-     /* HeaderBar */
--    [GtkChild] private HeaderBar headerbar;
--    [GtkChild] private MenuButton hamburger_menu;
--    [GtkChild] private Button new_game_button;
--    [GtkChild] private Button pause_button;
-+    [GtkChild] private unowned HeaderBar headerbar;
-+    [GtkChild] private unowned MenuButton hamburger_menu;
-+    [GtkChild] private unowned Button new_game_button;
-+    [GtkChild] private unowned Button pause_button;
- 
-     /* Pre-game screen widgets */
--    [GtkChild] private Players players;
--    [GtkChild] private Speed speed;
--    [GtkChild] private Controls controls;
-+    [GtkChild] private unowned Players players;
-+    [GtkChild] private unowned Speed speed;
-+    [GtkChild] private unowned Controls controls;
- 
-     /* Statusbar widgets */
--    [GtkChild] private Stack statusbar_stack;
--    [GtkChild] private Label countdown;
--    [GtkChild] private Scoreboard scoreboard;
-+    [GtkChild] private unowned Stack statusbar_stack;
-+    [GtkChild] private unowned Label countdown;
-+    [GtkChild] private unowned Scoreboard scoreboard;
-     private Gdk.Pixbuf scoreboard_life;
- 
-     /* Rendering of the game */
-     private NibblesView? view;
- 
--    [GtkChild] private Box game_box;
-+    [GtkChild] private unowned Box game_box;
-     private Games.GridFrame frame;
- 
-     /* Game being played */
-diff --git a/src/players.vala b/src/players.vala
-index 9198412..4bde18e 100644
---- a/src/players.vala
-+++ b/src/players.vala
-@@ -21,9 +21,9 @@ using Gtk;
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
- private class Players : Box
- {
--    [GtkChild] private ToggleButton worms4;
--    [GtkChild] private ToggleButton worms5;
--    [GtkChild] private ToggleButton worms6;
-+    [GtkChild] private unowned ToggleButton worms4;
-+    [GtkChild] private unowned ToggleButton worms5;
-+    [GtkChild] private unowned ToggleButton worms6;
- 
-     private SimpleAction nibbles_number_action;
-     private SimpleAction players_number_action;
-diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
-index 216a1e2..2d3a7bf 100644
---- a/src/preferences-dialog.vala
-+++ b/src/preferences-dialog.vala
-@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
-     private GLib.Settings settings;
-     private Gee.ArrayList<GLib.Settings> worm_settings;
- 
--    [GtkChild] private Stack            stack;
--    [GtkChild] private Stack            headerbar_stack;
--    [GtkChild] private ComboBoxText     worm_combobox;
--    [GtkChild] private Gtk.ListStore    list_store_1;
--    [GtkChild] private Gtk.ListStore    list_store_2;
--    [GtkChild] private Gtk.ListStore    list_store_3;
--    [GtkChild] private Gtk.ListStore    list_store_4;
--    [GtkChild] private TreeView         tree_view_1;
--    [GtkChild] private TreeView         tree_view_2;
--    [GtkChild] private TreeView         tree_view_3;
--    [GtkChild] private TreeView         tree_view_4;
--    [GtkChild] private ComboBoxText     combo_box_1;
--    [GtkChild] private ComboBoxText     combo_box_2;
--    [GtkChild] private ComboBoxText     combo_box_3;
--    [GtkChild] private ComboBoxText     combo_box_4;
-+    [GtkChild] private unowned Stack            stack;
-+    [GtkChild] private unowned Stack            headerbar_stack;
-+    [GtkChild] private unowned ComboBoxText     worm_combobox;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_1;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_2;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_3;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_4;
-+    [GtkChild] private unowned TreeView         tree_view_1;
-+    [GtkChild] private unowned TreeView         tree_view_2;
-+    [GtkChild] private unowned TreeView         tree_view_3;
-+    [GtkChild] private unowned TreeView         tree_view_4;
-+    [GtkChild] private unowned ComboBoxText     combo_box_1;
-+    [GtkChild] private unowned ComboBoxText     combo_box_2;
-+    [GtkChild] private unowned ComboBoxText     combo_box_3;
-+    [GtkChild] private unowned ComboBoxText     combo_box_4;
- 
-     private Gee.ArrayList<Gtk.ListStore>    list_stores;
-     private Gee.ArrayList<TreeView>         tree_views;
-diff --git a/src/scoreboard.vala b/src/scoreboard.vala
-index a41aee1..aebc1cc 100644
---- a/src/scoreboard.vala
-+++ b/src/scoreboard.vala
-@@ -59,9 +59,9 @@ private class Scoreboard : Box
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
- private class PlayerScoreBox : Box
- {
--    [GtkChild] private Label name_label;
--    [GtkChild] private Label score_label;
--    [GtkChild] private Grid lives_grid;
-+    [GtkChild] private unowned Label name_label;
-+    [GtkChild] private unowned Label score_label;
-+    [GtkChild] private unowned Grid lives_grid;
- 
-     private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
- 
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch
deleted file mode 100644
index c7a86316925e..000000000000
--- a/srcpkgs/gnome-nibbles/patches/vala2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 16 Jan 2021 13:56:10 +0100
-Subject: [PATCH] Don't alter or try to write [GtkChild] fields
-
-See https://gitlab.gnome.org/GNOME/vala/issues/1121
----
- src/controls.vala | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/controls.vala b/src/controls.vala
-index 4f07358..584c9ff 100644
---- a/src/controls.vala
-+++ b/src/controls.vala
-@@ -140,25 +140,25 @@ private class ControlsGrid : Button
-         arrow_left.set_from_pixbuf  (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE));
-         arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE));
- 
--           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    ref move_up_label));
--         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  ref move_down_label));
--         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  ref move_left_label));
--        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label));
--
--        configure_label (worm_props.up,    ref move_up_label);
--        configure_label (worm_props.down,  ref move_down_label);
--        configure_label (worm_props.left,  ref move_left_label);
--        configure_label (worm_props.right, ref move_right_label);
-+           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    move_up_label));
-+         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  move_down_label));
-+         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  move_left_label));
-+        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label));
-+
-+        configure_label (worm_props.up,    move_up_label);
-+        configure_label (worm_props.down,  move_down_label);
-+        configure_label (worm_props.left,  move_left_label);
-+        configure_label (worm_props.right, move_right_label);
-     }
- 
-     internal void mark_duplicated_keys (GenericSet<uint> duplicate_keys)
-     {
--        set_duplicate_class (worm_props.up    in duplicate_keys, ref move_up_label);
--        set_duplicate_class (worm_props.down  in duplicate_keys, ref move_down_label);
--        set_duplicate_class (worm_props.left  in duplicate_keys, ref move_left_label);
--        set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label);
-+        set_duplicate_class (worm_props.up    in duplicate_keys, move_up_label);
-+        set_duplicate_class (worm_props.down  in duplicate_keys, move_down_label);
-+        set_duplicate_class (worm_props.left  in duplicate_keys, move_left_label);
-+        set_duplicate_class (worm_props.right in duplicate_keys, move_right_label);
-     }
--    private static void set_duplicate_class (bool new_value, ref Label label)
-+    private static void set_duplicate_class (bool new_value, Label label)
-     {
-         if (new_value)
-             label.get_style_context ().add_class ("duplicate");
-@@ -175,7 +175,7 @@ private class ControlsGrid : Button
-         worm_props.disconnect (color_handler);
-     }
- 
--    private static void configure_label (uint key_value, ref Label label)
-+    private static void configure_label (uint key_value, Label label)
-     {
-         string? key_name = Gdk.keyval_name (key_value);
-         if (key_name == "Up")
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 32aa8aea4202..41210fcb7626 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-nibbles'
 pkgname=gnome-nibbles
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config vala"
+hostmakedepends="gettext glib-devel itstool pkg-config vala desktop-file-utils
+ gtk-update-icon-cache"
 makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
  libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
@@ -12,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
 changelog="https://gitlab.gnome.org/GNOME/gnome-nibbles/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=457a64b1c88e2d8d0143c452ffd01f0300d7d3005802954ef5abf9c896b353d9
+checksum=975fde1d83c7b15b392eac7a359161290fc8aeb7605c11e71cee0c3c326b5e61

From 80210511c3de396cb872d9a2159fbdedb4a3f655 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 29 Jun 2023 00:09:05 +0300
Subject: [PATCH 1508/1853] gnome-video-effects: update to 0.6.0

---
 srcpkgs/gnome-video-effects/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-video-effects/template b/srcpkgs/gnome-video-effects/template
index 7e8e62863461..7f1ee8da909a 100644
--- a/srcpkgs/gnome-video-effects/template
+++ b/srcpkgs/gnome-video-effects/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-video-effects'
 pkgname=gnome-video-effects
-version=0.5.0
-revision=2
+version=0.6.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext"
 makedepends="gstreamer1-devel"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeVideoEffects"
 changelog="https://gitlab.gnome.org/GNOME/gnome-video-effects/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dc68e9b38fdfc1e8e0414e2d7ee83ace78efdee76f30506cc9dcd07394ad0c8
+checksum=d7aeaeb46b3f5a832fb2e0d90b42bf8c6160202ca52ac9add17afce192e3c8a8

From 47d963b9177826110258cada8bb39721b6bafd81 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 29 Jun 2023 01:28:46 +0300
Subject: [PATCH 1509/1853] hitori: update to 44.0

---
 srcpkgs/hitori/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 15241423311d..427fe7a7c44e 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,6 +1,6 @@
 # Template file for 'hitori'
 pkgname=hitori
-version=3.38.4
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 changelog="https://gitlab.gnome.org/GNOME/hitori/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8993cc91fb923788e389e03ec2aa7876d15c12bad9204cf65b2ffa0ed3922f7d
+checksum=42270bd4f9525d180d3151bd7245335dc5cf248a984e02f68ff930da799e583b

From a0c0993f7828f38ffa987393f2887652207b3f14 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 28 Jun 2023 18:11:32 -0500
Subject: [PATCH 1510/1853] Signal-Desktop: update to 6.23.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 992612267835..4be72538e92f 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.22.0
+version=6.23.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=b895314710284bb7b5caac67eb514d8b83e933ace2c0801bc690a9c621cbed94
+checksum=dc004b5a31c4896aa0478618ed9226cc931f819f44a26966956f9fe586967060
 nostrip_files="signal-desktop"
 
 post_extract() {

From 56199cba17a08dbb1c53552f8c95298f0c7d0c44 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 28 Jun 2023 20:05:02 +0200
Subject: [PATCH 1511/1853] snoopy: fix dead distfiles

---
 srcpkgs/snoopy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/snoopy/template b/srcpkgs/snoopy/template
index 3d1b338fb245..da590a249355 100644
--- a/srcpkgs/snoopy/template
+++ b/srcpkgs/snoopy/template
@@ -7,9 +7,9 @@ hostmakedepends="socat"
 conf_files="/etc/snoopy.ini"
 short_desc="Log every executed command to syslog"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/a2o/snoopy"
-distfiles="http://source.a2o.si/download/snoopy/snoopy-${version}.tar.gz"
+distfiles="https://github.com/a2o/snoopy/releases/download/snoopy-${version}/snoopy-${version}.tar.gz"
 checksum=6442e1145a5cad725f6aae0887030ee3db34bafc40bbe3bb84da836cbb5f1569
 
 pre_configure() {

From 67705f9fbae613d9cb7a42dd778573380cdd9c6e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 29 Jun 2023 03:15:12 -0400
Subject: [PATCH 1512/1853] gptfdisk: fix libuuid linking

---
 srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch | 14 ++++++++++++++
 srcpkgs/gptfdisk/template                          |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch

diff --git a/srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch b/srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch
new file mode 100644
index 000000000000..eca9bc7d1518
--- /dev/null
+++ b/srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch
@@ -0,0 +1,14 @@
+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1853985.html
+https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/
+
+--- a/guid.cc
++++ b/guid.cc
+@@ -141,7 +141,7 @@
+ void GUIDData::Randomize(void) {
+    int i, uuidGenerated = 0;
+ 
+-#ifdef _UUID_UUID_H
++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+    uuid_generate(uuidData);
+    ReverseBytes(&uuidData[0], 4);
+    ReverseBytes(&uuidData[4], 2);
diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index 443cf57957ca..9bbc67a4d0ed 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'gptfdisk'
 pkgname=gptfdisk
 version=1.0.9
-revision=2
+revision=3
 build_style=gnu-makefile
 make_check_target=test
 makedepends="ncurses-devel popt-devel libuuid-devel"

From 2fd7edf28115c0d9fec16ab1571e4ccc4d756e4a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 19:45:06 -0500
Subject: [PATCH 1513/1853] New package: kbounce-23.04.0

---
 srcpkgs/kbounce/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kbounce/template

diff --git a/srcpkgs/kbounce/template b/srcpkgs/kbounce/template
new file mode 100644
index 000000000000..de23b9357074
--- /dev/null
+++ b/srcpkgs/kbounce/template
@@ -0,0 +1,16 @@
+# Template file for 'kbounce'
+pkgname=kbounce
+version=23.04.2
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons
+ kconfig kdoctools"
+makedepends="qt5-svg-devel kcoreaddons-devel kconfig-devel kxmlgui-devel
+ kcrash-devel kwidgetsaddons-devel kdbusaddons-devel ki18n-devel
+ kcompletion-devel kio-devel kdoctools-devel libkdegames-devel"
+short_desc="Build walls to confine a number of bouncing balls"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://apps.kde.org/kbounce/"
+distfiles="${KDE_SITE}/release-service/${version}/src/kbounce-${version}.tar.xz"
+checksum=88d9f9753e982b4ed00459ca57e6857649660ff612931ee55a02c549196f153d

From 0e3fb864207a07ea9380f2399d39a8cda730759d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 29 Jun 2023 14:31:32 +0200
Subject: [PATCH 1514/1853] elixir: update to 1.15.0.

---
 ...5eca5af294a8afbed5bc73c178da18f0055c.patch | 29 ++++++++++++++
 ...4e6830d0f44e26179582a16fef6f642df754.patch | 38 +++++++++++++++++++
 srcpkgs/elixir/template                       | 23 +++++++++--
 3 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
 create mode 100644 srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch

diff --git a/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch b/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
new file mode 100644
index 000000000000..06f5976e2c69
--- /dev/null
+++ b/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
@@ -0,0 +1,29 @@
+From 73b65eca5af294a8afbed5bc73c178da18f0055c Mon Sep 17 00:00:00 2001
+From: cjschneider2 <cjschneider2@users.noreply.github.com>
+Date: Fri, 23 Jun 2023 16:04:29 +0200
+Subject: [PATCH] Use printf instead of echo to output user flags (#12704)
+
+Fixes #12677.
+
+Using printf here prevents an error when outputting the filtered flag
+`-e` as doing with with `echo "-e"` doesn't output anything
+(deleting the option we wanted to filter).
+
+More info: https://unix.stackexchange.com/a/65819
+---
+ bin/elixir | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/elixir b/bin/elixir
+index 3c0323f0f1..cb0a84650b 100755
+--- a/bin/elixir
++++ b/bin/elixir
+@@ -233,7 +233,7 @@ set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SC
+ if [ -n "$RUN_ERL_PIPE" ]; then
+   ESCAPED=""
+   for PART in "$@"; do
+-    ESCAPED="$ESCAPED $(echo "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
++    ESCAPED="$ESCAPED $(printf '%s' "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
+   done
+   mkdir -p "$RUN_ERL_PIPE"
+   mkdir -p "$RUN_ERL_LOG"
diff --git a/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch b/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
new file mode 100644
index 000000000000..4512ad60e37b
--- /dev/null
+++ b/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
@@ -0,0 +1,38 @@
+From 9b254e6830d0f44e26179582a16fef6f642df754 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
+Date: Tue, 20 Jun 2023 12:31:53 +0200
+Subject: [PATCH] Do not expect OTP to be compiled with docs, closes #12677
+
+---
+ lib/mix/test/mix/tasks/compile_test.exs | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
+index cdc40977c7..c4e672ffd2 100644
+--- a/lib/mix/test/mix/tasks/compile_test.exs
++++ b/lib/mix/test/mix/tasks/compile_test.exs
+@@ -329,16 +329,22 @@ defmodule Mix.Tasks.CompileTest do
+     Application.delete_env(:sample, :hello, persistent: true)
+   end
+ 
+-  test "code path prunning" do
++  test "code path pruning" do
+     Mix.ensure_application!(:parsetools)
++    otp_docs? = match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:zlib))
+ 
+     in_fixture("no_mixfile", fn ->
+       assert Mix.Task.run("compile", []) == {:ok, []}
+       assert :code.where_is_file(~c"parsetools.app") == :non_existing
+ 
+       # Make sure erts is also kept but not loaded
+-      assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
+       assert Application.spec(:erts, :vsn) == nil
++
++      if otp_docs? do
++        assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
++      else
++        IO.warn("Erlang/OTP was not compiled with docs, skipping assertion")
++      end
+     end)
+   end
+ 
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 568e28e4f7ca..0e475ae139f1 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,11 +1,15 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.14.5
+version=1.15.0
 revision=1
 build_style=gnu-makefile
-make_check_target="test"
+make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+make_check_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+make_install_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+# make_check_target="test"
+make_check_target="test_erlang test_elixir"
 hostmakedepends="erlang"
-depends="erlang>=23"
+depends="erlang>=24"
 checkdepends="git"
 short_desc="Functional, concurrent, general-purpose programming language"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -13,7 +17,18 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd
+checksum=0f4df7574a5f300b5c66f54906222cd46dac0df7233ded165bc8e80fd9ffeb7a
+
+post_patch() {
+	# XXX: find a better solution
+	# Assertion with == failed
+	# code:  assert root_dir == :code.root_dir() |> to_string()
+	# left:  "/usr/lib/erlang"
+	# right: "/usr/lib64/erlang"
+	vsed -e '/assert root_dir == :code\.root_dir()/d' -i lib/mix/test/mix/tasks/release_test.exs
+	# orig file caused by line offset of the issue 12704 diff
+	rm bin/elixir.orig
+}
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From f886ea2e1c2e9af2f27db1fe44086826c7c8fdfa Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 15:49:19 +0530
Subject: [PATCH 1515/1853] checkbashisms: update to 2.23.5.

---
 srcpkgs/checkbashisms/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template
index 108db897a782..4b6bd7b8684b 100644
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.23.4
+version=2.23.5
 revision=1
 depends="perl"
 checkdepends="shunit2 perl"
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/devscripts"
 changelog="https://salsa.debian.org/debian/devscripts/-/raw/master/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=3dc68972734c0aeb310beb35d01b83d85e445270acefd8caeda6a6fef6f6f4f3
+checksum=8f47d45534bf94f28576078c864b22273dbe139928074ec82b6b848f9e44586d
 
 pre_install() {
 	vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl
@@ -21,6 +21,7 @@ do_check() {
 }
 
 do_install() {
+	vcompletion scripts/checkbashisms.bash_completion bash
 	vbin scripts/checkbashisms.pl checkbashisms
 	vman scripts/checkbashisms.1
 }

From 5c6b1c01c344757fa36ef748c5a87408e00b0fc8 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 29 Jun 2023 20:54:41 +0200
Subject: [PATCH 1516/1853] passt: update to 2023.06.27.289301b.

---
 srcpkgs/passt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passt/template b/srcpkgs/passt/template
index aa1679b2467d..a1519af156ba 100644
--- a/srcpkgs/passt/template
+++ b/srcpkgs/passt/template
@@ -1,6 +1,6 @@
 # Template file for 'passt'
 pkgname=passt
-version=2023.06.03.429e1a7
+version=2023.06.27.289301b
 revision=1
 # upstream uses YYYY_MM_DD.COMMIT
 _version=${version/./_}
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2, BSD-3-Clause"
 homepage="https://passt.top"
 distfiles="https://passt.top/passt/snapshot/passt-${_version}.tar.xz"
-checksum=4bd17ce7bd1d6dda033e346a40c5dc60d39cc08a6e3341fef79888299c84c3b6
+checksum=bdda46c2501797031f278c8926941208887f3c53be653e2af45870c48a7ddcb1
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 77062499ad648d121a9714599deb00d4fde5b292 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 01:01:03 +0530
Subject: [PATCH 1517/1853] strace: update to 6.4.

---
 srcpkgs/strace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 7dcdfd098fc6..333f2e8402cf 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,6 +1,6 @@
 # Template file for 'strace'
 pkgname=strace
-version=6.3
+version=6.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731
+checksum=27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238
 
 build_options="static libunwind"
 build_options_default="libunwind"

From 6e9b0b7ec28bcde52820a28e8f32d868a321f928 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:34:04 +0530
Subject: [PATCH 1518/1853] carapace: update to 0.25.0.

---
 srcpkgs/carapace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index e99aa377ea45..2d98250b1b99 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,6 +1,6 @@
 # Template file for 'carapace'
 pkgname=carapace
-version=0.24.5
+version=0.25.0
 revision=1
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
@@ -12,7 +12,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://github.com/rsteube/carapace-bin"
 distfiles="https://github.com/rsteube/carapace-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=7f2b9dd360b716c9c1399fb080fbf42fcfdd299336928a4135b5b2a095b186f1
+checksum=727c140851a961d786b5b55bb24852f6f50af8a55725e3d525acf2be10b5afb2
 
 pre_build() {
 	GOARCH= go generate ./cmd/...

From db00a7ec16772c366f6d775cd9e3b6bd27296818 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 21:59:04 +0530
Subject: [PATCH 1519/1853] yaydl: fix update-check

---
 srcpkgs/yaydl/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/yaydl/update

diff --git a/srcpkgs/yaydl/update b/srcpkgs/yaydl/update
new file mode 100644
index 000000000000..541f11194925
--- /dev/null
+++ b/srcpkgs/yaydl/update
@@ -0,0 +1 @@
+pattern="/archive/refs/tags/release-\K[\d\.]+(?=\.tar\.gz)"

From 0995f87b9598a2b126d39df78c292ffffb80add7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 22:09:57 +0530
Subject: [PATCH 1520/1853] qbe: fix update-check

---
 srcpkgs/qbe/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/qbe/update

diff --git a/srcpkgs/qbe/update b/srcpkgs/qbe/update
new file mode 100644
index 000000000000..100207e061cb
--- /dev/null
+++ b/srcpkgs/qbe/update
@@ -0,0 +1 @@
+site="https://c9x.me/compile/releases.html"

From 52833eb33a092a48979ccecc93e898e0d56f13ba Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 29 Jun 2023 05:17:09 +0200
Subject: [PATCH 1521/1853] linuxwave: update to 0.1.4

---
 srcpkgs/linuxwave/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linuxwave/template b/srcpkgs/linuxwave/template
index 60f47d8ac427..0330838b18fe 100644
--- a/srcpkgs/linuxwave/template
+++ b/srcpkgs/linuxwave/template
@@ -1,6 +1,6 @@
 # Template file for 'linuxwave'
 pkgname=linuxwave
-version=0.1.3
+version=0.1.4
 revision=1
 build_style=zig-build
 short_desc="Generate music from the entropy of Linux"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://orhun.dev/linuxwave/"
 changelog="https://raw.githubusercontent.com/orhun/linuxwave/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/linuxwave/releases/download/v${version}/v${version}.tar.gz"
-checksum=d82e0eda6f2bb3080e3af6a86bafa22ed91291eaf2afbb38492326a316f1853e
+checksum=e69e6960e0333883acffc6a1e7c5c77a83901cc96c0742c599e72b0e36baeb05
 
 post_install() {
 	vlicense LICENSE

From 1bd39da548b59b86fec6e0c3377850e2b2c4fe1b Mon Sep 17 00:00:00 2001
From: oliverwiegers <oliver.wiegers@gmail.com>
Date: Thu, 29 Jun 2023 16:13:22 +0200
Subject: [PATCH 1522/1853] nyxt: update to 3.3.0

---
 srcpkgs/nyxt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index fd7353026197..20bfaa15402e 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,6 +1,6 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=3.2.1
+version=3.3.0
 revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=55112dca1a7e0fc8d8c2c2531ecd996c2020ab0e242e240d223aa00498b63d66
+checksum=648809d19f9f971d6025c17a6ad08493af87cb94f96a1edcb994122f9f92436c
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From 3fab817e5be624856868d77295fd220718fd073c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 28 Jun 2023 16:43:30 -0400
Subject: [PATCH 1523/1853] ntfy: update to 2.6.1.

---
 srcpkgs/ntfy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index 54a11d3e5da6..0115b7dc45ae 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,6 +1,6 @@
 # Template file for 'ntfy'
 pkgname=ntfy
-version=2.5.0
+version=2.6.1
 revision=1
 build_style=go
 go_import_path="heckel.io/ntfy"
@@ -13,7 +13,7 @@ license="Apache-2.0,GPL-2.0-only"
 homepage="https://ntfy.sh"
 changelog="https://raw.githubusercontent.com/binwiederhier/ntfy/main/docs/releases.md"
 distfiles="https://github.com/binwiederhier/ntfy/archive/refs/tags/v${version}.tar.gz"
-checksum=16128c38c5ef8397463a44c953f77b14643caf8c044ddc1cc84377b3127ffc9f
+checksum=d9377383b134cb7a80b2a7bbca6eb4f5ec558d186ff63576e1606b0e3ce55058
 system_accounts="_ntfy"
 make_dirs="/var/lib/ntfy 0700 _ntfy _ntfy"
 _ntfy_homedir="/var/lib/ntfy"

From 7b496187f11dec1f27c9a2b98a7768ca474833a7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 29 Jun 2023 10:58:50 +0200
Subject: [PATCH 1524/1853] gegl: update to 0.4.46.

---
 srcpkgs/gegl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index ce14c44fc7f4..6ae901d21ded 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
-version=0.4.44
-revision=3
+version=0.4.46
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=true -Dvapigen=enabled
@@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://gegl.org/"
 changelog="https://gitlab.gnome.org/GNOME/gegl/-/raw/master/docs/NEWS.adoc"
 distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=0a4cdb41635e406a0849cd0d3f03caf7d97cab8aa13d28707d532d0089d56126
+checksum=d0b3b2481bc8774c5f3d0a487611910166d18eef823a859fb91e781ab7b1e892
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Db_lto=false"

From 80da3b654ce4606305224841611edcfb4c74b8f4 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 12:17:25 +0900
Subject: [PATCH 1525/1853] gcompat: update to 1.1.0.

---
 srcpkgs/gcompat/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gcompat/template b/srcpkgs/gcompat/template
index 3988a933a5a2..4fe031c5fad6 100644
--- a/srcpkgs/gcompat/template
+++ b/srcpkgs/gcompat/template
@@ -1,17 +1,17 @@
 # Template file for 'gcompat'
 pkgname=gcompat
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="musl-obstack-devel"
 short_desc="Compatibility layer to allow running glibc binaries on musl systems"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
-homepage="https://code.foxkit.us/adelie/gcompat"
-changelog="https://code.foxkit.us/adelie/gcompat/-/raw/current/CHANGELOG.rst"
-distfiles="https://distfiles.AdelieLinux.org/source/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=5bcf8bbe4b417bc66b22a7a3675273aa8834480144338172bbd8e81eaf41a7c4
+homepage="https://git.adelielinux.org/adelie/gcompat"
+changelog="https://git.adelielinux.org/adelie/gcompat/-/raw/current/CHANGELOG.rst"
+distfiles="https://distfiles.adelielinux.org/source/gcompat/gcompat-${version}.tar.xz"
+checksum=4e8c9cbf0615f1ce5d56ce02d84ac9c0a3d38b5bed32e8e02e2105e9658c9d57
 
 build_options="libucontext"
 desc_option_libucontext="Build with ucontext support via libucontext"

From ed2eae08a41a8a2523785d136efbdb70d14c7967 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Tue, 20 Jun 2023 22:51:36 +0100
Subject: [PATCH 1526/1853] New package: havoc-0.5.0

---
 srcpkgs/havoc/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/havoc/template

diff --git a/srcpkgs/havoc/template b/srcpkgs/havoc/template
new file mode 100644
index 000000000000..5df4864bbd71
--- /dev/null
+++ b/srcpkgs/havoc/template
@@ -0,0 +1,17 @@
+# Template file for 'havoc'
+pkgname=havoc
+version=0.5.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="wayland-devel pkg-config"
+makedepends="wayland-devel wayland-protocols libxkbcommon-devel"
+short_desc="Minimal terminal emulator for Wayland on Linux"
+maintainer="ii8 <murray.calavera@protonmail.com>"
+license="Public Domain, MIT"
+homepage="https://github.com/ii8/havoc"
+distfiles="https://github.com/ii8/havoc/archive/refs/tags/${version}.tar.gz"
+checksum=3b0d37b13e3ca21f5e22f1e62a32fe736119cd5c601307c4000bed5fee179f77
+
+post_install() {
+	vlicense LICENSE
+}

From 0a4e83a4571ead6fb8638fcb6fad056fd5727e37 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 15 Jun 2023 11:03:35 +0200
Subject: [PATCH 1527/1853] gradle: update to 8.1.1

---
 srcpkgs/gradle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 4cf4a29408a6..20dbf2d21cac 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=7.6
+version=8.1.1
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+checksum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 1f00bb387fa57372412bb19d5e39ceb2804058e1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 29 Jun 2023 10:26:09 +0200
Subject: [PATCH 1528/1853] linux6.3: update to 6.3.10

---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index d2c7b7a3cf48..89affe4a0d9b 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.8
+version=6.3.10
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- 927ba93d3da556c8e30b2640aa3f19c3c3cda66c655754e0798024020e2981b4"
+ 74d4dfb345540e91de4b41cbe9d81d2e5f90a2777419beac97c80cf6578408b1"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 4dd52766534c2492760ced5e70c65d0da7302c0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 15:50:52 +0200
Subject: [PATCH 1529/1853] bcc: update to 0.28.0.

---
 ...ffc0366981d4e41b08f007b37bd6af931f25.patch | 43 -------------------
 srcpkgs/bcc/template                          |  4 +-
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch

diff --git a/srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch b/srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch
deleted file mode 100644
index 4842e95e3711..000000000000
--- a/srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 950cffc0366981d4e41b08f007b37bd6af931f25 Mon Sep 17 00:00:00 2001
-From: Jesus Sanchez-Palencia <jesussanp@google.com>
-Date: Wed, 8 Mar 2023 16:48:36 -0800
-Subject: [PATCH] libbpf: Revert poisoning of strlcpy
-
-This reverts commit 6d0c4b11e743("libbpf: Poison strlcpy()").
-
-It added the pragma poison directive to libbpf_internal.h to protect
-against accidental usage of strlcpy but ended up breaking the build for
-toolchains based on libcs which provide the strlcpy() declaration from
-string.h (e.g. uClibc-ng). The include order which causes the issue is:
-
-    string.h,
-    from Iibbpf_common.h:12,
-    from libbpf.h:20,
-    from libbpf_internal.h:26,
-    from strset.c:9:
-
-Fixes: 6d0c4b11e743 ("libbpf: Poison strlcpy()")
-Signed-off-by: Jesus Sanchez-Palencia <jesussanp@google.com>
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Link: https://lore.kernel.org/bpf/20230309004836.2808610-1-jesussanp@google.com
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
----
- src/libbpf_internal.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libbpf_internal.h b/src/libbpf_internal.h
-index fbaf68335..e4d05662a 100644
---- a/src/cc/libbpf/src/libbpf_internal.h
-+++ b/src/cc/libbpf/src/libbpf_internal.h
-@@ -20,8 +20,8 @@
- /* make sure libbpf doesn't use kernel-only integer typedefs */
- #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
- 
--/* prevent accidental re-addition of reallocarray()/strlcpy() */
--#pragma GCC poison reallocarray strlcpy
-+/* prevent accidental re-addition of reallocarray() */
-+#pragma GCC poison reallocarray
- 
- #include "libbpf.h"
- #include "btf.h"
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 1b690066612f..ecedbd8e4bef 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,6 +1,6 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.27.0
+version=0.28.0
 revision=1
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=157208df3c8c0473b5dbedd57648fb98b5d07e5565984affc4e3e84a3df601bc
+checksum=65adcaf4cee17fa3a94d0bb96d3691ca7e5864244e7bd52df93f7ae6c004f23d
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 58bdaf816d65a0e04a5a5c98338486fc4c4c323c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 15:51:41 +0200
Subject: [PATCH 1530/1853] hwloc: update to 2.9.2.

---
 srcpkgs/hwloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index 7280c4c22653..28019fbf3a49 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.9.1
+version=2.9.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/projects/hwloc/"
 distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=7cc4931a20fef457e0933af3f375be6eafa7703fde21e137bfb9685b1409599e
+checksum=0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 8869eba99c8a8f98ed38ef267869c55f9302912d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 16:03:02 +0200
Subject: [PATCH 1531/1853] sbcl: update to 2.3.6.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 9ce15d3284f5..385709c32c68 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.3.5
+version=2.3.6
 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=89c90720cf9d05dbcd90d690e381a2514c0f1807159e0d7222220c5a8c2d5186
+checksum=b4414ca4d9a7474e8d884d7d63237e2f29ef459dfd5a848424a9c3fa551d19b9
 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+=" c4a9f2b30eeb74db0f069538458b955cfef46eecccc771b17ab250e9c144122d"
+	checksum+=" 004c345518f0bf53e7f38826079d286eb53f5103ec14dcd693f6c1f4831bde25"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From 5681e19b42ab9d823a9506c5cc305fd233ac52a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 16:03:06 +0200
Subject: [PATCH 1532/1853] console-setup: update to 1.222.

---
 srcpkgs/console-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
index f27bb89e8258..56c9b03be078 100644
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'console-setup'
 pkgname=console-setup
-version=1.220
+version=1.222
 revision=1
 hostmakedepends="perl"
 depends="kbd ckbcomp"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/console-setup"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=c33a693025551d0b86435b96dea13d7488b4d3c218ba3e88c024fc807f339125
+checksum=60f759afed744b0242f75c90e25a168a7c360d4f2c4278b9a9badc850f2c5e02
 conf_files="/etc/console-setup/console-setup
  /etc/console-setup/keyboard"
 

From 643d3a2dcef3bdeadf465213070c507b2378e5f0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 29 Mar 2023 14:55:46 -0400
Subject: [PATCH 1533/1853] musl: use nullptr for NULL in >=C++11

---
 ...88a9da5e7b2925dda17a2d6820dddf1fb287.patch | 139 ++++++++++++++++++
 srcpkgs/musl/template                         |   3 +-
 2 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch

diff --git a/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch
new file mode 100644
index 000000000000..a8bfa66d6c47
--- /dev/null
+++ b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch
@@ -0,0 +1,139 @@
+From 98e688a9da5e7b2925dda17a2d6820dddf1fb287 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+Date: Sun, 15 Aug 2021 17:51:57 +0200
+Subject: [PATCH] define NULL as nullptr when used in C++11 or later
+
+This should be safer for casting and more compatible with existing code
+bases that wrongly assume it must be defined as a pointer.
+---
+ include/locale.h | 4 +++-
+ include/stddef.h | 4 +++-
+ include/stdio.h  | 4 +++-
+ include/stdlib.h | 4 +++-
+ include/string.h | 4 +++-
+ include/time.h   | 4 +++-
+ include/unistd.h | 4 +++-
+ include/wchar.h  | 4 +++-
+ 8 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/include/locale.h b/include/locale.h
+index ce384381c..11106fea8 100644
+--- a/include/locale.h
++++ b/include/locale.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/stddef.h b/include/stddef.h
+index bd7538535..f25b86396 100644
+--- a/include/stddef.h
++++ b/include/stddef.h
+@@ -1,7 +1,9 @@
+ #ifndef _STDDEF_H
+ #define _STDDEF_H
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/stdio.h b/include/stdio.h
+index 3604198c3..d1ed01f03 100644
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -25,7 +25,9 @@ extern "C" {
+ 
+ #include <bits/alltypes.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 7af86e3bc..b507ca33b 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/string.h b/include/string.h
+index 795a2abcd..43ad0942e 100644
+--- a/include/string.h
++++ b/include/string.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/time.h b/include/time.h
+index 5494df183..3d9483720 100644
+--- a/include/time.h
++++ b/include/time.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/unistd.h b/include/unistd.h
+index 130640260..ee2dbe8af 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -15,7 +15,9 @@ extern "C" {
+ #define SEEK_CUR 1
+ #define SEEK_END 2
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/wchar.h b/include/wchar.h
+index 88eb55b18..ed5d774df 100644
+--- a/include/wchar.h
++++ b/include/wchar.h
+@@ -38,7 +38,9 @@ extern "C" {
+ #define WCHAR_MIN (-1-0x7fffffff+L'\0')
+ #endif
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index c77cc2b6c405..9de13710d7d3 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=15
+revision=16
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -24,6 +24,7 @@ post_build() {
 	$CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
 	$AR r libssp_nonshared.a __stack_chk_fail_local.o
 }
+
 do_install() {
 	# Move everything to /usr.
 	vmkdir usr/lib

From 4a8e256506eff7800933bad58cbbd6606b510214 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:27 -0400
Subject: [PATCH 1534/1853] cross-aarch64-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-aarch64-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 17ba4ec677a6..7fca6b575080 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-aarch64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From aaf0cb0305826753516589d22c9ead695a7419cc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:27 -0400
Subject: [PATCH 1535/1853] cross-aarch64-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-aarch64-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 8038b28d70ad..a633fa900da3 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-aarch64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From a22eeb9ba8f7d8a0540600b90e866a4924f62694 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:27 -0400
Subject: [PATCH 1536/1853] cross-arm-linux-gnueabi: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-arm-linux-gnueabi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 5aa1383aa8f9..dbb8d90c8c24 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-arm-linux-gnueabi
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 1195a833fb65396a19423b5f4bffb6576367dff5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:28 -0400
Subject: [PATCH 1537/1853] cross-arm-linux-gnueabihf: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-arm-linux-gnueabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 13a780794378..1a04ad3713af 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _glibc_patchver="72-g0f90d6204d"
 pkgname=cross-arm-linux-gnueabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From b6d65560666a89021757e03acb97047c16f312ab Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:28 -0400
Subject: [PATCH 1538/1853] cross-arm-linux-musleabi: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-arm-linux-musleabi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index ee59931d6d93..8b25e9f7c365 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-arm-linux-musleabi
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From e73c94c9540a976f3c639a1976c71d91f88a7daa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:28 -0400
Subject: [PATCH 1539/1853] cross-arm-linux-musleabihf: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-arm-linux-musleabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 333db95425dd..d6dca4e920d5 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-arm-linux-musleabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From db096a5ebaa0d849e526dc5c484b576a91dba557 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:29 -0400
Subject: [PATCH 1540/1853] cross-armv7l-linux-gnueabihf: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-armv7l-linux-gnueabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index ffb71af5b454..cb52dd2b291e 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-armv7l-linux-gnueabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From b0be8728d97db92543f010c88246dee23d6487d8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:29 -0400
Subject: [PATCH 1541/1853] cross-armv7l-linux-musleabihf: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-armv7l-linux-musleabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 3c4ea2357661..5268465669fa 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-armv7l-linux-musleabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 1238fa3b8781b214b93396af3ff65079c72a56a7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:29 -0400
Subject: [PATCH 1542/1853] cross-i686-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-i686-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6dc3fdcba07a..ea5d081e48f6 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,10 +6,10 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-i686-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From d089841c2655cac09104266933f811ddef1decb9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:30 -0400
Subject: [PATCH 1543/1853] cross-i686-pc-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-i686-pc-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index c6f2579c645d..e71a4faa367c 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,10 +6,10 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-i686-pc-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 816f11bd8dd6cf4095e72240f1350b5507a0fdfe Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:30 -0400
Subject: [PATCH 1544/1853] cross-mipsel-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mipsel-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 23247d5bc972..a053fe530153 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mipsel-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 04b960fd6dc8e3d41951684da6702812c32eb9e3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:30 -0400
Subject: [PATCH 1545/1853] cross-mipsel-linux-muslhf: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mipsel-linux-muslhf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 8cc208c7e86d..29d7261e9b48 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mipsel-linux-muslhf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 7a2550eb1ee5728fa1dd2a9560967ba582e3b123 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:31 -0400
Subject: [PATCH 1546/1853] cross-mips-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mips-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index f783961d70d2..8865f6dc092b 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mips-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 00f73f3973d8bfe006e41a7780be622a416dfa7c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:31 -0400
Subject: [PATCH 1547/1853] cross-mips-linux-muslhf: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mips-linux-muslhf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index fe41bc80d808..94691668dcf2 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mips-linux-muslhf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From c4b0260dc9244691cb4aefe145e125fb9d6d5638 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:31 -0400
Subject: [PATCH 1548/1853] cross-powerpc64le-linux-gnu: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpc64le-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index f4486e3f229c..577fccc6c5f8 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,12 +6,12 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64le-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From ad64a0f1f95cfa00fcf52adb6d9edbefb3586037 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:32 -0400
Subject: [PATCH 1549/1853] cross-powerpc64le-linux-musl: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpc64le-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index a863233b5b32..57c07e1d780b 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,12 +6,12 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-powerpc64le-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 493408084fe443f89c770ec4c89189575a1675fb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:32 -0400
Subject: [PATCH 1550/1853] cross-powerpc64-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpc64-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 95e6ce653c3d..aaab613d01e9 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,12 +6,12 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 064b91002a32978201e8243e5ed613a7473622e3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:33 -0400
Subject: [PATCH 1551/1853] cross-powerpc64-linux-musl: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpc64-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index b081a136ef29..359557d3afb9 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,12 +6,12 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-powerpc64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 47f55c4e73a37a6e83fb976618815946306dfa7d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:33 -0400
Subject: [PATCH 1552/1853] cross-powerpcle-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpcle-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 32337f1c37cc..340a50e2af41 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,11 +5,11 @@ _glibc_version=2.36
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 358bb3a49689ac2738b5623d78cd78002a8710fc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:33 -0400
Subject: [PATCH 1553/1853] cross-powerpcle-linux-musl: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpcle-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 2f483e1f1ee5..4749c8965cdb 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From a0241016b46eca44f68c19ba3332232eb324108d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:34 -0400
Subject: [PATCH 1554/1853] cross-powerpc-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpc-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index c759eda4505a..327f3f911eb5 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 948637e49f529083f71bf363f87cf9bfde223db3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:34 -0400
Subject: [PATCH 1555/1853] cross-powerpc-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpc-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index e06970d76b9e..85ea78c257f9 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 791e37c1d6d4f280ad3ede6b1e8876820499b764 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:34 -0400
Subject: [PATCH 1556/1853] cross-x86_64-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-x86_64-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 0f6daea7229c..a079bb7ddbc6 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,10 +6,10 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-x86_64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 000134b1051870397bc763f8ca673ccc9b024124 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:35 -0400
Subject: [PATCH 1557/1853] cross-x86_64-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-x86_64-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 4984cd77f149..dfce8b30d0ba 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,10 +6,10 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-x86_64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 407aa75f4775b1f6152f5d0ace2395c585a107f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 30 Jun 2023 22:22:56 +0700
Subject: [PATCH 1558/1853] linux6.1: update to 6.1.36.

---
 srcpkgs/linux6.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 36c411cfd693..9068e8fd5b0f 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.34
+version=6.1.36
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a"
+ e5af3f72906e169cff7f09965a643e82d310e49d709ad2b373e07d2c06ce8688"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From f363649b13558619bb837755b4953c7454a44b5b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 01:29:09 +0530
Subject: [PATCH 1559/1853] pngquant: update to 3.0.1.

---
 srcpkgs/pngquant/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 3e93e4cdf81b..2c98a7abe75c 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,20 +1,13 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.18.0
+version=3.0.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-openmp"
+build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="lcms2-devel libgomp-devel libimagequant-devel libpng-devel"
+makedepends="lcms2-devel libpng-devel"
 short_desc="Lossy PNG compressor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
-distfiles="https://github.com/kornelski/pngquant/archive/${version}.tar.gz"
-checksum=424ff432e51dfc3cf5ff8001ad1b64198850686c5e3c26ecd477e4b69ef4fade
-make_check_target=test
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*) configure_args+=" --enable-sse";;
-	*) configure_args+=" --disable-sse";;
-esac
+distfiles="https://static.crates.io/crates/pngquant/pngquant-${version}.crate"
+checksum=f5ff78ab2fc7b2c58eefe4e37dc68c4757f95380874d478ec3a52e9fdf363ae3

From ee419dbe7f568a851f1cef4ddec2cb0c37f138e4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Jun 2023 20:48:01 +0200
Subject: [PATCH 1560/1853] linux5.4: update to 5.4.249.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 8bd845cec228..10456b6b5b9d 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.248
+version=5.4.249
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- 0d919e129bdd21bdd25f6f358b8da04a48b598de7baba067ce3e3489b5b4fadf"
+ 58f1a4f9bfb8b3df4227139074e57668938937dfe388df7e414891f1e2629abd"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From a9403606120d25cb4cbcf86a926b00a09775e2b3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Jun 2023 20:50:31 +0200
Subject: [PATCH 1561/1853] linux4.19: update to 4.19.288.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 52000a3f1f46..a035c030bdbe 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.287
+version=4.19.288
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 6b36e15b50116dc414473a3fec4e012139e622ef99d5b7128935e28f787245eb"
+ f1cad7af74870882e86ed573769b6c15fb8f29faefaef3950561841f21efcf8a"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From d47e200cd3d86fca8ba1a593643cbdf21b11a9b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 12:16:32 +0300
Subject: [PATCH 1562/1853] eclipse: update to 4.28.

---
 srcpkgs/eclipse/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 8aca89770689..4108117dabc6 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.27
+version=4.28
 revision=1
 #code name of version
-_release=2023-03
+_release=2023-06
 archs="x86_64"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
  hicolor-icon-theme desktop-file-utils"
@@ -17,8 +17,8 @@ make_dirs="/usr/lib/eclipse/dropins 0770 root users"
 _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=ccd07314798d6b152eb73321ff9a4e8252622a1e4d02f495c2f3d8c80e9156be
+distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
+checksum=142e33831fbbe52f53255a746b35a038dff0366a04cb4d3be2d8fe0ce76f34e8
 python_version=2
 
 do_install() {

From 14be0c91dbdf8815a14329eb39118985fe62582a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jun 2023 22:38:04 +0300
Subject: [PATCH 1563/1853] opera: update to 100.0.4815.30.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 309afaa56fa5..9ed3ab1ced11 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=99.0.4788.65
+version=100.0.4815.30
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=62bf232a8b648b59616a2a870a2afc0f4be77f74f8e898d2dfe1295058e1b2db
+checksum=31e4c9b6a2ea4712157295afe7714a87cd092761b457a00b2067fd4de7182a6c
 repository="nonfree"
 nostrip=yes
 

From 322c9221b42aa2140afae41652d309cbfeb933a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 30 Jun 2023 23:37:47 +0700
Subject: [PATCH 1564/1853] nss: update to 3.91.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 6fda2a8425eb..ff2fa52f4059 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.35
 
 pkgname=nss
-version=3.89.1
+version=3.91
 revision=1
 hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156
+checksum=84bd46376df17118c55f6d73d30fd93a0af21296c66e7690471547e5898fc4b3
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 3381f12e62dae418a3770ef383f18a1ed4be0180 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 30 Jun 2023 21:24:50 -0400
Subject: [PATCH 1565/1853] jdupes: update to 1.25.3

---
 srcpkgs/jdupes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 28914083a92a..9c77eb429b69 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.25.2
+version=1.25.3
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=c137d07a70bcf70e15e92365df6b69bd210bb7856b6f10a860529aa7afc324a7
+checksum=89814310bb1884db6023436c523d03e405e1dda722a01caa336167e7938ac95e
 
 post_install() {
 	vlicense LICENSE.txt

From dd82e7d589e86a20347f2482dedcc1ec490f4685 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 1 Jul 2023 12:07:06 +0200
Subject: [PATCH 1566/1853] gradle: update to 8.2.

Closes: #44757 [via git-merge-pr]
---
 srcpkgs/gradle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 20dbf2d21cac..6d8f114040ec 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,15 +1,15 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=8.1.1
+version=8.2
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
-maintainer="Adrian Siekierka <kontakt@asie.pl>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+checksum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 834973b1f5fa3de38820b64bacedce815ed5b959 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Jul 2023 14:03:29 +0200
Subject: [PATCH 1567/1853] srt: update to 1.5.2.

---
 srcpkgs/srt/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srt/template b/srcpkgs/srt/template
index d4cacce2ec64..76a4d1055c7c 100644
--- a/srcpkgs/srt/template
+++ b/srcpkgs/srt/template
@@ -1,6 +1,6 @@
 # Template file for 'srt'
 pkgname=srt
-version=1.5.1
+version=1.5.2
 revision=1
 build_style=cmake
 configure_args="
@@ -12,8 +12,9 @@ short_desc="Secure, Reliable, Transport"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/Haivision/srt"
+changelog="https://github.com/Haivision/srt/releases"
 distfiles="https://github.com/Haivision/srt/archive/refs/tags/v${version}.tar.gz"
-checksum=af891e7a7ffab61aa76b296982038b3159da690f69ade7c119f445d924b3cf53
+checksum=463970a3f575446b3f55abb6f323d5476c963c77b3c975cd902e9c87cdd9a92c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From b9148d0db57068e4153469a358ed6f2c5df73e57 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Jul 2023 14:04:36 +0200
Subject: [PATCH 1568/1853] srcpkgs: orphan some packages

---
 srcpkgs/megazeux/template | 2 +-
 srcpkgs/visitors/template | 2 +-
 srcpkgs/xye/template      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/megazeux/template b/srcpkgs/megazeux/template
index 63cba8f658e9..77cce87718a1 100644
--- a/srcpkgs/megazeux/template
+++ b/srcpkgs/megazeux/template
@@ -8,7 +8,7 @@ configure_args="--platform unix --enable-release --bindir /usr/lib/megazeux
  --gamesdir /usr/bin --disable-updater"
 makedepends="SDL2-devel libvorbis-devel libpng-devel"
 short_desc="Game creation system"
-maintainer="Adrian Siekierka <kontakt@asie.pl>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later"
 homepage="http://www.digitalmzx.net/"
 distfiles="http://vault.digitalmzx.net/download.php?latest=src&ver=${version}>${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/visitors/template b/srcpkgs/visitors/template
index e5eea5407605..24a7f8df075d 100644
--- a/srcpkgs/visitors/template
+++ b/srcpkgs/visitors/template
@@ -4,7 +4,7 @@ version=0.7
 revision=3
 build_style=gnu-makefile
 short_desc="Lightweight web log analyzer"
-maintainer="Adrian Siekierka <asiekierka@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.hping.org/visitors/"
 distfiles="http://www.hping.org/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/xye/template b/srcpkgs/xye/template
index d36a89c9ad29..74c1cc9173d7 100644
--- a/srcpkgs/xye/template
+++ b/srcpkgs/xye/template
@@ -5,7 +5,7 @@ revision=4
 build_style=gnu-configure
 makedepends="SDL_image-devel SDL_ttf-devel"
 short_desc="Puzzle game inspired by Kye"
-maintainer="Adrian Siekierka <asiekierka@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, custom:resource"
 homepage="http://xye.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"

From cbd05e93617ff98a0216629a261d89dcb677c9d4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Jun 2023 18:36:04 +0200
Subject: [PATCH 1569/1853] cppcheck: update to 2.11.1.

---
 srcpkgs/cppcheck/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 98f1af93b724..883be07710cb 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.11
+version=2.11.1
 revision=1
 build_style=cmake
 configure_args="
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=ef7d77c16e6903834cc016986a60157918a90958e981863746a7f3147bfb94c6
+checksum=fef6ef868d562d49136f158e1d0f7a38237e7e1c0a91d9189bdd465f1fe54316
 
 export CXXFLAGS="-DNDEBUG"
 
@@ -31,7 +31,6 @@ post_extract() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -e '/run-dmake/d' -i test/CMakeLists.txt -i cli/CMakeLists.txt
 	fi
-	vsed -e 's/"2.11"/"2.11.0"/' -i cmake/versions.cmake
 }
 
 post_install() {

From d875f89dab3a097b9853305a8aa7e053fa0a0387 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 11:18:13 +0530
Subject: [PATCH 1570/1853] toot: update to 0.37.0.

---
 srcpkgs/toot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index a8947848ccc2..b329e52a93ab 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,6 +1,6 @@
 # Template file for 'toot'
 pkgname=toot
-version=0.36.0
+version=0.37.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://toot.bezdomni.net"
 changelog="https://raw.githubusercontent.com/ihabunek/toot/master/CHANGELOG.md"
 distfiles="https://github.com/ihabunek/toot/archive/refs/tags/${version}.tar.gz"
-checksum=0aa554154d3a784e5e2345a8a2df9a90b877de6d888419194968807c942c7d73
+checksum=0a77bb5f4c4f0a0aa22d1cd292312096f6dc5164922184135a483fc41ae014e4

From 553c4865cc8ef334e0984af3bcc153e0111b3a3a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 15:45:18 +0530
Subject: [PATCH 1571/1853] rust-sccache: update to 0.5.4.

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index f16c5ebf6041..aaae926466ab 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.5.3
+version=0.5.4
 revision=1
 build_style=cargo
 # 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 changelog="https://github.com/mozilla/sccache/releases"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
+checksum=b1211a5c7a6dcbb1ef3fab4f3b0f194f05d9ee3a65f7001a908fda5ed61732ad
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 531ee2a67d31469bbc1255c2eacca140b24901a7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Fri, 30 Jun 2023 17:36:27 +0200
Subject: [PATCH 1572/1853] openttd: update to 13.3.

---
 srcpkgs/openttd/patches/regression_tests.patch | 4 ++--
 srcpkgs/openttd/template                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
index 2afc07eb4204..7f9394545329 100644
--- a/srcpkgs/openttd/patches/regression_tests.patch
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -1,7 +1,7 @@
 Fix regression tests on musl libc
 index 19fece83f5..641e1e6de2 100644
---- a/openttd-13.1/cmake/scripts/Regression.cmake
-+++ b/openttd-13.1/cmake/scripts/Regression.cmake
+--- a/openttd-13.3/cmake/scripts/Regression.cmake
++++ b/openttd-13.3/cmake/scripts/Regression.cmake
 @@ -53,6 +53,7 @@ endif()
  string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
  string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index 3649699062df..edce911a3093 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,6 +1,6 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=13.1
+version=13.3
 revision=1
 _gfxver=7.1
 _sfxver=1.0.3
@@ -29,7 +29,7 @@ distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
  https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
  https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
-checksum="5edf22d37035238285ef672a97d59e64280bebab23e584780834ccd6be0a58bb
+checksum="aafa16d2fb67165134c73a888f79f7a5ed7da17a04cf6e9ecf672c9cb89e7192
  928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
  e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
  5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"

From 7fc9c6f479e3a73450275177caa83ec676e4f010 Mon Sep 17 00:00:00 2001
From: Andrei <queyenth@gmail.com>
Date: Fri, 30 Jun 2023 21:40:27 +0600
Subject: [PATCH 1573/1853] protonmail-bridge: update to 3.3.0

---
 srcpkgs/protonmail-bridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index d25b19ead183..5d1315f6063c 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,6 +1,6 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=3.0.21
+version=3.3.0
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://proton.me/mail/bridge"
 distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=cd2d5a605f4a6fcffcb2e536caf7503958419bdeb8ec4e96aa2f9a481699e48a
+checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
 
 restricted=yes
 noverifyrdeps=yes

From 100ad3fd3462730f5c8f2e9c5df69b60d6bdafba Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 10:43:03 +0200
Subject: [PATCH 1574/1853] kanshi: update to 1.4.0.

---
 srcpkgs/kanshi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template
index e1dac36fc238..8f0c810e1386 100644
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@@ -1,6 +1,6 @@
 # Template file for 'kanshi'
 pkgname=kanshi
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://wayland.emersion.fr/kanshi/"
 changelog="https://git.sr.ht/~emersion/kanshi/refs"
 distfiles="https://git.sr.ht/~emersion/kanshi/archive/v${version}.tar.gz"
-checksum=733b2bdc8e57d0040f6f0ad91097548ced0188e8ae23b64fae96638a2be74375
+checksum=e9be76a969f526bd51217c0465f4f00bdb8ce176c1e58f08c7b2ed1b341ce653
 
 post_install() {
 	vlicense LICENSE

From 2e619a2ed60d5592e18b980c87a62f46bbce0d56 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Jun 2023 14:20:29 +0200
Subject: [PATCH 1575/1853] chroma: update to 2.8.0.

---
 srcpkgs/chroma/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 69b1adcd5a98..bc19f850d59e 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=2.7.0
-revision=2
+version=2.8.0
+revision=1
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=9d5d1f5ff7f91aff97b9eb7921e3540c863b5f01197b99a1362e777f7b43e215
+checksum=d6ddb56fd3cf0d7ae2c592f834aced1be4494f21338a79636743c25305a65a00
 
 do_check() {
 	go test -v

From f1a7a11ebb6ed685086cf999b94421fb5bae73de Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jun 2023 22:40:12 +0300
Subject: [PATCH 1576/1853] skype: update to 8.99.0.202.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 9928e91e7c9e..2ad810b427eb 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.98.0.402
+version=8.99.0.202
 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=a7ca6b4a81ce8a28f0d6106dbd928c9b7e6c6dff987b413d8f73e1757dc0de1c
+checksum=27e12b85f272f8406da3e3bf6f79e7e42035115322906bc529d679c1a077d437
 repository="nonfree"
 nostrip="yes"
 

From 3255b3b250625ae5c9819c69fd1885c4e3ac1ba6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:31:35 +0300
Subject: [PATCH 1577/1853] ristretto: update to 0.13.1.

Also:
- replace intltool with gettext (upstream, thanks classabbyamp)
- remove --with-locales-dir (and configure_args)
---
 srcpkgs/ristretto/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index 7aaf6162ce5f..f28924663a8a 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -1,10 +1,9 @@
 # Template file for 'ristretto'
 pkgname=ristretto
-version=0.13.0
+version=0.13.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
-hostmakedepends="intltool pkg-config glib-devel"
+hostmakedepends="gettext pkg-config glib-devel"
 makedepends="exo-devel file-devel libexif-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Picture-viewer for the Xfce desktop environment"
@@ -13,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/ristretto/start"
 changelog="https://gitlab.xfce.org/apps/ristretto/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=596676b41daada390c8d83e5bb83be6832a260f4bf0dbcc651ac0b68c0f4e301
+checksum=d71affbf15245067124725b153c908a53208c4ca1ba2d4df1ec5a1308d53791e

From b8586659e34e034c81fadea0ed54808023ea9a10 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 29 Jun 2023 05:11:50 -0500
Subject: [PATCH 1578/1853] focuswriter: update to 1.8.5.

---
 srcpkgs/focuswriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index ac98ed65cd9a..196cc3cdd61a 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -1,6 +1,6 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
-version=1.8.4
+version=1.8.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt6-tools"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gottcode.org/focuswriter/"
 distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
-checksum=fe28b35951de0f5c2f3c5b849dae2267f162ee1bf2b500dc77cdbd45a20cd95b
+checksum=456e1780a0e79023305571c0c63e26dae927c9f8862c746bab53dbb831be7d0b

From 7736ee5745d63d6febf8811b8b6da1823c6b18f0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 1 Jul 2023 08:35:13 -0500
Subject: [PATCH 1579/1853] aide: update to 0.18.5.

---
 srcpkgs/aide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index 32e90793100e..a4e2e5417539 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.18.4
+version=0.18.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=4f7e2c7f49f3ca25fdafad6170390a4d8c8334af17bbd48ad34dbd6dde4ee757
+checksum=58d63e6d16f5af296da427313861222426aec7610f4dbc76a1bc76310e1f1db5
 
 export MHASH_CFLAGS="=I${XBPS_CROSS_BASE}/usr/include"
 export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"

From 38600c70922fe312857aac2fc753e3f23a6c282a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 1 Jul 2023 08:43:49 -0500
Subject: [PATCH 1580/1853] focuswriter: fix cross

---
 srcpkgs/focuswriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index 196cc3cdd61a..8c693da0ede6 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -1,9 +1,9 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
 version=1.8.5
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="pkg-config qt6-tools"
+hostmakedepends="pkg-config qt6-tools qt6-base"
 makedepends="hunspell-devel pulseaudio-devel qt6-multimedia-devel"
 short_desc="Simple, distraction-free word processor with a hide-away interface"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From cf5901f133b533f1f12e4c324904c617a4ef542a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 09:41:06 -0400
Subject: [PATCH 1581/1853] imhex: update to 1.30.1.

---
 srcpkgs/imhex/patches/sort-file-chooser.patch | 27 -------------------
 srcpkgs/imhex/template                        |  6 ++---
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/imhex/patches/sort-file-chooser.patch

diff --git a/srcpkgs/imhex/patches/sort-file-chooser.patch b/srcpkgs/imhex/patches/sort-file-chooser.patch
deleted file mode 100644
index 90bf07de6700..000000000000
--- a/srcpkgs/imhex/patches/sort-file-chooser.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f57d4f2f7adb44b97f9696c94d3178e4ccebcd99 Mon Sep 17 00:00:00 2001
-From: WerWolv <werwolv98@gmail.com>
-Date: Sun, 21 May 2023 18:41:43 +0200
-Subject: [PATCH] impr: Manually sort file chooser popup list
-
----
- .../builtin/include/content/popups/popup_file_chooser.hpp  | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/builtin/include/content/popups/popup_file_chooser.hpp b/plugins/builtin/include/content/popups/popup_file_chooser.hpp
-index ce464aeee76d..e52c040c27ea 100644
---- a/plugins/builtin/include/content/popups/popup_file_chooser.hpp
-+++ b/plugins/builtin/include/content/popups/popup_file_chooser.hpp
-@@ -13,7 +13,12 @@ namespace hex::plugin::builtin {
-                 : hex::Popup<PopupFileChooser>("hex.builtin.common.choose_file"),
-                   m_indices({ }), m_files(files),
-                   m_openCallback(callback),
--                  m_validExtensions(validExtensions), m_multiple(multiple) { }
-+                  m_validExtensions(validExtensions), m_multiple(multiple) {
-+
-+            std::sort(this->m_files.begin(), this->m_files.end(), [](const std::fs::path &a, const std::fs::path &b) {
-+                return a.filename() < b.filename();
-+            });
-+        }
- 
-         void drawContent() override {
-             bool doubleClicked = false;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 6c8761e81fc8..3f7f4750389e 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,6 +1,6 @@
 # Template file for 'imhex'
 pkgname=imhex
-version=1.29.0
+version=1.30.1
 revision=1
 build_wrksrc="ImHex"
 build_style=cmake
@@ -20,8 +20,8 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="25a8b250412e5b870871978e58cd5f5c08bd42587122ab7799c59eec31843c46
- a237a4fcf565af6b4ad94ec71f50b284bef3af93a13da744092da7e83d7767c0"
+checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
+ 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
 patch_args="-Np1 -d $build_wrksrc"
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then

From 99d4914c75e52350e36b90766b13a470b09690a0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 09:41:14 -0400
Subject: [PATCH 1582/1853] pyright: update to 1.1.316.

---
 srcpkgs/pyright/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index f8bb5adf6691..fb6f95c5cef2 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.315
+version=1.1.316
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=6c3d404815527b8143b9eab0e3978b3126a95d9e8502177ebb4f1b23a437896e
+checksum=9601cc32ece6dc6db312c4b947f4c85908a4de75890ffa6519421728d0ee4119
 
 do_configure() {
 	cd "$wrksrc"

From 5582ef3698c18381239eab36ab1665a7aa1fc69e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 09:41:20 -0400
Subject: [PATCH 1583/1853] typst: update to 0.6.0.

---
 srcpkgs/typst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 7d517adbf6cd..48ce0da20442 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -1,7 +1,7 @@
 # Template file for 'typst'
 pkgname=typst
 reverts="23.03.28_1"
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cargo
 make_install_args="--path cli"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://typst.app"
 changelog="https://typst.app/docs/changelog/"
 distfiles="https://github.com/typst/typst/archive/refs/tags/v${version}.tar.gz"
-checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
+checksum=0f5c16c2143bbdc8889d823506e29a4706f8606ce29769916d71b17a05dda568
 
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"

From bcd4d1ed8c0b9900079f7e69634a26ed846f93b6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jun 2023 22:59:14 +0300
Subject: [PATCH 1584/1853] rssguard: update to 4.4.0.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 2f85cfb29f84..fe08f9c237c2 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.3.4
+version=4.4.0
 revision=1
 build_style=cmake
 configure_args="-DUSE_WEBENGINE=false"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=139db542e82be8c958f6a4c5e5fd0beb1c3c06a7d6b84706d0deb08131de350a
+checksum=38726783d72c3e68c72ace73b46b610f5ea51dcc1085526a932913eb441870da
 
 post_install() {
 	# Install rssguard icon manually

From cf7f43e23521fa85bad8156aeeb1fb9dfa62b072 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 11:48:55 -0400
Subject: [PATCH 1585/1853] noto-fonts-ttf: update to 23.7.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 554f1c2ceac1..cda4ce869356 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.6.1
+version=23.7.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=4a52070a67ce1f9c74eb74645bfa769d5df43bf1268123e733a5ac56cb36c476
+checksum=f2fd4738436bde60583fffdbd99744e85c821903a47847b72532c221a29227b4
 font_dirs="/usr/share/fonts/noto"
 
 do_install() {

From 00574cf83a3d5235a40ea4097762462b9c57ae7d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Jul 2023 18:00:05 +0200
Subject: [PATCH 1586/1853] opensmtpd: update to 7.3.0p1.

---
 srcpkgs/opensmtpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 2878481668df..6d20f0159d6b 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,6 +1,6 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=7.3.0p0
+version=7.3.0p1
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
@@ -22,7 +22,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=2dd7a5a8ca127be7eb491540405684acb3dd04d93ad23d7709accd2b0450cae6
+checksum=1b46cd41a1c2738757cc3a0e4aea71f3c6db56def727f7261bcd362583345a07
 provides="smtp-forwarder-0_1 smtp-server-0_1"
 replaces="smtp-forwarder>=0 smtp-server>=0"
 system_accounts="_smtpd _smtpq"

From d598c854935407588f22a82352c617c9f5a8896a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Jul 2023 18:03:59 +0200
Subject: [PATCH 1587/1853] weechat: update to 4.0.1.

---
 srcpkgs/weechat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index ffcbf8b9e5be..972c5ef1c446 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,6 +1,6 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=5bd75ee15f3392a0ad174ee7c54518daece3878477670c07f10d6ebf988240f9
+checksum=1b9533123af427922b3d7fabede958dc85392d50881d97d0b7986d8f514556e9
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From a55f626d851339c3e684d96600082a962c544e54 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Jul 2023 17:53:42 +0200
Subject: [PATCH 1588/1853] elixir: update to 1.15.1.

---
 ...5eca5af294a8afbed5bc73c178da18f0055c.patch | 29 --------------
 ...4e6830d0f44e26179582a16fef6f642df754.patch | 38 -------------------
 srcpkgs/elixir/template                       |  6 +--
 3 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
 delete mode 100644 srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch

diff --git a/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch b/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
deleted file mode 100644
index 06f5976e2c69..000000000000
--- a/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 73b65eca5af294a8afbed5bc73c178da18f0055c Mon Sep 17 00:00:00 2001
-From: cjschneider2 <cjschneider2@users.noreply.github.com>
-Date: Fri, 23 Jun 2023 16:04:29 +0200
-Subject: [PATCH] Use printf instead of echo to output user flags (#12704)
-
-Fixes #12677.
-
-Using printf here prevents an error when outputting the filtered flag
-`-e` as doing with with `echo "-e"` doesn't output anything
-(deleting the option we wanted to filter).
-
-More info: https://unix.stackexchange.com/a/65819
----
- bin/elixir | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/elixir b/bin/elixir
-index 3c0323f0f1..cb0a84650b 100755
---- a/bin/elixir
-+++ b/bin/elixir
-@@ -233,7 +233,7 @@ set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SC
- if [ -n "$RUN_ERL_PIPE" ]; then
-   ESCAPED=""
-   for PART in "$@"; do
--    ESCAPED="$ESCAPED $(echo "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
-+    ESCAPED="$ESCAPED $(printf '%s' "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
-   done
-   mkdir -p "$RUN_ERL_PIPE"
-   mkdir -p "$RUN_ERL_LOG"
diff --git a/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch b/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
deleted file mode 100644
index 4512ad60e37b..000000000000
--- a/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9b254e6830d0f44e26179582a16fef6f642df754 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
-Date: Tue, 20 Jun 2023 12:31:53 +0200
-Subject: [PATCH] Do not expect OTP to be compiled with docs, closes #12677
-
----
- lib/mix/test/mix/tasks/compile_test.exs | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
-index cdc40977c7..c4e672ffd2 100644
---- a/lib/mix/test/mix/tasks/compile_test.exs
-+++ b/lib/mix/test/mix/tasks/compile_test.exs
-@@ -329,16 +329,22 @@ defmodule Mix.Tasks.CompileTest do
-     Application.delete_env(:sample, :hello, persistent: true)
-   end
- 
--  test "code path prunning" do
-+  test "code path pruning" do
-     Mix.ensure_application!(:parsetools)
-+    otp_docs? = match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:zlib))
- 
-     in_fixture("no_mixfile", fn ->
-       assert Mix.Task.run("compile", []) == {:ok, []}
-       assert :code.where_is_file(~c"parsetools.app") == :non_existing
- 
-       # Make sure erts is also kept but not loaded
--      assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
-       assert Application.spec(:erts, :vsn) == nil
-+
-+      if otp_docs? do
-+        assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
-+      else
-+        IO.warn("Erlang/OTP was not compiled with docs, skipping assertion")
-+      end
-     end)
-   end
- 
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 0e475ae139f1..2b1bb9af0130 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.15.0
+version=1.15.1
 revision=1
 build_style=gnu-makefile
 make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
@@ -17,7 +17,7 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=0f4df7574a5f300b5c66f54906222cd46dac0df7233ded165bc8e80fd9ffeb7a
+checksum=cf89434f4cf7477b929c56e16ae22bf08e64101a144911d2834a2f3c9b3ae40f
 
 post_patch() {
 	# XXX: find a better solution
@@ -26,8 +26,6 @@ post_patch() {
 	# left:  "/usr/lib/erlang"
 	# right: "/usr/lib64/erlang"
 	vsed -e '/assert root_dir == :code\.root_dir()/d' -i lib/mix/test/mix/tasks/release_test.exs
-	# orig file caused by line offset of the issue 12704 diff
-	rm bin/elixir.orig
 }
 
 do_check() {

From 4a69562fafdb2e90093ad314dcfd128fda36d9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 1 Jul 2023 17:12:11 -0300
Subject: [PATCH 1589/1853] igraph: update to 0.10.5.

---
 srcpkgs/igraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
index 30772d74a2fa..44e52818d4ec 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,6 +1,6 @@
 # Template file for 'igraph'
 pkgname=igraph
-version=0.10.4
+version=0.10.5
 revision=1
 build_style=cmake
 configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://igraph.org/c/"
 changelog="https://github.com/igraph/igraph/releases"
 distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
-checksum=aa5700b58c5f1e1de1f4637ab14df15c6b20e25e51d0f5a260921818e8f02afc
+checksum=1c2725122fda9b72065095794bc7748939d90d942d312cb63c6160cd98d50f1e
 
 build_options="openblas"
 

From 6c7f958a91e46524c122c27c68242fbe8e2c1a51 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 12:05:59 +0530
Subject: [PATCH 1590/1853] hurl: update to 4.0.0.

---
 srcpkgs/hurl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hurl/template b/srcpkgs/hurl/template
index 5881b444a7af..6de478686c53 100644
--- a/srcpkgs/hurl/template
+++ b/srcpkgs/hurl/template
@@ -1,9 +1,10 @@
 # Template file for 'hurl'
 pkgname=hurl
-version=3.0.1
+version=4.0.0
 revision=1
 build_style=cargo
-make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl"
+make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl
+ --skip=simple sample"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libcurl-devel libxml2-devel"
 short_desc="CLI to run HTTP requests defined in a simple plain text format"
@@ -12,7 +13,7 @@ license="Apache-2.0"
 homepage="https://hurl.dev"
 changelog="https://raw.githubusercontent.com/Orange-OpenSource/hurl/master/CHANGELOG.md"
 distfiles="https://github.com/Orange-OpenSource/hurl/archive/refs/tags/${version}.tar.gz"
-checksum=551a730ed23150bc0a120781abe8c36b2989abc03c97c3e79191eea87cca5632
+checksum=43b5943b8135a0b2c0bb16897291e641f38e7e81aab17a18ee3d6eb5e1cd0d48
 
 if [[ "$XBPS_WORDSIZE" -eq 32 ]]; then
 	make_check=no # https://github.com/Orange-OpenSource/hurl/issues/1220

From 8743d3ceb9a91979ab40659f6298e38c19710219 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Sat, 1 Jul 2023 14:46:57 -0300
Subject: [PATCH 1591/1853] czkawka: update to 6.0.0.

---
 srcpkgs/czkawka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/czkawka/template b/srcpkgs/czkawka/template
index 4bb96fd8bc0d..08b9392fa1ea 100644
--- a/srcpkgs/czkawka/template
+++ b/srcpkgs/czkawka/template
@@ -1,6 +1,6 @@
 # Template file for 'czkawka'
 pkgname=czkawka
-version=5.1.0
+version=6.0.0
 revision=1
 build_style=cargo
 build_helper=rust
@@ -14,7 +14,7 @@ maintainer="sirkhancision <jsantiago12tone@gmail.com>"
 license="MIT"
 homepage="https://github.com/qarmin/czkawka"
 distfiles="https://github.com/qarmin/czkawka/archive/refs/tags/${version}.tar.gz"
-checksum=346c256ef215fa029a78c8150fcac1815e0c7f98319a167e18c5239e04849068
+checksum=32dc1d8a55bc3ce478246830a1f81679affa85735e69aa049fd83e30271e368f
 
 do_check() {
 	dbus-run-session xvfb-run -s '-nolisten local' cargo test --bin czkawka_gui --release

From 64c0e31c6c538384b724a6de1fdc092a0d41732f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 00:37:31 +0530
Subject: [PATCH 1592/1853] osv-scanner: update to 1.3.5.

---
 srcpkgs/osv-scanner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index ff02f965d680..2c98317fbe07 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,6 +1,6 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
-version=1.3.4
+version=1.3.5
 revision=1
 build_style=go
 go_import_path="github.com/google/osv-scanner"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://google.github.io/osv-scanner/"
 changelog="https://raw.githubusercontent.com/google/osv-scanner/main/CHANGELOG.md"
 distfiles="https://github.com/google/osv-scanner/archive/refs/tags/v${version}.tar.gz"
-checksum=19229149eca937a4da60ca29416fe1ea6997655fd10e273b833082ef5977a3de
+checksum=fe4566f1159b33827ad64f86219c8a2f6497cf92fe8d8c9388a7148880396a38
 
 do_check() {
 	go test ./...

From 4c3e3b2b837b53e6061ab073f2d138977d0b298d Mon Sep 17 00:00:00 2001
From: Heinrich Kruger <heindsight@kruger.dev>
Date: Sat, 1 Jul 2023 14:53:42 +0100
Subject: [PATCH 1593/1853] zoom: update to 5.15.2.4260.

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 4271caca95a0..177afbd77f5c 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.15.0.4063
+version=5.15.2.4260
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=5cd162d5a86144e4f87967f5a132c7f0b8cb6d9585fdc02d1ae0ea8a20bbe9db
+checksum=9074a59845a9c7f92d7914a9c77cb00b60c6c3754a40a95dc557f051f24b512a
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From f0d70a1ac02bd9bcb8cebcedcfa586d01284bc95 Mon Sep 17 00:00:00 2001
From: Heinrich Kruger <heindsight@kruger.dev>
Date: Fri, 30 Jun 2023 18:50:28 +0100
Subject: [PATCH 1594/1853] 1password: update to 8.10.8

---
 srcpkgs/1password/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index e4a929e497ae..92c7fde50229 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,6 +1,6 @@
 # Template file for '1password'
 pkgname=1password
-version=8.10.7
+version=8.10.8
 revision=1
 archs="x86_64 aarch64"
 hostmakedepends="gnupg"
@@ -12,14 +12,14 @@ homepage="https://www.1password.com"
 case "${XBPS_TARGET_MACHINE}" in
 	aarch64)
 		_arch="arm64"
-		checksum="4e6a1ffa66b54893104525754f97e52de5df7ba5b56b6536998ce2f8caf1bc93
- 31dd56227da961b346c5e00aebfe44b065cecb06314c144c3572033777d5c6d0"
+		checksum="57fa891ede3da4f126d60f76844402b1c989dd99121d3636a00ebd77a0f19265
+ e354e5621259b164d9136fa9947a0e617b4e993ff3c0a57b4279900f5b4dcf1e"
 		;;
 
 	x86_64)
 		_arch="x64"
-		checksum="e4a300cecb683e636015e8e9db547c3dc76b994b645f7ab11d85f7ad5e49ab21
- 572508224d18cceb7efe66ed2db3c52f2cfd7f572c7e107e9d7b8439340d17ac"
+		checksum="13b957cb1a012f6ce2308222b2c909261679ca62b2bafe335c4aa2814b54e352
+ 99e5d9dc9b348d96d8349d68f2a45d11461e2fd2e5c948ad9f4a2c5fcf6af259"
 		;;
 esac
 

From 8de6859f66f823a494f62e19e00bb6b3d65911e3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 15:38:09 +0200
Subject: [PATCH 1595/1853] zls: fix update check

---
 srcpkgs/zls/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/zls/update

diff --git a/srcpkgs/zls/update b/srcpkgs/zls/update
new file mode 100644
index 000000000000..85f55914204f
--- /dev/null
+++ b/srcpkgs/zls/update
@@ -0,0 +1,2 @@
+site=https://github.com/zigtools/zls/releases
+pattern="zls \K[\d.]+"

From 30572ff340b6d0dfe65469740b2b19f0dcc5e177 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 09:36:17 +0200
Subject: [PATCH 1596/1853] got: update to 0.90.

---
 srcpkgs/got/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 873094582d8a..1f2521923f3e 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
 # Template file for 'got'
 pkgname=got
-version=0.89
+version=0.90
 revision=1
 build_style=gnu-configure
 hostmakedepends="byacc pkg-config"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://gameoftrees.org"
 changelog="https://gameoftrees.org/releases/CHANGES"
 distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="27404932c07713400124c15e318417385411b7a1fe7ee534e48f2b9e4f096d8c"
+checksum=da353f43a5b91b563f1d9be4b2bdb50fddfffc70b0a4b777fa5dd114629bf783
 
 post_install() {
 	sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE

From 830802f1ae898e21c0fb435bd69e1419bd77ca24 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 09:30:19 +0200
Subject: [PATCH 1597/1853] containerd: update to 1.7.2, orphan

---
 srcpkgs/containerd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index 932e245800bb..0c74e43bb6ca 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
-version=1.6.10
-revision=2
+version=1.7.2
+revision=1
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd
@@ -16,11 +16,11 @@ hostmakedepends="pkg-config go-md2man"
 makedepends="libbtrfs-devel libseccomp-devel"
 depends="runc"
 short_desc="Open and reliable container runtime"
-maintainer="Paul Knopf <pauldotknopf@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/containerd/containerd"
 distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz"
-checksum=57be0d7b448abc83f2d1e0045864ffec83e6afa0c7e54548b50d67152686745e
+checksum=68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43
 make_dirs="/var/lib/containerd 0755 root root"
 
 post_build() {

From 1dbeb42ca68f40a83b8170a65b4441a72324f550 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 1 Jul 2023 16:36:27 +0200
Subject: [PATCH 1598/1853] bluez: update to 5.68.

---
 srcpkgs/bluez/patches/max-input.patch | 15 ---------------
 srcpkgs/bluez/template                |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/bluez/patches/max-input.patch

diff --git a/srcpkgs/bluez/patches/max-input.patch b/srcpkgs/bluez/patches/max-input.patch
deleted file mode 100644
index f11c1684d82f..000000000000
--- a/srcpkgs/bluez/patches/max-input.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Required for musl, taken from alpine: https://git.alpinelinux.org/aports/tree/main/bluez/max-input.patch
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 0a0308c..a2b8c23 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -65,7 +65,7 @@ void *util_memdup(const void *src, size_t size)
- void util_debug_va(util_debug_func_t function, void *user_data,
- 				const char *format, va_list va)
- {
--	char str[MAX_INPUT];
-+	char str[_POSIX_MAX_INPUT];
- 
- 	if (!function || !format)
- 		return;
-
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index d66ca51557f4..f1a1ca5b72fa 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.66
+version=5.68
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574
+checksum=fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From 8b81f8d033e71f90e3a66448252e3dd4c98699f6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 13:29:26 +0530
Subject: [PATCH 1599/1853] python3-yamllint: update to 1.32.0.

---
 srcpkgs/python3-yamllint/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index e8e1db1290a8..6bb91ed36037 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-yamllint'
 pkgname=python3-yamllint
-version=1.30.0
+version=1.32.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pathspec python3-setuptools python3-yaml"
-checkdepends="python3-pytest python3-pathspec python3-yaml"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-pathspec python3-yaml"
+checkdepends="${depends} python3-pytest-xdist"
 short_desc="Python 3 linter for YAML files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/yamllint"
 changelog="https://github.com/adrienverge/yamllint/raw/master/CHANGELOG.rst"
 distfiles="https://github.com/adrienverge/yamllint/archive/refs/tags/v${version}.tar.gz"
-checksum=8a4a6b2d15f9c6d97f012408eb811e62dd00554fbb4db4a2017dc2c8d1ee1da5
+checksum=08ee588189ce7909401894b2f93375366271132a3ae3afc2de2665b27baf2d5f
 conflicts="python-yamllint>=0"
 
 # These test cases require locale support, which musl libc lacks, so these tests are expected to fail

From 7c05fc6cc13f82f06f77a760c18238a772a00d8e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:18:37 +0100
Subject: [PATCH 1600/1853] calibre: poppler-utils -> poppler

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0bed9e49972e..04bd9fe283fc 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -15,7 +15,7 @@ makedepends="libinput-devel libmagick-devel libmtp-devel libstemmer-devel
  freetype-devel uchardet-devel openssl-devel icu-devel libusb-devel
  sqlite-devel tslib-devel hunspell-devel hyphen-devel libstemmer-devel
  python3-pyqt6-devel python3-pyqt6-webengine-devel"
-depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
+depends="desktop-file-utils optipng poppler python3-BeautifulSoup4
  qt6-imageformats python3-Pygments python3-pycryptodome
  python3-Markdown python3-Pillow python3-zeroconf python3-Pygments python3-apsw
  python3-css-parser python3-cssselect python3-dateutil python3-jeepney

From 96ebf7b954e35b39b08a6b751ed2d7955425c2f6 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:18:59 +0100
Subject: [PATCH 1601/1853] cups-filters: poppler-utils -> poppler

---
 srcpkgs/cups-filters/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 4e475d018054..e7a796d5fbcf 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -6,11 +6,10 @@ build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS
  --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
-hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler-utils
- liblouis"
+hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler liblouis"
 makedepends="avahi-glib-libs-devel cups-devel fontconfig-devel liblouis-devel
  ghostscript-devel lcms2-devel libqpdf-devel poppler-cpp-devel libexif-devel"
-depends="bc ghostscript libcups-filters-${version}_${revision} poppler-utils"
+depends="bc ghostscript libcups-filters-${version}_${revision} poppler"
 checkdepends="dejavu-fonts-ttf"
 conf_files="/etc/cups/cups-browsed.conf"
 short_desc="OpenPrinting CUPS Filters"

From 9dd0ebb3fc1c592d19347a5c3254e34e14f12d8d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:19:18 +0100
Subject: [PATCH 1602/1853] pdfsandwhich: poppler-utils -> poppler

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index 82f2f934fdc1..325222502a57 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"
-depends="tesseract-ocr ImageMagick ghostscript poppler-utils unpaper"
+depends="tesseract-ocr ImageMagick ghostscript poppler unpaper"
 short_desc="CLI tool which is useful to add OCR to scanned books or journals"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="GPL-2.0-only"

From b63415e6daff85e0b00757ad516107f3659e71af Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:19:56 +0100
Subject: [PATCH 1603/1853] xpdf: poppler-utils -> poppler

---
 srcpkgs/xpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index 854150d56eb5..6309c5c8f778 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -25,7 +25,7 @@ post_install() {
 	# copy sample xpdfrc
 	vmkdir etc
 	vinstall doc/sample-xpdfrc 644 etc xpdfrc
-	# already in poppler-utils
+	# already in poppler
 	rm $DESTDIR/usr/bin/pdf*
 	rm $DESTDIR/usr/share/man/man1/pdf*
 }

From a059ca85fa671665faa9f3c67ba331944e1ca700 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 2 Jul 2023 15:55:56 +0300
Subject: [PATCH 1604/1853] srcpkgs: orphaning

Closes: #44789 [via git-merge-pr]
---
 srcpkgs/nemo-audio-tab/template            | 2 +-
 srcpkgs/nemo-compare/template              | 2 +-
 srcpkgs/nemo-emblems/template              | 2 +-
 srcpkgs/nemo-extensions/template           | 2 +-
 srcpkgs/nemo-image-converter/template      | 2 +-
 srcpkgs/nemo-preview/template              | 2 +-
 srcpkgs/nemo-python/template               | 2 +-
 srcpkgs/nemo-terminal/template             | 2 +-
 srcpkgs/python3-distro/template            | 2 +-
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
index a7788a0acafa..7f595e46880c 100644
--- a/srcpkgs/nemo-audio-tab/template
+++ b/srcpkgs/nemo-audio-tab/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python python3-mutagen"
 short_desc="Nemo audio tab extention"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index 9e8cb9e4b46e..eca7719edc33 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python meld"
 short_desc="Nemo compare extention"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
index 153f10e52906..681498ca8b08 100644
--- a/srcpkgs/nemo-emblems/template
+++ b/srcpkgs/nemo-emblems/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python"
 short_desc="Nemo extension for changing emblems in files/dirs"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index ec953536f50c..ac7a2cb16a2d 100644
--- a/srcpkgs/nemo-extensions/template
+++ b/srcpkgs/nemo-extensions/template
@@ -13,7 +13,7 @@ depends="
  nemo-emblems>=${version}
  nemo-terminal>=${version}"
 short_desc="Extentions for nemo file manager"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause" #no vlicense
 homepage="https://github.com/linuxmint/nemo-extensions"
 
diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
index 9bc7f196636d..f0458c09ca27 100644
--- a/srcpkgs/nemo-image-converter/template
+++ b/srcpkgs/nemo-image-converter/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config gettext"
 makedepends="nemo-devel libglib-devel"
 depends="ImageMagick"
 short_desc="Nemo image converter extension"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index beb14c4662a4..2cbac5160b2f 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config gettext gobject-introspection glib-devel"
 makedepends="nemo-devel  libmusicbrainz5-devel cjs-devel clutter-devel
  clutter-gtk-devel clutter-gst3-devel libxreader-devel gtksourceview4-devel webkit2gtk-devel"
 short_desc="Nemo preview extension"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index 5218bc746ab4..630302ee848a 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -7,7 +7,7 @@ build_style=meson
 hostmakedepends="pkg-config"
 makedepends="nemo-devel python3-devel python3-gobject-devel"
 short_desc="Nemo python binding"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
index b3f7679db2a0..5029a82836a6 100644
--- a/srcpkgs/nemo-terminal/template
+++ b/srcpkgs/nemo-terminal/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python vte3 glib gtk+3 xapps"
 short_desc="Nemo terminal extention"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index e8366a9193de..93d66fba5da2 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-wheel"
 depends="python3"
 checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 changelog="https://raw.githubusercontent.com/python-distro/distro/master/CHANGELOG.md"
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index f04aa3c6b4b5..202735222e95 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-poetry-core"
 depends="python3-pytest python3-Werkzeug"
 checkdepends="${depends} python3-MarkupSafe python3-requests"
 short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.github.com/csernazs/pytest-httpserver"
 changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"

From 04da1b47f9837130dd2b204544951c72a6424d8b Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 2 Jul 2023 20:05:41 +0900
Subject: [PATCH 1605/1853] watchdog: fix build on musl

---
 srcpkgs/watchdog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/watchdog/template b/srcpkgs/watchdog/template
index 743b8d4f1291..3d410fc469e6 100644
--- a/srcpkgs/watchdog/template
+++ b/srcpkgs/watchdog/template
@@ -7,14 +7,10 @@ short_desc="Software watchdog daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/watchdog/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/watchdog/watchdog-${version}.tar.gz"
 checksum=b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d
 conf_files="/etc/watchdog.conf"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	broken="nfsmount.h:9:10: fatal error: rpc/rpc.h: No such file or directory"
-fi
-
 post_install() {
 	vsv watchdog
 }

From f47c89ac96e24d3cf1bbe7961ad7d5f1b1c7a523 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 2 Jul 2023 09:54:04 +0200
Subject: [PATCH 1606/1853] system-monitoring-center: update to 2.17.0

---
 srcpkgs/system-monitoring-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/system-monitoring-center/template b/srcpkgs/system-monitoring-center/template
index 0fac7cee3d7c..376ed6ae7794 100644
--- a/srcpkgs/system-monitoring-center/template
+++ b/srcpkgs/system-monitoring-center/template
@@ -1,6 +1,6 @@
 # Template file for 'system-monitoring-center'
 pkgname=system-monitoring-center
-version=2.14.0
+version=2.17.0
 revision=1
 build_style=meson
 hostmakedepends="kdelibs4support-devel gettext"
@@ -10,4 +10,4 @@ maintainer="zenobit <zen@osowoso.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/hakandundar34coding/system-monitoring-center"
 distfiles="https://github.com/hakandundar34coding/system-monitoring-center/archive/refs/tags/v${version}.tar.gz"
-checksum=0ae387300d5a30c1323cb6f0f037cfe0d304270560018bb41933046eb20b2763
+checksum=433e0e06ba2e49c81c19eaa47641a354a5bc4a866db6cbb59544a84943edc831

From ba21439b57276825d28ef8301e3cda330138a71b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 09:18:00 +0200
Subject: [PATCH 1607/1853] ansifilter: update to 2.20.

---
 srcpkgs/ansifilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansifilter/template b/srcpkgs/ansifilter/template
index 30519cb8ef6c..758c50e65743 100644
--- a/srcpkgs/ansifilter/template
+++ b/srcpkgs/ansifilter/template
@@ -1,6 +1,6 @@
 # Template file for 'ansifilter'
 pkgname=ansifilter
-version=2.18
+version=2.20
 revision=1
 build_style=gnu-makefile
 short_desc="Remove or convert ANSI codes to another format"
@@ -8,4 +8,4 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://gitlab.com/saalen/ansifilter"
 distfiles="https://gitlab.com/saalen/ansifilter/-/archive/${version}/ansifilter-${version}.tar.gz"
-checksum=e91cc14bd5a464cfd39e77a254ea6e12314a2b7d4554766d6b7043a8cb5faa04
+checksum=96aad3c95113e921ab912b63152471e5b532a54ecfe90d8c86b2c9127c3aa39b

From bf7164ee68b8b38fcf1579cacca8b58f5f7309b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 1 Jul 2023 02:03:06 +0200
Subject: [PATCH 1608/1853] arti: update to 1.1.6.

---
 srcpkgs/arti/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index d6be792e376c..d7b72dc4915c 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
 # Template file for 'arti'
 pkgname=arti
-version=1.1.5
+version=1.1.6
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0, MIT"
 homepage="https://gitlab.torproject.org/tpo/core/arti"
 changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
 distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=1ac43aa8ae742d516724bd1f7b412a5a979b5007b88f9eed2d8ab06e92bb28f4
+checksum=a438507af31078eec90018709529b9c6ebfefefb55827019c83a8e9ec2b5b56c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	case "$XBPS_TARGET_MACHINE" in

From ab66ca9029ed4590166191b52960bf5935962514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 1 Jul 2023 02:27:35 +0200
Subject: [PATCH 1609/1853] netavark: update to 1.7.0.

---
 srcpkgs/netavark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netavark/template b/srcpkgs/netavark/template
index 4bc741f29a5f..c4dd300f9366 100644
--- a/srcpkgs/netavark/template
+++ b/srcpkgs/netavark/template
@@ -1,6 +1,6 @@
 # Template file for 'netavark'
 pkgname=netavark
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=cargo
 hostmakedepends="mandown protobuf"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/netavark"
 changelog="https://raw.githubusercontent.com/containers/netavark/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/netavark/archive/refs/tags/v${version}.tar.gz"
-checksum=3bec9e9b0f3f8f857370900010fb2125ead462d43998ad8f43e4387a5b06f9d6
+checksum=b0ed7d80fd96ef2af88e7a001d91024919125e5842d9772de94648044630e116
 # needs unshare which cannot be used in CI
 make_check=ci-skip
 

From 560f79a6ae7238a55bce35c01afcad945186b3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 1 Jul 2023 02:27:41 +0200
Subject: [PATCH 1610/1853] aardvark-dns: update to 1.7.0.

---
 srcpkgs/aardvark-dns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aardvark-dns/template b/srcpkgs/aardvark-dns/template
index c4a47746f1f3..ab5e1737f06f 100644
--- a/srcpkgs/aardvark-dns/template
+++ b/srcpkgs/aardvark-dns/template
@@ -1,6 +1,6 @@
 # Template file for 'aardvark-dns'
 pkgname=aardvark-dns
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=cargo
 short_desc="Authoritative dns server for A/AAAA container records"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/aardvark-dns"
 changelog="https://raw.githubusercontent.com/containers/aardvark-dns/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/aardvark-dns/archive/refs/tags/v${version}.tar.gz"
-checksum=f3a2ff2d7baf07d8bf2785b6f1c9618db8aa188bd738b7f5cf1b0a31848232f5
+checksum=6ee7dfa8bab8040b917959a2f57f25496ad036a2d933c6225114e2c1e68bab0b
 
 post_install() {
 	vmkdir usr/libexec/podman

From 1cf85bd116e3d0d5866e5ed54b513a63d19bc65b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Apr 2023 19:13:48 -0300
Subject: [PATCH 1611/1853] arpack-ng: update to 3.9.0.

---
 srcpkgs/arpack-ng/patches/b3fe4ad7.patch | 518 +++++++++++++++++++++++
 srcpkgs/arpack-ng/template               |   7 +-
 srcpkgs/arpack-ng/update                 |   4 -
 3 files changed, 521 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/arpack-ng/patches/b3fe4ad7.patch
 delete mode 100644 srcpkgs/arpack-ng/update

diff --git a/srcpkgs/arpack-ng/patches/b3fe4ad7.patch b/srcpkgs/arpack-ng/patches/b3fe4ad7.patch
new file mode 100644
index 000000000000..b3ba91397ec4
--- /dev/null
+++ b/srcpkgs/arpack-ng/patches/b3fe4ad7.patch
@@ -0,0 +1,518 @@
+From b3fe4ad7fa875d192071972ee8523cbc149e8221 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= <szhorvat@gmail.com>
+Date: Sun, 9 Apr 2023 16:36:35 +0200
+Subject: [PATCH] fix: ensure that LAPACK RNG state is propagated
+
+ - fixes #401, #410, #411
+ - restores 'inits' variable removed in ce2e69a849da1d10dad5d6d3ec4db6120b3ecf50, ensuring that the RNG state is propagated
+ - reverts e0d67054f573da351f12a226f7c7cc65a690ef3d to ensure that seed is different on each parallel thread
+ - updates seed initialization of parallel pdgetv0/psgetv0 so that they match that of pzgetv0/pcgetv0
+---
+ PARPACK/SRC/MPI/pcgetv0.f | 48 +++++++++++++++++++++++----------------
+ PARPACK/SRC/MPI/pdgetv0.f | 40 ++++++++++++++++++++++++++------
+ PARPACK/SRC/MPI/psgetv0.f | 43 ++++++++++++++++++++++++++---------
+ PARPACK/SRC/MPI/pzgetv0.f | 48 +++++++++++++++++++++++----------------
+ SRC/cgetv0.f              | 21 ++++++++++++-----
+ SRC/dgetv0.f              | 21 ++++++++++++-----
+ SRC/sgetv0.f              | 21 ++++++++++++-----
+ SRC/zgetv0.f              | 21 ++++++++++++-----
+ 8 files changed, 183 insertions(+), 80 deletions(-)
+
+diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f
+index 59e3d1658..24fe8a0f1 100644
+--- a/PARPACK/SRC/MPI/pcgetv0.f
++++ b/PARPACK/SRC/MPI/pcgetv0.f
+@@ -176,13 +176,13 @@ subroutine pcgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Real
+      &           rnorm0
+       Complex
+      &           cnorm, cnorm2
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Complex
+      &           cnorm_buf, buf2(1)
+@@ -203,6 +203,12 @@ subroutine pcgetv0
+      &           ccdotc
+       external   ccdotc, pscnorm2, slapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -213,26 +219,30 @@ subroutine pcgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
++      if (inits) then
+ c
+-c     %-----------------------------------%
+-c     | Generate a seed on each processor |
+-c     | using process id (myid).          |
+-c     | Note: the seed must be between 1  |
+-c     | and 4095.  iseed(4) must be odd.  |
+-c     %-----------------------------------%
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
+ c
+-      call MPI_COMM_RANK(comm, myid, ierr)
+-      igen = 1000 + 2*myid + 1
+-      if (igen .gt. 4095) then
+-         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+-      end if
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
+ c
+-      iseed(1) = igen/1000
+-      igen     = mod(igen,1000)
+-      iseed(2) = igen/100
+-      igen     = mod(igen,100)
+-      iseed(3) = igen/10
+-      iseed(4) = 7
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f
+index 0f348b820..5a1956997 100644
+--- a/PARPACK/SRC/MPI/pdgetv0.f
++++ b/PARPACK/SRC/MPI/pdgetv0.f
+@@ -177,11 +177,11 @@ subroutine pdgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
+-      integer    idist, iseed(4), iter, msglvl, jj
++      logical    first, inits, orth
++      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Double precision
+      &           rnorm0, buf2(1)
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Double precision
+      &           rnorm_buf
+@@ -206,6 +206,12 @@ subroutine pdgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -216,10 +222,30 @@ subroutine pdgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++c
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
++c
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
++c
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f
+index d79a513b2..078e4fa8c 100644
+--- a/PARPACK/SRC/MPI/psgetv0.f
++++ b/PARPACK/SRC/MPI/psgetv0.f
+@@ -177,11 +177,11 @@ subroutine psgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
+-      integer    idist, iseed(4), iter, msglvl, jj
++      logical    first, inits, orth
++      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Real
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Real
+      &           rnorm_buf
+@@ -206,20 +206,41 @@ subroutine psgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+ c
+ c
+-c     %-----------------------------------%
+-c     | Initialize the seed of the LAPACK |
+-c     | random number generator           |
+-c     %-----------------------------------%
++      if (inits) then
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
++c
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
++c
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f
+index 731fb319f..94fb705f3 100644
+--- a/PARPACK/SRC/MPI/pzgetv0.f
++++ b/PARPACK/SRC/MPI/pzgetv0.f
+@@ -176,13 +176,13 @@ subroutine pzgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Double precision
+      &           rnorm0
+       Complex*16
+      &           cnorm, cnorm2
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Complex*16
+      &           cnorm_buf, buf2(1)
+@@ -203,6 +203,12 @@ subroutine pzgetv0
+      &           zzdotc
+       external   zzdotc , pdznorm2 , dlapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -213,26 +219,30 @@ subroutine pzgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
++      if (inits) then
+ c
+-c     %-----------------------------------%
+-c     | Generate a seed on each processor |
+-c     | using process id (myid).          |
+-c     | Note: the seed must be between 1  |
+-c     | and 4095.  iseed(4) must be odd.  |
+-c     %-----------------------------------%
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
+ c
+-      call MPI_COMM_RANK(comm, myid, ierr)
+-      igen = 1000 + 2*myid + 1
+-      if (igen .gt. 4095) then
+-         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+-      end if
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
+ c
+-      iseed(1) = igen/1000
+-      igen     = mod(igen,1000)
+-      iseed(2) = igen/100
+-      igen     = mod(igen,100)
+-      iseed(3) = igen/10
+-      iseed(4) = 7
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f
+index b49e66708..c231eadcb 100644
+--- a/SRC/cgetv0.f
++++ b/SRC/cgetv0.f
+@@ -156,13 +156,13 @@ subroutine cgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Real
+      &           rnorm0
+       Complex
+      &           cnorm
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -180,6 +180,12 @@ subroutine cgetv0
+      &           ccdotc
+       external   ccdotc, scnrm2, slapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -190,10 +196,13 @@ subroutine cgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f
+index 8be4fa26d..1d6dc01bd 100644
+--- a/SRC/dgetv0.f
++++ b/SRC/dgetv0.f
+@@ -157,11 +157,11 @@ subroutine dgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Double precision
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -183,6 +183,12 @@ subroutine dgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -193,10 +199,13 @@ subroutine dgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f
+index 26130a014..d861b2d6d 100644
+--- a/SRC/sgetv0.f
++++ b/SRC/sgetv0.f
+@@ -157,11 +157,11 @@ subroutine sgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Real
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -183,6 +183,12 @@ subroutine sgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -193,10 +199,13 @@ subroutine sgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f
+index cc13c3cfb..1fbd50851 100644
+--- a/SRC/zgetv0.f
++++ b/SRC/zgetv0.f
+@@ -156,13 +156,13 @@ subroutine zgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Double precision
+      &           rnorm0
+       Complex*16
+      &           cnorm
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -180,6 +180,12 @@ subroutine zgetv0
+      &           zzdotc
+       external   zzdotc, dznrm2, dlapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -190,10 +196,13 @@ subroutine zgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template
index 8a1098a62c39..82940ff2bdf9 100644
--- a/srcpkgs/arpack-ng/template
+++ b/srcpkgs/arpack-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'arpack-ng'
 pkgname=arpack-ng
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool gcc-fortran pkg-config"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/opencollab/arpack-ng"
 changelog="https://raw.githubusercontent.com/opencollab/arpack-ng/master/CHANGES"
 distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"
-checksum=ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d
+checksum=24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0
 
 # As of 2021-01-03 arpack-ng is only used by octave which includes openblas as
 # its BLAS implementation. So if openblas is available for XBPS_TARGET_MACHINE,
@@ -39,9 +39,8 @@ arpack-ng-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/include/arpack
+		vmove usr/include/arpack-ng
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/arpack-ng/update b/srcpkgs/arpack-ng/update
deleted file mode 100644
index b92bf49ef733..000000000000
--- a/srcpkgs/arpack-ng/update
+++ /dev/null
@@ -1,4 +0,0 @@
-# Regression causes failures in igraph. See:
-# https://github.com/igraph/igraph/issues/2311
-# https://github.com/opencollab/arpack-ng/issues/401
-ignore="3.9.0"

From b453fdb9fc19eaf5966f037f092be5fa43984eff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 2 Jul 2023 16:49:58 +0200
Subject: [PATCH 1612/1853] bluez: remove two year old INSTALL.msg

---
 srcpkgs/bluez/INSTALL.msg | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 srcpkgs/bluez/INSTALL.msg

diff --git a/srcpkgs/bluez/INSTALL.msg b/srcpkgs/bluez/INSTALL.msg
deleted file mode 100644
index 349f14710bec..000000000000
--- a/srcpkgs/bluez/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING: if bluez 5.59 had audio issues for you, removing the
-/var/lib/bluetooth directory might be necessary to completely restore
-functionality.
-
-For more information, see https://github.com/bluez/bluez/issues/157

From 006c4cccace6031b063cafebe38bc14c8d305886 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 18:51:19 +0200
Subject: [PATCH 1613/1853] ansifilter: add changelog

---
 srcpkgs/ansifilter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ansifilter/template b/srcpkgs/ansifilter/template
index 758c50e65743..a24d47217f23 100644
--- a/srcpkgs/ansifilter/template
+++ b/srcpkgs/ansifilter/template
@@ -1,11 +1,12 @@
 # Template file for 'ansifilter'
 pkgname=ansifilter
 version=2.20
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="Remove or convert ANSI codes to another format"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://gitlab.com/saalen/ansifilter"
+changelog="https://gitlab.com/saalen/ansifilter/-/raw/master/ChangeLog.adoc"
 distfiles="https://gitlab.com/saalen/ansifilter/-/archive/${version}/ansifilter-${version}.tar.gz"
 checksum=96aad3c95113e921ab912b63152471e5b532a54ecfe90d8c86b2c9127c3aa39b

From 539694c133071a9fc443f5a5816efcdc083f5e23 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 19:14:55 +0200
Subject: [PATCH 1614/1853] poedit: update to 3.3.2.

---
 srcpkgs/poedit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 4385b532d247..c346c96b12c6 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,6 +1,6 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=3.3
+version=3.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -12,8 +12,9 @@ short_desc="Cross-platform gettext catalogs (.po files) editor"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
+changelog="https://raw.githubusercontent.com/vslavik/poedit/master/NEWS"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=47b608e192a36e10b117da3edc4c684795f4ec10a94846fc5d66395ee1cc2d27
+checksum=e64139dd4beac1b8ea468d351b2b4bdae8ecbc6f4ca5d1ee1c73832036fff097
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
 

From c18c8210c09b52a5d4c699ef22e60b681cd98c63 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 09:16:33 +0200
Subject: [PATCH 1615/1853] pyradio: update to 0.9.2.12.

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 8b9ad44e1f18..3a6e9fdc8882 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.11
+version=0.9.2.12
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=fe715119a7341e4f940e3edd854ef2e41285773a9086c6bff611be821e452bcd
+checksum=e34f32e9f0299a7776e9f709f1f116932ca41dc36251e7312b4899b4892a7975
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 1d52dadd66921c39948a5733b301a4169a340951 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:33:29 +0200
Subject: [PATCH 1616/1853] font-mutt-misc: update to 1.0.4.

---
 srcpkgs/font-mutt-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template
index ab1735f89a10..7c277409a9a0 100644
--- a/srcpkgs/font-mutt-misc/template
+++ b/srcpkgs/font-mutt-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-mutt-misc'
 pkgname=font-mutt-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=fcecbfc475dfe5826d137f8edc623ba27d58d32f069165c248a013b3c566bb59
+checksum=9a9bc19088c6c9456c567e8f54d7a8e5e96b0d085066d9dcfe3ac8d898dd7c03
 font_dirs="/usr/share/fonts/X11/misc"
 
 post_install() {

From 2acc7583dc5b508418b138192215b4e228f83f6f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:33:11 +0200
Subject: [PATCH 1617/1853] font-jis-misc: update to 1.0.4.

---
 srcpkgs/font-jis-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-jis-misc/template b/srcpkgs/font-jis-misc/template
index f3c1c652e4d0..2183f538ddb6 100644
--- a/srcpkgs/font-jis-misc/template
+++ b/srcpkgs/font-jis-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-jis-misc'
 pkgname=font-jis-misc
-version=1.0.3
-revision=5
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=57c2db8824865117287d57d47f2c8cf4b2842d036c7475534b5054be69690c73
+checksum=7ab270255b27061003058ccbfc775d0813d17dca7aa8e07bdccb728f1b713984
 font_dirs="/usr/share/fonts/X11/misc"
 
 

From 034d91d8cb022b911bcdd403ddda8c14dd3fc4e1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:32:49 +0200
Subject: [PATCH 1618/1853] font-isas-misc: update to 1.0.4.

---
 srcpkgs/font-isas-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template
index cdd4b235f7fc..20b37ec73e94 100644
--- a/srcpkgs/font-isas-misc/template
+++ b/srcpkgs/font-isas-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-isas-misc'
 pkgname=font-isas-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=493965263070a5ee2a301dfdb2e87c1ca3c00c7882bfb3dd99368565ba558ff5
+checksum=711a648206f0d7f4a8c3fa61b4b4703e789f37603937b488a6edd7c71182f7d5
 font_dirs="/usr/share/fonts/X11/misc"
 
 post_install() {

From c0f4412d53f1d09a9dc93e38e00f331b69f663ef Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:32:26 +0200
Subject: [PATCH 1619/1853] font-bitstream-type1: update to 1.0.4.

---
 srcpkgs/font-bitstream-type1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template
index 82a18792bbf8..1f5539c71358 100644
--- a/srcpkgs/font-bitstream-type1/template
+++ b/srcpkgs/font-bitstream-type1/template
@@ -1,7 +1,7 @@
 # Template file for 'font-bitstream-type1'
 pkgname=font-bitstream-type1
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=3399b7586c18be509cdaeceeebf754b861faa1d8799dda1aae01aeb2a7a30f01
+checksum=3827eef5d8482e956c9cbe412aab03c067f844bff50470add52bdac298f0e4c7
 font_dirs="/usr/share/fonts/X11/Type1"
 
 post_install() {

From 6f0d42abbeaf0dfc861f433af523f9f920657074 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:31:45 +0200
Subject: [PATCH 1620/1853] font-misc-misc: update to 1.1.3.

---
 srcpkgs/font-misc-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template
index 7f9b85edc86f..998f1a212213 100644
--- a/srcpkgs/font-misc-misc/template
+++ b/srcpkgs/font-misc-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-misc-misc'
 pkgname=font-misc-misc
-version=1.1.2
-revision=7
+version=1.1.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=46142c876e176036c61c0c24c0a689079704d5ca5b510d48c025861ee2dbf829
+checksum=bece4a9482b3cb6f7fad2164fd3b394d22dfe1ad2f96f60030a703bcff30f5a5
 font_dirs="/usr/share/fonts/X11/misc"
 
 post_install() {

From 4c4fecd86dfc7aa6d284cd06a435df869c5224cc Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 2 Jul 2023 18:35:38 +0900
Subject: [PATCH 1621/1853] lifelines: fix build on musl

---
 srcpkgs/lifelines/patches/fix-musl.patch | 15 +++++++++++++++
 srcpkgs/lifelines/template               |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lifelines/patches/fix-musl.patch

diff --git a/srcpkgs/lifelines/patches/fix-musl.patch b/srcpkgs/lifelines/patches/fix-musl.patch
new file mode 100644
index 000000000000..e17f69e2da0a
--- /dev/null
+++ b/srcpkgs/lifelines/patches/fix-musl.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gedlib/locales.c b/src/gedlib/locales.c
+index fb3badca27..c6a73b3fc7 100644
+--- a/src/gedlib/locales.c
++++ b/src/gedlib/locales.c
+@@ -414,8 +414,10 @@ notify_gettext_language_changed (void)
+ #if  WIN32_INTL_SHIM
+ 	gt_notify_language_change();
+ #else
++#ifdef __GLIBC__
+ 	extern int _nl_msg_cat_cntr;
+ 	++_nl_msg_cat_cntr;
++#endif
+ #endif
+ #endif
+ }
diff --git a/srcpkgs/lifelines/template b/srcpkgs/lifelines/template
index b8f42c2e3431..1a2353a0f4d0 100644
--- a/srcpkgs/lifelines/template
+++ b/srcpkgs/lifelines/template
@@ -5,13 +5,13 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
 makedepends="ncurses-devel"
-archs="~*-musl" # For no reason except it keeps failing
 short_desc="Genealogy Software System"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lifelines/lifelines"
 distfiles="https://github.com/lifelines/lifelines/releases/download/${version}/lifelines-${version}.tar.gz"
 checksum=083007f81e406fce15931e5a29a7ba0380ef0b3b9c61d5eb5228ad378c7f332d
+make_check=no # times out
 
 post_install() {
 	vlicense LICENSE

From 57d05d3196ac56adea000be8e4803b0fe0668551 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 20:07:22 +0200
Subject: [PATCH 1622/1853] iana-etc: update to 20230629.

---
 srcpkgs/iana-etc/files/protocols | 2 +-
 srcpkgs/iana-etc/files/services  | 7 +++++++
 srcpkgs/iana-etc/template        | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iana-etc/files/protocols b/srcpkgs/iana-etc/files/protocols
index ed52330ca2ae..1adb889b46df 100644
--- a/srcpkgs/iana-etc/files/protocols
+++ b/srcpkgs/iana-etc/files/protocols
@@ -77,7 +77,6 @@ iso-ip        80 ISO-IP
 vmtp          81 VMTP
 secure-vmtp   82 SECURE-VMTP
 vines         83 VINES
-ttp           84 TTP
 iptm          84 IPTM
 nsfnet-igp    85 NSFNET-IGP
 dgp           86 DGP
@@ -133,4 +132,5 @@ wesp         141 WESP
 rohc         142 ROHC
 ethernet     143 Ethernet
 aggfrag      144 AGGFRAG
+nsh          145 NSH
 reserved     255 Reserved
diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 85155a5a5735..1272f9185cb1 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -1364,6 +1364,8 @@ apex-mesh         912/tcp
 apex-mesh         912/udp
 apex-edge         913/tcp
 apex-edge         913/udp
+rift-lies         914/udp
+rift-ties         915/udp
 rndc              953/tcp
 ftps-data         989/tcp
 ftps-data         989/udp
@@ -3846,6 +3848,8 @@ simple-tx-rx     2257/tcp
 simple-tx-rx     2257/udp
 rcts             2258/tcp
 rcts             2258/udp
+bid-serv         2259/tcp
+bid-serv         2259/udp
 apc-2260         2260/tcp
 apc-2260         2260/udp
 comotionmaster   2261/tcp
@@ -4064,6 +4068,8 @@ service-ctrl     2367/tcp
 service-ctrl     2367/udp
 opentable        2368/tcp
 opentable        2368/udp
+bif-p2p          2369/tcp
+bif-p2p          2369/udp
 l3-hbmon         2370/tcp
 l3-hbmon         2370/udp
 rda              2371/tcp
@@ -10750,6 +10756,7 @@ dsmcc-download  13821/udp
 dsmcc-ccp       13822/tcp
 dsmcc-ccp       13822/udp
 bmdss           13823/tcp
+a-trust-rpc     13832/tcp
 ucontrol        13894/tcp
 ucontrol        13894/udp
 dta-systems     13929/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index ad5430ac07dc..ad2d10630f09 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,7 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
 reverts="202001016_1"
-version=20230104
+version=20230629
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From a7cd087b094346a87f1e9e801c5c8cbbb1785330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 2 Jul 2023 10:20:38 +0100
Subject: [PATCH 1623/1853] SDL2: update to 2.28.1.

---
 srcpkgs/SDL2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index d8fb73d1dd1a..690b04523129 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.26.5
+version=2.28.1
 revision=1
 build_style=cmake
 configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF
@@ -15,7 +15,7 @@ license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz"
-checksum=ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7
+checksum=4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

From ca27581398c591e24750cb36012dd61e930928a8 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sun, 2 Jul 2023 17:33:25 +0200
Subject: [PATCH 1624/1853] stockfish: update to 16

---
 .../patches/makefile-nnue-download.patch      | 40 -------------------
 srcpkgs/stockfish/patches/makefile.patch      | 10 +++--
 srcpkgs/stockfish/template                    |  8 ++--
 3 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/stockfish/patches/makefile-nnue-download.patch

diff --git a/srcpkgs/stockfish/patches/makefile-nnue-download.patch b/srcpkgs/stockfish/patches/makefile-nnue-download.patch
deleted file mode 100644
index 55a38c51ec11..000000000000
--- a/srcpkgs/stockfish/patches/makefile-nnue-download.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 61ea1534ff7026009a3435575c7beee91534db83 Mon Sep 17 00:00:00 2001
-From: Joost VandeVondele <Joost.VandeVondele@gmail.com>
-Date: Mon, 19 Dec 2022 17:54:36 +0100
-Subject: [PATCH] No error if net available but wget/curl missing
-
-do not error out on missing wget/curl if these tools are not needed later on,
-i.e. if the net is available already.
-
-closes https://github.com/official-stockfish/Stockfish/pull/4291
-closes https://github.com/official-stockfish/Stockfish/pull/4253
-
-No functional change
----
- src/Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index da81ceb4a0..bcf0abdf5e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -853,7 +853,7 @@ net:
- 	$(eval nnuedownloadurl2 := https://github.com/official-stockfish/networks/raw/master/$(nnuenet))
- 	$(eval curl_or_wget := $(shell if hash curl 2>/dev/null; then echo "curl -skL"; elif hash wget 2>/dev/null; then echo "wget -qO-"; fi))
- 	@if [ "x$(curl_or_wget)" = "x" ]; then \
--	    echo "Automatic download failed: neither curl nor wget is installed. Install one of these tools or download the net manually"; exit 1; \
-+	    echo "Neither curl nor wget is installed. Install one of these tools unless the net has been downloaded manually"; \
-         fi
- 	$(eval shasum_command := $(shell if hash shasum 2>/dev/null; then echo "shasum -a 256 "; elif hash sha256sum 2>/dev/null; then echo "sha256sum "; fi))
- 	@if [ "x$(shasum_command)" = "x" ]; then \
-@@ -864,7 +864,9 @@ net:
- 	      echo "$(nnuenet) available."; \
- 	   else \
- 	      if [ "x$(curl_or_wget)" != "x" ]; then \
--	         echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\
-+                 echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\
-+              else \
-+                 echo "No net found and download not possible"; exit 1;\
- 	      fi; \
- 	   fi; \
- 	   if [ "x$(shasum_command)" != "x" ]; then \
diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch
index 87aa039c722f..62b436ed5fd3 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,10 +1,11 @@
---- a/src/Makefile	2022-12-04 14:17:15.000000000 +0100
-+++ b/src/Makefile	2022-12-05 16:52:13.648959706 +0100
-@@ -366,27 +366,5 @@ endif
+--- a/src/Makefile	2023-07-02 17:28:33.297238434 +0200
++++ b/src/Makefile	2023-07-02 17:28:50.820207636 +0200
+@@ -377,29 +377,7 @@
+ 
  ifeq ($(COMP),gcc)
  	comp=gcc
 -	CXX=g++
- 	CXXFLAGS += -pedantic -Wextra -Wshadow
+ 	CXXFLAGS += -pedantic -Wextra -Wshadow -Wmissing-declarations
 -
 -	ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64))
 -		ifeq ($(OS),Android)
@@ -28,3 +29,4 @@
 -	endif
  endif
  
+ ifeq ($(target_windows),yes)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index c04e296027f5..363603f83d5a 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=15.1
+version=16
 revision=1
-_net_file=nn-ad9b42354671.nnue
+_net_file=nn-5af11540bbfe.nnue
 build_wrksrc=src
 build_style=gnu-makefile
 make_build_target=build
@@ -14,8 +14,8 @@ license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="d4272657905319328294355973faee40a8c28e3eecb0e7b266ed34ff33383b76
- ad9b423546714137916bd38978af6fd68d7b8951bef25ff76bf43da72d6cb786"
+checksum="a1600ebdaf4e324ba3e10cec2e0c9a810dc64c6f0db5cc955b2fd5e1eefa1cc6
+ 5af11540bbfefcb54e38c5dd000cab4b469dfa7599a1d55be5d2722c20a8929b"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From 4705113273ce05990dca8a9e8fe7826e391efa2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:36:38 +0100
Subject: [PATCH 1625/1853] imath: update to 3.1.9.

---
 common/shlibs          | 2 +-
 srcpkgs/imath/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ef71bae3f9a7..4e6a5a663fa0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4259,7 +4259,7 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
-libImath-3_1.so.30 imath-3.1.7_1
+libImath-3_1.so.29 imath-3.1.9_1
 libIex-3_1.so.30 libopenexr-3.1.5_1
 libIlmThread-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
index ee47207a3e51..e43f1a707562 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
 # Template file for 'imath'
 pkgname=imath
-version=3.1.7
-revision=2
+version=3.1.9
+revision=1
 build_style=cmake
 configure_args="-DPYTHON=ON"
 hostmakedepends="python3-numpy"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://imath.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
 distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/imath-${version}.tar.gz"
-checksum=bff1fa140f4af0e7f02c6cb78d41b9a7d5508e6bcdfda3a583e35460eb6d4b47
+checksum=f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

From c897d2c9b83b39fe9f5e078c14adc0dd621bfee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:57 +0100
Subject: [PATCH 1626/1853] alembic: revbump for imath 3.1.9.

---
 srcpkgs/alembic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index d075ec686ddc..53ff7d48719f 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,7 +1,7 @@
 # Template file for 'alembic'
 pkgname=alembic
 version=1.8.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="zlib-devel imath-devel"

From 8a21f8302cd2fd7cf2c9cbd5047e7fad571b7794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:58 +0100
Subject: [PATCH 1627/1853] blender: revbump for imath 3.1.9.

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index ec724bb0a6dc..7a710ac0df49 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.5.1
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 75f5f945db37c768af9e4f1c989ade5267a1c4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:59 +0100
Subject: [PATCH 1628/1853] darktable: revbump for imath 3.1.9.

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2da30286a3a6..bf6137d46870 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.2.1
-revision=5
+revision=6
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From f61e58cd5b001a696e240db7f44d7ba6cb2bfdc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:59 +0100
Subject: [PATCH 1629/1853] Field3D: revbump for imath 3.1.9.

---
 srcpkgs/Field3D/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 6e4a351327ae..9c6c0e0872ee 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=7
+revision=8
 build_style=cmake
 makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"

From 7bae0842bc2721bdc7944ea55479f940152d737b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:59 +0100
Subject: [PATCH 1630/1853] gmic: revbump for imath 3.1.9.

---
 srcpkgs/gmic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 24a9c7218fdf..0bb4034d5cc8 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=3
+revision=4
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 3247798aea47ee4affff18b67e8132491a79191c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:00 +0100
Subject: [PATCH 1631/1853] hugin: revbump for imath 3.1.9.

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 19cee114c73a..52b56a2c4102 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 603a16c0b7adaa550cfe825cc1f76f77f45b84f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:00 +0100
Subject: [PATCH 1632/1853] kimageformats: revbump for imath 3.1.9.

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 364ad440219e..8b4d971133fa 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.107.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From ca1b8fff8a4ec313e155e8e8f1167c37b737721a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:01 +0100
Subject: [PATCH 1633/1853] libgdal: revbump for imath 3.1.9.

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 1aef0fd69a4e..53425db44746 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=7
+revision=8
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From d21aca89b2bdf92a9759a08969f0d49733f13fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:01 +0100
Subject: [PATCH 1634/1853] opencolorio: revbump for imath 3.1.9.

---
 srcpkgs/opencolorio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 4679a10653d2..defdf8a7acad 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,7 +1,7 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
 version=2.1.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DCMAKE_CONFIGURATION_TYPES=None
  -DOCIO_INSTALL_EXT_PACKAGES=NONE

From 2515a9edbc84567bb644ffc07f00731d6d421ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:02 +0100
Subject: [PATCH 1635/1853] openimageio: revbump for imath 3.1.9.

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index c2d36b4b3539..0e9e22e9685d 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From df2319be5544b6d6ae121ff71abce84ab718c3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:03 +0100
Subject: [PATCH 1636/1853] synfig: revbump for imath 3.1.9.

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 5f5f5bb3f4b2..30109541ec4f 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From b04bb26e6bf86fcb9520c6568327c25839ca73d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:03 +0100
Subject: [PATCH 1637/1853] synfigstudio: revbump for imath 3.1.9.

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 91349169ed2b..af1c5a296ef0 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From ca0439cc06bfa1d2d43dece78f8b20738a49595d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:03 +0100
Subject: [PATCH 1638/1853] vigra: revbump for imath 3.1.9.

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 950afc974309..0ed638bcd990 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=10
+revision=11
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From 10df9ee7b3dd68685bae4062b498008c9c4caead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 28 Jun 2023 15:43:45 +0100
Subject: [PATCH 1639/1853] calligra: revbump for imath 3.1.9.

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 38d7984727af..29a1f0a7716a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=14
+revision=15
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From bddd7bf95d057f595183a4e92afba4b880d8a0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 28 Jun 2023 15:44:02 +0100
Subject: [PATCH 1640/1853] krita: revbump for imath 3.1.9.

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b39dffdd1135..8280590f39ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=7
+revision=8
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 55aba3081dcb3e50faab4933265751bc364bbf7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 28 Jun 2023 15:44:36 +0100
Subject: [PATCH 1641/1853] openexr: update to 3.1.9.

---
 srcpkgs/openexr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b15bfb736f72..a44453df30ec 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,6 +1,6 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.7
+version=3.1.9
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -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=78dbca39115a1c526e6728588753955ee75fa7f5bb1a6e238bed5b6d66f91fd7
+checksum=103e902d3902800ab07b5f3a298be7afd2755312737b2cdbfa01326ff99dac07
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

From d97e6fb01e420d77531671208dc18928ef600dca Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Thu, 29 Jun 2023 20:42:35 +0900
Subject: [PATCH 1642/1853] systemtap: update to 4.9.

---
 srcpkgs/systemtap/patches/fix-musl.patch | 127 +++++++++++++++++++++++
 srcpkgs/systemtap/template               |  16 ++-
 2 files changed, 139 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/systemtap/patches/fix-musl.patch

diff --git a/srcpkgs/systemtap/patches/fix-musl.patch b/srcpkgs/systemtap/patches/fix-musl.patch
new file mode 100644
index 000000000000..9d1039100c3b
--- /dev/null
+++ b/srcpkgs/systemtap/patches/fix-musl.patch
@@ -0,0 +1,127 @@
+diff --git a/buildrun.cxx b/buildrun.cxx
+index 0048d07..904ce47 100644
+--- a/buildrun.cxx
++++ b/buildrun.cxx
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/resource.h>
++#include "gnu_basename.h"
+ }
+ 
+ // A bit of obfuscation for Gentoo's sake.
+@@ -943,7 +944,7 @@ make_kernel_run_command (systemtap_session& s, const string& remotedir,
+           if (remotedir.empty())
+             opt_u.append(s.uprobes_path);
+           else
+-            opt_u.append(remotedir + "/" + basename(s.uprobes_path.c_str()));
++            opt_u.append(remotedir + "/" + gnu_basename(s.uprobes_path.c_str()));
+         }
+       cmd.push_back(opt_u);
+     }
+diff --git a/client-http.cxx b/client-http.cxx
+index fca7362..d6096b9 100644
+--- a/client-http.cxx
++++ b/client-http.cxx
+@@ -38,6 +38,7 @@ extern "C" {
+ #include <elfutils/libdw.h>
+ #include <fcntl.h>
+ #include <nss3/nss.h>
++#include <paths.h>
+ 
+ #ifdef HAVE_RPMCRYPTO_H
+ #include <rpm/rpmcrypto.h>
+@@ -1016,7 +1017,7 @@ http_client_backend::include_file_or_directory (const string &subdir,
+ 
+   // Canonicalize the given path and remove the leading /.
+   string rpath;
+-  char *cpath = canonicalize_file_name (path.c_str ());
++  char *cpath = realpath (path.c_str (), NULL);
+   if (! cpath)
+     {
+       // It can not be canonicalized. Use the name relative to
+diff --git a/client-nss.cxx b/client-nss.cxx
+index 55266fe..a775ed1 100644
+--- a/client-nss.cxx
++++ b/client-nss.cxx
+@@ -576,7 +576,7 @@ nss_client_backend::include_file_or_directory (const string &subdir,
+ 
+   // Canonicalize the given path and remove the leading /.
+   string rpath;
+-  char *cpath = canonicalize_file_name (path.c_str ());
++  char *cpath = realpath (path.c_str (), NULL);
+   if (! cpath)
+     {
+       // It can not be canonicalized. Use the name relative to
+diff --git a/gnu_basename.h b/gnu_basename.h
+new file mode 100644
+index 0000000..dce5f19
+--- /dev/null
++++ b/gnu_basename.h
+@@ -0,0 +1,12 @@
++#ifndef GNU_BASENAME_H
++#define GNU_BASENAME_H
++
++#include <string.h>
++
++#if defined(__GLIBC__)
++#define gnu_basename(src) basename(src)
++#else
++#define gnu_basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
++#endif
++
++#endif
+diff --git a/remote.cxx b/remote.cxx
+index bffeaa9..bd6c7c4 100644
+--- a/remote.cxx
++++ b/remote.cxx
+@@ -16,6 +16,7 @@ extern "C" {
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include "gnu_basename.h"
+ }
+ 
+ #include <cstdio>
+@@ -472,7 +473,7 @@ class stapsh : public remote {
+ 
+         if (!s->uprobes_path.empty())
+           {
+-            string remoteuprobes = basename(s->uprobes_path.c_str());
++            string remoteuprobes = gnu_basename(s->uprobes_path.c_str());
+             if ((rc = send_file(s->uprobes_path, remoteuprobes)))
+               return rc;
+ 
+diff --git a/session.cxx b/session.cxx
+index a22baab..77eedf9 100644
+--- a/session.cxx
++++ b/session.cxx
+@@ -42,6 +42,7 @@ extern "C" {
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <wordexp.h>
++#include <paths.h>
+ }
+ 
+ #if HAVE_NSS
+@@ -1537,7 +1538,7 @@ systemtap_session::parse_cmdline (int argc, char * const argv [])
+ 	  } else {
+ 	      char *spath;
+ 	      assert(optarg);
+-	      spath = canonicalize_file_name (optarg);
++	      spath = realpath (optarg, NULL);
+ 	      if (spath == NULL) {
+ 		  cerr << _F("ERROR: %s is an invalid directory for --sysroot", optarg) << endl;
+ 		  return 1;
+diff --git a/util.h b/util.h
+index c708aa6..ef4a6fe 100644
+--- a/util.h
++++ b/util.h
+@@ -27,6 +27,7 @@ extern "C" {
+ #include <spawn.h>
+ #include <assert.h>
+ #include <poll.h>
++#include <unistd.h>
+ }
+ 
+ // Sanity check C++11 support.  We're only requiring GCC 4.4's level of
diff --git a/srcpkgs/systemtap/template b/srcpkgs/systemtap/template
index 8441d545c435..0c4bc2ebcaa3 100644
--- a/srcpkgs/systemtap/template
+++ b/srcpkgs/systemtap/template
@@ -1,8 +1,7 @@
 # Template file for 'systemtap'
 pkgname=systemtap
-version=4.5
+version=4.9
 revision=1
-archs="i686 x86_64 armv6l armv7l aarch64 ppc64le"
 build_style=gnu-configure
 hostmakedepends="python3"
 makedepends="elfutils-devel"
@@ -12,10 +11,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/systemtap/"
 distfiles="https://sourceware.org/pub/systemtap/releases/systemtap-${version}.tar.gz"
-checksum=75078ed37e0dd2a769c9d1f9394170b2d9f4d7daa425f43ca80c13bad6cfc925
+checksum=d01033baea9d0af52a65e70167816931f4b856427a53ff2ab30e4b45f6ad3a98
 python_version=3
 CFLAGS=-Wno-error
-CXXFLAGS=-Wno-error
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-obstack-devel"
+	CFLAGS+=" -DFNM_EXTMATCH=0"
+	CFLAGS+=" -DFTW_ACTIONRETVAL=16 -DFTW_CONTINUE=0 -DFTW_SKIP_SUBTREE=2"
+	CFLAGS+=" -D__off_t=off_t -D__uint32_t=uint32_t -D__uint64_t=uint64_t"
+	CXXFLAGS=-fpermissive
+fi
+
+CXXFLAGS+=" $CFLAGS"
 
 systemtap-devel_package() {
 	depends="systemtap-${version}_${revision}"

From 386a27b020810d6f956b606181e4bafa7f592b72 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 10:42:28 +0200
Subject: [PATCH 1643/1853] docker-compose: update to 2.19.1.

---
 srcpkgs/docker-compose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 280cca8333d0..50bb23bdb186 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=2.19.0
-revision=2
+version=2.19.1
+revision=1
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 changelog="https://github.com/docker/compose/releases"
 distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=0be3fd713ef84985f63d76de4c58451401aed1dfbeb235127dd77a57d1890996
+checksum=869d4ffd3f6b6835dcbb5cd627e98a9d2f1d30a9ae2c8e712275db9aa3e6e97d
 
 post_install() {
 	vmkdir usr/libexec/docker/cli-plugins

From 75857ff5503d58a2d66df490002c2f9d59cefe76 Mon Sep 17 00:00:00 2001
From: lzcoder <lzcoder@proton.me>
Date: Thu, 29 Jun 2023 14:30:41 -0300
Subject: [PATCH 1644/1853] grub-btrfs: update to 4.13.

---
 srcpkgs/grub-btrfs/patches/no-root-please.patch | 16 +++++++---------
 srcpkgs/grub-btrfs/template                     |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/grub-btrfs/patches/no-root-please.patch b/srcpkgs/grub-btrfs/patches/no-root-please.patch
index 4e0a32803fd1..85349efeb891 100644
--- a/srcpkgs/grub-btrfs/patches/no-root-please.patch
+++ b/srcpkgs/grub-btrfs/patches/no-root-please.patch
@@ -1,15 +1,13 @@
-Index: grub-btrfs-4.9/Makefile
-===================================================================
---- grub-btrfs-4.9.orig/Makefile
-+++ grub-btrfs-4.9/Makefile
-@@ -9,10 +9,6 @@ LIB_DIR = $(DESTDIR)$(PREFIX)/lib
- .PHONY: install uninstall help
+--- a/Makefile
++++ b/Makefile
+@@ -22,10 +22,6 @@
+ .PHONY: install uninstall clean help
  
  install:
 -	@if test "$(shell id -u)" != 0; then \
 -		echo "You are not root, run this target as root please."; \
 -		exit 1; \
 -	fi
- 	@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
- 	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
- 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
+ 	@echo "					     	   Installing "
+ 	@echo
+ 	@echo "       ::::::::  :::::::::  :::    ::: :::::::::               ::::::::: ::::::::::: :::::::::  :::::::::: ::::::::      "
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 9579e0a51e0e..c74ab5d04845 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.10.1
+version=4.13
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -8,8 +8,8 @@ short_desc="Include btrfs snapshots at Grub menu"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
-distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=3ef53f16a7bc0fdd5a5ac2216a41bf1b2f4fd2283717c5c240415d5d24d3734b
+distfiles="https://github.com/Antynea/grub-btrfs/archive/${version}.tar.gz"
+checksum=c493d0d5a6548c01993641ce586c98d461cabe40df4dff79d974d0c59068ff1d
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

From 04c755ac870cc1421369d6c7dcd92fcdc392c2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=2E=20C=2E=20Moreira?=
 <andrelcmoreira@disroot.org>
Date: Sun, 2 Jul 2023 23:29:54 -0300
Subject: [PATCH 1645/1853] newsboat: update to 2.32

---
 srcpkgs/newsboat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 45d0b355d5ed..463709feec91 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.31
+version=2.32
 revision=1
 build_style=configure
 build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=4baf7de25cf569924eebb63a5ddc467cd58dd3f0e7190b327b49d0c1e454c1da
+checksum=5b63514572a21e93f4dd3dd6c58f44fdbd9c9e6c6f978329a4766aabb13be6e6
 python_version=3
 
 # tests fail when run by superuser

From f3ed5bce00586d2577009ab6a6b3335c191343b4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Jul 2023 13:09:42 +0200
Subject: [PATCH 1646/1853] elixir: update to 1.15.2.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 2b1bb9af0130..9a829fef2e05 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.15.1
+version=1.15.2
 revision=1
 build_style=gnu-makefile
 make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
@@ -17,7 +17,7 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=cf89434f4cf7477b929c56e16ae22bf08e64101a144911d2834a2f3c9b3ae40f
+checksum=3cfadca57c3092ccbd3ec3f17e5eab529bbd2946f50e4941a903c55c39e3c5f5
 
 post_patch() {
 	# XXX: find a better solution

From 3a9272e7c24b3855405b23eb6d80551ea0c151eb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 13:01:17 +0530
Subject: [PATCH 1647/1853] lets: update to 0.0.52.

Closes: #44802 [via git-merge-pr]
---
 srcpkgs/lets/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index b4aa4171993c..0be733e685f3 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,16 +1,16 @@
 # Template file for 'lets'
 pkgname=lets
-version=0.0.50
-revision=2
+version=0.0.52
+revision=1
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"
 short_desc="CLI task runner for developers - a better alternative to make"
-maintainer="juan <juan@horlux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://lets-cli.org/"
 distfiles="https://github.com/lets-cli/lets/archive/refs/tags/v${version}.tar.gz"
-checksum=8c2cd55d7e2432dac0b89941125f2a83ce03a89ff36adcc52dd75896919376d8
+checksum=478a97dab8123b7bd5555502ae53146f05e44bbdc11cee87b69a53c1bf7c796c
 
 post_install() {
 	vlicense LICENSE

From 09f03472443d6e149eb7337b9403fbd6082500e2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Jul 2023 13:10:48 +0200
Subject: [PATCH 1648/1853] srcpkgs: orphan never updated packages

---
 srcpkgs/firehol/template        | 2 +-
 srcpkgs/podman-compose/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firehol/template b/srcpkgs/firehol/template
index 228584e4780b..52fe7ac2e783 100644
--- a/srcpkgs/firehol/template
+++ b/srcpkgs/firehol/template
@@ -7,7 +7,7 @@ configure_args="--disable-doc --disable-man"
 hostmakedepends="automake iproute2 kmod procps-ng iprange iputils traceroute curl ipset tar"
 depends="iproute2 kmod procps-ng iprange iputils traceroute curl ipset"
 short_desc="Firewall for humans"
-maintainer="juan <juan@horlux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/firehol/firehol/"
 distfiles="https://github.com/firehol/firehol/archive/v${version}.tar.gz"
diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 205691f08dcb..1902d68f1b33 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="podman python3-yaml python3-dotenv"
 short_desc="Script to run docker-compose.yml using podman"
-maintainer="juan <juan@horlux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"

From bd010f78d4087c2f88f29b0d134f1c6910f2b9ac Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 11:34:48 +0200
Subject: [PATCH 1649/1853] pnpm: update to 8.6.5, fix update-check

Closes: #44809 [via git-merge-pr]
---
 srcpkgs/pnpm/template | 6 +++---
 srcpkgs/pnpm/update   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pnpm/update

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 09d40e5b7124..516c1921b399 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,16 +1,16 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=8.6.2
+version=8.6.5
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
 depends="nodejs"
 short_desc="Fast, disk space efficient package manager"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=c6da9e00697e334b6193c034a5d1508e4c8605b12f249736b13f31139f4f0d73
+checksum=91dd45b4762c73f58f354999867854fcbe7376235474d131080fe391f2eb5227
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/pnpm/update b/srcpkgs/pnpm/update
new file mode 100644
index 000000000000..839b3fac2ecc
--- /dev/null
+++ b/srcpkgs/pnpm/update
@@ -0,0 +1,2 @@
+site=https://github.com/pnpm/pnpm/tags
+pattern='/tags/v\K[\d.]+(?=.tar.gz)'

From 73f555056b9328652c2275305f73e90912146717 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Jul 2023 13:18:36 +0200
Subject: [PATCH 1650/1853] srcpkgs: orphan packages

---
 srcpkgs/blanket/template           | 2 +-
 srcpkgs/ddgtk/template             | 2 +-
 srcpkgs/ekushey-fonts-ttf/template | 2 +-
 srcpkgs/ibus-m17n/template         | 2 +-
 srcpkgs/textadept/template         | 2 +-
 srcpkgs/xdgmenumaker/template      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 9db5a1d5a3c9..79f18e4fe21d 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
 depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libadwaita"
 short_desc="Improve focus and productivity by listening to different sounds"
-maintainer="Reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
 distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/ddgtk/template b/srcpkgs/ddgtk/template
index 5d45aeb4a8b9..31e8517c65dd 100644
--- a/srcpkgs/ddgtk/template
+++ b/srcpkgs/ddgtk/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config glib glib-devel gettext appstream-glib"
 depends="python3 python3-gobject gtk+3"
 short_desc="GUI frontend for dd to create bootable ISO images for Linux"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gort818/ddgtk"
 distfiles="https://github.com/gort818/ddgtk/archive/${version}.tar.gz"
diff --git a/srcpkgs/ekushey-fonts-ttf/template b/srcpkgs/ekushey-fonts-ttf/template
index 4862d810d8c6..afa5ce3b0bf2 100644
--- a/srcpkgs/ekushey-fonts-ttf/template
+++ b/srcpkgs/ekushey-fonts-ttf/template
@@ -5,7 +5,7 @@ revision=2
 build_style=fetch
 depends="font-util"
 short_desc="Bengali fonts from Ekushey project"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, OFL-1.0, GPL-3.0-or-later"
 homepage="http://ekushey.org/"
 distfiles="${SOURCEFORGE_SITE}/ekushey/SolaimanLipi_20-04-07.ttf
diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template
index 663096d55c06..9f3b2c28c332 100644
--- a/srcpkgs/ibus-m17n/template
+++ b/srcpkgs/ibus-m17n/template
@@ -9,7 +9,7 @@ hostmakedepends="gettext gettext-devel ibus m17n-db m17n-lib
 makedepends="gettext-devel ibus-devel m17n-lib-devel"
 depends="ibus m17n-db"
 short_desc="M17N engine for IBus"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ibus/ibus-m17n"
 distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz"
diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template
index 2625a775a7e2..e97f96f2a8c6 100644
--- a/srcpkgs/textadept/template
+++ b/srcpkgs/textadept/template
@@ -6,7 +6,7 @@ build_wrksrc="src"
 hostmakedepends="tar unzip pkg-config"
 makedepends="gtk+3-devel ncurses-devel"
 short_desc="Fast, minimalist, and extensible text editor for programmers"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://orbitalquark.github.io/textadept/"
 # Note: The dependency urls and filenames must be checked and updated manually
diff --git a/srcpkgs/xdgmenumaker/template b/srcpkgs/xdgmenumaker/template
index 2235ed1a02f8..02fd30f60c95 100644
--- a/srcpkgs/xdgmenumaker/template
+++ b/srcpkgs/xdgmenumaker/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="txt2tags"
 depends="python3-xdg python3-gobject gobject-introspection python3-Pillow gtk+3"
 short_desc="Automatic menu generator for WMs, such as, fluxbox, icewm, jwm, pekwm"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gapan/xdgmenumaker"
 distfiles="https://github.com/gapan/xdgmenumaker/archive/${version}.tar.gz"

From 4bddb7aefcb67a1e18cfa85164514b7c24506218 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 3 Jul 2023 12:42:14 +0100
Subject: [PATCH 1651/1853] alacritty: update to 0.12.2.

---
 srcpkgs/alacritty/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 6508a3059557..88ff3bcea75c 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 make_install_args="--path alacritty"
@@ -13,13 +13,13 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="https://github.com/alacritty/alacritty/archive/refs/tags/v${version}.tar.gz"
-checksum=14bce0bfc538872c97e0e38b9233a9d1fa992dcf83a22b6035da5fe58a55bc6c
+checksum=285b44d2d2e83118ab7fe61d575811bb85d5e21147808171bd0e583e9e794748
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	ppc*) broken="ftbfs: thread 'main' panicked at 'slice index starts at 4289555962 but ends at 114', /builddir/rustc-1.46.0-src/src/libstd/io/mod.rs:396:27";;
+	ppc*) broken="ftbfs: thread 'main' panicked at 'slice index starts at 4289555962 but ends at 114', /builddir/rustc-1.46.0-src/src/libstd/io/mod.rs:396:27" ;;
 	# disable doctests on i686
-	i686) make_check_args="--tests";;
+	i686*) make_check_args="--tests" ;;
 esac
 
 post_install() {

From f7da85e918a42e4e0f53f2e217d5050a084a83c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 14:14:28 +0200
Subject: [PATCH 1652/1853] jq: upstream moved.

---
 srcpkgs/jq/template | 6 +++---
 srcpkgs/jq/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/jq/update

diff --git a/srcpkgs/jq/template b/srcpkgs/jq/template
index 5cf139e340db..26928ff9b442 100644
--- a/srcpkgs/jq/template
+++ b/srcpkgs/jq/template
@@ -1,7 +1,7 @@
 # Template file for 'jq'
 pkgname=jq
 version=1.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="oniguruma-devel"
@@ -9,8 +9,8 @@ checkdepends="valgrind"
 short_desc="Command-line JSON processor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="http://stedolan.github.io/jq/"
-distfiles="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"
+homepage="https://jqlang.github.io/jq/"
+distfiles="https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz"
 checksum=5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72
 CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 
diff --git a/srcpkgs/jq/update b/srcpkgs/jq/update
deleted file mode 100644
index 5952b47d8f74..000000000000
--- a/srcpkgs/jq/update
+++ /dev/null
@@ -1 +0,0 @@
-site="http://stedolan.github.io/jq/download/"

From afe64c4dcafcb84767dbd8ba5753a438caa56ada Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 2 Jul 2023 09:17:28 +0200
Subject: [PATCH 1653/1853] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 61 ++++++++++-------
 4 files changed, 43 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..956fe154b59d 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,49 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel"
+	depends+=" libexecinfo"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) arch="x86_32" ;;
+	x86_64*) arch="x86_64" ;;
+	aarch64*) arch="arm64" ;;
+	armv7*) arch="arm32" ;;
+	ppc64*) arch="ppc64" ;;
+esac
+
+make_build_args+=" arch=$arch"
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +54,12 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		i686*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
+		aarch64*) vbin bin/godot.linuxbsd.editor.arm64 godot;;
+		armv7*) vbin bin/godot.linuxbsd.editor.arm32 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
 	esac
 }

From 43344066b08b7a6c5403e416f5cfccec400c6d26 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 11:49:10 +0200
Subject: [PATCH 1654/1853] rust-analyzer: fix update-check

---
 srcpkgs/rust-analyzer/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/rust-analyzer/update

diff --git a/srcpkgs/rust-analyzer/update b/srcpkgs/rust-analyzer/update
new file mode 100644
index 000000000000..48dce688f314
--- /dev/null
+++ b/srcpkgs/rust-analyzer/update
@@ -0,0 +1,2 @@
+site=https://github.com/rust-lang/rust-analyzer/tags
+pattern="/tag/\K\d{4}-\d{2}-\d{2}"

From da1aa5cba28de8b943b93962b8e9a69830efbaa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 1 Jul 2023 18:06:23 -0300
Subject: [PATCH 1655/1853] SuiteSparse: update to 7.1.0.

---
 srcpkgs/SuiteSparse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 6cc6b0a232d5..3490f6f3fa7f 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.0.1
+version=7.1.0
 revision=1
 hostmakedepends="cmake gcc-fortran"
 makedepends="libgomp-devel mpfr-devel
@@ -11,7 +11,7 @@ license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
 changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=dc2f8d5c2657c120b30cce942f634ec08fc3a4b0b10e19d3eef7790b2bec8d1e
+checksum=4cd3d161f9aa4f98ec5fa725ee5dc27bca960a3714a707a7d12b3d0abb504679
 
 build_options="openblas"
 

From 0988f0f92472e3ae012fddad9bf712f2ab90295f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 2 Jul 2023 18:00:08 -0300
Subject: [PATCH 1656/1853] octave: fix build with SuiteSparse-7.1.0

---
 .../octave/patches/fix-suitesparse-7.1.patch  | 166 ++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 srcpkgs/octave/patches/fix-suitesparse-7.1.patch

diff --git a/srcpkgs/octave/patches/fix-suitesparse-7.1.patch b/srcpkgs/octave/patches/fix-suitesparse-7.1.patch
new file mode 100644
index 000000000000..a9235cb386fb
--- /dev/null
+++ b/srcpkgs/octave/patches/fix-suitesparse-7.1.patch
@@ -0,0 +1,166 @@
+--- a/liboctave/numeric/sparse-qr.cc	2023-04-13 13:43:35.000000000 -0300
++++ b/liboctave/numeric/sparse-qr.cc	2023-07-02 17:56:48.485762203 -0300
+@@ -804,17 +804,17 @@
+   Matrix ret (nrows, nc);
+   cholmod_dense *q;
+ 
+-  // I is nrows x nrows identity matrix
+-  cholmod_dense *I
++  // Id is nrows x nrows identity matrix
++  cholmod_dense *Id
+     = cholmod_l_allocate_dense (nrows, nrows, nrows, CHOLMOD_REAL, &m_cc);
+ 
+   for (octave_idx_type i = 0; i < nrows * nrows; i++)
+-    (reinterpret_cast<double *> (I->x))[i] = 0.0;
++    (reinterpret_cast<double *> (Id->x))[i] = 0.0;
+ 
+   for (octave_idx_type i = 0; i < nrows; i++)
+-    (reinterpret_cast<double *> (I->x))[i * nrows + i] = 1.0;
++    (reinterpret_cast<double *> (Id->x))[i * nrows + i] = 1.0;
+ 
+-  q = SuiteSparseQR_qmult<double> (SPQR_QX, m_H, m_Htau, m_HPinv, I, &m_cc);
++  q = SuiteSparseQR_qmult<double> (SPQR_QX, m_H, m_Htau, m_HPinv, Id, &m_cc);
+   spqr_error_handler (&m_cc);
+ 
+   double *q_x = reinterpret_cast<double *> (q->x);
+@@ -824,7 +824,7 @@
+       ret_vec[j * nrows + i] = q_x[j * nrows + i];
+ 
+   cholmod_l_free_dense (&q, &m_cc);
+-  cholmod_l_free_dense (&I, &m_cc);
++  cholmod_l_free_dense (&Id, &m_cc);
+ 
+   return ret;
+ 
+@@ -1738,18 +1738,18 @@
+   ComplexMatrix ret (nrows, nc);
+   cholmod_dense *q;
+ 
+-  // I is nrows x nrows identity matrix
+-  cholmod_dense *I
++  // Id is nrows x nrows identity matrix
++  cholmod_dense *Id
+     = reinterpret_cast<cholmod_dense *>
+       (cholmod_l_allocate_dense (nrows, nrows, nrows, CHOLMOD_COMPLEX, &m_cc));
+ 
+   for (octave_idx_type i = 0; i < nrows * nrows; i++)
+-    (reinterpret_cast<Complex *> (I->x))[i] = 0.0;
++    (reinterpret_cast<Complex *> (Id->x))[i] = 0.0;
+ 
+   for (octave_idx_type i = 0; i < nrows; i++)
+-    (reinterpret_cast<Complex *> (I->x))[i * nrows + i] = 1.0;
++    (reinterpret_cast<Complex *> (Id->x))[i * nrows + i] = 1.0;
+ 
+-  q = SuiteSparseQR_qmult<Complex> (SPQR_QX, m_H, m_Htau, m_HPinv, I,
++  q = SuiteSparseQR_qmult<Complex> (SPQR_QX, m_H, m_Htau, m_HPinv, Id,
+                                     &m_cc);
+   spqr_error_handler (&m_cc);
+ 
+@@ -1761,7 +1761,7 @@
+       ret_vec[j * nrows + i] = q_x[j * nrows + i];
+ 
+   cholmod_l_free_dense (&q, &m_cc);
+-  cholmod_l_free_dense (&I, &m_cc);
++  cholmod_l_free_dense (&Id, &m_cc);
+ 
+   return ret;
+ 
+@@ -1786,7 +1786,7 @@
+       OCTAVE_LOCAL_BUFFER (cs_complex_t, bvec, nr);
+ 
+       for (octave_idx_type i = 0; i < nr; i++)
+-        bvec[i] = cs_complex_t (0.0, 0.0);
++        bvec[i] = (cs_complex_t) 0.0;
+ 
+       OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2);
+ 
+@@ -1794,7 +1794,7 @@
+         {
+           octave_quit ();
+ 
+-          bvec[j] = cs_complex_t (1.0, 0.0);
++          bvec[j] = (cs_complex_t) 1.0;
+ 
+           volatile octave_idx_type nm = (nr < nc ? nr : nc);
+ 
+@@ -1813,7 +1813,7 @@
+           for (octave_idx_type i = 0; i < nr; i++)
+             vec[i+idx] = buf[i];
+ 
+-          bvec[j] = cs_complex_t (0.0, 0.0);
++          bvec[j] = (cs_complex_t) 0.0;
+         }
+     }
+ 
+@@ -2073,7 +2073,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv,
+                                reinterpret_cast<cs_complex_t *>(Xx),
+@@ -2143,7 +2143,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *> (Xx),
+                               buf, nr);
+@@ -2206,7 +2206,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv,
+                                reinterpret_cast<cs_complex_t *> (Xx),
+@@ -2304,7 +2304,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q,
+                               reinterpret_cast<cs_complex_t *> (Xx),
+@@ -2392,7 +2392,7 @@
+       octave_quit ();
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + bidx, buf, nr);
+ 
+@@ -2460,7 +2460,7 @@
+       octave_quit ();
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q, bvec + bidx, buf, nr);
+       CXSPARSE_ZNAME (_utsolve) (N->U, buf);
+@@ -2522,7 +2522,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv,
+                                reinterpret_cast<cs_complex_t *> (Xx),
+@@ -2620,7 +2620,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx),
+                               buf, nr);

From 2b9e4cc31a8e7fbe8cc3065047dc53997e17f9a2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:37 +0200
Subject: [PATCH 1657/1853] erlang: update to 26.0.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 6b94c9dbd9f5..c34f2bb01bd1 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=25.3.2
+version=26.0.2
 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=504fc2045198c192de7edbb04e880cbb1ee79b1d9880270b8af8ed2348d2e242
+checksum=4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 33ede824eaa4a59f2d732cd363aca31d45885b52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1658/1853] elixir: rebuild for erlang-26.0.2.

---
 srcpkgs/elixir/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 9a829fef2e05..d8f31283ed9c 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,7 +1,7 @@
 # Template file for 'elixir'
 pkgname=elixir
 version=1.15.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
 make_check_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"

From 8d383cc4f187980825d6a4d8ef8438e75c48c1cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1659/1853] rebar3: rebuild for erlang-26.0.2.

---
 srcpkgs/rebar3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index cce9ffb4db68..37c562e55cb5 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,7 +1,7 @@
 # Template file for 'rebar3'
 pkgname=rebar3
 version=3.19.0
-revision=2
+revision=3
 hostmakedepends=erlang
 depends="erlang>=22"
 short_desc="Erlang build tool to compile, test, and release applications"

From 92f6b755c12b86d19a127a67fe76e97d127530a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1660/1853] ejabberd: rebuild for erlang-26.0.2.

---
 srcpkgs/ejabberd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index c77545190f4f..5d5995e0be21 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,7 +1,7 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=22.05
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"

From 942aa616dd755d790e4654ab2544e250f5a78464 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1661/1853] lfe: update to 2.1.1.

---
 srcpkgs/lfe/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lfe/template b/srcpkgs/lfe/template
index 04967e48fc96..5a91da33bc2e 100644
--- a/srcpkgs/lfe/template
+++ b/srcpkgs/lfe/template
@@ -1,7 +1,7 @@
 # Template file for 'lfe'
 pkgname=lfe
-version=2.0.1
-revision=2
+version=2.1.1
+revision=1
 build_style=gnu-makefile
 hostmakedepends="erlang"
 depends="erlang"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://lfe.io/"
 distfiles="https://github.com/lfe/lfe/archive/v${version}.tar.gz"
-checksum=d64a5c0b626411afe67f146b56094337801c596d9b0cdfeabaf61223c479985f
+checksum=e5abacd57dc2f357dda46d8336a40046be806f5c6776f95612676c4b45f6d56b
 
 do_install() {
 	for b in lfe lfec lfescript; do

From 97034a50af93dca53f5ffa862017b010e8d93e2c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 23:14:05 +0200
Subject: [PATCH 1662/1853] ejabberd: remove conflict with elixir.

---
 srcpkgs/ejabberd/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 5d5995e0be21..218c2857ab85 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,7 +1,7 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=22.05
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
@@ -29,3 +29,7 @@ fi
 pre_configure() {
 	autoreconf -fi
 }
+
+post_install() {
+	rm -f ${DESTDIR}/usr/bin/{elixir,iex,mix}
+}

From dbd03e01e12672d57f791286539039ada57d552e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 26 Jun 2023 20:01:53 +0200
Subject: [PATCH 1663/1853] Manual.md: move section on automatically detected
 depends

---
 Manual.md | 91 +++++++++++++++++++++++++++----------------------------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/Manual.md b/Manual.md
index 1670863cbe54..da2572e911a0 100644
--- a/Manual.md
+++ b/Manual.md
@@ -27,7 +27,6 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Build helper scripts](#build_helper)
 	* [Functions](#functions)
 	* [Build options](#build_options)
-		* [Runtime dependencies](#deps_runtime)
 	* [INSTALL and REMOVE files](#install_remove_files)
 	* [INSTALL.msg and REMOVE.msg files](#install_remove_files_msg)
 	* [Creating system accounts/groups at runtime](#runtime_account_creation)
@@ -787,11 +786,55 @@ should be listed in `checkdepends` and will be installed as if they were part of
   a D-Bus session for applications that need it
 - `git`: some test suites run the `git` command
 
+<a id="deps_runtime"></a>
 Lastly, a package may require certain dependencies at runtime, without which it
 is unusable. These dependencies, when they aren't detected automatically by
 XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
 modules and other programs that use `dlopen(3)` instead of dynamically linking.
 
+Dependencies for ELF objects are detected automatically by `xbps-src`, hence runtime
+dependencies must not be specified in templates via `$depends` with the following exceptions:
+
+- ELF objects using dlopen(3).
+- non ELF objects, i.e perl/python/ruby/etc modules.
+- Overriding the minimal version specified in the `shlibs` file.
+
+The runtime dependencies for ELF objects are detected by checking which SONAMEs
+they require and then the SONAMEs are mapped to a binary package name with a minimal
+required version. The `shlibs` file in the `void-packages/common` directory
+sets up the `<SONAME> <pkgname>>=<version>` mappings.
+
+For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
+software requiring this library will link to `libfoo`; the resulting binary
+package will have a run-time dependency to `foo>=1.0_1` package as specified in
+`common/shlibs`:
+
+```
+# common/shlibs
+...
+libfoo.so.1 foo-1.0_1
+...
+```
+
+- The first field specifies the SONAME.
+- The second field specified the package name and minimal version required.
+- A third optional field (usually set to `ignore`) can be used to skip checks in soname bumps.
+
+Dependencies declared via `${depends}` are not installed to the master directory, rather are
+only checked if they exist as binary packages, and are built automatically by `xbps-src` if
+the specified version is not in the local repository.
+
+As a special case, `virtual` dependencies may be specified as runtime dependencies in the
+`${depends}` template variable. Several different packages can provide common functionality by
+declaring a virtual name and version in the `${provides}` template variable (e.g.,
+`provides="vpkg-0.1_1"`). Packages that rely on the common functionality without concern for the
+specific provider can declare a dependency on the virtual package name with the prefix `virtual?`
+(e.g., `depends="virtual?vpkg-0.1_1"`). When a package is built by `xbps-src`, providers for any
+virtual packages will be confirmed to exist and will be built if necessary. A map from virtual
+packages to their default providers is defined in `etc/defaults.virtual`. Individual mappings can be
+overridden by local preferences in `etc/virtual`. Comments in `etc/defaults.virtual` provide more
+information on this map.
+
 Finally, as a general rule, if a package is built the exact same way whether or
 not a particular package is present in `makedepends` or `hostmakedepends`, that
 package shouldn't be added as a build time dependency.
@@ -1214,52 +1257,6 @@ Example: `XBPS_PKG_OPTIONS_xorg_server=opt`.
 The list of supported package build options and its description is defined in the
 `common/options.description` file.
 
-<a id="deps_runtime"></a>
-#### Runtime dependencies
-
-Dependencies for ELF objects are detected automatically by `xbps-src`, hence runtime
-dependencies must not be specified in templates via `$depends` with the following exceptions:
-
-- ELF objects using dlopen(3).
-- non ELF objects, i.e perl/python/ruby/etc modules.
-- Overriding the minimal version specified in the `shlibs` file.
-
-The runtime dependencies for ELF objects are detected by checking which SONAMEs
-they require and then the SONAMEs are mapped to a binary package name with a minimal
-required version. The `shlibs` file in the `void-packages/common` directory
-sets up the `<SONAME> <pkgname>>=<version>` mappings.
-
-For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
-software requiring this library will link to `libfoo`; the resulting binary
-package will have a run-time dependency to `foo>=1.0_1` package as specified in
-`common/shlibs`:
-
-```
-# common/shlibs
-...
-libfoo.so.1 foo-1.0_1
-...
-```
-
-- The first field specifies the SONAME.
-- The second field specified the package name and minimal version required.
-- A third optional field (usually set to `ignore`) can be used to skip checks in soname bumps.
-
-Dependencies declared via `${depends}` are not installed to the master directory, rather are
-only checked if they exist as binary packages, and are built automatically by `xbps-src` if
-the specified version is not in the local repository.
-
-As a special case, `virtual` dependencies may be specified as runtime dependencies in the
-`${depends}` template variable. Several different packages can provide common functionality by
-declaring a virtual name and version in the `${provides}` template variable (e.g.,
-`provides="vpkg-0.1_1"`). Packages that rely on the common functionality without concern for the
-specific provider can declare a dependency on the virtual package name with the prefix `virtual?`
-(e.g., `depends="virtual?vpkg-0.1_1"`). When a package is built by `xbps-src`, providers for any
-virtual packages will be confirmed to exist and will be built if necessary. A map from virtual
-packages to their default providers is defined in `etc/defaults.virtual`. Individual mappings can be
-overridden by local preferences in `etc/virtual`. Comments in `etc/defaults.virtual` provide more
-information on this map.
-
 <a id="install_remove_files"></a>
 ### INSTALL and REMOVE files
 

From ab5a4fe9ec0d6614e720db6355077c86385919d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 26 Jun 2023 20:13:46 +0200
Subject: [PATCH 1664/1853] Manual.md: reword section on automatically detected
 depends

Co-authored-by: Mohammed Anas <triallax@tutanota.com>
---
 Manual.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Manual.md b/Manual.md
index da2572e911a0..bb1f4edfcc34 100644
--- a/Manual.md
+++ b/Manual.md
@@ -789,24 +789,25 @@ should be listed in `checkdepends` and will be installed as if they were part of
 <a id="deps_runtime"></a>
 Lastly, a package may require certain dependencies at runtime, without which it
 is unusable. These dependencies, when they aren't detected automatically by
-XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
-modules and other programs that use `dlopen(3)` instead of dynamically linking.
+XBPS, should be listed in `depends`.
 
-Dependencies for ELF objects are detected automatically by `xbps-src`, hence runtime
-dependencies must not be specified in templates via `$depends` with the following exceptions:
+Libraries linked by ELF objects are detected automatically by `xbps-src`, hence they
+must not be specified in templates via `depends`. This variable should list:
 
+- executables called as separate processes.
 - ELF objects using dlopen(3).
-- non ELF objects, i.e perl/python/ruby/etc modules.
-- Overriding the minimal version specified in the `shlibs` file.
+- non-object code, e.g. C headers, perl/python/ruby/etc modules.
+- data files.
+- overriding the minimal version specified in the `common/shlibs` file.
 
 The runtime dependencies for ELF objects are detected by checking which SONAMEs
 they require and then the SONAMEs are mapped to a binary package name with a minimal
-required version. The `shlibs` file in the `void-packages/common` directory
+required version. The `common/shlibs` file
 sets up the `<SONAME> <pkgname>>=<version>` mappings.
 
 For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
-software requiring this library will link to `libfoo`; the resulting binary
-package will have a run-time dependency to `foo>=1.0_1` package as specified in
+software requiring this library will link to `libfoo.so.1`; the resulting binary
+package will have a run-time dependency on `foo>=1.0_1` package as specified in
 `common/shlibs`:
 
 ```
@@ -820,13 +821,13 @@ libfoo.so.1 foo-1.0_1
 - The second field specified the package name and minimal version required.
 - A third optional field (usually set to `ignore`) can be used to skip checks in soname bumps.
 
-Dependencies declared via `${depends}` are not installed to the master directory, rather are
+Dependencies declared via `depends` are not installed to the master directory, rather they are
 only checked if they exist as binary packages, and are built automatically by `xbps-src` if
 the specified version is not in the local repository.
 
 As a special case, `virtual` dependencies may be specified as runtime dependencies in the
-`${depends}` template variable. Several different packages can provide common functionality by
-declaring a virtual name and version in the `${provides}` template variable (e.g.,
+`depends` template variable. Several different packages can provide common functionality by
+declaring a virtual name and version in the `provides` template variable (e.g.
 `provides="vpkg-0.1_1"`). Packages that rely on the common functionality without concern for the
 specific provider can declare a dependency on the virtual package name with the prefix `virtual?`
 (e.g., `depends="virtual?vpkg-0.1_1"`). When a package is built by `xbps-src`, providers for any

From f72ddc9e319f4f20034f27a239d698f1f485b7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 26 Jun 2023 20:25:19 +0200
Subject: [PATCH 1665/1853] Manual.md: adjust sections hierarchy

---
 Manual.md | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/Manual.md b/Manual.md
index bb1f4edfcc34..63f10f354582 100644
--- a/Manual.md
+++ b/Manual.md
@@ -5,7 +5,8 @@ packages for XBPS, the `Void Linux` native packaging system.
 
 *Table of Contents*
 
-* [Introduction](#Introduction)
+* The XBPS source packages manual
+	* [Introduction](#Introduction)
 	* [Package build phases](#buildphase)
 	* [Package naming conventions](#namingconventions)
 		* [Libraries](#libs)
@@ -33,13 +34,14 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Writing runit services](#writing_runit_services)
 	* [32bit packages](#32bit_pkgs)
 	* [Subpackages](#pkgs_sub)
-	* [Development packages](#pkgs_development)
-	* [Data packages](#pkgs_data)
-	* [Documentation packages](#pkgs_documentation)
-	* [Python packages](#pkgs_python)
-	* [Go packages](#pkgs_go)
-	* [Haskell packages](#pkgs_haskell)
-	* [Font packages](#pkgs_font)
+	* [Some package classes](#pkgs_classes)
+		* [Development packages](#pkgs_development)
+		* [Data packages](#pkgs_data)
+		* [Documentation packages](#pkgs_documentation)
+		* [Python packages](#pkgs_python)
+		* [Go packages](#pkgs_go)
+		* [Haskell packages](#pkgs_haskell)
+		* [Font packages](#pkgs_font)
 	* [Renaming a package](#pkg_rename)
 	* [Removing a package](#pkg_remove)
 	* [XBPS Triggers](#xbps_triggers)
@@ -72,10 +74,10 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Void specific documentation](#documentation)
 	* [Notes](#notes)
 	* [Contributing via git](#contributing)
-* [Help](#help)
+	* [Help](#help)
 
 <a id="Introduction"></a>
-## Introduction
+### Introduction
 
 The `void-packages` repository contains all the
 recipes to download, compile and build binary packages for Void Linux.
@@ -841,10 +843,10 @@ not a particular package is present in `makedepends` or `hostmakedepends`, that
 package shouldn't be added as a build time dependency.
 
 <a id="repositories"></a>
-#### Repositories
+### Repositories
 
 <a id="repo_by_branch"></a>
-##### Repositories defined by Branch
+#### Repositories defined by Branch
 
 The global repository takes the name of
 the current branch, except if the name of the branch is master. Then the resulting
@@ -852,7 +854,7 @@ repository will be at the global scope. The usage scenario is that the user can
 update multiple packages in a second branch without polluting his local repository.
 
 <a id="pkg_defined_repo"></a>
-##### Package defined Repositories
+#### Package defined Repositories
 
 The second way to define a repository is by setting the `repository` variable in
 a template. This way the maintainer can define repositories for a specific
@@ -1474,8 +1476,11 @@ destdir (`$DESTDIR`) to the `subpackage` destdir (`$PKGDESTDIR`).
 Subpackages are processed always in alphabetical order; To force a custom order,
 the `subpackages` variable can be declared with the wanted order.
 
+<a id="pkgs_classes"></a>
+### Some package classes
+
 <a id="pkgs_development"></a>
-### Development packages
+#### Development packages
 
 A development package, commonly generated as a subpackage, shall only contain
 files required for development, that is, headers, static libraries, shared
@@ -1505,7 +1510,7 @@ following subset of files from the main package:
 * Vala bindings `usr/share/vala`
 
 <a id="pkgs_data"></a>
-### Data packages
+#### Data packages
 
 Another common subpackage type is the `-data` subpackage. This subpackage
 type used to split architecture independent, big(ger) or huge amounts
@@ -1517,7 +1522,7 @@ The main package must then have `depends="${pkgname}-data-${version}_${revision}
 possibly in addition to other, non-automatic depends.
 
 <a id="pkgs_documentation"></a>
-### Documentation packages
+#### Documentation packages
 
 Packages intended for user interaction do not always unconditionally require
 their documentation part. A user who does not want to e.g. develop
@@ -1532,7 +1537,7 @@ amounts of documentation for no reason. Thus the size of the documentation part
 be your guidance to decide whether or not to split off a `-doc` subpackage.
 
 <a id="pkgs_python"></a>
-### Python packages
+#### Python packages
 
 Python packages should be built with the `python{,2,3}-module` build style, if possible.
 This sets some environment variables required to allow cross compilation. Support to allow
@@ -1593,7 +1598,7 @@ Also, a set of useful variables are defined to use in the templates:
 python versions.
 
 <a id="pkgs_go"></a>
-### Go packages
+#### Go packages
 
 Go packages should be built with the `go` build style, if possible.
 The `go` build style takes care of downloading Go dependencies and
@@ -1627,7 +1632,7 @@ The path to the package's source inside `$GOPATH` is available as
 `$GOSRCPATH`.
 
 <a id="pkgs_haskell"></a>
-### Haskell packages
+#### Haskell packages
 
 We build Haskell package using `stack` from
 [Stackage](http://www.stackage.org/), generally the LTS versions.
@@ -1645,7 +1650,7 @@ The following variables influence how Haskell packages are built:
   you can add your `--flag ...` parameters there.
 
 <a id="pkgs_font"></a>
-### Font packages
+#### Font packages
 
 Font packages are very straightforward to write, they are always set with the
 following variables:
@@ -1902,7 +1907,7 @@ If it is running under another architecture it tries to use the host's `install-
 utility.
 
 <a id="triggers_initramfs_regenerate"></a>
-### initramfs-regenerate
+#### initramfs-regenerate
 
 The initramfs-regenerate trigger will trigger the regeneration of all kernel
 initramfs images after package installation or removal. The trigger must be
@@ -2151,7 +2156,7 @@ to pull in new changes:
     $ git pull --rebase upstream master
 
 <a id="help"></a>
-## Help
+### Help
 
 If after reading this `manual` you still need some kind of help, please join
 us at `#xbps` via IRC at `irc.libera.chat`.

From 63177f6280da9425bec65e4654d876261d4bc206 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 11:40:36 +0200
Subject: [PATCH 1666/1853] zig: fix update-check

---
 srcpkgs/zig/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/zig/update

diff --git a/srcpkgs/zig/update b/srcpkgs/zig/update
new file mode 100644
index 000000000000..930380745b6b
--- /dev/null
+++ b/srcpkgs/zig/update
@@ -0,0 +1,2 @@
+site=https://ziglang.org
+pattern="<b>\K[\d.]+(?=</b>)"

From 6cc8f6485f2eb62982d27753d2973f758bb0eab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 6 Sep 2019 20:55:47 +0200
Subject: [PATCH 1667/1853] util-linux: adjust PATH for usrmerge

---
 srcpkgs/util-linux-common/template            |  2 +-
 srcpkgs/util-linux/patches/default-PATH.patch | 37 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/util-linux/patches/default-PATH.patch

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 90b768803f05..d17a31a482f5 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux
 pkgname=util-linux-common
 version=2.38.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/util-linux/patches/default-PATH.patch b/srcpkgs/util-linux/patches/default-PATH.patch
new file mode 100644
index 000000000000..d811470b16a1
--- /dev/null
+++ b/srcpkgs/util-linux/patches/default-PATH.patch
@@ -0,0 +1,37 @@
+From 52f81526dbbea59e5c8f6aee64db1a9c29509d58 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Tue, 30 Mar 2021 22:58:45 +0200
+Subject: [PATCH] default-PATH
+
+
+diff --git a/include/pathnames.h b/include/pathnames.h
+index 3845d4c..984b4d8 100644
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -19,20 +19,12 @@
+ /* DEFPATHs from <paths.h> don't include /usr/local */
+ #undef _PATH_DEFPATH
+ 
+-#ifdef USE_USRDIR_PATHS_ONLY
+-# define _PATH_DEFPATH	        "/usr/local/bin:/usr/bin"
+-#else
+-# define _PATH_DEFPATH	        "/usr/local/bin:/bin:/usr/bin"
+-#endif
++# define _PATH_DEFPATH	        "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"
+ 
+ #undef _PATH_DEFPATH_ROOT
+ 
+-#ifdef USE_USRDIR_PATHS_ONLY
+-# define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+-#else
+-# define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
+-#endif
+-
++# define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"
++	
+ #define	_PATH_HUSHLOGIN		".hushlogin"
+ #define	_PATH_HUSHLOGINS	"/etc/hushlogins"
+ 
+-- 
+2.31.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 29477fc6ea89..99819d02068b 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.38.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From 02fc12ba8dac69f407f5fe83a70593efc1979348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 30 Mar 2021 22:03:49 +0200
Subject: [PATCH 1668/1853] openssh: adjust PATH for usrmerge

---
 srcpkgs/openssh/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index c74b56e08ac3..5beea5260428 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,13 +1,14 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.3p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
  --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth
  --disable-strip --with-privsep-path=/var/chroot/ssh
- --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
+ --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
  --with-pid-dir=/run --with-pam
  --with-libedit --with-Werror
  $(vopt_if ldns --with-ldns=$XBPS_CROSS_BASE/usr)

From 72912b34870b01296da46bbe4603d49d7b07193c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 8 Oct 2019 19:42:38 +0200
Subject: [PATCH 1669/1853] lxdm: adjust PATH for usrmerge

---
 srcpkgs/lxdm/patches/default-PATH.patch | 22 ++++++++++++++++++++++
 srcpkgs/lxdm/template                   |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/lxdm/patches/default-PATH.patch

diff --git a/srcpkgs/lxdm/patches/default-PATH.patch b/srcpkgs/lxdm/patches/default-PATH.patch
new file mode 100644
index 000000000000..160fcbb73453
--- /dev/null
+++ b/srcpkgs/lxdm/patches/default-PATH.patch
@@ -0,0 +1,22 @@
+From e46c33735f81ca5607247fd0690ebbe9f1565708 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Tue, 8 Oct 2019 19:32:15 +0200
+Subject: [PATCH] tweak default PATH
+
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index a37f051..8a0e6c6 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -1399,7 +1399,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ 	if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */
+ 		env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */
+ 	else /* don't use the global env, they are bad for user */
+-		env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */
++		env=g_environ_setenv(env, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin", TRUE); /* set proper default */
+ 	g_free(path);
+ 	/* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */
+ 	if( lang && lang[0] )
+-- 
+2.23.0
+
diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template
index 55ae9b5356eb..d9e532be58ac 100644
--- a/srcpkgs/lxdm/template
+++ b/srcpkgs/lxdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lxdm'
 pkgname=lxdm
 version=0.5.3
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-consolekit --with-pam --enable-gtk3"
 hostmakedepends="automake gettext-devel libtool pkg-config intltool"
@@ -16,13 +16,13 @@ conf_files="
 	/etc/lxdm/Xsession
 	/etc/lxdm/lxdm.conf
 	/etc/pam.d/lxdm"
-system_groups="lxdm"
 short_desc="GUI login manager for LXDE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://lxde.org"
 distfiles="${SOURCEFORGE_SITE}/lxdm/lxdm-${version}.tar.xz"
 checksum=4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f
+system_groups="lxdm"
 
 pre_configure() {
 	autoreconf -fi

From b9f07f2ebaf80df666a70baddff0dbab5c848006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 27 Jun 2023 00:11:02 +0200
Subject: [PATCH 1670/1853] sddm: adjust PATH for usrmerge

---
 .../sddm/patches/0.19.0--default-path.patch   | 22 +++++++++++++++++++
 srcpkgs/sddm/template                         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sddm/patches/0.19.0--default-path.patch

diff --git a/srcpkgs/sddm/patches/0.19.0--default-path.patch b/srcpkgs/sddm/patches/0.19.0--default-path.patch
new file mode 100644
index 000000000000..bc3f8bd348cd
--- /dev/null
+++ b/srcpkgs/sddm/patches/0.19.0--default-path.patch
@@ -0,0 +1,22 @@
+From 57d716be7cb0588538d89bb72113bec82adf9e52 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Mon, 26 Jun 2023 23:15:05 +0200
+Subject: default-path
+
+
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index cf44a62..4c01c4a 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -82,7 +82,7 @@ namespace SDDM {
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
++            Entry(DefaultPath,         QString,     _S("/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
+-- 
+2.41.0
+
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 2a87381c8e8a..63fa93f160cf 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
 version=0.19.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs

From d397e2390027f751065da3e32b0556bb7861e81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 14:40:51 +0200
Subject: [PATCH 1671/1853] gdm: adjust PATH for usrmerge

---
 srcpkgs/gdm/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 5cdcf618cb83..f8990839198a 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=44.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -10,6 +10,7 @@ configure_args="
  -Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
  -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true
  -Dselinux=disabled -Dlibaudit=disabled -Dgdm-xsession=true
+ -Ddefault-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
  -Dsystemdsystemunitdir=/usr/lib/systemd/system
  -Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="dconf gettext itstool pkg-config"

From 7009c8e8333efe344c7871043c467192be113732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 17:28:41 +0200
Subject: [PATCH 1672/1853] slim: adjust PATH for usrmerge

---
 .../1.3.6--adjust-PATH-for-usrmerge.patch     | 34 +++++++++++++++++++
 srcpkgs/slim/template                         |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch

diff --git a/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch b/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch
new file mode 100644
index 000000000000..76bf4fa6c6e9
--- /dev/null
+++ b/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch
@@ -0,0 +1,34 @@
+From 0a96bb015d9dc30ff98cfc21256851cb2005cea1 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Sat, 1 Jul 2023 17:28:17 +0200
+Subject: adjust-PATH-for-usrmerge
+
+
+diff --git a/cfg.cpp b/cfg.cpp
+index 02379f2..56a584b 100644
+--- a/cfg.cpp
++++ b/cfg.cpp
+@@ -29,7 +29,7 @@ Cfg::Cfg()
+ 	: currentSession(-1)
+ {
+ 	/* Configuration options */
+-	options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));
++	options.insert(option("default_path","/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"));
+ 	options.insert(option("default_xserver","/usr/bin/X"));
+ 	options.insert(option("xserver_arguments",""));
+ 	options.insert(option("numlock",""));
+diff --git a/slim.conf b/slim.conf
+index a8e2e1c..1c14ade 100644
+--- a/slim.conf
++++ b/slim.conf
+@@ -1,6 +1,6 @@
+ # Path, X server and arguments (if needed)
+ # Note: -xauth $authfile is automatically appended
+-default_path        /bin:/usr/bin:/usr/local/bin
++default_path        /usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
+ default_xserver     /usr/bin/X
+ #xserver_arguments   -dpi 75
+ 
+-- 
+2.41.0
+
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b7382cac3085..1ca2ff320bfc 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -1,7 +1,7 @@
 # Template file for 'slim'
 pkgname=slim
 version=1.3.6
-revision=13
+revision=14
 build_style=cmake
 configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
 conf_files="/etc/slim.conf /etc/pam.d/slim"

From 22382a019f7e056491ad0dc7b3a92d69f6a97036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 17:31:24 +0200
Subject: [PATCH 1673/1853] lightdm: adjust PATH for usrmerge

---
 .../1.32.0--adjust-PATH-for-usrmerge.patch    | 22 +++++++++++++++++++
 srcpkgs/lightdm/template                      |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch

diff --git a/srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch b/srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch
new file mode 100644
index 000000000000..0e079369ec04
--- /dev/null
+++ b/srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch
@@ -0,0 +1,22 @@
+From 389d9e09217ee598674ff7d6df69563be51cbfe6 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Sat, 1 Jul 2023 17:30:54 +0200
+Subject: adjust-PATH-for-usrmerge
+
+
+diff --git a/src/session-child.c b/src/session-child.c
+index 112daab..af28c48 100644
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -394,7 +394,7 @@ session_child_run (int argc, char **argv)
+         else
+         {
+             /* Set POSIX variables */
+-            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
++            pam_putenv (pam_handle, "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin");
+             pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));
+-- 
+2.41.0
+
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index f527616261ba..5a0db355bf73 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.32.0
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter

From be375c0fa1f69da24e214f00d7b6b1dfde642f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 17:53:46 +0200
Subject: [PATCH 1674/1853] xdm: adjust PATH for usrmerge

---
 srcpkgs/xdm/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 2fdc56ad7f23..282b8fe7a540 100644
--- a/srcpkgs/xdm/template
+++ b/srcpkgs/xdm/template
@@ -1,7 +1,7 @@
 # Template file for 'xdm'
 pkgname=xdm
 version=1.1.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-random-device=/dev/urandom
  --with-utmp-file=/var/run/utmp
@@ -24,6 +24,10 @@ homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
 checksum=3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f
 
+pre_configure() {
+	export DEF_USER_PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
+}
+
 post_install() {
 	vsv xdm
 	vinstall ${FILESDIR}/xdm.pam 644 etc/pam.d xdm

From 181bba33aea6d385843c7241687dfc53cd115bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 22:39:03 +0200
Subject: [PATCH 1675/1853] linux-driver-management: move sddm setup to
 examples

do not overwrite sddm file
---
 srcpkgs/linux-driver-management/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index 0a8859cb73b4..33396a0b9be3 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-driver-management'
 pkgname=linux-driver-management
 version=1.0.3
-revision=2
+revision=3
 # Tests require unpackaged umockdev
 # https://github.com/martinpitt/umockdev
 build_style=meson
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
 fi
 
+post_install() {
+	mkdir -p ${DESTDIR}/usr/share/examples/sddm/scripts
+	mv ${DESTDIR}/usr/share/sddm/scripts/Xsetup ${DESTDIR}/usr/share/examples/sddm/scripts/Xsetup
+}
+
 linux-driver-management-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"

From dde1a0b272a441dc5cc455849f1e29eedb959ea6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:36:25 +0200
Subject: [PATCH 1676/1853] xorg-util-macros: update to 1.20.0.

---
 srcpkgs/xorg-util-macros/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template
index 2ee195972a73..364947d4e4e4 100644
--- a/srcpkgs/xorg-util-macros/template
+++ b/srcpkgs/xorg-util-macros/template
@@ -1,15 +1,15 @@
 # Template file for 'xorg-util-macros'
 pkgname=xorg-util-macros
-version=1.19.3
+version=1.20.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 short_desc="X.org autotool macros"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/util/macros/"
-distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2"
-checksum=0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971
+distfiles="${XORG_SITE}/util/util-macros-${version}.tar.xz"
+checksum=0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db
 
 post_install() {
 	vlicense COPYING

From 34386c37148665372922cd7939213ab3eb9765e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:36:29 +0200
Subject: [PATCH 1677/1853] xorg-cf-files: update to 1.0.8.

---
 srcpkgs/xorg-cf-files/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index 4bec7c2ac82e..65bd013abca4 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-cf-files'
 pkgname=xorg-cf-files
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake xorg-util-macros font-util"
@@ -8,8 +8,8 @@ short_desc="X.Org imake program and related utilities"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="X11"
 homepage="https://www.x.org/wiki/"
-distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
-checksum=74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308
+distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.xz"
+checksum=7408955defcfab0f44d1bedd4ec0c20db61914917ad17bfc1f1c9bf56acc17b9
 
 pre_configure() {
 	autoreconf -fi

From 0292452b78697ea3a346b38c43c5835a307fcdd4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:37:40 +0200
Subject: [PATCH 1678/1853] xkbevd: update to 1.1.5.

---
 srcpkgs/xkbevd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xkbevd/template b/srcpkgs/xkbevd/template
index 6ed2959ad663..da491661f069 100644
--- a/srcpkgs/xkbevd/template
+++ b/srcpkgs/xkbevd/template
@@ -1,7 +1,7 @@
 # Template file for 'xkbevd'
 pkgname=xkbevd
-version=1.1.4
-revision=2
+version=1.1.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
@@ -9,8 +9,8 @@ short_desc="XKBD Event Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b
 
 post_install() {
 	vlicense COPYING

From a31c4703ff6ac8d9bde3c35b5c1227f7023f2ff5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:38:03 +0200
Subject: [PATCH 1679/1853] xkbutils: update to 1.0.5.

---
 srcpkgs/xkbutils/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xkbutils/template b/srcpkgs/xkbutils/template
index 18789b0ad14e..3b8d51321160 100644
--- a/srcpkgs/xkbutils/template
+++ b/srcpkgs/xkbutils/template
@@ -1,7 +1,7 @@
 # Template build file for 'xkbutils'.
 pkgname=xkbutils
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXaw-devel xorgproto"
@@ -9,8 +9,8 @@ short_desc="XKBD Utilities"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4
 
 post_install() {
 	vlicense COPYING

From 6c7437745aa738ee279cb1dd34d2b59484ab0d96 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:39:01 +0200
Subject: [PATCH 1680/1853] xlsatoms: update to 1.1.4.

---
 srcpkgs/xlsatoms/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template
index 42570e6b125b..e1cd09eddf38 100644
--- a/srcpkgs/xlsatoms/template
+++ b/srcpkgs/xlsatoms/template
@@ -1,7 +1,7 @@
 # Template file for 'xlsatoms'
 pkgname=xlsatoms
-version=1.1.3
-revision=2
+version=1.1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxcb-devel"
@@ -9,8 +9,8 @@ short_desc="List interned atoms defined on the X server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7
 
 post_install() {
 	vlicense COPYING

From a90c7c062c70bc54e5d8577d3ecb10179f3b87f5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:40:08 +0200
Subject: [PATCH 1681/1853] xvinfo: update to 1.1.5.

---
 srcpkgs/xvinfo/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template
index 21be07874f8e..847a275b9427 100644
--- a/srcpkgs/xvinfo/template
+++ b/srcpkgs/xvinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'xvinfo'
 pkgname=xvinfo
-version=1.1.4
-revision=2
+version=1.1.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXv-devel"
@@ -9,8 +9,8 @@ short_desc="Query X-Video capabilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404
 
 post_install() {
 	vlicense COPYING

From e9998417c1ffc8844c444f0f2e34c457cb978d06 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:40:53 +0200
Subject: [PATCH 1682/1853] xwininfo: update to 1.1.6.

---
 srcpkgs/xwininfo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xwininfo/template b/srcpkgs/xwininfo/template
index 6ba84063fe8a..432ae29443b9 100644
--- a/srcpkgs/xwininfo/template
+++ b/srcpkgs/xwininfo/template
@@ -1,6 +1,6 @@
 # Template file for 'xwininfo'
 pkgname=xwininfo
-version=1.1.5
+version=1.1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Query information about X windows"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f
 
 post_install() {
 	vlicense COPYING

From a9eca820cc4393dd77d13e98d17871407d44decd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:41:50 +0200
Subject: [PATCH 1683/1853] setxkbmap: update to 1.3.4.

---
 srcpkgs/setxkbmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 02a6f5de2452..820288afe657 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -1,6 +1,6 @@
 # Template file for 'setxkbmap'
 pkgname=setxkbmap
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/app/setxkbmap"
 distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.xz"
-checksum=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b
+checksum=be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade
 
 post_install() {
 	vlicense COPYING

From a51f0a54d530b777c53794c5b177882cfd7ae553 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:42:35 +0200
Subject: [PATCH 1684/1853] sessreg: update to 1.1.3.

---
 srcpkgs/sessreg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sessreg/template b/srcpkgs/sessreg/template
index a95e0b950789..a7ef25c66914 100644
--- a/srcpkgs/sessreg/template
+++ b/srcpkgs/sessreg/template
@@ -1,6 +1,6 @@
 # Template build file for 'sessreg'.
 pkgname=sessreg
-version=1.1.2
+version=1.1.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Manage utmp/wtmp entries for xdm"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 8c4508bf706e00b88a08c6daa7f674c6a5dd9e06 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 12:22:59 -0500
Subject: [PATCH 1685/1853] sddm: update to 0.20.0.

Closes #44593.
---
 srcpkgs/sddm/patches/qt-5.15.2.patch | 23 -----------------------
 srcpkgs/sddm/template                | 11 ++++++-----
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/sddm/patches/qt-5.15.2.patch

diff --git a/srcpkgs/sddm/patches/qt-5.15.2.patch b/srcpkgs/sddm/patches/qt-5.15.2.patch
deleted file mode 100644
index 51094817c6da..000000000000
--- a/srcpkgs/sddm/patches/qt-5.15.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid@kde.org" <aacid@kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b37..d5f29a94a 100644
---- a/src/daemon/XorgDisplayServer.cpp
-+++ b/src/daemon/XorgDisplayServer.cpp
-@@ -65,7 +65,7 @@ namespace SDDM {
-         // create a random hexadecimal number
-         const char *digits = "0123456789abcdef";
-         for (int i = 0; i < 32; ++i)
--            m_cookie[i] = digits[dis(gen)];
-+            m_cookie[i] = QLatin1Char(digits[dis(gen)]);
-     }
- 
-     XorgDisplayServer::~XorgDisplayServer() {
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 63fa93f160cf..b91cef64249e 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
-version=0.19.0
-revision=4
+version=0.20.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
@@ -12,9 +12,10 @@ depends="dbus"
 short_desc="QML based X11 display manager"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-3.0"
-homepage="http://github.com/sddm/sddm"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
+homepage="https://github.com/sddm/sddm"
+changelog="https://raw.githubusercontent.com/sddm/sddm/develop/ChangeLog"
+distfiles="https://github.com/sddm/sddm/archive/v${version}.tar.gz"
+checksum=467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

From 16935b4f53db1462291ed21c5415096c8d878a9d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 22:12:08 -0500
Subject: [PATCH 1686/1853] ntdsextract2: update to 0.12.2.

---
 srcpkgs/ntdsextract2/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index ce95b7a42748..34842894e043 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,17 +1,11 @@
 # Template file for 'ntdsextract2'
 pkgname=ntdsextract2
-version=0.9.1
-revision=2
+version=0.12.2
+revision=1
 build_style=cargo
 short_desc="Display contents of Active Directory database files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/janstarke/ntdsextract2"
 distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=75b3731dac5e3d2f6d3149f60f4336d3bd2732a1843bfff6e1fcb8d1cc46fc45
-
-post_patch() {
-	# https://github.com/janstarke/ntdsextract2/pull/8
-	cargo generate-lockfile
-	cargo update --package libesedb@0.1.4 --precise 0.1.3
-}
+checksum=d6515d5c703d6d2dd0d921439d72f0e47a0f58b41d9efc24aa2eeda92068b3fb

From 67ac13233af1580a786621e27f99c94266f0be56 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 22:51:24 -0500
Subject: [PATCH 1687/1853] QXlsx: backport cmake patch

---
 srcpkgs/QXlsx/patches/fix-inc.patch | 24 ++++++++++++++++++++++++
 srcpkgs/QXlsx/template              |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/QXlsx/patches/fix-inc.patch

diff --git a/srcpkgs/QXlsx/patches/fix-inc.patch b/srcpkgs/QXlsx/patches/fix-inc.patch
new file mode 100644
index 000000000000..5b26d47c2c70
--- /dev/null
+++ b/srcpkgs/QXlsx/patches/fix-inc.patch
@@ -0,0 +1,24 @@
+From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Mon, 17 Apr 2023 23:43:59 +0100
+Subject: [PATCH] Fix #278
+
+There's no real reason to install the same headers twice, but at least
+now clients of the library can build again
+---
+ QXlsx/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index 4fa7f7f..074922a 100644
+--- a/QXlsx/CMakeLists.txt
++++ b/QXlsx/CMakeLists.txt
+@@ -179,7 +179,7 @@ PRIVATE
+     ${QXLSX_HEADERPATH}
+ PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+-    $<INSTALL_INTERFACE:include/QXlsx>
++    $<INSTALL_INTERFACE:include/QXlsxQt${QT_VERSION_MAJOR}>
+ )
+ 
+ set_target_properties(QXlsx PROPERTIES
diff --git a/srcpkgs/QXlsx/template b/srcpkgs/QXlsx/template
index 8177672d010c..31cc3ba9e5f8 100644
--- a/srcpkgs/QXlsx/template
+++ b/srcpkgs/QXlsx/template
@@ -1,7 +1,7 @@
 # Template file for 'QXlsx'
 pkgname=QXlsx
 version=1.4.6
-revision=1
+revision=2
 build_style=cmake
 build_wrksrc="QXlsx"
 hostmakedepends="qt5-qmake qt5-host-tools"

From 07788581e692a8a113876fff3862ad9855d2846f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 23:00:23 -0500
Subject: [PATCH 1688/1853] stellarium: update to 23.2.

---
 srcpkgs/stellarium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index e468c1f3bc06..74ee07205f6e 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=23.1
+version=23.2
 revision=1
 build_style=cmake
 configure_args="-DENABLE_SHOWMYSKY=Off -DUSE_PLUGIN_TELESCOPECONTROL=NO"
@@ -14,5 +14,5 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://stellarium.org/"
 distfiles="https://github.com/Stellarium/stellarium/archive/refs/tags/v${version}.tar.gz"
-checksum=ce896ddf6f0b35d6bbf6cee122d8f0b5c7bca93fffa17c10f16c56a689a1850f
+checksum=58cf1dc6b7f18626177f80d9912dff6ac24044ad4184d778fe513788c3d97b96
 replaces="stellarium-data>=0"

From 7aaf015787440fe549265f796239f377f8ea3ce1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 23:52:10 -0500
Subject: [PATCH 1689/1853] python3-ytmusicapi: update to 1.1.1.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 6cd02fa6be08..bb8abe329516 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${PYPI_SITE}/y/ytmusicapi/ytmusicapi-${version}.tar.gz"
-checksum=3286de79e94a914e4a14814fffe372d24b734e784acd7f9fa734ee383adf8c6d
+checksum=50258db9bd0512b766177906488265a4870a74f65d3f3279cbccb1f593c1525c
 
 post_install() {
 	vlicense LICENSE

From 6f5ac56438e92f7521d4fa054a8956ba1462edd1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 23:52:14 -0500
Subject: [PATCH 1690/1853] python3-pydyf: update to 0.7.0.

---
 srcpkgs/python3-pydyf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pydyf/template b/srcpkgs/python3-pydyf/template
index b705f1e4c311..ae5e0092490e 100644
--- a/srcpkgs/python3-pydyf/template
+++ b/srcpkgs/python3-pydyf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pydyf'
 pkgname=python3-pydyf
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core python3-flit_core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://courtbouillon.org/pydyf"
 distfiles="https://github.com/CourtBouillon/pydyf/archive/refs/tags/v${version}.tar.gz"
-checksum=28b521b82e5b76633680b97172a13265e3dedab807372d01802015b83ea99d9d
+checksum=b7055ab659108f13036637a398de6ed20a9e23e11ed33fbd9cc586c91fcfd16b
 
 post_install() {
 	vlicense LICENSE

From ff72c932bb526a6059905da3fd0757f9647aae9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Jul 2023 22:08:02 -0300
Subject: [PATCH 1691/1853] primecount: update to 7.9.

---
 srcpkgs/primecount/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template
index 4f698b1e2169..624f7b9cd674 100644
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@@ -1,6 +1,6 @@
 # Template file for 'primecount'
 pkgname=primecount
-version=7.8
+version=7.9
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primecount/"
 changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=7588b241cd268f4cc6c836135088a143ca65c181278ee0ba3b3309ac055d5ae8
+checksum=872975ba2cbb43f5cc1ff5f5fda9ec4ec3f2be1eb3e3e906abe5d0b29a997f5b
 
 build_options="native_build"
 

From 29711d82c05f588219301e9acc98a477627dd500 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 3 Jul 2023 21:54:18 -0400
Subject: [PATCH 1692/1853] grype: update to 0.63.1

---
 srcpkgs/grype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 11972217100b..df162a5317ee 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,6 +1,6 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.63.0
+version=0.63.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=a55aa18498a2b67f7bdcfb0fac0746a351ceb8a2e9da0842ab1a68a07f0ffa65
+checksum=c0cae06f51a00a9ada57dd3ddd8de052893e42620d8cee49c8874630d5d89817
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

From 68dd477e6c55c37115d710597c8c9f7d3a7861e0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 3 Jul 2023 21:30:42 -0400
Subject: [PATCH 1693/1853] syft: update to 0.84.1

---
 srcpkgs/syft/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index a38b2524bd87..11bd81181bee 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,16 +1,17 @@
 # Template file for 'syft'
 pkgname=syft
-version=0.84.0
+version=0.84.1
 revision=1
 build_style=go
 build_helper=qemu
-go_import_path="github.com/anchore/syft/cmd/syft"
+go_import_path="github.com/anchore/syft"
+go_package="github.com/anchore/syft/cmd/syft"
 short_desc="SBOM generator CLI for container images, filesystems and more"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/syft"
 distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz"
-checksum=fc16bd2e207d864a56c7122b0ad48b393214383f606e63d3f71bc4761d809326
+checksum=f8089209966436e7ef829b50092a410a152df8b98e60fe93214556f473d306b0
 
 post_install() {
 	syft="${DESTDIR}/usr/bin/syft"

From 3d4bdb0aa980b1d69257252c4d9eb47d0ec8ad4a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 18:48:29 +0200
Subject: [PATCH 1694/1853] wayland-protocols: update to 1.32.

---
 srcpkgs/wayland-protocols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template
index 2b29a4206cba..d24fd1f43af4 100644
--- a/srcpkgs/wayland-protocols/template
+++ b/srcpkgs/wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'wayland-protocols'
 pkgname=wayland-protocols
-version=1.31
+version=1.32
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://wayland.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${version}/wayland-protocols-${version}.tar.gz"
-checksum=04d3f66eca99d638ec8dbfdfdf79334290e22028f7d0b04c7034d9ef18a3248a
+checksum=444b5d823ad0163dfe505c97ea1a0689ca7e2978a87cf59b03f06573b87db260
 
 post_install() {
 	vlicense COPYING

From 91d0f70e840372076b2e905bfc68541a39d006bc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 3 Jul 2023 18:29:26 +0200
Subject: [PATCH 1695/1853] squirrel: fix -devel subpackage

---
 srcpkgs/squirrel/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/squirrel/template b/srcpkgs/squirrel/template
index abd2c7a0d607..32fdef7af991 100644
--- a/srcpkgs/squirrel/template
+++ b/srcpkgs/squirrel/template
@@ -1,7 +1,7 @@
 # Template file for 'squirrel'
 pkgname=squirrel
 version=3.2
-revision=1
+revision=2
 build_style=cmake
 short_desc="Squirrel Programming Language"
 maintainer="Wilson Birney <wpb@360scada.com>"
@@ -25,9 +25,9 @@ squirrel-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmkdir usr
-		vcopy include usr
-		vmove usr/lib/*.so
-		vmove usr/lib/*.a
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }

From 25843f1ecf87aeb2136812de653a939fa68cd115 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 18:34:15 +0200
Subject: [PATCH 1696/1853] hwids: update to 0.372.

---
 srcpkgs/hwids/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index 7b1bfc0dc06d..f274acd8cdf1 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -1,14 +1,14 @@
 # Template file for 'hwids'
 pkgname=hwids
 reverts="20201207_1 20210613_1 20200813.1_1 20200813.1_2 20200306_1 20200204_1 20191025_1 20190818_1 20190316_1 20180917_1 20180518_1 20180315_1 20171003_1 20170715_1 20170328_1 20161103_1 20160801_1 20160421_1 20160306_1 20150717_1 20150421_1 20150129_1 20150118_1"
-version=0.368
+version=0.372
 revision=1
 short_desc="Hardware Identification Databases"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/vcrhonek/hwdata"
 distfiles="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${version}.tar.gz"
-checksum=d3db5f4d08a0ba2e4d776fba507662399816e75a14af78bd25dd3c8f2fb8e951
+checksum=aff121c1c7a7dec58414c5e21151a180d3a23628e21c12e3bef58e063a0dc228
 
 do_install() {
 	vmkdir usr/share/hwdata

From 5602a5738e824018d4891960166e01a8273cbdb0 Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 24 Mar 2023 19:42:35 -0400
Subject: [PATCH 1697/1853] newsraft: update to 0.19.

Closes #44817.
---
 srcpkgs/newsraft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/newsraft/template b/srcpkgs/newsraft/template
index 68cd33eea0f8..74e39db007e9 100644
--- a/srcpkgs/newsraft/template
+++ b/srcpkgs/newsraft/template
@@ -1,6 +1,6 @@
 # Template file for 'newsraft'
 pkgname=newsraft
-version=0.17
+version=0.19
 revision=1
 build_style=gnu-makefile
 make_install_args="EXAMPLES_DIR=${DESTDIR}/usr/share/examples/newsraft"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://codeberg.org/grisha/newsraft"
 changelog="https://codeberg.org/grisha/newsraft/releases"
 distfiles="https://codeberg.org/grisha/newsraft/archive/newsraft-${version}.tar.gz"
-checksum=12a09b4d4ade374d1ccf4256a9d7eb511f4a59e175e4d832842dfd2b95d8742c
+checksum=6f7b578609f543f65b63dc0ba2fd904cc7b71d4f33f84ef052fe704c5156b605
 
 post_install() {
 	vlicense doc/license.txt

From acf223f1b2609eedca97d08c3fe6c3990738f600 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 28 Jun 2023 14:24:43 +0000
Subject: [PATCH 1698/1853] MoarVM: update to 2023.06.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index d5a1b302328c..d48bb17819e7 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2023.05
+version=2023.06
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -14,6 +14,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=c8e75883c1e1936d71ac081b21e8c2a344c80c6db5b4f8e1e6bb9481dd8b7547
+checksum=143f92510eaa3452c712e4aae9f44d84cd078f16517b40252bab7dd5e224ecdb
 nocross=yes
 shlib_provides="libmoar.so"

From 9138e1cc14ca76f7fa034f6a2a5a2f9bfdf0a499 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 28 Jun 2023 14:25:39 +0000
Subject: [PATCH 1699/1853] nqp: update to 2023.06.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 5c05ed55c9a5..648dae62f7a0 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2023.05
+version=2023.06
 revision=1
 build_style=configure
 make_check_target=test
@@ -14,5 +14,5 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
 distfiles="https://rakudo.org/dl/nqp/nqp-${version}.tar.gz"
-checksum=1402db7e3ca6f2f3dfc1e98aa32e0e2a937e49b2a777a74c62268a98abb3bbd2
+checksum=ddcb92f29180699ebaf0a7faa46ad4ac902f9c8826d7476d9c6f71176cadd7d3
 nocross=yes

From a6ef62e7fa2710a3fd842375f3584570df9cbfcf Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 28 Jun 2023 14:26:51 +0000
Subject: [PATCH 1700/1853] rakudo: update to 2023.06.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 5ccd01e973fd..8e87abaa2535 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2023.05
+version=2023.06
 revision=1
 build_style=configure
 make_check_target=test
@@ -31,7 +31,7 @@ license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
 distfiles="https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"
-checksum=cfae1cf1321c8130e4746eb5f5c926f65adc9774e92c1b3a89c2c48f0b22236a
+checksum=da50fed9fa99cced37f8e450c6a023150804d627bf698a5c0d88cbe84f405e72
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 256dad944d4acc791a655627e60fc130e8cf606d Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Tue, 16 May 2023 18:22:00 -0400
Subject: [PATCH 1701/1853] New package: juliaup-1.8.16

---
 srcpkgs/juliaup/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/juliaup/template

diff --git a/srcpkgs/juliaup/template b/srcpkgs/juliaup/template
new file mode 100644
index 000000000000..3f718e4692d8
--- /dev/null
+++ b/srcpkgs/juliaup/template
@@ -0,0 +1,21 @@
+# Template file for 'juliaup'
+pkgname=juliaup
+version=1.8.16
+revision=1
+archs="x86_64* i686 aarch64"
+build_style=cargo
+short_desc="Julia installer and version multiplexer"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="MIT"
+homepage="https://github.com/JuliaLang/juliaup"
+distfiles="https://github.com/JuliaLang/juliaup/archive/refs/tags/v${version}.tar.gz"
+checksum=99b0d62b589c8a330fffaa2252b8e4251124bfd59077f0789a6a456d3b1ae81a
+
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+	# command_add test fails, doesn't seem to be able to launch the downloaded julia in the test
+	make_check=no
+fi
+
+post_install() {
+	vlicense LICENSE
+}

From faf8d9b269a3b5d1542345ea13d114d662788341 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 4 Jul 2023 06:09:09 -0400
Subject: [PATCH 1702/1853] chezmoi: update to 2.34.3.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 4e8b46f9b709..074ef8b8c602 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.34.2
+version=2.34.3
 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=fc47d6e4cbe1b8f4762c204be28e30d9e9f3bcfa8c51ac276cbd1864804b2dc8
+checksum=708ad93e8e0504ca598f6571652fc15ac609c735ce55af6a23a9b8931553c2e5
 
 pre_build() {
 	local _date

From 30011a9194110de936833805c114a1b93bb29d29 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 13:57:56 +0200
Subject: [PATCH 1703/1853] cmark: update to 0.30.3.

---
 srcpkgs/cmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmark/template b/srcpkgs/cmark/template
index cd822051b3ab..08f8e4d8930f 100644
--- a/srcpkgs/cmark/template
+++ b/srcpkgs/cmark/template
@@ -1,6 +1,6 @@
 # Template file for 'cmark'
 pkgname=cmark
-version=0.30.2
+version=0.30.3
 revision=1
 build_style=cmake
 short_desc="CommonMark parsing and rendering library and program in C"
@@ -8,7 +8,7 @@ maintainer="pancake <pancake@nopcode.org>"
 license="MIT"
 homepage="https://github.com/commonmark/cmark"
 distfiles="https://github.com/commonmark/cmark/archive/${version}.tar.gz"
-checksum=6c7d2bcaea1433d977d8fed0b55b71c9d045a7cdf616e3cd2dce9007da753db3
+checksum=85e9fb515531cc2c9ae176d693f9871774830cf1f323a6758fb187a5148d7b16
 
 pre_configure() {
 	# Fix the SONAME version to use just the major number

From df5bae6e68548ea573a6a1dcad255672528213b5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 13:58:36 +0200
Subject: [PATCH 1704/1853] gucci: update to 1.6.10.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d2de364bbd2e..887d8a1ad5af 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.6.6
+version=1.6.10
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz"
-checksum=5e418d5801bee415fe055535dd2943aceb4a19646a2b101be0ba429b84de3fd6
+checksum=1cdf723cf95708234034608a9628aed642cfb2f0ad58f58756694e34d18e557b
 
 post_install() {
 	vlicense LICENSE

From 6a9b6a93446c22f0dd7ac920caa583d493169f68 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:06:52 +0200
Subject: [PATCH 1705/1853] imlib2: update to 1.11.1.

---
 srcpkgs/imlib2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 19cb61e08f4c..e985230fbb8a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,7 +1,7 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.11.0
-revision=3
+version=1.11.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
-checksum=6121196a05a82cc49d104d066ef1bd1e68b4b6394064d244985d0d6aa5fd8170
+checksum=f712b6bb9dcad46d8b8f4ad52610dcbbaebb4cc80b5fd12f93124d3a380fa6bf
 
 post_install() {
 	vlicense COPYING

From f1d47a840db8c4e939cb3f66f0a34208556ccf42 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:08:09 +0200
Subject: [PATCH 1706/1853] libpng: update to 1.6.40.

---
 srcpkgs/libpng/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index 626caa73effe..8c33a8252c90 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -1,16 +1,16 @@
 # Template file for 'libpng'
 pkgname=libpng
-version=1.6.39
+version=1.6.40
 revision=1
 build_style=gnu-configure
 makedepends="zlib-devel"
 short_desc="Library for manipulating PNG images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Libpng"
 homepage="http://www.libpng.org/pub/png/libpng.html"
 changelog="https://github.com/pnggroup/libpng/blob/master/CHANGES"
 distfiles="${SOURCEFORGE_SITE}/libpng/libpng-${version}.tar.xz"
-checksum=1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
+checksum=535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*) configure_args="--enable-arm-neon=no";;

From a8a3f062a4a4a1e1878e6557c23e1a23c6ae2b5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:10:40 +0200
Subject: [PATCH 1707/1853] imake: update to 1.0.9.

---
 srcpkgs/imake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imake/template b/srcpkgs/imake/template
index 90d09a3bab0b..a3eddf950e17 100644
--- a/srcpkgs/imake/template
+++ b/srcpkgs/imake/template
@@ -1,6 +1,6 @@
 # Template file for 'imake'
 pkgname=imake
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config perl makedepend xorg-cf-files"
@@ -10,5 +10,5 @@ short_desc="X.Org imake program and related utilities"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="GPL-2.0-or-later"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/util/imake-${version}.tar.bz2"
-checksum=b8d2e416b3f29cd6482bcffaaf19286d32917a164d07102a0e531ccd41a2a702
+distfiles="${XORG_SITE}/util/imake-${version}.tar.xz"
+checksum=72de9d278f74d95d320ec7b0d745296f582264799eab908260dbea0ce8e08f83

From 3be438f89508b945f25fbd0f5ed22214bb77571b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:11:51 +0200
Subject: [PATCH 1708/1853] libXaw3d: update to 1.6.4.

---
 srcpkgs/libXaw3d/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libXaw3d/template b/srcpkgs/libXaw3d/template
index f0241c7cc871..dcdd7dec142f 100644
--- a/srcpkgs/libXaw3d/template
+++ b/srcpkgs/libXaw3d/template
@@ -1,7 +1,7 @@
 # Template file for 'libXaw3d'
 pkgname=libXaw3d
-version=1.6.3
-revision=2
+version=1.6.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-internationalization --enable-multiplane-bitmaps
  --enable-gray-stipples --enable-arrow-scrollbars --with-pic --with-gnu-ld"
@@ -11,8 +11,8 @@ short_desc="X Athena Widget 3d library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT/X11"
 homepage="https://cgit.freedesktop.org/xorg/lib/libXaw3d"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=2600df524bc68eb0f25a5a9b28f056f9ad0bfa9336db870c6b4a623992750411
 
 post_install() {
 	vlicense COPYING

From 1a27b2a9dc30244f4580d7033b9fd3ecfabe2410 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:12:28 +0200
Subject: [PATCH 1709/1853] libSM: update to 1.2.4.

---
 srcpkgs/libSM/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index 8ed244b8a462..554423552a92 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -1,6 +1,6 @@
 # Template file for 'libSM'
 pkgname=libSM
-version=1.2.3
+version=1.2.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X Session Management Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84
 
 post_install() {
 	vlicense COPYING

From c2e5d6fd0551a79e89006e57d0474293317c0d27 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:13:11 +0200
Subject: [PATCH 1710/1853] libXfixes: update to 6.0.1.

---
 srcpkgs/libXfixes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index 173c075e99f5..5aa1618c5504 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -1,6 +1,6 @@
 # Template file for 'libXfixes'
 pkgname=libXfixes
-version=6.0.0
+version=6.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Xfixes library and extension of X RandR from modular X.org"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58
 
 post_install() {
 	vlicense COPYING

From a0f38d718446c2a3fb1fcd53f75c30df2353ad36 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:15:07 +0200
Subject: [PATCH 1711/1853] libXft: update to 2.3.8.

---
 srcpkgs/libXft/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 98b206dd35a2..3564df73cae2 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.7
+version=2.3.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxft"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.gz"
-checksum=75b4378644f5df3a15f684f8f0b5ff1324d37aacd5a381f3b830a2fbe985f660
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49
 
 post_install() {
 	vlicense COPYING

From a3aa9b186cec9c2b4fda312077a8d2a2980ccf6d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:16:27 +0200
Subject: [PATCH 1712/1853] libXi: update to 1.8.1.

---
 srcpkgs/libXi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index d1781a394bd3..c199d9c825a1 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -1,6 +1,6 @@
 # Template file for 'libXi'
 pkgname=libXi
-version=1.8
+version=1.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="X Input extension library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxi"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7
 
 post_install() {
 	vlicense COPYING

From ea8c30adb2fcac452df6cc8392c4b427bc72fb0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:17:20 +0200
Subject: [PATCH 1713/1853] libXpm: update to 3.5.16.

---
 srcpkgs/libXpm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXpm/template b/srcpkgs/libXpm/template
index f038544d9be3..bfd6ff3ca25c 100644
--- a/srcpkgs/libXpm/template
+++ b/srcpkgs/libXpm/template
@@ -1,6 +1,6 @@
 # Template file for 'libXpm'
 pkgname=libXpm
-version=3.5.14
+version=3.5.16
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
@@ -9,8 +9,8 @@ short_desc="X PixMap Library from modular Xorg X11"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.xz"
-checksum=f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=e6bc5da7a69dbd9bcc67e87c93d4904fe2f5177a0711c56e71fa2f6eff649f51
 
 post_install() {
 	vlicense COPYING

From 363774b1a49d8dbd3c68aff57e8f4f44bd3ee9a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:18:23 +0200
Subject: [PATCH 1714/1853] libXp: update to 1.0.4.

---
 srcpkgs/libXp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libXp/template b/srcpkgs/libXp/template
index 1f67f212c0b0..153aef21367d 100644
--- a/srcpkgs/libXp/template
+++ b/srcpkgs/libXp/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXp'.
 pkgname=libXp
-version=1.0.3
-revision=2
+version=1.0.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="xorgproto libXext-devel"
 short_desc="X Print Service Extension Library"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
 maintainer="Orphaned <orphan@voidlinux.org>"
-checksum=7f360c9905849c3587d48efc0f0ecbc852c19f61a52b18530d6b005cb9148c57
+checksum=1f19e3b8e82a34a8fd9889a7d9af0abe8588cb03fb57c37c569634cf3b9df1a4
 
 post_install() {
 	vlicense COPYING

From 73b6d70d7d5a9f539222aa3ea86f4807ec560e6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:19:17 +0200
Subject: [PATCH 1715/1853] libXres: update to 1.2.2.

---
 srcpkgs/libXres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template
index af75d0ad21d5..213e1cae7861 100644
--- a/srcpkgs/libXres/template
+++ b/srcpkgs/libXres/template
@@ -1,6 +1,6 @@
 # Template file for 'libXres'
 pkgname=libXres
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="X Resource Information Extension Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxres"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f
 
 post_install() {
 	vlicense COPYING

From db133e97bc6720febdcaff4fd9ef7093ccacc33f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:20:36 +0200
Subject: [PATCH 1716/1853] libXt: update to 1.3.0.

---
 srcpkgs/libXt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index 25891d8f9b8f..c06ad0dc2ae0 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -1,6 +1,6 @@
 # Template file for 'libXt'
 pkgname=libXt
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="X Toolkit Intrinsics library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91
 
 post_install() {
 	vlicense COPYING

From 7ff0e500bbe9153786f4c846a31bcd9b826d6369 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:21:15 +0200
Subject: [PATCH 1717/1853] libXxf86dga: update to 1.1.6.

---
 srcpkgs/libXxf86dga/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template
index fe22492d3a29..761b49e52af7 100644
--- a/srcpkgs/libXxf86dga/template
+++ b/srcpkgs/libXxf86dga/template
@@ -1,6 +1,6 @@
 # Template file for 'libXxf86dga'
 pkgname=libXxf86dga
-version=1.1.5
+version=1.1.6
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="Library for the XFree86-DGA X extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=be44427579808fe3a217d59f51cae756a26913eb6e4c8738ccab65ff56d7980f
 
 post_install() {
 	vlicense COPYING

From 85b92a473e940492b3ef878675b75c2006cc56eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:22:00 +0200
Subject: [PATCH 1718/1853] smproxy: update to 1.0.7.

---
 srcpkgs/smproxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/smproxy/template b/srcpkgs/smproxy/template
index 15eb253f900f..0408ac12d425 100644
--- a/srcpkgs/smproxy/template
+++ b/srcpkgs/smproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'smproxy'
 pkgname=smproxy
-version=1.0.6
-revision=2
+version=1.0.7
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libSM-devel libXt-devel libXmu-devel"
@@ -9,8 +9,8 @@ short_desc="X11R6 session management application"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/smproxy-${version}.tar.bz2"
-checksum=6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266
+distfiles="${XORG_SITE}/app/smproxy-${version}.tar.xz"
+checksum=4aa99237cc9dab7d87ce9bc7cca4116674a853b5f08dfe3f9db1bb2b2cf9f305
 
 post_install() {
 	vlicense COPYING

From 4898a5bf406891cc3de45309ce90da4c06e77f3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:23:00 +0200
Subject: [PATCH 1719/1853] xcowsay: update to 1.6.

---
 srcpkgs/xcowsay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xcowsay/template b/srcpkgs/xcowsay/template
index 7e62d1307e27..7028c5982ad7 100644
--- a/srcpkgs/xcowsay/template
+++ b/srcpkgs/xcowsay/template
@@ -1,6 +1,6 @@
 # Template file for 'xcowsay'
 pkgname=xcowsay
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.doof.me.uk/xcowsay/"
 distfiles="http://www.nickg.me.uk/files/${pkgname}-${version}.tar.gz"
-checksum=3ea45a453135e4d4eb79bd587c29acd4ee08c5fd3ed4099b114f852f0c50ca5f
+checksum=46ace864ff28d2d21f4b7058f0295e18d0041a120c1078a951fa43c4e0f5c8c5

From 15eb8a8bce05fbfa4c7dc0822c8fd780ebd4ed8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:23:50 +0200
Subject: [PATCH 1720/1853] xf86-video-dummy: update to 0.4.1.

---
 srcpkgs/xf86-video-dummy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xf86-video-dummy/template b/srcpkgs/xf86-video-dummy/template
index c123cd2d6189..1e11163faad6 100644
--- a/srcpkgs/xf86-video-dummy/template
+++ b/srcpkgs/xf86-video-dummy/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-video-dummy'
 pkgname=xf86-video-dummy
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="Xorg dummy video driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.gz"
-checksum=bbecddd599d6fbf0e2a40aa4a5baabaa2ea9690521ffc8e9a3c26e1172498197
+distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.xz"
+checksum=351920a7fd0f759a3ac972a5999b3ffed46f07fb52a99f319bfb5b6a59d3dfaf
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"

From db0d25c8e47e9e8ee0f559f4ad98e01963adba5e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH 1721/1853] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d..11784add7063 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,9 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

From 847cb3a29396ea3fe5c285abb2bbc59958e9122c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 12:33:40 +0100
Subject: [PATCH 1722/1853] firebird3: rename isql to avoid conflict with
 unixodbc.

---
 srcpkgs/firebird3/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index 8f2285dc7729..575415d2128f 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -1,7 +1,7 @@
 # Template file for 'firebird3'
 pkgname=firebird3
 version=3.0.6.33328
-revision=1
+revision=2
 _build=0
 _uver=${version//./_}
 build_style=gnu-configure
@@ -30,7 +30,7 @@ makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-dev
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom"
+license="custom:IDPL-1.0, Interbase-1.0"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
 checksum=34c1d2a29bbaf288e682cd1b5f8083f2baf73f351062245ace0bee35a3f7d35f
@@ -87,7 +87,7 @@ pre_configure() {
 	# do not change ownership to root:root and
 	# do not change permissions to read-only
 	find -iname "*.sh.in" -exec sed -i "{}" \
-		-e 's;"`whoami`";"root";' \
+		-e 's;"\x60whoami\x60";"root";' \
 		-e 's;chown root:root;#&;' \
 		-e 's;chown -R;#&;' \
 		-e 's;chmod 0444;chmod 0644;' \
@@ -113,6 +113,9 @@ do_install() {
 
 	cp -pR gen/buildroot/* ${DESTDIR}/
 
+	# Conflicts with isql from unixodbc.
+	mv ${DESTDIR}/usr/bin/isql{,-fb}
+
 	# TODO: create superserver?
 	# system account?
 	# runit service?

From 320c3578f36531a486743230916461fceb8cbf83 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 4 Jul 2023 15:31:33 +0200
Subject: [PATCH 1723/1853] syncthing: update to 1.23.6.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1c704f3d6eed..9a5f43c41489 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.23.5
+version=1.23.6
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=d87f02b3e970c0f08c59166851b40ee5c647efcb2d70b5f0410416987cd42294
+checksum=8b4d127c6893375165bbbc31865735b7cccc99e1bb019f6dab7a6020ba6b621b
 
 pre_build() {
 	GOARCH= go generate \

From d892d7ec4824b23fc3b566ba1893b257c401a400 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 12:29:07 +0530
Subject: [PATCH 1724/1853] pex: update to 2.1.138.

---
 srcpkgs/pex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index 9db0c0483905..d3ebccc07248 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,6 +1,6 @@
 # Template file for 'pex'
 pkgname=pex
-version=2.1.137
+version=2.1.138
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core python3-Sphinx"
@@ -9,9 +9,9 @@ short_desc="Library & tool for generating .pex (Python EXecutable) files"
 maintainer="icp <pangolin@vivaldi.net>"
 license="Apache-2.0"
 homepage="https://github.com/pantsbuild/pex"
-changelog="https://raw.githubusercontent.com/pantsbuild/pex/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/pantsbuild/pex/main/CHANGES.md"
 distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=cb0ce6cf64757dd5ba4f34c4607ab485f7909e6c24cd479ca28ce52205f0edeb
+checksum=75a514cd37a23fb587d15d91664be0e94f7acc1d132ff0f72c215e2125c28be2
 
 post_build() {
 	PYTHONPATH="$PWD" make -C docs man

From 84ffe279a8bd2e101258de0a75ff346686eed585 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Tue, 4 Jul 2023 15:06:52 +0000
Subject: [PATCH 1725/1853] gzdoom: update to version 4.10.0.

---
 srcpkgs/gzdoom/patches/fix-i686.patch    | 32 ------------------------
 srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------
 srcpkgs/gzdoom/template                  | 30 +++++++---------------
 3 files changed, 9 insertions(+), 77 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.patch

diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
deleted file mode 100644
index 14914b3a5a51..000000000000
--- a/srcpkgs/gzdoom/patches/fix-i686.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 26c617e..e162638 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1361,11 +1361,11 @@ endif()
- if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 	# Need to enable intrinsics for these files.
- 	if( SSE_MATTERS )
--		set_property( SOURCE
-+		set_source_files_properties(
- 			common/rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
--			utility/palette.cpp
--			utility/x86.cpp
-+			common/utility/palette.cpp
-+			common/utility/x86.cpp
- 			APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
- 	endif()
- endif()
-diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
-index f2a2987..b8de208 100644
---- a/src/common/utility/palette.cpp
-+++ b/src/common/utility/palette.cpp
-@@ -33,6 +33,8 @@
- */
- 
- #include <algorithm>
-+#include <cfloat>
-+#include <cmath>
- #include "palutil.h"
- #include "palentry.h"
- #include "sc_man.h"
diff --git a/srcpkgs/gzdoom/patches/sdl-version.patch b/srcpkgs/gzdoom/patches/sdl-version.patch
deleted file mode 100644
index 2ec2680ab4b7..000000000000
--- a/srcpkgs/gzdoom/patches/sdl-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2c69afa1187f55c2634c67c3ece47d89fd1b4f67 Mon Sep 17 00:00:00 2001
-From: Christoph Oelckers <coelckers@users.noreply.github.com>
-Date: Tue, 31 May 2022 11:00:10 +0200
-Subject: [PATCH] - fixed SDL version check
-
----
- src/common/platform/posix/sdl/sdlglvideo.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp
-index a5f7e6b527e..335dc620657 100644
---- a/src/common/platform/posix/sdl/sdlglvideo.cpp
-+++ b/src/common/platform/posix/sdl/sdlglvideo.cpp
-@@ -394,9 +394,7 @@ SDLVideo::SDLVideo ()
- 	}
- 
- 	// Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6.
--	SDL_version sdlver;
--	SDL_GetVersion(&sdlver);
--	if (!(sdlver.patch >= 6))
-+	if (!SDL_VERSION_ATLEAST(2, 0, 6))
- 	{
- 		I_FatalError("Only SDL 2.0.6 or later is supported.");
- 	}
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 99ee5e2144c2..781616f36a93 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,34 +1,31 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.1
-revision=2
-_tagdate=2021-10-20
+version=4.10.0
+revision=1
+archs="~i686* ~arm*"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel"
+makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel libvpx-devel"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.zdoom.org"
 # WARNING: watch out for new submodules
-distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
- https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
-checksum="454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102
- af1501c05815a7945a335704f6f05ac263c5877549fa3f476478077b56ea14f2"
+distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz
+ https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
+checksum="8702522c05048dfd4a765c6ac82a270d8bd0942e813d5bc6f4b69795a5d23a20
+ 1baf9f577839daff89073768eeccf561dd330eabec65217ba67eba799a4dfcab"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
 CXXFLAGS=-std=gnu++11
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	CFLAGS="-D_7ZIP_AFFINITY_DISABLE"
 	makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
-esac
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
@@ -39,15 +36,6 @@ post_extract() {
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 }
 
-post_patch() {
-	vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
-	vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
-	vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp
-	vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
-		-i src/common/platform/posix/i_system.h
-	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
-}
-
 post_install() {
 	vmkdir usr/share/licenses
 	mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}

From ac66f9bd12acbac876094b1480d8a561902b9e9b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:24:04 +0200
Subject: [PATCH 1726/1853] xtrans: update to 1.5.0

---
 srcpkgs/xtrans/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xtrans/template b/srcpkgs/xtrans/template
index 444f6801723f..27491fa3c3ca 100644
--- a/srcpkgs/xtrans/template
+++ b/srcpkgs/xtrans/template
@@ -1,15 +1,15 @@
 # Template file for 'xtrans'
 pkgname=xtrans
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 short_desc="Network API translation layer to insulate X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/xtrans-${version}.tar.bz2"
-checksum=377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773
+distfiles="${XORG_SITE}/lib/xtrans-${version}.tar.gz"
+checksum=a806f8a92f879dcd0146f3f1153fdffe845f2fc0df9b1a26c19312b7b0a29c86
 
 post_install() {
 	vlicense COPYING

From e68a152943209674e6317e04889fcd3a3b6ecd17 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:22:34 +0200
Subject: [PATCH 1727/1853] xcursorgen: update to 1.0.8

---
 srcpkgs/xcursorgen/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xcursorgen/template b/srcpkgs/xcursorgen/template
index f6d5165d43c0..54a1fda4a732 100644
--- a/srcpkgs/xcursorgen/template
+++ b/srcpkgs/xcursorgen/template
@@ -1,6 +1,6 @@
 # Template file for 'xcursorgen'
 pkgname=xcursorgen
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X cursor generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.gz"
+checksum=b8bb2756918343b8bc15a4ce875e9efb6c4e7777adba088280e53dd09753b6ac
 
 post_install() {
 	vlicense COPYING

From 5db20989121eb093a0b39bf911a3d327f7fe1c2a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:30:25 +0200
Subject: [PATCH 1728/1853] xwud: update to 1.0.6

Closes: #44838 [via git-merge-pr]
---
 srcpkgs/xwud/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xwud/template b/srcpkgs/xwud/template
index d49fb3d5e3a4..356673aecfae 100644
--- a/srcpkgs/xwud/template
+++ b/srcpkgs/xwud/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwud'.
+# Template file for 'xwud'
 pkgname=xwud
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="Image displayer for X"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9
+license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/xwud-${version}.tar.gz"
+checksum=262171b0c434966ddbbe8a54afb9615567ad74d4cc2e823e14e51e099ec3ab0d
 
 post_install() {
 	vlicense COPYING

From dec0ff5acdce56392310591ddc28cb1eeda9d82e Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:31:36 +0200
Subject: [PATCH 1729/1853] xrefresh: update to 1.0.7

Closes: #44839 [via git-merge-pr]
---
 srcpkgs/xrefresh/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template
index 2a0c179313e0..0a54077b9f0e 100644
--- a/srcpkgs/xrefresh/template
+++ b/srcpkgs/xrefresh/template
@@ -1,16 +1,16 @@
-# Template build file for 'xrefresh'.
+# Template file for 'xrefresh'
 pkgname=xrefresh
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="X refresher"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=287dfb9bb7e8d780d07e672e3252150850869cb550958ed5f8401f0835cd6353
+license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/xrefresh-${version}.tar.gz"
+checksum=f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337
 
 post_install() {
 	vlicense COPYING

From a2469658ee5cf603a29908ed354b0378b9466547 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 00:30:34 +0200
Subject: [PATCH 1730/1853] xrefresh: update metadata

---
 srcpkgs/xrefresh/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template
index 0a54077b9f0e..dc585750006a 100644
--- a/srcpkgs/xrefresh/template
+++ b/srcpkgs/xrefresh/template
@@ -1,14 +1,14 @@
 # Template file for 'xrefresh'
 pkgname=xrefresh
 version=1.0.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
-short_desc="X refresher"
+short_desc="Refresh all or part of an X screen"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xorg.freedesktop.org"
+homepage="https://gitlab.freedesktop.org/xorg/app/xrefresh"
 distfiles="${XORG_SITE}/app/xrefresh-${version}.tar.gz"
 checksum=f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337
 

From 813090abec084c2c936c38095b4efff912765e26 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 4 Jul 2023 20:43:20 +0100
Subject: [PATCH 1731/1853] freetype: update to 2.13.1.

---
 srcpkgs/freetype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 7a47c539928f..2e5aeaadc9fa 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,6 +1,6 @@
 # Template file for 'freetype'
 pkgname=freetype
-version=2.13.0
+version=2.13.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
@@ -13,7 +13,7 @@ homepage="https://www.freetype.org/"
 # Should be using NONGNU_SITE instead, but that often redirects to outdated
 # mirrors, causing fetching the distfile to fail.
 distfiles="https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${version}.tar.xz"
-checksum=5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c
+checksum=ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf
 
 post_patch() {
 	vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in

From a71965754c69d1048c466853ced0e4e3522c43a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 4 Jul 2023 23:19:59 +0200
Subject: [PATCH 1732/1853] ncpamixer: update to 1.3.3.5.

---
 srcpkgs/ncpamixer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncpamixer/template b/srcpkgs/ncpamixer/template
index 2adac2d5f703..514b60c43e4b 100644
--- a/srcpkgs/ncpamixer/template
+++ b/srcpkgs/ncpamixer/template
@@ -1,6 +1,6 @@
 # Template file for 'ncpamixer'
 pkgname=ncpamixer
-version=1.3.3.4
+version=1.3.3.5
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/fulhax/ncpamixer"
 distfiles="https://github.com/fulhax/ncpamixer/archive/${version}.tar.gz"
-checksum=78be1b229c0325d58d34efd50cec3d2b0a1cb04fd2b34e4914e6ad29c7c17658
+checksum=2f9cd3801acea6f1f5e93222b80940b5966790c51236b6ee3456e46d4b0269af
 
 post_install() {
 	vlicense ../LICENSE

From ed8df3fd36e1124d868371b62d79c90d2ce4865d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:33:29 +0200
Subject: [PATCH 1733/1853] pciutils: update to 3.10.0.

---
 srcpkgs/pciutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index e7f993727aad..b5c8eb6bea05 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -1,6 +1,6 @@
 # Template file for 'pciutils'
 pkgname=pciutils
-version=3.9.0
+version=3.10.0
 revision=1
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libkmod-devel"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://mj.ucw.cz/sw/pciutils/"
 changelog="https://raw.githubusercontent.com/pciutils/pciutils/master/ChangeLog"
 distfiles="https://mj.ucw.cz/download/linux/pci/pciutils-${version}.tar.gz"
-checksum=8953a785b2e3af414434b8fdcbfb75c90758819631001e60dd3afb89b22b2331
+checksum=7deabe38ae5fa88a96a8c4947975cf31c591506db546e9665a10dddbf350ead0
 
 do_build() {
 	make OPT="${CFLAGS}" SHARED=no AR=${AR} \

From af53a276924d54f8bb5703b8a42b3f6958fc9ec4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 3 Jul 2023 22:22:08 -0400
Subject: [PATCH 1734/1853] NetworkManager: update to 1.42.8

---
 srcpkgs/NetworkManager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 6311d82924c1..61dba80e131a 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.42.6
+version=1.42.8
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-42/NEWS"
 distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
-checksum=8c388ac3775ac6bceb605fae21be2c3e261cafe6067994a89f0dfa4610ed0279
+checksum=0337e7583d2ec5ade2ba2e8c625d2f09eeccda1d22836ee29aa72925d399c353
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes

From 6af0bc7433aa55322174521edbd8fa6488d49262 Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH 1735/1853] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index 7a1d31df3d..262448c2da 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -22,7 +22,7 @@ jobs:
-     runs-on: ubuntu-20.04
-     strategy:
-       matrix:
--        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
-+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:19:24 +0100
-Subject: [PATCH 2/4] follow bpo-37324:
- :ref:`collections-abstract-base-classes` moved to the :mod:`collections.abc`
- module
-
-(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
----
- fail2ban/server/action.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
-index 3bc48fe046..f0f1e6f59a 100644
---- a/fail2ban/server/action.py
-+++ b/fail2ban/server/action.py
-@@ -30,7 +30,10 @@
- import threading
- import time
- from abc import ABCMeta
--from collections import MutableMapping
-+try:
-+	from collections.abc import MutableMapping
-+except ImportError:
-+	from collections import MutableMapping
- 
- from .failregex import mapTag2Opt
- from .ipdns import DNSUtils
-
-From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:25:45 +0100
-Subject: [PATCH 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py
-index b7b95b445a..897d907c1a 100644
---- a/fail2ban/server/actions.py
-+++ b/fail2ban/server/actions.py
-@@ -28,7 +28,10 @@
- import os
- import sys
- import time
--from collections import Mapping
-+try:
-+	from collections.abc import Mapping
-+except ImportError:
-+	from collections import Mapping
- try:
- 	from collections import OrderedDict
- except ImportError:
-
-From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:35:59 +0100
-Subject: [PATCH 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py
-index 972a8c4bd2..27e12ddf65 100644
---- a/fail2ban/server/jails.py
-+++ b/fail2ban/server/jails.py
-@@ -22,7 +22,10 @@
- __license__ = "GPL"
- 
- from threading import Lock
--from collections import Mapping
-+try:
-+	from collections.abc import Mapping
-+except ImportError:
-+	from collections import Mapping
- 
- from ..exceptions import DuplicateJailException, UnknownJailException
- from .jail import Jail
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

From 3d2bae9e782b565f2ded74f33ef5a7d8fd1f0b3d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 4 Jul 2023 20:41:16 -0400
Subject: [PATCH 1736/1853] podofo: fix homepage, distfile, update check

closes #44846
---
 srcpkgs/podofo/template | 6 +++---
 srcpkgs/podofo/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/podofo/update

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index 6194d645ddcc..8fdf86188cf7 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -8,9 +8,9 @@ makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://podofo.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/podofo/podofo/${version}/podofo-${version}.tar.gz"
-checksum=7cf2e716daaef89647c54ffcd08940492fd40c385ef040ce7529396bfadc1eb8
+homepage="https://github.com/podofo/podofo"
+distfiles="https://github.com/podofo/podofo/archive/refs/tags/${version}.tar.gz"
+checksum=42d7eaa3c8ffabf001121447830343c4362e562d0f12192b033a393f334a64a6
 disable_parallel_build=yes
 
 libpodofo_package() {
diff --git a/srcpkgs/podofo/update b/srcpkgs/podofo/update
deleted file mode 100644
index 35f969938eda..000000000000
--- a/srcpkgs/podofo/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://sourceforge.net/projects/podofo/files/"

From 7d899cd4d2a4332bcf258ea0bda73df342a9bee1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Jul 2023 18:39:03 +0200
Subject: [PATCH 1737/1853] rustypaste: update to 0.11.1

---
 srcpkgs/rustypaste/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustypaste/template b/srcpkgs/rustypaste/template
index f04fb2e37d6a..b1d056dfd53a 100644
--- a/srcpkgs/rustypaste/template
+++ b/srcpkgs/rustypaste/template
@@ -1,6 +1,6 @@
 # Template file for 'rustypaste'
 pkgname=rustypaste
-version=0.10.0
+version=0.11.1
 revision=1
 build_style=cargo
 make_check_args="-- --test-threads 1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste/archive/refs/tags/v${version}.tar.gz"
-checksum=54e4235716ccece450b51ffbd7a42a21b730650d3b481901e95d91477819806b
+checksum=5e6be43231b9dc1765390414c2d370717444be52f1ce4f23cf454c50bdfbb44d
 conf_files="/etc/rustypaste/config.toml"
 
 system_accounts="_rustypaste"

From b5fdcca5d3f374a9c8688da2759e3e1d04550300 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Jul 2023 18:39:23 +0200
Subject: [PATCH 1738/1853] rustypaste-cli: update to 0.5.0

---
 srcpkgs/rustypaste-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustypaste-cli/template b/srcpkgs/rustypaste-cli/template
index 663a222a059f..a521dd887b08 100644
--- a/srcpkgs/rustypaste-cli/template
+++ b/srcpkgs/rustypaste-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'rustypaste-cli'
 pkgname=rustypaste-cli
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=cargo
 short_desc="CLI tool for rustypaste"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste-cli"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste-cli/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=c534d047202dcae17255a816882ac6358f82735270843f0b7ae525cc15fc2e91
+checksum=6af63a98fdd852e4a930568d74b75442c48cea741410ef87efc7694910d94be2
 
 post_install() {
 	vlicense LICENSE

From 3e200e90e426e9a41100d26d523ea8d7702e334b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 1 Jul 2023 12:47:38 +0530
Subject: [PATCH 1739/1853] python3-markdown-it: update to 3.0.0.

---
 srcpkgs/python3-markdown-it/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template
index 75075530af2a..58a2fe5e2211 100644
--- a/srcpkgs/python3-markdown-it/template
+++ b/srcpkgs/python3-markdown-it/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-markdown-it'
 pkgname=python3-markdown-it
-version=2.2.0
+version=3.0.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/executablebooks/markdown-it-py"
 changelog="https://raw.githubusercontent.com/executablebooks/markdown-it-py/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/m/markdown-it-py/markdown-it-py-${version}.tar.gz"
-checksum=7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1
+checksum=e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb
 # Tests not shipped in PYPI tarball
 make_check=no
 

From 8411643ae1a6e63269ec5aa7aaf0a8461b8073fd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 00:33:37 +0530
Subject: [PATCH 1740/1853] python3-pyfuse3: update to 3.2.3.

---
 srcpkgs/python3-pyfuse3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyfuse3/template b/srcpkgs/python3-pyfuse3/template
index 1463ecb76f81..7df3627a4067 100644
--- a/srcpkgs/python3-pyfuse3/template
+++ b/srcpkgs/python3-pyfuse3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyfuse3'
 pkgname=python3-pyfuse3
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -13,4 +13,4 @@ license="LGPL-2.0-or-later"
 homepage="https://pypi.org/project/pyfuse3/"
 changelog="https://raw.githubusercontent.com/libfuse/pyfuse3/master/Changes.rst"
 distfiles="${PYPI_SITE}/p/pyfuse3/pyfuse3-${version}.tar.gz"
-checksum=aa4080913e6148bff1365d4aaacdc96767b87a1e178031fd9caeb5f0b9fc8cec
+checksum=0771e921fd2a1c36bd4ed6b74db0616f4d40c8ac68994a80f3cc8a249fa807d8

From af6ce1298eacce51ff8fab996d8fdb7377b67756 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 31 May 2023 12:28:26 +0530
Subject: [PATCH 1741/1853] python3-semver: update to 3.0.1.

---
 srcpkgs/python3-semver/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-semver/template b/srcpkgs/python3-semver/template
index 171f8e521315..225c634148d2 100644
--- a/srcpkgs/python3-semver/template
+++ b/srcpkgs/python3-semver/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-semver'
 pkgname=python3-semver
-version=2.13.0
-revision=2
+version=3.0.1
+revision=1
 build_style=python3-pep517
-make_check_target="test_semver.py"
-hostmakedepends="python3-wheel"
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3"
 checkdepends="python3-pytest-cov"
 short_desc="Python package to work with Semantic Versioning"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://github.com/python-semver/python-semver"
+homepage="https://python-semver.readthedocs.io/en/latest/"
+changelog="https://raw.githubusercontent.com/python-semver/python-semver/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/s/semver/semver-${version}.tar.gz"
-checksum=fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f
+checksum=9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
 
 post_install() {
 	vlicense LICENSE.txt

From f00b24d3fbd25bd2d23c3ffb7c64e59c69543fd1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 00:28:24 +0530
Subject: [PATCH 1742/1853] python3-milc: update to 1.6.8.

Adopt.
---
 srcpkgs/python3-milc/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-milc/template b/srcpkgs/python3-milc/template
index 94772363c818..04bbc495b33a 100644
--- a/srcpkgs/python3-milc/template
+++ b/srcpkgs/python3-milc/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-milc'
 pkgname=python3-milc
-version=1.6.5
-revision=2
+version=1.6.8
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-argcomplete python3-colorama python3-halo
  python3-spinners"
 checkdepends="${depends} python3-pytest python3-semver"
 short_desc="Batteries-Included Python 3 CLI Framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://milc.clueboard.co"
+changelog="https://raw.githubusercontent.com/clueboard/milc/master/CHANGELOG.rst"
 distfiles="https://github.com/clueboard/milc/archive/refs/tags/${version}.tar.gz"
-checksum=c2ec7ca643f7bc59ed22b510cdd2ff9fb28c1778a9b98021c4386bcb6854ea08
+checksum=578f51ca87be5d135ff6e8ada8268402819424b723efb7ac954bd99ebaeec0ab
 
 post_install() {
 	vlicense LICENSE

From be4dd5df22959c4cd5f79e616fdf2ca320eea5df Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 4 Jul 2023 13:14:54 -0400
Subject: [PATCH 1743/1853] libjodycode: update to 3.1

---
 srcpkgs/libjodycode/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
index 92f5ed05e736..fa91b332c5f4 100644
--- a/srcpkgs/libjodycode/template
+++ b/srcpkgs/libjodycode/template
@@ -1,6 +1,6 @@
 # Template file for 'libjodycode'
 pkgname=libjodycode
-version=3.0.1
+version=3.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/libjodycode"
 changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
-checksum=e02aa4b96577fb5b6ca26018759cdaf71e3768dac321c07a84f2fb93ca4871bf
+checksum=c72974eb1d38873e06ea84b3d78990f87192f0113da5bd13fcac6bbc6a6e2184
 
 post_install() {
 	vlicense LICENSE.txt
@@ -21,6 +21,7 @@ libjodycode-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 	}
 }

From c66dc6b3021f8290bb41868140b229d3612ce1e9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 4 Jul 2023 13:15:09 -0400
Subject: [PATCH 1744/1853] jdupes: update to 1.26.1

---
 srcpkgs/jdupes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 9c77eb429b69..657ce382ec07 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.25.3
+version=1.26.1
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=89814310bb1884db6023436c523d03e405e1dda722a01caa336167e7938ac95e
+checksum=09153824320c65ad529f8f97cd3b7e792c50e9f9018192ea1a76f2e33a196225
 
 post_install() {
 	vlicense LICENSE.txt

From 93f480b580a66913d1f1117685ea7687ee133b1a Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Tue, 4 Jul 2023 11:16:50 +0200
Subject: [PATCH 1745/1853] ncspot: update to 0.13.3.

---
 srcpkgs/ncspot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncspot/template b/srcpkgs/ncspot/template
index 19a47daeca3c..070b720b8c3d 100644
--- a/srcpkgs/ncspot/template
+++ b/srcpkgs/ncspot/template
@@ -1,6 +1,6 @@
 # Template file for 'ncspot'
 pkgname=ncspot
-version=0.13.2
+version=0.13.3
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/hrkfdn/ncspot"
 changelog="https://github.com/hrkfdn/ncspot/releases"
 distfiles="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${version}.tar.gz"
-checksum=c329fc3fe229c47c2b3490555b4c8df550a3e2bbe3d0ade4e07f59434fa14e77
+checksum=316995d5bbef59c7a8699c8e7c3b3bc7699a38395a7d3500771abe4ca51b4d50
 
 post_build() {
 	cargo auditable build --release --target ${RUST_TARGET} --package xtask

From 78ff5ada1f6ac700ab68faae79ded84cadf3163c Mon Sep 17 00:00:00 2001
From: Massimo Manzato <massimo.manzato@gmail.com>
Date: Tue, 4 Jul 2023 12:08:25 +0200
Subject: [PATCH 1746/1853] a4: update to 0.2.2.

---
 srcpkgs/a4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/a4/template b/srcpkgs/a4/template
index 42c3ee99ade7..0b068ab111df 100644
--- a/srcpkgs/a4/template
+++ b/srcpkgs/a4/template
@@ -1,6 +1,6 @@
 # Template file for 'a4'
 pkgname=a4
-version=0.2.1
+version=0.2.2
 revision=1
 build_style=gnu-makefile
 makedepends="libvterm-devel libtickit-devel"
@@ -9,7 +9,7 @@ maintainer="Massimo Manzato <massimo.manzato@gmail.com>"
 license="MIT"
 homepage="https://a4term.com/"
 distfiles="https://github.com/rpmohn/a4/archive/v${version}.tar.gz"
-checksum=52e16e58ac52b9157933a3fd1063bc79e8dfa2f72ea2b4f03e77327bbec2c59e
+checksum=6cf79cfae36d171d0de9b2e79c55c2fbd10d30be25863842d23c95e8df628050
 
 post_install() {
 	vlicense LICENSE

From de5394d9e9bb44c5346ae50ad6bb329b1b2bbacb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 21:50:49 +0530
Subject: [PATCH 1747/1853] rust-analyzer: update to 2023.07.03.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 6ae7cd38d4fb..83984deaaed2 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.06.26
+version=2023.07.03
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=2a22d552e98820dacf34aa84816dff1d83e9c56c997470e917c9d77f150069b4
+checksum=8212fd4f4337166f046cab44463185226e6782554c956cddbe2786c8e1dd510e
 # tests require Rust source code
 make_check=no
 

From f3fcca00c19131b657c5c8951bf2bd5176dda291 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 10:56:52 +0530
Subject: [PATCH 1748/1853] gallery-dl: update to 1.25.7.

---
 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 2c893c251a71..7a277412c05a 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.6
+version=1.25.7
 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=d162f97c62e9d54ef3efdf00cd6c76ee422929bf19871b948caa6b3e0a1cc356
+checksum=46b37242e101e81f6ae908d972349c103b2b589453cf2f98547f19bf10cdf6dd
 
 pre_build() {
 	make man completion

From 3d50f6086c8b79e85570e7564a8711f7b9dd456b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 28 Jun 2023 13:38:22 +0100
Subject: [PATCH 1749/1853] apparmor: update to 3.1.6.

---
 srcpkgs/apparmor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index b81fab0d0f02..1a4293f5ba72 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,6 +1,6 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.4
+version=3.1.6
 revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
-checksum=6bee0c3941836dae2c635fe82f09b666123fcac16563aa0fedf4a63c22b91f40
+checksum=d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

From d810e444305f2421627e1c0b3ba77c1d65a5afab Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 09:50:09 +0200
Subject: [PATCH 1750/1853] mdBook: update to 0.4.31.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index cfcdbc4cb545..05894f869ce3 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.30
+version=0.4.31
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz"
-checksum=9df217a6a4c22d4b0fef0d13e04b1a9ae896a0c1084af36b93d032c9fa2c4148
+checksum=0eab74f3861db63fce1a6624cc84a834441f35558128fb0b2e12f8806311283d
 
 post_install() {
 	vlicense LICENSE

From a82688956c595f33191e86cda67591c400c2b8bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 23:15:14 -0400
Subject: [PATCH 1751/1853] python: fix checksum

---
 srcpkgs/python/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 21566f3e9733..52b2b4532e62 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,7 +4,8 @@
 #
 pkgname=python
 version=2.7.18.7
-revision=2
+revision=3
+_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -14,8 +15,8 @@ short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
 
 alternatives="
  python:idle:/usr/bin/idle2.7

From cb4546cc71d21c8d4877bea92f1fc2f24f50f8a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 23:15:17 -0400
Subject: [PATCH 1752/1853] python-tkinter: fix checksum

---
 srcpkgs/python-tkinter/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 858a70a97c9a..35c2c102b73c 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -8,7 +8,8 @@ _desc="Interpreted, interactive, object-oriented programming language"
 
 pkgname=python-tkinter
 version=2.7.18.7
-revision=1
+revision=2
+_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -17,8 +18,8 @@ short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
 
 pre_configure() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.

From a1515ead84d9b54df33de5a52931fe8f12f98c61 Mon Sep 17 00:00:00 2001
From: Numair Dubas <Numair2644@protonmail.com>
Date: Tue, 4 Jul 2023 22:21:23 -0400
Subject: [PATCH 1753/1853] flavours: update to 0.7.1.

closes #44850
---
 srcpkgs/flavours/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flavours/template b/srcpkgs/flavours/template
index 7e5dfd626932..afb58c057d56 100644
--- a/srcpkgs/flavours/template
+++ b/srcpkgs/flavours/template
@@ -1,6 +1,6 @@
 # Template file for 'flavours'
 pkgname=flavours
-version=0.6.1
+version=0.7.1
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -8,8 +8,9 @@ short_desc="Simple and easy cli to build and use base16 schemes"
 maintainer="Numair Dubas <Numair2644@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Misterio77/flavours"
-distfiles=${homepage}/archive/refs/tags/v${version}.tar.gz
-checksum=48c7659031d399ff125a07b71419935946e0da8d3ef1817a9f89dda32c2dcac1
+changelog="https://raw.githubusercontent.com/Misterio77/flavours/master/CHANGELOG.md"
+distfiles=https://github.com/Misterio77/flavours/archive/refs/tags/v${version}.tar.gz
+checksum=207002728cc270d92f4cd437384925e767c611d30520ec8a29816dfe600d7f61
 
 post_build() {
 	FLAVOURS="target/${RUST_TARGET}/release/flavours"

From ce5fa5e39772f2e5789af091137d79d0a9e8e5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 29 Mar 2023 15:02:49 +0100
Subject: [PATCH 1754/1853] New package: darkman-1.5.4

---
 srcpkgs/darkman/template | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/darkman/template

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
new file mode 100644
index 000000000000..123091a952a1
--- /dev/null
+++ b/srcpkgs/darkman/template
@@ -0,0 +1,31 @@
+# Template file for 'darkman'
+pkgname=darkman
+version=1.5.4
+revision=1
+build_style=go
+go_import_path="gitlab.com/WhyNotHugo/darkman"
+go_package="${go_import_path}/cmd/darkman"
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
+depends="dbus"
+short_desc="Daemon for dark-mode and light-mode transitions on Linux desktop"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="ISC"
+homepage="https://darkman.whynothugo.nl/"
+changelog="https://gitlab.com/WhyNotHugo/darkman/-/raw/main/CHANGELOG.md"
+distfiles="https://gitlab.com/WhyNotHugo/darkman/-/archive/v${version}/darkman-v${version}.tar"
+checksum=c19b33a62a90120df53ccfa823eb69da24429bb63101d57e9604e36eb3de9e38
+
+post_install() {
+	vmkdir usr/share/dbus-1/services
+	vinstall contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service 644 usr/share/dbus-1/services
+	vinstall contrib/dbus/nl.whynothugo.darkman.service 644 usr/share/dbus-1/services
+
+	vmkdir usr/share/xdg-desktop-portal/portals
+	vinstall contrib/portal/darkman.portal 644 usr/share/xdg-desktop-portal/portals
+
+	scdoc < darkman.1.scd > darkman.1
+	vman darkman.1
+
+	vlicense LICENCE
+}

From 46ac04ab7cd9d358f4e16ba010f581fef1491f50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 15:23:09 +0200
Subject: [PATCH 1755/1853] msmtp: update to 1.8.24.

---
 srcpkgs/msmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 0310b6bf284e..15c0a030e2f8 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.23
+version=1.8.24
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8
+checksum=bd6644b1aaab17d61b86647993e3efad860b23c54283b00ddc579c1f5110aa59
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl msmtpd"

From d056e4067c4aa713fc9d002f6669f1d4c6efb92d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 15:24:49 +0200
Subject: [PATCH 1756/1853] cloud-hypervisor: update to 33.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index f4bb6b21c064..2171efcbd7de 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=32.0
+version=33.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=b9754a5ecd26697e5416a642345b2f35f4fdc983a83d540d740978309f2eb419
+checksum=d3c03e26621ea70a73ab03395e284312e30113cfbb13df50f16e503a413a3a82
 
 post_install() {
 	vbin scripts/ch-trace-visualiser.py ch-trace-visualiser

From 914dd8aa3c56e75374497e1ee12828055e5278ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 16:34:13 +0200
Subject: [PATCH 1757/1853] crawl: update to 0.30.1.

---
 srcpkgs/crawl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index 8e061ee68eea..2b19b200f838 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.30.0
+version=0.30.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=a4ba0d5a6fcf9bb1ad57b6a116f5d577b7ee9dac33d90448525a1061207a6abf
+checksum=f7f793271eab06822b9cb3936da54a1cbe759b471347088a4d76052ac8947597
 nocross=yes
 
 post_extract() {

From 51ade6980b2b798143ce2f627fab4b98aff60bb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 16:34:15 +0200
Subject: [PATCH 1758/1853] crawl-tiles: update to 0.30.1.

---
 srcpkgs/crawl-tiles/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index af4ff9fddd8d..a2f229cea7bc 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.30.0
+version=0.30.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin DATADIR=/usr/share/crawl-tiles
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=a4ba0d5a6fcf9bb1ad57b6a116f5d577b7ee9dac33d90448525a1061207a6abf
+checksum=f7f793271eab06822b9cb3936da54a1cbe759b471347088a4d76052ac8947597
 nocross=yes
 
 post_extract() {

From 1d8902c73390c34f2f58898d0f258ff2552da4ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 22:02:58 +0200
Subject: [PATCH 1759/1853] lnav: update to 0.11.2.

---
 srcpkgs/lnav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 02cc3c853413..18bb1dd3a6e6 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,6 +1,6 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.11.1
+version=0.11.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/lnav/archive/v${version}.tar.gz"
-checksum=7d73ceeeae0fdc61cffce0f8a7a3435aa91b401b67d233ffaa018faab00d7d3f
+checksum=03b72fd02faccdbf98fcdeba62306794b677b8bcf49d6023117808f88ed627dc
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 23024dd18ee21675f7f1f0f116309205d400bb12 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:17:42 +0200
Subject: [PATCH 1760/1853] icu: update to 73.2.

---
 common/shlibs        | 12 ++++++------
 srcpkgs/icu/template |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4e6a5a663fa0..b8ab3ec37bff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -525,12 +525,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.72 icu-libs-72.1_2
-libicui18n.so.72 icu-libs-72.1_2
-libicudata.so.72 icu-libs-72.1_2
-libicutu.so.72 icu-libs-72.1_2
-libicuuc.so.72 icu-libs-72.1_2
-libicutest.so.72 icu-libs-72.1_2
+libicuio.so.73 icu-libs-73.2_1
+libicui18n.so.73 icu-libs-73.2_1
+libicudata.so.73 icu-libs-73.2_1
+libicutu.so.73 icu-libs-73.2_1
+libicuuc.so.73 icu-libs-73.2_1
+libicutest.so.73 icu-libs-73.2_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant-2.so.2 enchant2-2.2.3_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 50abf1f34b94..355865ce25df 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,8 +2,8 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=72.1
-revision=2
+version=73.2
+revision=1
 build_wrksrc=source
 build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
@@ -15,7 +15,7 @@ maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
+checksum=818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
 
 CFLAGS="-fPIC  -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-fPIC  -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"

From f2ee70ce1838ab424d7c1a407ccd3e53fc8164cb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:17:53 +0200
Subject: [PATCH 1761/1853] firefox: update to 115.0.

---
 srcpkgs/firefox/patches/lto-thin.patch      | 19 -------------------
 srcpkgs/firefox/patches/rust-lto-thin.patch | 12 ++++++++++++
 srcpkgs/firefox/template                    |  4 ++--
 3 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/firefox/patches/rust-lto-thin.patch

diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/patches/rust-lto-thin.patch b/srcpkgs/firefox/patches/rust-lto-thin.patch
new file mode 100644
index 000000000000..788fceab39f5
--- /dev/null
+++ b/srcpkgs/firefox/patches/rust-lto-thin.patch
@@ -0,0 +1,12 @@
+set rust crate lto to thin to not use fatlto for gkrust which fails sometimes
+--- a/config/makefiles/rust.mk
++++ b/config/makefiles/rust.mk
+@@ -92,7 +92,7 @@
+ # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
+ ifndef MOZ_CODE_COVERAGE
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)
++cargo_rustc_flags += -Clto=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3bf78b037413..083b409f27b3 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=114.0
+version=115.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -12,7 +12,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 # distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"
-checksum=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6
+checksum=7cdb23fe5ccb54334c8fe14c1e5dd89d5788f8e7b79a2bd9cc4eabdc7e54e898
 
 lib32disabled=yes
 

From 51337516c10b5ec76ba2986a64ee51347ac4ec74 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:54 +0200
Subject: [PATCH 1762/1853] 0ad: rebuild for icu-73.2_1

---
 srcpkgs/0ad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f085facb1fdd..6d596c331988 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.26
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel

From 5983447ab4e3d233e5ebfbb6e7a4aa78a1e8c0a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:54 +0200
Subject: [PATCH 1763/1853] Aegisub: rebuild for icu-73.2_1

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 7a2bf765d3af..671c74ca645a 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.3.2
-revision=8
+revision=9
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 cmake_builddir="BUILD"

From 641f25639e68e3ae652be6194e690a88600518f0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1764/1853] OpenRCT2: rebuild for icu-73.2_1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 87f68c27927a..ceb69d829a39 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -3,7 +3,7 @@
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
 version=0.4.5
-revision=1
+revision=2
 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
 _objects_version=1.3.11
 _titles_version=0.4.0

From 6b5cc5001130ff3ed77d91cd61ada7510893e63b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1765/1853] R: rebuild for icu-73.2_1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 9740a27a6636..334d68ddaa65 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From 4a407f80a13204989835936411771d4de639e99c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1766/1853] R-cran-stringi: rebuild for icu-73.2_1

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index a2708c8cd120..358e924b2e6c 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.7.12
-revision=1
+revision=2
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From 1e6f1f6fca73ef2e10d90bbbfa578a1ac11d9d0d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1767/1853] an: rebuild for icu-73.2_1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 7eea017502fa..c3e4315ff853 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=11
+revision=12
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From ce6daa81c28e41231472457e881bc0c524d42c90 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1768/1853] boost: rebuild for icu-73.2_1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 743ed9850772..1f6abd4fcab1 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.82.0
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config openmpi"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From e87ebdf95ab907c780668669a1883e5291b69ce4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1769/1853] brltty: rebuild for icu-73.2_1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 44b39d26439e..6858fbd10b04 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.4
-revision=8
+revision=9
 build_style=gnu-configure
 build_helper=python3
 configure_args="--enable-gpm --with-screen-driver=lx,sc

From ca96a27c4ba74295ae9ce230981cc8e66891e592 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1770/1853] calibre: rebuild for icu-73.2_1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 04bd9fe283fc..bddbd0d896a3 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=6.17.0
-revision=1
+revision=2
 build_wrksrc=calibre
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"

From 50cd3be88a40d47f228f0c6b8d8a68d288022299 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1771/1853] clamav: rebuild for icu-73.2_1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 65237deb1413..1bcd94cd7761 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.8
-revision=2
+revision=3
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From c62e1fe21ab6ef323eccc9288be41ffedd4ee4e1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1772/1853] darktable: rebuild for icu-73.2_1

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index bf6137d46870..6f6d24ac27a7 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.2.1
-revision=6
+revision=7
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 900a21c6e1cb58c91b046e24c64c962a71fe59ca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1773/1853] dino: rebuild for icu-73.2_1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 7a32986b692e..f359226a73b8 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.4.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON -DUSE_SOUP3=ON"
 hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"

From e4e87aed1e1899977fa764a72a46896158dffd36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1774/1853] dwdiff: rebuild for icu-73.2_1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 8d980fe9ec16..e7b2eaecdc88 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From be60f94e43b80cc339007af47b6eec7fc37a8030 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1775/1853] enchant2: rebuild for icu-73.2_1

---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index c3d41d86fda6..4e7a9c0b5ee1 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
 # might be a bug in their build system that only this directory and/or file aren't

From 1a92500aef65d8cbece2af8c14e2bffde8ddca4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1776/1853] evolution-data-server: rebuild for icu-73.2_1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 652f8911aef0..dc161e0aa313 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.48.0
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc

From a69d9a734df2dec5761d238f6fb9ed1b8ca49286 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1777/1853] firefox-esr: rebuild for icu-73.2_1

---
 srcpkgs/firefox-esr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 49c86d8e59de..fcad6ea4194a 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -5,7 +5,7 @@
 #
 pkgname=firefox-esr
 version=102.9.0
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release"
 maintainer="Orphaned <orphan@voidlinux.org>"

From debf8d664230ec9d1c3cae491828a3ff77af0cf7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1778/1853] freeciv: rebuild for icu-73.2_1

---
 srcpkgs/freeciv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 14a116e4f2b3..827b30f5e11c 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,7 +1,7 @@
 # Template file for 'freeciv'
 pkgname=freeciv
 version=3.0.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
 hostmakedepends="pkg-config"

From 703be340c74461c7fe3fab0760afa60f84c640fd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1779/1853] fsearch: rebuild for icu-73.2_1

---
 srcpkgs/fsearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fsearch/template b/srcpkgs/fsearch/template
index 5b01ca37f4f9..e579dfcaaad2 100644
--- a/srcpkgs/fsearch/template
+++ b/srcpkgs/fsearch/template
@@ -1,7 +1,7 @@
 # Template file for 'fsearch'
 pkgname=fsearch
 version=0.2.2
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="gtk+3-devel pcre2-devel"

From 8e788308d057a92011a48dadeac29eaf21a71e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1780/1853] geary: rebuild for icu-73.2_1

---
 srcpkgs/geary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a1804b4b65e5..7479ab2bdb5c 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=43.0
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From a588933ba32831de7af6dbc23e78cf17c7fe7a4f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1781/1853] gnome-builder: rebuild for icu-73.2_1

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 24baa8995ae1..11cff69fe7fb 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=44.1
-revision=3
+revision=4
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"

From b4c63dc0c78948ce7247f86469e54337a090d831 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1782/1853] gnome-text-editor: rebuild for icu-73.2_1

---
 srcpkgs/gnome-text-editor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 82c89561a6f5..0c68ebd73d88 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-text-editor'
 pkgname=gnome-text-editor
 version=44.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel
  gtk-update-icon-cache desktop-file-utils"

From a431b8ca90d3bfbf92984edfc92640996c979c87 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1783/1853] gnucash: rebuild for icu-73.2_1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index c648d0bff35d..7dec42730332 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.13
-revision=3
+revision=4
 build_style=cmake
 make_check_target=check
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"

From 3ac454c8f81d34d23b17566eaca088e7b6be9ba1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1784/1853] gnustep-base: rebuild for icu-73.2_1

---
 srcpkgs/gnustep-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index be29b6c7a132..64e1f812fb93 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.29.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From 19f29a3db2d857b0497400b7eddf9cac2f4fb010 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1785/1853] gnustep-gui: rebuild for icu-73.2_1

---
 srcpkgs/gnustep-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 5ba94179d482..7beb2854a8a1 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.30.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From 5259c6225df79d115de20983fd4d4463253ab941 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1786/1853] gspell: rebuild for icu-73.2_1

---
 srcpkgs/gspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 06cc8718242f..b76318ffffd9 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
 # Template file for 'gspell'
 pkgname=gspell
 version=1.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)

From 4f55fa1d97342cee7201dfb7635f9d5609721c82 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1787/1853] harfbuzz: rebuild for icu-73.2_1

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 29901df47ad2..cc939aebce0d 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=7.3.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled

From f90b558884849e73bec441f9588767c75b48751e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1788/1853] icu4lua: rebuild for icu-73.2_1

---
 srcpkgs/icu4lua/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index a63d0362e179..05117c642db0 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=13
+revision=14
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From 766cb2b5168ad36c6a55175277dcba93990043dd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1789/1853] imv: rebuild for icu-73.2_1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index f59108e98e1d..7e34b622d9e1 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.4.0
-revision=4
+revision=5
 build_style=meson
 # don't define NDEBUG since assert(3) is used to detect error conditions
 # (e.g.: https://git.sr.ht/~exec64/imv/tree/v4.4.0/item/src/x11_window.c#L109

From 3aa9a90a421c5518556bc41ded2df8aba80316b9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1790/1853] kdb: rebuild for icu-73.2_1

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index ee02c7ae3040..57bff3872488 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=9
+revision=10
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons python3"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From b3e299338fe31757ae9fa08f26abaf4d96bffecf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1791/1853] kdeplasma-addons5: rebuild for icu-73.2_1

---
 srcpkgs/kdeplasma-addons5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 877694cb3f46..b3ce923df439 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
 version=5.27.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools pkg-config

From aa207711748dbe2e5044ed81f6d6de0bed3a76d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1792/1853] kiwix-lib: rebuild for icu-73.2_1

---
 srcpkgs/kiwix-lib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index f05fe442241e..6534f59384a5 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=5
+revision=6
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel

From fc34517d8d8991d09188996f5d73c91042489205 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1793/1853] konsole: rebuild for icu-73.2_1

---
 srcpkgs/konsole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index e210bd4803de..fe2ffc25713c 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,7 +1,7 @@
 # Template file for 'konsole'
 pkgname=konsole
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From fcc0854c2c883940affffea81df2f554dce4d7f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1794/1853] libcdr: rebuild for icu-73.2_1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index c0057aada95f..979206c432ac 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 636bee8171f133cfeb4f85cc34ae6e715f57bf9a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1795/1853] libe-book: rebuild for icu-73.2_1

---
 srcpkgs/libe-book/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index f9a17bdc72a7..c2f7ebeed3e4 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From 8fbb514052301128c2237f18080a557c679be911 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1796/1853] libical: rebuild for icu-73.2_1

---
 srcpkgs/libical/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 937c9613c4d3..f368c11c3db8 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
 version=3.0.16
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false

From 8089b9d6676f647768be6d4af970414fae13aa7d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1797/1853] liblcf: rebuild for icu-73.2_1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 35f3a24c8036..19c6db01578e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From ee17d64f92b3a42e5c9b0bf9ee91e29795cfa54f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1798/1853] libmspub: rebuild for icu-73.2_1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5b4ff7331eb4..b99747040d60 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=10
+revision=11
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From c5f3f3d0e469b761e8eff5c4ef5ed4d75d17acfe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1799/1853] libphonenumber: rebuild for icu-73.2_1

---
 srcpkgs/libphonenumber/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 0af9ced1bcff..f554714b3c7a 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
 version=8.12.39
-revision=11
+revision=12
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu

From 5a68d746435a089dc34d64905e6c68250ea9b7e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1800/1853] libpsl: rebuild for icu-73.2_1

---
 srcpkgs/libpsl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 2e1527338dfc..bfdbb13a5404 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From 4f887af3df5348645c7e381e538494497fb368c3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1801/1853] libqalculate: rebuild for icu-73.2_1

---
 srcpkgs/libqalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template
index beec5e4a96d5..23d9d0c18ab2 100644
--- a/srcpkgs/libqalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -2,7 +2,7 @@
 # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
 pkgname=libqalculate
 version=4.5.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
 makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel

From 23e06038644efd897a929c8c805815c44b98c0d6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1802/1853] libqxp: rebuild for icu-73.2_1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 78e24b95ed3a..0925df7036dd 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From 377c43f874f8b42c5ec93630534cad718afdad24 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1803/1853] libreoffice: rebuild for icu-73.2_1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
 nocross="Several dependencies are nocross=yes"

From fb94b0fe963e7b6f0f0e2613dd42a1fe405248ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1804/1853] libvisio: rebuild for icu-73.2_1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 77dbf5cf02e4..dd376f85afac 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From b99e5a017e2d0564139c72d6379042b081d4045c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1805/1853] libxml2: rebuild for icu-73.2_1

---
 srcpkgs/libxml2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 5041c99e5819..bdfc411d75c9 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2'
 pkgname=libxml2
 version=2.11.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu
  --with-legacy --with-ftp --with-xptr-locs --enable-static"

From 969d4a3cc461bca2357490670379d69719b1a21f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1806/1853] libzim: rebuild for icu-73.2_1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 242334046c1d..cb6d1be1620a 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.2
-revision=4
+revision=5
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From a41886b64a4c455bbdbbabdfc295d8749a5bd467 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1807/1853] maim: rebuild for icu-73.2_1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index 70e05e06c539..894369ec42f8 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 46f5c7b89f12d4180948671555fed2b088e43dbf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1808/1853] modsecurity: rebuild for icu-73.2_1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 00774d754cf3..d0ad1b197bc2 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
 hostmakedepends="pkg-config"

From caefd08139e7b8a63f49a03c039c6cad05c984ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1809/1853] mozjs102: rebuild for icu-73.2_1

---
 srcpkgs/mozjs102/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 8c9f93a5b37a..4bbc084b5a44 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs102'
 pkgname=mozjs102
 version=102.8.0
-revision=2
+revision=3
 build_wrksrc=js/src
 build_style=gnu-configure
 build_helper=rust

From ea26adabda3c37380123d3f06cee6224d5b7b808 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1810/1853] mozjs78: rebuild for icu-73.2_1

---
 srcpkgs/mozjs78/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 91142647baeb..10d9af44619f 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=7
+revision=8
 build_wrksrc=js/src
 build_style=gnu-configure
 build_helper=rust

From a9b6f3facfbf901ca15b07d55f8951c094df6065 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1811/1853] mpd: rebuild for icu-73.2_1

---
 srcpkgs/mpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 9dbd4c935acc..9f058b62df2f 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.23.13
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled

From c0080b3d5d7c48c6e0deb43285ed3e49b6df02fa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1812/1853] ncmpcpp: rebuild for icu-73.2_1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index a66f5f7e9e0c..31a5c007a990 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From 671605e115d72f0e47815789d8b0006fba5b88e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1813/1853] nodejs: rebuild for icu-73.2_1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 14f17fd3167f..aa03b7f48c27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=18.16.0
-revision=1
+revision=2
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
  $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)

From 5ac8fe6fbeaa322d2c72941d085e6cea761d91be Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1814/1853] nuspell: rebuild for icu-73.2_1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 92da1cae8371..57e5acd58688 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=5.1.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From 3bcc7645742fbd9b16858f048717d4e66ac415b4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1815/1853] openttd: rebuild for icu-73.2_1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index edce911a3093..4bfb9a56c076 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=13.3
-revision=1
+revision=2
 _gfxver=7.1
 _sfxver=1.0.3
 _msxver=0.4.2

From 0e2f4a85a3017a309003443ac471ddb77b2e8bce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1816/1853] peaclock: rebuild for icu-73.2_1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 76b7fd1aebf4..4618c2ae5582 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=5
+revision=6
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From b5eda6d8657018707b4f40c53b86ff7f0eceba9e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1817/1853] perl-XML-LibXML: rebuild for icu-73.2_1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index f8ff1fd13a4d..63917e570a98 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=11
+revision=12
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends} libxml2-devel perl-XML-SAX perl-XML-NamespaceSupport"

From 05c010aa3437534f0540fe545f21d9410d96a20c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1818/1853] php8.0: rebuild for icu-73.2_1

---
 srcpkgs/php8.0/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index be2dec51141e..520bc839f11c 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0'
 pkgname=php8.0
 version=8.0.28
-revision=2
+revision=3
 _php_version=8.0
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From 82a935b96f118dcd024661d41e766370c56f2226 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1819/1853] php8.1: rebuild for icu-73.2_1

---
 srcpkgs/php8.1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 90be03c44a5d..d41eb4784b48 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.19
-revision=1
+revision=2
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From 8b5aa46d3227239b186356e4aee2e7dd0e375e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1820/1853] php8.2: rebuild for icu-73.2_1

---
 srcpkgs/php8.2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index c73b5f8c010c..05275b9bfb1c 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
 version=8.2.6
-revision=1
+revision=2
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From b6659dfe7028230aed1eaf8d98593b871e645a03 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1821/1853] plasma-workspace: rebuild for icu-73.2_1

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 772c0dd6e846..9033ad55ac17 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.27.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner

From 55e09a63bd967845898651dcc5c2259f5cae64bb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1822/1853] poedit: rebuild for icu-73.2_1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index c346c96b12c6..f27cb3e5dbef 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=3.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From 9bc51f12b9ab5d3b81a08dede7ad02b063c1b74e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1823/1853] postfix: rebuild for icu-73.2_1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 1a5fb172288c..fb603162173f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.8.1
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
  postgresql-libs-devel sqlite-devel"

From b66b2b26434ceb67359434b418752dfe83e2ee33 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1824/1853] prosody: rebuild for icu-73.2_1

---
 srcpkgs/prosody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index c93905bea5cd..db5f614b4973 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.12.1
-revision=2
+revision=3
 build_style=configure
 configure_args="
  --ostype=linux

From 84ad9960eb99e7e908c41dda57116d1707354c69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1825/1853] python3-PyICU: rebuild for icu-73.2_1

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index b6292f67504b..ded6827200ae 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.10.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel icu-devel"

From 1df1cf429c895778cddb1696237e3fc1f1b4caa1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1826/1853] qt5: rebuild for icu-73.2_1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index a79d25e69da8..d3821efbe378 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
 version=5.15.7+20221119
 # commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=5
+revision=6
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From 7dfc1a0cd02e7ce6187e1434ddc3a7bb298db744 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1827/1853] qt5-webengine: rebuild for icu-73.2_1

---
 srcpkgs/qt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 85267c7cf8a3..edeb07f1ab7a 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.11
-revision=3
+revision=4
 _version="${version}-lts"
 _chromium_commit=be349eaf62e77955791d7bf29f893f1e8a37daf4
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"

From b4c8eded89c4b89fca48c7d63991253eee3c6517 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1828/1853] qt5-webkit: rebuild for icu-73.2_1

---
 srcpkgs/qt5-webkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 249902bb9d62..b66658071d43 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=15
+revision=16
 _snap=1586819898
 _v=${version%.*}
 build_style=cmake

From bd93ed59358706a41d34e2ee0cc80d9b7f2d6d5b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1829/1853] qt6-base: rebuild for icu-73.2_1

---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c6d790e64226..c2e526cf9c22 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6

From f4cce145dea82f1be7e572c6ce7b0565b102c294 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1830/1853] qt6-qt5compat: rebuild for icu-73.2_1

---
 srcpkgs/qt6-qt5compat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 3b3d2b5dfacf..3facfbfca375 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_FEATURE_textcodec=ON -DQT_FEATURE_codecs=ON
  -DQT_FEATURE_iconv=ON -DQT_FEATURE_big_codecs=ON"

From 89eadf0cfb99cf9ad48773f0a62498105b9d8a49 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1831/1853] qt6-webengine: rebuild for icu-73.2_1

---
 srcpkgs/qt6-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 4e22cb6e8863..f948dc919a15 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-webengine'
 pkgname=qt6-webengine
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DQT_FEATURE_webengine_system_ffmpeg=ON

From 513d95ab12c82a4d78e207ddafc181635128196b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1832/1853] rspamd: rebuild for icu-73.2_1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 44d3eb142951..38679104924d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=9
+revision=10
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 6011cd3770a6f8a1e83725b355acdc63e22f2f62 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1833/1853] scribus: rebuild for icu-73.2_1

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 7794c71b0e6c..5fd3f79d1931 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From d77fb1625c7280e522214fb5a9cf350f1aa1cb15 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1834/1853] sile: rebuild for icu-73.2_1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 93279cb59f38..097fccd2b39e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From a1e319dd442d4f4884919c9c2744591e77f749b0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1835/1853] slop: rebuild for icu-73.2_1

---
 srcpkgs/slop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index ff9a02db3826..929c0486cfb0 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.6
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From c63b5dfb3784fecaf4e136adbebe009b3ab3b775 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1836/1853] strawberry: rebuild for icu-73.2_1

---
 srcpkgs/strawberry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 83cbd3bd73a5..b42efa1b89b2 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=1.0.17
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel

From d0a0fb0820937375c5b4c6b6cf458a2011494980 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1837/1853] sword: rebuild for icu-73.2_1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 7eef5b8be663..61c9de83e110 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From 68eec7375d9b693893b3c17d590135abe66fe5bf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1838/1853] tectonic: rebuild for icu-73.2_1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index ef293da34228..088c9569b5fe 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.14.1
-revision=1
+revision=2
 build_style=cargo
 configure_args="--features=external-harfbuzz"
 hostmakedepends="pkg-config"

From 92c8131372573958562557b99ced055f12e4309f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1839/1853] tepl: rebuild for icu-73.2_1

---
 srcpkgs/tepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 7e8c5ba0ffd5..c989d7ed7289 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"

From c9f6541fe20316c4d3a85e57b0a1741ba0092a13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1840/1853] tesseract-ocr: rebuild for icu-73.2_1

---
 srcpkgs/tesseract-ocr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 9a1de9581262..ac55c2892dbd 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=8
+revision=9
 _tessdataver=4.0.0
 create_wrksrc=yes
 build_style=gnu-configure

From e53a5f2486c489b3bbbef47ae9e076b5b6fddaa7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1841/1853] texlive: rebuild for icu-73.2_1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 3ed852196cc5..cd7ab47a061a 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20210325
-revision=5
+revision=6
 build_wrksrc="build"
 build_style=gnu-configure
 configure_script="../configure"

From acd59e4da7f64bf94043d240fbc46df70edc00d0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1842/1853] thunderbird: rebuild for icu-73.2_1

---
 srcpkgs/thunderbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index ec3fa3d4c35f..397e3b246aef 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
 #
 pkgname=thunderbird
 version=102.6.1
-revision=3
+revision=4
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From b6856a6564976c2442ae7c9d78155cf9f896a96d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1843/1853] tracker: rebuild for icu-73.2_1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 4e431f680a6b..0ac5d828e786 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=3.5.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled

From 4d2e26938e589368a2af50a3c4f67c7d44ede15d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1844/1853] tracker-miners: rebuild for icu-73.2_1

---
 srcpkgs/tracker-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 8c005d697fa4..a6e5aa577702 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=3.5.0
-revision=3
+revision=4
 build_style=meson
 build_helper=qemu
 # missing libgrss for miner_rss

From 6513dd12be2a0b60a1d78b31f3c79feafb77b029 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1845/1853] unar: rebuild for icu-73.2_1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 460c65022c68..c7068465ed7a 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=12
+revision=13
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From 4c689981bf5d4531ca083068b027952b3c7085ad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1846/1853] vte3: rebuild for icu-73.2_1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index b15539a721a9..db2e5a8b8dd8 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.72.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false

From a4876173936275875849d4046385c6f5c05f468d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1847/1853] webkit2gtk: rebuild for icu-73.2_1

---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 3894f64a2ffe..15e98aaca3b0 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
 version=2.40.0
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF

From d64cd078ae5e28a5f9475d0f575a0d4e929a9154 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1848/1853] widelands: rebuild for icu-73.2_1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 8a2706efbf63..3f86742df6b0 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -4,7 +4,7 @@ pkgname=widelands
 reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
  19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
 version=1.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_BASEDIR=/usr/share/widelands

From 1d05497f14e0e27d5cb49bf3278766ef31097036 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1849/1853] xerces-c: rebuild for icu-73.2_1

---
 srcpkgs/xerces-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 47c57b22d354..1ac8de6b568b 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From bcf0a159c508ac8bc4a716d003c6c8a145da032e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:08 +0200
Subject: [PATCH 1850/1853] yaz: rebuild for icu-73.2_1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 1716a6e6c9bf..25c8c301a582 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From 28b9b694137ebf9e426aeda851952776a7a81bc2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:08 +0200
Subject: [PATCH 1851/1853] znc: rebuild for icu-73.2_1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index c279d4a655b9..69d03cae4661 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=14
+revision=15
 build_style=gnu-configure
 configure_args="
  --enable-python

From 581014e8b1f51d9c13aa3269995cbbac0832c40d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 23:41:06 +0200
Subject: [PATCH 1852/1853] firefox-i18n: update to 115.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7c94212c279a..845dafecdfb4 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=114.0
+version=115.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="c0f9a6c3d766c08f3676602696d8798b679ec1388cd5392a1b8668ffee145ffa
- 26e309adb10d6ee133a5e1d47d969b04da06a9aaafb915080ab6d039bd7c9995
- 5275570c342f09f90a735bb264810c7f4ae1fbc8e18d9a4944a95569682daf62
- 4f6b16a79b454c72f8fdc0e4800e7a085c392a3204cf2173fb85853568820fe9
- 34423da9b8cf41b280a3c6dc998da72004bc2ea0245dcb59af6cbe26a6683b68
- e37ca54dbd3506ca177e812305c5ba870584131a16958b8c46c7f2159172982d
- 0db3c23472f6b45d158b9de5220040821e89be207767910121040e9cba949f92
- 38e9cccd6791e769fd9016c2e0a3d5aafb6a2090c1c60326f03907aac0991325
- f3bec565c0c4c1bd7b659e4c4922d2d33ed5ebc1dd81e9d7b5a23c510da325a0
- 045ff5e6a99bacdeb1421061fb01a1fc71a76e12c9205cdd1fc58391cd89a613
- 7aa85724f5b31d31c3108700bf0d2efca74105c5e0df72c6a79b1913f5058152
- 6a1fd174df2343abe8a74f219c32cbf457f3914c0dd3c96949d947dedafec8b1
- 559b6c47830caaae13ea507cec2268e4469ee1b90504cdfa1252e5d6295d9a7c
- ff96e801074a1343ea9a122d3078250a961eb7da29ecac542a0c84186a17f010
- d0f973e086135861ce2e5e26e1e56bf9b21503d06fb732c8b918f426d55348f6
- aee67eb0b05c7c06b23aca4af3e473ddc75c9570a3d866675bb30c0fa409f2c0
- 20e9c7514e8e4a135c36cfd32177fbb000072e2fe3b7a38ea3e08ec2064d9633
- 6adfd2d6f9667472b0665f0370c2eb582355ca370ea046028741b91c16aa76b2
- c2a9d90d8a46a3f0070c031c48dcc09fcb33b8d571881578ae541984f0f98ff5
- 797686f4f8ad9279e8b080ba39cf52f049235ff4ce6e61ca0fe65f9d479a2d45
- 9ea3dc01ba7d9389d4514626f5cb1597063f7e68401ea13522a74ac777cde4cb
- 3e02c13156f87af7a25e826f8f72487004c3b64675be73e53eaa55f45a4b0147
- a2561641f64b428f34ec4d5215b97a6ae945df31b347c282e4f33a1fe82c5bc1
- 93a4955b0952613b931c2574fa9c6ed251a08df32f46304b3ead002bbe701ec9
- f1bab7c5b208ebb5ac87a5006a236fe09727be260bdd3b0f7b520a0ed91366d8
- c7ff4fee557227e6dbf87a1bd12205217710e41028066b0da3ed46adc3df2944
- 7f6f51cc45674f07f905107d2b6ea1770c39ccf1b8a5782e6bab964fcccc39a2
- a28453e1d0727297918fb3a83bd68090598c5ddd0386e5cbd21b5ead68cd8d2e
- 5b88a842efc8b8adccf314734e56ef5570e8823614f03b1023e7f3ba6ae904bf
- 0f607d174af36790046d1ce2219dd341e557af524f22d8afa504538e047d9081
- 85a57d3d4746f6e43c3f24ca9d7c2d873ba48166772c0a127485381b4017d9d2
- ed68f1678df1cedc204c2ebc6363f5ccc82562f684f45455169ffce3a94860ab
- da0e4e3abc51b101e84450ef84f77b3709ef21d7db3f401f4449fab69966ff62
- b474686d3b54e00ef1c3606dc432c64a4f3b1f56321cc1b28cd0737e7e313ab8
- c2c27f1b46fdf4288fd04ff8554443542ce6821cdb7c13e3ddc7bf51c4b62c0a
- 342230adbb31f5e07b5a89ded0bd860fe76a1cb638953383de5c690fead75050
- 48d5d27014991eebd2f3cd86ddce13807753fba0c67af32f4665db3685b45ee0
- e9a5d2be6f3e69570abefcf58390ffecf911efcbb096601f6ea326797d9950e3
- 0185575560595cd58b8526ba5450c395b0c513e360b523e57be37c3d0af05744
- e5abcec84157c0085f99b2f4d0cce258d3dd496a8edb7fa208937da8fa7436a3
- 4d3f1274da892de438c0d0e1003dd06509a7c21b60e7df3f91cbec463021a9db
- 61356d776b6341a0802ad6974bfd133db0b93b5430eb55d21167049a8626b603
- 8968f1a77e30680209df33cc6282797ef0e24164ca65141e232d8bc3fbff8123
- cc4769a1372fe19d1d64afb2660d71eb012f518a731fe2a3b1fc4d38cab285f0
- b3cfcc9e008fd1800d6688d5180e9fbcbb0336e16e444f81715ffca4d1ddc96f
- 96592a74d16993e03fd202be691f2e3bc9ac6e2d9fa50a6de0670f46e71b203b
- 1644d3bfd7e4c2b537a7a52b25b7f9cd808ddbaf86e026be91536c62252cd792
- 63e53aee3ca63d086778c3b66d2e0530c23e901dc4e2a437e8bdba7bcb6ee720
- 49e78397cd9d8ec6ce22f6503f89132009ecf028719f5b5ddd1164922184ffa5
- 12ec633c84011216239334c2f08eaa7ec4e4fa4f9c4d9277d6275a84f6df467f
- 825410ee4860f3466803725a7a604530b5641779f819f48e3fd47b5831a47659
- cab3fdae9481f6b8d4f81b91377771022de050a5da63d970b0b35c9a4c8c82f1
- aa56bd371cf1096c65e2c76073d25d69ecc8018be8487e14cac370bd9f5d45b1
- 0a18c294ef2a89150acc6521898bed8276806ca607bbb87c6e01c30cc3f6f697
- fc5e0b80bb4dda023a18d46f3f686981a13bfb364d6d29e4e46cf1f58381daf2
- 6f15404bca77866c663e8ba1c727ff40007700ca0d36f0e5559e417e654d3b64
- f0b77a56215baf8546b06a69e7211319af04e3baeb5c06a0fe0519787d949d8c
- 0a8c4f3c3f541cf4be8ac72c5d8e9cc85852568ece273f4173c71eb637d406e7
- 23a448de4027b9b2b7d3ad46d3a53411289a2d9b8fdfcbf2b9d9094d0269ff34
- 3890f6fcc967db23914ee090edd31ca03622e359d7ca7fe5ebb92a203d63f17e
- f14464fee583c0afe7022db7e6d5dd607782a5f04c9e0caef7dfab6ab135f609
- 82baa25118153388a0ab7b9c2ec4d89ad52c1acd380141e0bb301bb698371563
- 39da2bd341d58d4686b2609772d2e40c04183a4046ef4de5bf02821cd550d864
- ca2e41b6c29c062f40cbf8b5ebb9badfde0457350169b6ae201f607f3dc25813
- 752168e60f96d2b01275afc1ffcf7b8ad9f3383a05d6f99c76d7f8b2052189e9
- 37cac85f7af9cb2edc726cb8336dead32ed2f10ab6e72547c799e0dae455148a
- da58c2ba13252a42551629e66771e8254fdc4e80fff7e7fab40baeec8adc201c
- 050b33dba495f812910ee3a53affd7eae61ce2456b148a33e1883e06c6beb73e
- 16d619c02edb3179a30f7af5aea14d0c01266d46f0663b76fbcf71de29b27af8
- 1eadb108e6271cd74ef0a3328dd277cb92765ff0b8d72d922a979d0ed9710944
- ac5352956096a0eb869759cbbc0e04acc95a3be677b5ef56f2b237ae74567632
- cc2035801a929b67b97d5185480757eb51fd8063e360a7bd0d2cecea6edda2e4
- 62d73008f29ffc7078d1e2bddb36f360044f28a3bab820832b6ea82b07582048
- 129981bf7628f49fba9522636211405b66fb14159f76c557b93d6d810c672cc2
- ba6a082b4c41594d1fa671269357f7f814c169f0c62e343164ea86957cb0c748
- 33de6d30b7a9337b299d083bf5ede792f785c17e4bf3a9c85dcecd7abb0ea4ef
- b8d14e07fdbd034d4241de6a77c6bfed38b54726ec770ea25442a947fd9a821f
- 86436adc98e9f449ca2dcdf076042987400d62f8acf9458abf7cd98c327751e8
- ba69da64c6ab3d416759818e420259023a4d64434b27cb604d6491737e7e4a33
- ff239bdcb54a03dad3210b9457231e56a38e306220ec981c1f29307d73620fa4
- 3ebb85c2974c9d69f4e9c816f338da304a58469034997f83f0cd9056c4acb6d3
- 5315ff187fe3fddfc39000a7164ff3b42938059978eb322ba222a43d2a1145d1
- 0f768dd1b87e34b347e32d5f06691b68d7747654faf2586a673154d777a2765f
- 802537e360788ec58d697c17cd0333e8fcfc92ce3161d19cedc2a4841825d0ca
- 6722b217cd12f3a6502f14865fbf02bae8dceeb98f7a593840a88d57829cbbed
- a0d85d09f3bda6a1416240a252ec4cfc916cf37b98c72185a6b97e3b7b50251d
- 0a48ee5ae79e98d8b07adfef4eaacf93b19011ec3a667bfca3fc0098e348ab8c
- 4b559d090fe138fabc031b27b1cf5a0d67c0a036f646fa4430fe8c4c9f6b0e37
- 3c9b56539542ace8a6481400800367a07e980ebaad213caba3e5fe2da15bef9b
- 0b27ce7aa8ff4b09d5f42c1525d89505d2b159c7d9051b3e1dcb60ed67a0be5c
- b9fcbc9063278b77c652ed738913c1d9506306796af41c42fbe5ff2bae721fe1
- 625c2e19caa24046e624383501a395bdbbbf39594e742cc40e31d85cdc3eadce
- 5b397388706d49d413b745ca17f0776f8db6c81b3b6001d0490b3f1163d50ff3
- 03bb0e45f2038e8dd5d57ad131c163ddcd135cbf1b42371670bef4fa2fdf8da3
- 8b11f723ba5a973cf3639fa03e860e29f7427c8d8e68d278d5770ec83a6fb903
- 6ded563d8f5ae096ed6f3c58dd19277333dae81fda96832a50a5040ef79ca35b"
+checksum="
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ "

From 52087c11b4c014c9e77f17735c95558b79077d1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 6 Jul 2023 00:58:05 +0200
Subject: [PATCH 1853/1853] boost: temporarily marked as broken to build some
 other stuff first

---
 srcpkgs/boost/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 1f6abd4fcab1..dcfbb2567ea1 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -23,6 +23,8 @@ if [ "${version%beta*}" != "$version" ]; then
 	distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version%.rc*}/source/boost_${_version//./_}.tar.bz2"
 fi
 
+broken="build some other stuff first"
+
 replaces="libboost_program_options1.80>=0 libboost_math_c99f1.80>=0
  libboost_stacktrace_basic1.80>=0 libboost_stacktrace_noop1.80>=0
  libboost_iostreams1.80>=0 libboost_math_tr1l1.80>=0 libboost_filesystem1.80>=0

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (3 preceding siblings ...)
  2023-07-05 23:06 ` [PR PATCH] [Updated] " hholst80
@ 2023-07-05 23:14 ` hholst80
  2023-07-05 23:28 ` hholst80
                   ` (28 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 23:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

There is an updated pull request by hholst80 against master on the void-packages repository

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 3473104 bytes --]

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH 0001/1854] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

From 08b5b965c01ea869e232dca292adfcac8f23e4d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 May 2023 13:08:35 +0200
Subject: [PATCH 0002/1854] c-ares: update to 1.19.1.

---
 srcpkgs/c-ares/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index e2093b49feb4..a4538e3f1e51 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,7 +1,7 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.19.0
-revision=2
+version=1.19.1
+revision=1
 build_style=gnu-configure
 checkdepends="iana-etc"
 short_desc="Library for asynchronous DNS requests"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="https://c-ares.haxx.se/download/c-ares-${version}.tar.gz"
-checksum=bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3
+checksum=321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e
 make_check=ci-skip # segfaults only on CI
 
 post_install() {

From 57226542697ad72f645dd40f79988bba0c6310c9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 May 2023 13:10:31 +0200
Subject: [PATCH 0003/1854] elixir: update to 1.14.5.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index cfcd51f13f5f..568e28e4f7ca 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.14.4
+version=1.14.5
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=07d66cf147acadc21bd1679f486efd6f8d64a73856ecc83c71b5e903081b45d2
+checksum=2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From a4f05d33112196a9452ebb4d71ea7b155d67d9d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 May 2023 14:43:13 +0200
Subject: [PATCH 0004/1854] bmake: update to 20230522.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 5a0afae5376d..a0bb5be099ba 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20230512
+version=20230522
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=b927b50a45e4b5579c6491ab09ce3dbd8b170fb10fe6f16d484e13d15e338ffa
+checksum=dfe556df70e1555b70eccf4e6d367aa8b91aa076d5e9b55e36b5ce3e721f9050
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From 1883416531d50a31f028ff703fdede6257edcdd9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 8 Apr 2023 13:52:03 +0100
Subject: [PATCH 0005/1854] wayland-utils: orphan.

Closes #42257.
---
 srcpkgs/wayland-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wayland-utils/template b/srcpkgs/wayland-utils/template
index b3b9c3c4d644..7c05257f97d3 100644
--- a/srcpkgs/wayland-utils/template
+++ b/srcpkgs/wayland-utils/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel wayland-protocols"
 short_desc="Wayland utilities"
-maintainer="Kirill Primak <vyivel@posteo.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/wayland-utils-${version}.tar.xz"

From 3fd8761b07ebfff4d1b07457bb70ada21db04513 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:33:54 -0400
Subject: [PATCH 0006/1854] New package: pipewire-session-manager-bootstrap-0

This dummy package will be the default provider for the the session
manager pulled in by pipewire, breaking a build cycle.
---
 etc/defaults.virtual                                |  1 +
 srcpkgs/pipewire-session-manager-bootstrap/template | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 srcpkgs/pipewire-session-manager-bootstrap/template

diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..f399b1299840 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
 ntp-daemon chrony
 phonon-backend phonon-backend-gstreamer
 phonon-qt5-backend phonon-qt5-backend-gstreamer
+pipewire-session-manager pipewire-session-manager-bootstrap
 rkt-stage1 rkt-stage1-coreos
 smtp-server opensmtpd
 tex texlive
diff --git a/srcpkgs/pipewire-session-manager-bootstrap/template b/srcpkgs/pipewire-session-manager-bootstrap/template
new file mode 100644
index 000000000000..355313ab40dd
--- /dev/null
+++ b/srcpkgs/pipewire-session-manager-bootstrap/template
@@ -0,0 +1,11 @@
+# Template file for 'pipewire-session-manager-bootstrap'
+pkgname=pipewire-session-manager-bootstrap
+version=0
+revision=1
+build_style=meta
+short_desc="Dummy pipewire-session-manager provider"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Public Domain"
+homepage="https://voidlinux.org"
+provides="pipewire-session-manager-${version}_${revision}"
+repository=bootstrap

From 737ffa92739b6b649a456eeb09f1aca64ad80beb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:35:25 -0400
Subject: [PATCH 0007/1854] wireplumber: provide virtual
 pipewire-session-manager

---
 srcpkgs/wireplumber/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 23b011e8d203..f0ca35159469 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -15,6 +15,7 @@ homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
+provides="pipewire-session-manager-0_1"
 
 post_install() {
 	vlicense LICENSE

From b17b57589be40a77604c2dcfcd06d09e5adaf28b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 19 May 2023 22:38:03 -0400
Subject: [PATCH 0008/1854] pipewire: update to 0.3.71, drop
 pipewire-media-session

Now depends on virtual session manager

Closes: #43574 [via git-merge-pr]
---
 srcpkgs/pipewire/INSTALL.msg                  |  6 +--
 .../patches/autostart-media-session.patch     | 17 -------
 .../patches/jack-fix-notify-skip.patch        | 50 +++++++++++++++++++
 srcpkgs/pipewire/template                     | 27 +++-------
 4 files changed, 60 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/autostart-media-session.patch
 create mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
index 9a3d2db6e1f1..3c3a9b13ef4f 100644
--- a/srcpkgs/pipewire/INSTALL.msg
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -1,4 +1,2 @@
-The pipewire-media-session session manager has been abandoned upstream and will
-be removed from Void in a subsequent pipewire update. All users are encouraged
-to transition to wireplumber as soon as possible to avoid unexpected loss of
-functionality in the future.
+The pipewire-media-session session manager has been removed from Void.
+All users must transition to wireplumber to avoid loss of functionality.
diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
deleted file mode 100644
index c5753a3719c2..000000000000
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream's config does not autostart pipewire-media-session anymore, which
-is an essential component. It's not easy to start it externally in a script
-since it needs the pipewire socket up, and Void doesn't have a mechanism to
-ensure it (systemd socket activation).
-diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in
-index 95632c2..ab0b097 100644
---- a/src/daemon/pipewire.conf.in.orig
-+++ b/src/daemon/pipewire.conf.in
-@@ -236,7 +236,7 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
-+    { path = "@session_manager_path@" args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
new file mode 100644
index 000000000000..fed37727a636
--- /dev/null
+++ b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
@@ -0,0 +1,50 @@
+From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 18 May 2023 09:59:26 +0200
+Subject: [PATCH] jack: update bufsize and samplerate when skipping notify
+
+When we skip the notify because we are not active or we don't have a
+callback, still update the buffer_size and sample_rate fields or else
+we will keep on trying forever.
+
+Fixes #3226
+---
+ pipewire-jack/src/pipewire-jack.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
+index 0c8363ea3..20feb2462 100644
+--- a/pipewire-jack/src/pipewire-jack.c
++++ b/pipewire-jack/src/pipewire-jack.c
+@@ -1027,8 +1027,6 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
+ 	struct notify *notify;
+ 	bool emit = false;;
+ 
+-	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
+-		return 0;
+ 	switch (type) {
+ 	case NOTIFY_TYPE_REGISTRATION:
+ 		emit = c->registration_callback != NULL && o != NULL;
+@@ -1060,8 +1058,18 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
+ 	default:
+ 		break;
+ 	}
++	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
++		emit = false;
+ 	if (!emit) {
+-		pw_log_debug("%p: skip notify %d", c, type);
++		switch (type) {
++		case NOTIFY_TYPE_BUFFER_FRAMES:
++			c->buffer_frames = arg1;
++			break;
++		case NOTIFY_TYPE_SAMPLE_RATE:
++			c->sample_rate = arg1;
++			break;
++		}
++		pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active);
+ 		if (o != NULL && arg1 == 0 && o->removing) {
+ 			o->removing = false;
+ 			free_object(c, o);
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index f2d161227deb..92feaab2a6d7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,9 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.68
+version=0.3.71
 revision=1
-_pms_version=0.4.2
-build_wrksrc="${pkgname}-${version}"
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -15,9 +13,8 @@ configure_args="
  -Dsystemd=disabled
  -Dudevrulesdir=/usr/lib/udev/rules.d
  -Dvulkan=enabled
- -Dmedia-session:systemd=disabled
  -Dbluez5-codec-lc3plus=disabled
- -Dsession-managers=media-session
+ -Dsession-managers=[]
  -Drlimits-match=@_pipewire
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
@@ -26,23 +23,20 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel"
+ libmysofa-devel opus-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
- libspa-v4l2>=${version}_${revision} pulseaudio-utils"
+ libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="fdcf7f2ee881cdc91ef54b3a558e431bdb3395f7a1e9044753c7a89346fafd91
- 4cf8577d4431e08b0e6f29c1ad6bf8662765ab66986ea6f0151883101811c119"
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
+checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
-patch_args="-Np1 --directory=${build_wrksrc}"
 
 build_options="sdl2"
 
@@ -59,18 +53,13 @@ else
 	configure_args+=" -Dbluez5-codec-ldac=disabled"
 fi
 
-post_extract() {
-	mv media-session-${_pms_version} ${build_wrksrc}/subprojects/media-session
-}
-
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
 	vsv pipewire
 	vsv pipewire-pulse
-	vmkdir usr/share/applications
-	cp "${FILESDIR}/pipewire.desktop" ${DESTDIR}/usr/share/applications/pipewire.desktop
-	cp "${FILESDIR}/pipewire-pulse.desktop" ${DESTDIR}/usr/share/applications/pipewire-pulse.desktop
+	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
+	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
 }
 
 libpipewire_package() {

From d467744b2df53e0217841fd4cd86609948e64715 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 17 May 2023 23:10:27 +0000
Subject: [PATCH 0009/1854] neomutt: update to 20230517

---
 srcpkgs/neomutt/template | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 39927bb48fbb..791bdcafd7c7 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,29 +1,29 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20220429
-revision=3
+version=20230517
+revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
 build_style=configure
 configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb
- --rocksdb --testing"
+ --rocksdb"
 make_check_target=test
 conf_files="/etc/neomuttrc"
 # neomutt needs either w3m/lynx/elinks to build manual.html
-hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
-makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
- rocksdb-devel tdb-devel ncurses-devel
- libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
+hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m pkg-config"
+makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel
+ rocksdb-devel tdb-devel ncurses-devel libidn2-devel libnotmuch-devel
+ openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
+_test_files_hash=34f79ee9d91863a97f6e18700aea51157b8610cf
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="45496542897ba8de6bc7cce3f5951d9033ed1c49e5d6f1353adaeefe795d9043
- bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
+checksum="4ac277b40e7ed5d67ba516338e2b26cc6810aa37564f6e9a2d45eb15b3a9213e
+ 4507e70e7c8512c993d9188cf320aea601580345ae9fb0c399ed1402d4e39b1f"
 python_version=3
 
 # fix:
@@ -34,13 +34,22 @@ if [ "${XBPS_CROSS_BASE}" ]; then
 fi
 
 case "${XBPS_TARGET_MACHINE}" in
-	x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";;
+	x86_64-musl)
+		# FIXME: error: variable 'fp' has initializer but incomplete type
+		make_check=no # https://github.com/neomutt/neomutt/issues/3865
+		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+		;;
+	*-musl)
+		make_check=no # Same as in the x86_64-musl condition
+		;;
 	# Inquiry: Do we have largefile support on everywhere?
 esac
 
 post_install() {
 	# move dist to examples dir
-	vsconf contrib/samples/gpg.rc Muttrc.gpg.dist
+	vsconf contrib/oauth2/mutt_oauth2.py Muttrc.mutt_oauth2.dist
+	vsconf contrib/vim-keys/vim-keys.rc Muttrc.vim-keys.dist
+	vsconf contrib/smime_keys Muttrc.smime_keys.dist
 }
 
 pre_check() {

From 4b6ade898c0aa8f2e49e5937dcce79c1d3f16380 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 May 2023 16:56:31 -0400
Subject: [PATCH 0010/1854] mdBook: update to 0.4.29

---
 srcpkgs/mdBook/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 2a0be62e53f0..0f14fdda92c3 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.28
+version=0.4.29
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -8,8 +8,8 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
-distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=b7785a0e69a6628bedebb31257113ae659de3b561458cc635d30d07794284b14
+distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz"
+checksum=13e2ff0b9193aa257e6629554bc7dcdb83ee9654235dcd351b254aecd7d7b04f
 
 post_install() {
 	vlicense LICENSE

From 9babae2ec9afb3c01d8626e28a54f24ed824a11e Mon Sep 17 00:00:00 2001
From: Tommy Alatalo <tommy.alatalo@gmail.com>
Date: Tue, 23 May 2023 09:01:19 +0200
Subject: [PATCH 0011/1854] consul: add service

---
 srcpkgs/consul/files/consul/run | 4 ++++
 srcpkgs/consul/template         | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/consul/files/consul/run

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
new file mode 100644
index 000000000000..ece1efba0ce4
--- /dev/null
+++ b/srcpkgs/consul/files/consul/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec 2>&1
+exec consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ed5683591ac2..189ef2eaf55b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=7c04b6a0dd433619e788617434a4c236b7d4f892
@@ -15,4 +15,5 @@ checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
 
 post_install() {
 	vlicense LICENSE
+	vsv consul
 }

From 336da8d52546faffbe1a930ef79069b510e4b778 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 01:08:35 -0500
Subject: [PATCH 0012/1854] nomad: update to 1.5.6.

---
 srcpkgs/nomad/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index d1530935b20f..ef3c1b0a66ec 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.5.1
-revision=2
+version=1.5.6
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=6c118ddaf95e9bfd3d85f488f255fdc5e14129c7
+_git_commit=8af70885c02ab921dedbdf6bc406a1e886866f80
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 depends="cni-plugins"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=d1df280e400149e9bd41ee5e952201a06a2c8ab86554edc4d8d0f33fd2498e2f
+checksum=21bb378584a3f0e3bf3731f89b64658fedf20c829de8eedba9a6773cddfa0c3e
 make_dirs="/etc/nomad.d 0755 root root
  /var/lib/nomad 0755 root root"
 

From c0d9d91ffaf957fea50d48c9d12b960d07552a9f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 17:20:46 -0500
Subject: [PATCH 0013/1854] e2fsprogs: update to 1.47.0, add fuse-devel to
 makedepends, split fuse2fs subpkg

---
 srcpkgs/e2fsprogs/template | 15 ++++++++++++---
 srcpkgs/fuse2fs            |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/fuse2fs

diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index a32c50b823b5..7b41eb0ac1d7 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.46.5
+version=1.47.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -10,14 +10,14 @@ configure_args="--enable-elf-shlibs --disable-fsck
  --sbindir=/usr/bin --libdir=/usr/lib e2fsprogs_cv_struct_st_flags=no"
 make_install_args="install-libs"
 hostmakedepends="texinfo pkg-config"
-makedepends="libuuid-devel libblkid-devel"
+makedepends="libuuid-devel libblkid-devel fuse-devel"
 checkdepends="perl tar"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
+checksum=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {
@@ -55,9 +55,18 @@ e2fsprogs-devel_package() {
 		vmove "usr/share/info/libext2fs.info*"
 	}
 }
+
 e2fsprogs-libs_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
+fuse2fs_package() {
+	short_desc+=" - driver for FUSE"
+	pkg_install() {
+		vmove usr/bin/fuse2fs
+		vmove usr/share/man/man1/fuse2fs.1
+	}
+}
diff --git a/srcpkgs/fuse2fs b/srcpkgs/fuse2fs
new file mode 120000
index 000000000000..84c526343bfc
--- /dev/null
+++ b/srcpkgs/fuse2fs
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file

From 7489ef8fb9263f0560ca8d67275351ad661760c0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Mar 2023 15:26:13 -0400
Subject: [PATCH 0014/1854] grub: patch for e2fsprogs

---
 srcpkgs/grub/patches/xx-e2fsprogs-1.patch | 62 +++++++++++++++++++++++
 srcpkgs/grub/patches/xx-e2fsprogs-2.patch | 60 ++++++++++++++++++++++
 srcpkgs/grub/template                     |  2 +-
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-1.patch
 create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-2.patch

diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-1.patch b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
new file mode 100644
index 000000000000..5cd83273be1a
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
@@ -0,0 +1,62 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
+useful because e2fsprogs 1.47 defaults to this enabled, and grub won't touch it
+--
+From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Fri, 11 Jun 2021 21:36:16 +0200
+Subject: fs/ext2: Ignore checksum seed incompat feature
+
+This incompat feature is used to denote that the filesystem stored its
+metadata checksum seed in the superblock. This is used to allow tune2fs
+changing the UUID on a mounted metdata_csum filesystem without having
+to rewrite all the disk metadata. However, the GRUB doesn't use the
+metadata checksum at all. So, it can just ignore this feature if it
+is enabled. This is consistent with the GRUB filesystem code in general
+which just does a best effort to access the filesystem's data.
+
+The checksum seed incompat feature has to be removed from the ignore
+list if the support for metadata checksum verification is added to the
+GRUB ext2 driver later.
+
+Suggested-by: Eric Sandeen <esandeen@redhat.com>
+Suggested-by: Lukas Czerner <lczerner@redhat.com>
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+Reviewed-by: Lukas Czerner <lczerner@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index e7dd78e..4953a15 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
+ #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
++#define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
+ 
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
+  * mmp:            Not really back-incompatible - was added as such to
+  *                 avoid multiple read-write mounts. Safe to ignore for this
+  *                 RO driver.
++ * checksum seed:  Not really back-incompatible - was added to allow tools
++ *                 such as tune2fs to change the UUID on a mounted metadata
++ *                 checksummed filesystem. Safe to ignore for now since the
++ *                 driver doesn't support checksum verification. However, it
++ *                 has to be removed from this list if the support is added later.
+  */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+-				     | EXT4_FEATURE_INCOMPAT_MMP)
+-
++				     | EXT4_FEATURE_INCOMPAT_MMP \
++				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
+ 
+ #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
+ 
+-- 
+cgit v1.1
+
diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-2.patch b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
new file mode 100644
index 000000000000..7e02e2087799
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
@@ -0,0 +1,60 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b
+useful to support the large_dir ext4 feature
+--
+From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Tue, 30 Aug 2022 22:41:59 -0400
+Subject: fs/ext2: Ignore the large_dir incompat feature
+
+Recently, ext4 added the large_dir feature, which adds support for
+a 3 level htree directory support.
+
+The GRUB supports existing file systems with htree directories by
+ignoring their existence, and since the index nodes for the hash tree
+look like deleted directory entries (by design), the GRUB can simply do
+a brute force O(n) linear search of directories. The same is true for
+3 level deep htrees indicated by large_dir feature flag.
+
+Hence, it is safe for the GRUB to ignore the large_dir incompat feature.
+
+Fixes: https://savannah.gnu.org/bugs/?61606
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index 0989e26..e1cc5e6 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
+ #define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
++#define EXT4_FEATURE_INCOMPAT_LARGEDIR		0x4000 /* >2GB or 3 level htree */
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
+ 
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+");
+  *                 checksummed filesystem. Safe to ignore for now since the
+  *                 driver doesn't support checksum verification. However, it
+  *                 has to be removed from this list if the support is added later.
++ * large_dir:      Not back-incompatible given that the GRUB ext2 driver does
++ *                 not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB
++ *                 eventually supports the htree feature (aka dir_index)
++ *                 it should support 3 level htrees and then move
++ *                 EXT4_FEATURE_INCOMPAT_LARGEDIR to
++ *                 EXT2_DRIVER_SUPPORTED_INCOMPAT.
+  */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+ 				     | EXT4_FEATURE_INCOMPAT_MMP \
+-				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
++				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
++				     | EXT4_FEATURE_INCOMPAT_LARGEDIR)
+ 
+ #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
+ 
+-- 
+cgit v1.1
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index b4d3b07af620..7294fa503f3a 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.06
-revision=2
+revision=3
 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man
  automake gettext-devel-tools"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel

From 94be3facdcd8c47c05e088c3526cb29bb2871fe8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:02:23 +0200
Subject: [PATCH 0015/1854] vagrant: update to 2.3.6.

---
 srcpkgs/vagrant/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 99a7b803c1f6..987ff584ab38 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.3.5
-revision=3
+version=2.3.6
+revision=1
 archs="i686 x86_64*"
 build_style=gemspec
 depends="bsdtar curl openssh rsync"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.vagrantup.com/"
 changelog="https://raw.githubusercontent.com/hashicorp/vagrant/main/CHANGELOG.md"
 distfiles="https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"
-checksum=34fce02219c67174457a6f8750063047f6c29b7148e425e4f3647cb80b8a5b2e
+checksum=3f9780b32d979e7cf4565a56fa6dc40b3c9b1b73e4cae9931b1d4a706d0d4d9e
 nocross=yes
 
 post_extract() {

From 4cb4df2e960c2ef7a1e0aef0ddabe6a37282f081 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:05:24 +0200
Subject: [PATCH 0016/1854] terragrunt: update to 0.45.16.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index c45b71409b10..cc4ee5d45d03 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.45.11
+version=0.45.16
 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=621f688faacab5afec7d6cb2f821ceac3539fa737b050df634a54b710d8e8330
+checksum=11c2fadf60545ec495a031ddc72e985af83aa5171f952ef0da451f37f5160435
 
 post_install() {
 	vlicense LICENSE.txt

From b835d5d794dc90835fd0f261db4193c43706cd43 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:07:33 +0200
Subject: [PATCH 0017/1854] kubernetes: update to 1.27.2.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 2cd3a8e544a2..cd21779f27d9 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.27.1
+version=1.27.2
 revision=1
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=3a3f7c6b8cf1d9f03aa67ba2f04669772b1205b89826859f1636062d5f8bec3f
+checksum=c6fcfddd38f877ce49c49318973496f9a16672e83a29874a921242950cd1c5d2
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From b4156d90224fb085157ce9f8b44b52414c0b31bc Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:14:01 +0200
Subject: [PATCH 0018/1854] hugo: update to 0.112.3.

---
 srcpkgs/hugo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 30bbbbfd088b..d9f4819d8c27 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.111.3
-revision=2
+version=0.112.3
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=b6eeb13d9ed2e5d5c6895bae56480bf0fec24a564ad9d17c90ede14a7b240999
+checksum=24720523cd4feb4a746fb1462c4ad0b1ecdd4c3fbe08469d4498ca0647b9e28f
 
 post_install() {
 	vdoc README.md

From 441781947bd0cf485d2bd438c9c1b24bbeba0ed4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:17:01 +0200
Subject: [PATCH 0019/1854] hopper: update to 5.11.0.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 8dbbc6ed054f..2bc7952d22d3 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=5.10.0
+version=5.11.0
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=9d1bf15b475f4a6cafbf5f10fe8cbe9520fde14a0701529d9803b27bf5dd7aca
+checksum=c14843755669369df54222a54ab0d2069edb30b2fbcdb33abc8da6575bfde6d3
 
 archs="x86_64"
 restricted=yes

From 3c1c5bbb2ebffceee75be05cef69d937ca35c987 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 25 May 2023 10:17:11 +0200
Subject: [PATCH 0020/1854] docker-cli: update to 24.0.1.

---
 srcpkgs/docker-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 6a848d9b3820..ae4587fa99c7 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 # should be kept in sync with moby
 pkgname=docker-cli
-version=23.0.6
+version=24.0.1
 revision=1
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9
+checksum=f5916273959fb2df56424bb2c26d8b6feb9a148dd15eb400aedd5d3753e06959
 system_groups="docker"
 
 pre_build() {

From 0f17826f0b35bb6b4aa8f68ac6e72ad763877374 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 25 May 2023 16:18:26 +0200
Subject: [PATCH 0021/1854] wlsunset: update to 0.3.0.

---
 .../patches/fix-scdoc-cross-compiling.patch   | 55 -------------------
 srcpkgs/wlsunset/template                     |  7 ++-
 2 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch

diff --git a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
deleted file mode 100644
index f9189f0e700d..000000000000
--- a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7be432057f268fff6e68928f3c3f3b4b70d67368 Mon Sep 17 00:00:00 2001
-From: Kenny Levinsen <kl@kl.wtf>
-Date: Fri, 30 Apr 2021 20:02:02 +0200
-Subject: [PATCH] meson: Copy seatd's scdoc handling
-
-This fixes cross-compiling, and avoids unnecessary search for a shell.
----
- meson.build | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 23d24c5..9a02caf 100644
---- a/meson.build
-+++ b/meson.build
-@@ -3,7 +3,7 @@ project(
- 	'c',
- 	version: '0.2.0',
- 	license: 'MIT',
--	meson_version: '>=0.53.0',
-+	meson_version: '>=0.56.0',
- 	default_options: [
- 		'c_std=c11',
- 		'warning_level=3',
-@@ -56,16 +56,13 @@ executable(
- 	install: true,
- )
- 
--scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
-+scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
- 
- if scdoc.found()
--	sh = find_program('sh')
--
--	man_pages = ['wlsunset.1.scd']
--
-+	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
- 	mandir = get_option('mandir')
- 
--	foreach src : man_pages
-+	foreach src : ['wlsunset.1.scd']
- 		topic = src.split('.')[0]
- 		section = src.split('.')[1]
- 		output = '@0@.@1@'.format(topic, section)
-@@ -75,7 +72,7 @@ if scdoc.found()
- 			input: src,
- 			output: output,
- 			command: [
--				sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
-+				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
- 			],
- 			install: true,
- 			install_dir: '@0@/man@1@'.format(mandir, section)
--- 
-2.30.2
-
diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 984ee8cbfc67..f32f51082c83 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,7 +1,7 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
@@ -9,8 +9,9 @@ short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://sr.ht/~kennylevinsen/wlsunset/"
+changelog="https://git.sr.ht/~kennylevinsen/wlsunset/refs"
 distfiles="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"
-checksum=88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
+checksum=9ece2570c3427888a493cd33a129e82634475e6e9286ed729af24fba07ab5424
 
 post_install() {
 	vlicense LICENSE

From 5e99670002dbbf4d84cc7e055df58ac6103f42ac Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 23 Feb 2023 12:00:26 +0100
Subject: [PATCH 0022/1854] i2pd: restrict /etc/i2pd permissions

It's not a good idea to have /etc/i2pd/*.conf world-readable since
it may contain sensitive information.
---
 srcpkgs/i2pd/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 237ee28d4db8..d0fc5060e887 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -19,7 +19,9 @@ conf_files="
  /etc/i2pd/tunnels.conf"
 system_accounts="_i2pd"
 _i2pd_homedir="/var/lib/i2pd"
-make_dirs="/var/lib/i2pd 0700 _i2pd _i2pd"
+make_dirs="
+ /var/lib/i2pd 0700 _i2pd _i2pd
+ /etc/i2pd 0750 root _i2pd"
 
 case "${XBPS_TARGET_MACHINE}" in
 	x86_64*) ;;

From 8d466231e8e55c35582d7d91d929382cce392a67 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 25 May 2023 18:31:29 +0200
Subject: [PATCH 0023/1854] i2pd: revbump for #42409

---
 srcpkgs/i2pd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index d0fc5060e887..68bfd051faee 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.46.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
 makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel

From c556597ee1e098d6a0373a53e90989f93304adeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 19:51:18 -0300
Subject: [PATCH 0024/1854] build-style/python3-pep517: use generic glob for
 wheels, refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also: do not compile bytecode in `do_install()` since it will be removed
in `post_install()`.

Co-authored-by: Gonzalo Tornaría <tornaria@cmat.edu.uy>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #44071.
---
 common/build-style/python3-pep517.sh | 38 +++++++++++-----------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index f13046ea1968..ffe52fccf3db 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -9,35 +9,27 @@ do_build() {
 }
 
 do_check() {
-	local testjobs
-	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		if python3 -c 'import xdist' >/dev/null 2>&1; then
-			testjobs="-n $XBPS_MAKEJOBS"
-		fi
+	if ! python3 -c 'import pytest' >/dev/null 2>&1; then
+		msg_warn "Testing of python3-pep517 templates requires pytest\n"
+		return 0
+	fi
 
-		if [ -z "${make_install_target}" ]; then
-			local wheelbase="${pkgname#python3-}"
-			make_install_target="dist/${wheelbase//-/_}-${version}-*-*-*.whl"
-		fi
+	local testjobs
+	if python3 -c 'import xdist' >/dev/null 2>&1; then
+		testjobs="-n $XBPS_MAKEJOBS"
+	fi
 
-		local testdir="${wrksrc}/tmp/$(date +%s)"
-		python3 -m installer --destdir "${testdir}" \
-			${make_install_args} ${make_install_target}
+	local testdir="${wrksrc}/tmp/$(date +%s)"
+	python3 -m installer --destdir "${testdir}" \
+		${make_install_args} ${make_install_target:-dist/*.whl}
 
-		PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
-			${make_check_pre} pytest3 ${testjobs} ${make_check_args} ${make_check_target}
-	else
-		msg_warn "Unable to determine tests for PEP517 Python templates\n"
-		return 0
-	fi
+	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
+		${make_check_pre} pytest3 ${testjobs} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	if [ -z "${make_install_target}" ]; then
-		# Default wheel name normalizes hyphens to underscores
-		local wheelbase="${pkgname#python3-}"
-		make_install_target="dist/${wheelbase//-/_}-${version}-*-*-*.whl"
-	fi
+	: ${make_install_args:=--no-compile-bytecode}
+	: ${make_install_target:="dist/*.whl"}
 
 	python3 -m installer --destdir ${DESTDIR} \
 		${make_install_args} ${make_install_target}

From 69d2899d914acd87772adfafd6f5ddb75500c04f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 25 May 2023 09:27:35 -0400
Subject: [PATCH 0025/1854] python3-*: remove unnecessary make_install_target
 for pep517

Now that the wheel glob in do_check and do_install is more generic,
there is no longer a need to override the default behavior.
---
 srcpkgs/python3-PyHamcrest/template        | 1 -
 srcpkgs/python3-Pyphen/template            | 1 -
 srcpkgs/python3-Sphinx/template            | 1 -
 srcpkgs/python3-WeasyPrint/template        | 1 -
 srcpkgs/python3-ansible-lint/template      | 1 -
 srcpkgs/python3-b2sdk/template             | 1 -
 srcpkgs/python3-gnupg/template             | 1 -
 srcpkgs/python3-ipython_ipykernel/template | 1 -
 srcpkgs/python3-logbook/template           | 1 -
 srcpkgs/python3-markdown-it/template       | 1 -
 srcpkgs/python3-mistune2/template          | 1 -
 srcpkgs/python3-quart/template             | 1 -
 srcpkgs/python3-saml2/template             | 1 -
 srcpkgs/python3-ytmusicapi/template        | 1 -
 srcpkgs/rofi-rbw/template                  | 1 -
 srcpkgs/synapse/template                   | 1 -
 16 files changed, 16 deletions(-)

diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
index cbba236bc53b..d6b17d61463f 100644
--- a/srcpkgs/python3-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -3,7 +3,6 @@ pkgname=python3-PyHamcrest
 version=2.0.4
 revision=1
 build_style=python3-pep517
-make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
 hostmakedepends="hatch-vcs"
 depends="python3"
 checkdepends="python3-pytest python3-numpy"
diff --git a/srcpkgs/python3-Pyphen/template b/srcpkgs/python3-Pyphen/template
index a0f9db3ea933..a8d34fb01d9d 100644
--- a/srcpkgs/python3-Pyphen/template
+++ b/srcpkgs/python3-Pyphen/template
@@ -3,7 +3,6 @@ pkgname=python3-Pyphen
 version=0.14.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/pyphen-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core python3-flit_core"
 checkdepends="python3-pytest-isort python3-pytest-cov python3-pytest-flake8
  python3-pytest-xdist"
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 26b161172705..c49bb438a78b 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -3,7 +3,6 @@ pkgname=python3-Sphinx
 version=7.0.1
 revision=1
 build_style=python3-pep517
-make_install_target="dist/sphinx-$version-py3-none-any.whl"
 hostmakedepends="python3-flit_core python3-pyproject-hooks"
 depends="python3-Jinja2 python3-docutils python3-Pygments
  python3-snowballstemmer python3-Babel python3-alabaster python3-imagesize
diff --git a/srcpkgs/python3-WeasyPrint/template b/srcpkgs/python3-WeasyPrint/template
index 8c87d92cbea5..0b0a2040b6c1 100644
--- a/srcpkgs/python3-WeasyPrint/template
+++ b/srcpkgs/python3-WeasyPrint/template
@@ -3,7 +3,6 @@ pkgname=python3-WeasyPrint
 version=59.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/weasyprint-${version}-py3-none-any.whl"
 _runtime_deps="fonttools python3-Pillow python3-cssselect2 python3-html5lib python3-cffi
  python3-Pyphen python3-pydyf glib pango"
 hostmakedepends="python3-poetry-core python3-flit_core ${_runtime_deps}"
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index ad75a253c592..f99a3c167dd6 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -3,7 +3,6 @@ pkgname=python3-ansible-lint
 version=6.14.3
 revision=1
 build_style=python3-pep517
-make_install_target="dist/ansible_lint-*-*-*-*.whl"
 hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3-ansible-compat ansible-core black python3-filelock
  python3-jsonschema python3-packaging python3-yaml python3-rich
diff --git a/srcpkgs/python3-b2sdk/template b/srcpkgs/python3-b2sdk/template
index 720dab64afc0..b2db87588bf8 100644
--- a/srcpkgs/python3-b2sdk/template
+++ b/srcpkgs/python3-b2sdk/template
@@ -3,7 +3,6 @@ pkgname=python3-b2sdk
 version=1.20.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/b2sdk-${version}-*-*-*.whl"
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-logfury python3-Arrow python3-requests python3-tqdm"
 checkdepends="python3-pytest-lazy-fixture $depends python3-dateutil
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index 597b6888818b..4b2c42dc299f 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -3,7 +3,6 @@ pkgname=python3-gnupg
 version=0.5.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/python_gnupg-${version}-py2.py3-none-any.whl"
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3 gnupg"
 checkdepends="${depends} python3-pytest"
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 42020b2dc775..4034b98a6ff5 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -3,7 +3,6 @@ pkgname=python3-ipython_ipykernel
 version=6.19.2
 revision=1
 build_style=python3-pep517
-make_install_target="dist/ipykernel-${version}-*-*-*.whl"
 hostmakedepends="hatchling python3-jupyter_client python3-jupyter_core
  python3-platformdirs"
 depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado
diff --git a/srcpkgs/python3-logbook/template b/srcpkgs/python3-logbook/template
index b49bd495ae46..319bb1e19ab5 100644
--- a/srcpkgs/python3-logbook/template
+++ b/srcpkgs/python3-logbook/template
@@ -4,7 +4,6 @@ version=1.5.3
 revision=6
 build_style=python3-pep517
 make_check_args="--ignore=scripts"
-make_install_target="dist/Logbook-${version}-*-*-*_*.whl"
 hostmakedepends="python3-setuptools python3-wheel python3-devel python3-Cython"
 depends="python3"
 checkdepends="python3-execnet python3-pytest python3-pyzmq python3-SQLAlchemy
diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template
index acd48c68a10a..75075530af2a 100644
--- a/srcpkgs/python3-markdown-it/template
+++ b/srcpkgs/python3-markdown-it/template
@@ -3,7 +3,6 @@ pkgname=python3-markdown-it
 version=2.2.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/markdown_it_py-${version}-*-*-*.whl"
 hostmakedepends="python3-flit_core"
 depends="python3-mdurl"
 short_desc="Python port of the JavaScript mardown-it package"
diff --git a/srcpkgs/python3-mistune2/template b/srcpkgs/python3-mistune2/template
index 76bc57ec0b6c..82f19f0bb31c 100644
--- a/srcpkgs/python3-mistune2/template
+++ b/srcpkgs/python3-mistune2/template
@@ -3,7 +3,6 @@ pkgname=python3-mistune2
 version=2.0.4
 revision=1
 build_style=python3-pep517
-make_install_target="dist/mistune-${version}-*-*-*.whl"
 hostmakedepends="python3-wheel"
 depends="python3"
 checkdepends="python3-pytest"
diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index b032ba6bc283..49f066b717cc 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -3,7 +3,6 @@ pkgname=python3-quart
 version=0.18.4
 revision=1
 build_style=python3-pep517
-make_install_target="dist/quart-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core"
 depends="python3-aiofiles python3-hypercorn python3-click python3-MarkupSafe
  python3-blinker python3-itsdangerous python3-Jinja2 python3-Werkzeug"
diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 0a386d5c2ae1..9583564c1008 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -6,7 +6,6 @@ build_style=python3-pep517
 make_check_args="--ignore=tests/test_36_mdbcache.py \
  --ignore=tests/test_75_mongodb.py \
  --ignore=tests/test_76_metadata_in_mdb.py"
-make_install_target="dist/pysaml2-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core unzip"
 depends="python3-cryptography python3-openssl python3-dateutil python3-pytz
  python3-requests python3-six python3-defusedxml python3-xmlschema"
diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 96248893bded..78e59051e530 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -3,7 +3,6 @@ pkgname=python3-ytmusicapi
 version=1.0.2
 revision=1
 build_style=python3-pep517
-make_install_target="dist/ytmusicapi-*.*.*-*-*-*.whl"
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-requests"
 checkdepends="$depends python3-coverage"
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 164abbeab791..c6d83a812d99 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -3,7 +3,6 @@ pkgname=rofi-rbw
 version=1.2.0
 revision=1
 build_style=python3-pep517
-make_install_target="dist/rofi_rbw-${version}-py3-none-any.whl"
 hostmakedepends="python3-poetry-core"
 depends="python3 python3-ConfigArgParse rbw"
 short_desc="Rofi frontend for Bitwarden"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index a116d321f6bc..2749f0a5c548 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -5,7 +5,6 @@ revision=1
 build_style=python3-pep517
 build_helper=rust
 make_check_target=tests
-make_install_target="dist/matrix_synapse-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core python3-setuptools-rust cargo"
 depends="python3-jsonschema python3-immutabledict python3-unpaddedbase64
  python3-canonicaljson python3-signedjson python3-pynacl

From 8c755a8db781c4cf7146883a5ad32b36866248ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 25 May 2023 09:41:17 -0400
Subject: [PATCH 0026/1854] python3-xcffib: update to 1.3.0.

---
 srcpkgs/python3-xcffib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-xcffib/template b/srcpkgs/python3-xcffib/template
index e33b1feed7cc..07fa9f0732c0 100644
--- a/srcpkgs/python3-xcffib/template
+++ b/srcpkgs/python3-xcffib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xcffib'
 pkgname=python3-xcffib
-version=0.11.1
-revision=2
+version=1.3.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools pkg-config cabal-install parallel xcb-proto python3-cffi python3-wheel"
 makedepends="python3-devel libffi-devel libxcb-devel python3-six"
@@ -11,7 +11,7 @@ maintainer="Kai Stian Olstad <void@olstad.com>"
 license="Apache-2.0"
 homepage="https://github.com/tych0/xcffib"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=bd89c1e65cf4773fe10d70209ba069e0e1fe82c37c121501fc404aa9867d0ff3
+checksum=e0819e9cf56d47839a58755728af22eee02cad3b8b57157f8f682f187da96013
 nocross="Cannot yet cross compile with Haskell"
 
 pre_build() {

From 0ca99d4cb40167627ac35dbe3b4b47e1f4be7ac6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 May 2023 14:35:50 -0400
Subject: [PATCH 0027/1854] python3-phonenumbers: update to 8.13.11.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index a51431294971..3690912d6585 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.13.10
+version=8.13.11
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=421b69fd6d6650372000a6c47ab5b5c5d7b438b33f7b317739e728eff1ec1886
+checksum=3e3274d88cab3609b55ff5b93417075dbca2d13064f103fbf562e0ea1dda0f9a

From fdef914fbfc2132f2c5267d92bd2c4e2238f240e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 9 May 2023 14:41:06 -0400
Subject: [PATCH 0028/1854] synapse: update to 1.84.0.

restore make_install_target needed for tests
---
 srcpkgs/synapse/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 2749f0a5c548..47e9393dcb8f 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.82.0
+version=1.84.0
 revision=1
 build_style=python3-pep517
 build_helper=rust
 make_check_target=tests
+make_install_target="dist/matrix_synapse-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core python3-setuptools-rust cargo"
 depends="python3-jsonschema python3-immutabledict python3-unpaddedbase64
  python3-canonicaljson python3-signedjson python3-pynacl
@@ -23,7 +24,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=bea5b8e40be5f79977732867dae34eb45667aae41c3ee366a3164d5e20c8b327
+checksum=f87b0565403bdf457f92c75e314fd3581e50bf48259089f22406dc5d90be44bd
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 61dc9154a494bd61b53114e03ad2e80211fb1b97 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 23 May 2023 21:15:56 +0100
Subject: [PATCH 0029/1854] xdpyinfo: update to 1.3.4.

---
 srcpkgs/xdpyinfo/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 2b51598a40f9..71bf9a858dc9 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,8 +1,9 @@
 # Template file for 'xdpyinfo'
 pkgname=xdpyinfo
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
+configure_args="--with-xf86misc"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXtst-devel libXxf86vm-devel
  libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
@@ -10,8 +11,8 @@ short_desc="Display information utility for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/app/xdpyinfo"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
-checksum=356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206
+distfiles="${XORG_SITE}/app/xdpyinfo-${version}.tar.xz"
+checksum=a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b
 
 post_install() {
 	vlicense COPYING

From 914b7eb9a8da6e70c9132912b8db62bef865421b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 24 May 2023 10:23:57 +0300
Subject: [PATCH 0030/1854] wget: update to 1.21.4, adopt.

---
 srcpkgs/wget/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 89bb4b69d7c7..7024498b67ac 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,6 +1,6 @@
 # Template file for 'wget'
 pkgname=wget
-version=1.21.3
+version=1.21.4
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
@@ -11,12 +11,12 @@ makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/wget/wget.html"
 changelog="https://git.savannah.gnu.org/cgit/wget.git/plain/NEWS"
 distfiles="${GNU_SITE}/wget/wget-${version}.tar.gz"
-checksum=5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5
+checksum=81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c
 
 build_options="gnutls ssl"
 build_options_default="ssl"

From e47dfd489190609d8586ff32a27c8f3b54629aef Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 20:33:12 +0100
Subject: [PATCH 0031/1854] dav1d: update to 1.2.0.

---
 srcpkgs/dav1d/template | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index 84c9c7e50bb6..93a5a75f8238 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -1,18 +1,27 @@
 # Template file for 'dav1d'
 pkgname=dav1d
-version=1.0.0
+version=1.2.0
 revision=1
 build_style=meson
-configure_args="-Denable_tests=true -Denable_asm=true -Denable_tools=true
- -Dfuzzing_engine=none -Dtestdata_tests=false"
-hostmakedepends="nasm"
+configure_args="-Denable_asm=true -Denable_tools=true -Dfuzzing_engine=none
+ -Dtestdata_tests=false"
 short_desc="Small and fast AV1 Decoder"
 maintainer="mustaqim <git@mustaqim.ml>"
 license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 changelog="https://code.videolan.org/videolan/dav1d/raw/master/NEWS"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive/${version}/dav1d-${version}.tar.bz2"
-checksum=4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f
+checksum=05cedc43127e00a86c68b8a49a5f68e2dc22b9baa10b1e12a5e3bc5b37876a6b
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Denable_tests=true"
+else
+	configure_args+=" -Denable_tests=false"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64* | i686*) hostmakedepends="nasm" ;;
+esac
 
 libdav1d6_package() {
 	short_desc+=" - runtime library"

From 4dd431e6d47ef1fecbd53a6f1724eda8b332a7b9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 21 May 2023 16:38:34 +0300
Subject: [PATCH 0032/1854] lcms2: update to 2.15.

---
 srcpkgs/lcms2/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 079248068934..4607451d89e2 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,15 +1,15 @@
 # Template file for 'lcms2'
 pkgname=lcms2
-version=2.14
-revision=2
-build_style=gnu-configure
+version=2.15
+revision=1
+build_style=meson
 makedepends="tiff-devel"
 short_desc="Small-footprint color management engine, version 2"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://littlecms.com"
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-${version}.tar.gz"
-checksum=28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740
+checksum=b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39
 
 post_install() {
 	vlicense COPYING
@@ -21,7 +21,6 @@ lcms2-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From dbd2236c29925498eb46ea20be4edb59741f311b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 21 May 2023 16:08:19 +0300
Subject: [PATCH 0033/1854] benchmark: update to 1.8.0.

---
 srcpkgs/benchmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 78941a55ebd3..29941542ad0b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=6430e4092653380d9dc4ccb45a1e2dc9259d581f4866dc0759713126056bc1d7
+checksum=ea2e94c24ddf6594d15c711c06ccd4486434d9cf3eca954e2af8a20c88f9f172
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From edb2430556942d5cb5ab737ef6436c3779842d30 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 21 May 2023 14:33:48 +0200
Subject: [PATCH 0034/1854] codeberg-cli: update to 0.3.5

---
 srcpkgs/codeberg-cli/patches/update-lockfile.patch | 11 -----------
 srcpkgs/codeberg-cli/template                      |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/codeberg-cli/patches/update-lockfile.patch

diff --git a/srcpkgs/codeberg-cli/patches/update-lockfile.patch b/srcpkgs/codeberg-cli/patches/update-lockfile.patch
deleted file mode 100644
index 733a7c5fe850..000000000000
--- a/srcpkgs/codeberg-cli/patches/update-lockfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -195,7 +195,7 @@
- 
- [[package]]
- name = "codeberg-cli"
--version = "0.3.3"
-+version = "0.3.4"
- dependencies = [
-  "anyhow",
-  "chrono",
diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template
index 5cf09bc3bb8c..69027f4b4106 100644
--- a/srcpkgs/codeberg-cli/template
+++ b/srcpkgs/codeberg-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'codeberg-cli'
 pkgname=codeberg-cli
-version=0.3.4
-revision=2
+version=0.3.5
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
 homepage="https://codeberg.org/RobWalt/codeberg-cli"
 changelog="https://codeberg.org/RobWalt/codeberg-cli/raw/branch/main/CHANGELOG.md"
 distfiles="https://codeberg.org/RobWalt/codeberg-cli/archive/v${version}.tar.gz"
-checksum=379e39412eb5a15b5a0920e29d19d36d5abaa5e5b8d4fb16658e3fbbe3eba189
+checksum=bd705df34588fcf668fab8f2c77127679a83335d8ce5248950365fb599d35d29
 
 post_install() {
 	vlicense LICENSE

From 6c41b8ec52b5fece4f3bd5c3727bd7252e3b576b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 21 May 2023 14:21:11 +0100
Subject: [PATCH 0035/1854] blender: update to 3.5.1.

---
 srcpkgs/blender/patches/numpy-2.24.patch | 22 ----------------------
 srcpkgs/blender/template                 | 13 +++++++------
 2 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/blender/patches/numpy-2.24.patch

diff --git a/srcpkgs/blender/patches/numpy-2.24.patch b/srcpkgs/blender/patches/numpy-2.24.patch
deleted file mode 100644
index 716315b74be7..000000000000
--- a/srcpkgs/blender/patches/numpy-2.24.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 74e6e07cf7c67b55d384db72f5aa3892db8a3da6 Mon Sep 17 00:00:00 2001
-From: oreo639 <oreo6391@gmail.com>
-Date: Tue, 17 Jan 2023 14:36:54 -0800
-Subject: [PATCH] Remove usage of deprecated np.bool alias
-
----
- addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
-index 6366434a6..8160c9e99 100644
---- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
-+++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
-@@ -620,7 +620,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs):
-     # Try to guess which polys should be flat based on the fact that all the
-     # loop normals for a flat poly are = the poly's normal.
- 
--    poly_smooths = np.empty(num_polys, dtype=np.bool)
-+    poly_smooths = np.empty(num_polys, dtype=bool)
- 
-     poly_normals = np.empty(num_polys * 3, dtype=np.float32)
-     mesh.polygons.foreach_get('normal', poly_normals)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index d18bc88838ff..ec724bb0a6dc 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
-version=3.4.1
-revision=4
+version=3.5.1
+revision=1
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -12,8 +12,8 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
  -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON
  -DWITH_GHOST_X11=ON -DWITH_GHOST_WAYLAND=ON -DWITH_GHOST_LIBDECOR=ON
  -DWITH_BUILDINFO=OFF -DPYTHON_VERSION=${py3_ver} -DPYTHON_LIBPATH=/usr/lib
- -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
- -DPYTHON_INCLUDE_DIRS=/${py3_inc}"
+ -DPYTHON_LIBRARY=python${py3_ver}${py3_abiver} -DPYTHON_INCLUDE_DIRS=/${py3_inc}
+ -DWITH_SYSTEM_LZO=ON -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON"
 hostmakedepends="pkg-config"
 makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
@@ -22,14 +22,15 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  opencolorio-devel opencollada-devel python3-numpy libXrender-devel
  OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
  pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel
- wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel"
+ wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel
+ eigen lzo-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.blender.org"
 distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=247c4c1228270c9010f4721c985cb5b628ab50abcf9f2678630737142eeb91c3
+checksum=bd7428c7e6cba5a900216269c32111dffaabaf1bdb5472f231965e615174a809
 python_version=3
 LDFLAGS="-Wl,-z,stack-size=2097152"
 # Blender tests are executed against a system installation of blender. This

From fd30a6c3e464490d64bf3a1bdbe117a7fa63ca06 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 21:50:49 -0400
Subject: [PATCH 0036/1854] alsa-lib: update to 1.2.9

---
 srcpkgs/alsa-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index de17002ed450..576745a85219 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-lib'
 pkgname=alsa-lib
-version=1.2.8
+version=1.2.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347
+checksum=dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2
 
 alsa-lib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5790df91b3fdc8c678d542b2f5bec28a68eaaa21 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 21:51:19 -0400
Subject: [PATCH 0037/1854] alsa-utils: update to 1.2.9, adopt

---
 srcpkgs/alsa-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 717be1947398..90cf5e61ec60 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-utils'
 pkgname=alsa-utils
-version=1.2.8
+version=1.2.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -10,11 +10,11 @@ makedepends="libsamplerate-devel ncurses-devel"
 depends="alsa-lib"
 make_dirs="/var/lib/alsa 0750 root root"
 short_desc="Advanced Linux Sound Architecture (ALSA) utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=e140fa604c351f36bd72167c8860c69d81b964ae6ab53992d6434dde38e9333c
+checksum=e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd
 
 post_install() {
 	# Install required udev rules file.

From c63bf3851661474cb3672c46a8491f03262e2e36 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 21:51:41 -0400
Subject: [PATCH 0038/1854] alsa-ucm-conf: update to 1.2.9

---
 srcpkgs/alsa-ucm-conf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
index 0fa5a69c8c4c..a965973cb1dc 100644
--- a/srcpkgs/alsa-ucm-conf/template
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -1,13 +1,13 @@
 # Template file for 'alsa-ucm-conf'
 pkgname=alsa-ucm-conf
-version=1.2.8
+version=1.2.9
 revision=1
 short_desc="ALSA Use Case Manager topology configurations"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/alsa-project/alsa-ucm-conf"
 distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=711ca92a17d7519755bfd633ca819e2a4e5e40eddbde6b66d18aa1d9a5346ced
+checksum=1c40618161bc2738c55aab4dee1d0c82514e257116f296815a799adeaab5e48b
 
 do_install() {
 	vdoc ucm2/README.md

From 002c0280037dee16a93e46b16763b9bd5749817d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 21 May 2023 13:02:52 -0500
Subject: [PATCH 0039/1854] New package: grpn-1.4.1.

---
 srcpkgs/grpn/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/grpn/template

diff --git a/srcpkgs/grpn/template b/srcpkgs/grpn/template
new file mode 100644
index 000000000000..c9cb836ccfcc
--- /dev/null
+++ b/srcpkgs/grpn/template
@@ -0,0 +1,16 @@
+# Template file for 'grpn'
+pkgname=grpn
+version=1.4.1
+revision=1
+build_style=gnu-makefile
+short_desc="GTK+ RPN Calculator"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://tracker.debian.org/pkg/grpn"
+distfiles="http://deb.debian.org/debian/pool/main/g/grpn/grpn_${version}.orig.tar.gz"
+checksum=1e43c507795a9107bfb1e4f16c1da706579a22f254ef81422418121bebe60345
+
+post_install() {
+	vmkdir usr/share
+	mv $DESTDIR/usr/man/* $DESTDIR/usr/share/man
+}

From dface99600cfc5f61e67510905248c64a4698340 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 23:39:11 -0500
Subject: [PATCH 0040/1854] grpn: nocross for now

---
 srcpkgs/grpn/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/grpn/template b/srcpkgs/grpn/template
index c9cb836ccfcc..8572473388df 100644
--- a/srcpkgs/grpn/template
+++ b/srcpkgs/grpn/template
@@ -1,7 +1,7 @@
 # Template file for 'grpn'
 pkgname=grpn
 version=1.4.1
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="GTK+ RPN Calculator"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
 homepage="https://tracker.debian.org/pkg/grpn"
 distfiles="http://deb.debian.org/debian/pool/main/g/grpn/grpn_${version}.orig.tar.gz"
 checksum=1e43c507795a9107bfb1e4f16c1da706579a22f254ef81422418121bebe60345
+nocross=yes # Practically abandonware, and only requested for x86
 
 post_install() {
 	vmkdir usr/share

From e67f798ae96b924e753f16367f78861db5522c4c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 23:42:03 -0500
Subject: [PATCH 0041/1854] consul: update to 1.15.2.

---
 srcpkgs/consul/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 189ef2eaf55b..a9796ff5c796 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,17 +1,17 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.15.1
-revision=3
+version=1.15.2
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=7c04b6a0dd433619e788617434a4c236b7d4f892
+_git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 short_desc="Distributed solution to connect and configure applications"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
+checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
 
 post_install() {
 	vlicense LICENSE

From 5ca3319055e63ea9c7da18f891b41041b3604187 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 May 2023 23:44:13 -0500
Subject: [PATCH 0042/1854] vault: update to 1.13.2.

---
 srcpkgs/vault/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 2154f2fda120..efe62f6cfead 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.13.0
-revision=2
+version=1.13.2
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=a4cf0dc4437de35fce4860857b64569d092a9b5a
+_git_commit=b9b773f1628260423e6cc9745531fd903cae853f
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 depends="libcap-progs"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=ebffe482b9e23346862272fbab7d589315200f2004b63b26b2df43823a5d3fb6
+checksum=265b1632857af01984fa108644ef1e00f4545db889c21443025bf46941b9c845
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From 0cdd91288cd9293252e990cb631ba0b607e4a11b Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Fri, 24 Feb 2023 15:13:22 +1100
Subject: [PATCH 0043/1854] snapcast: update to 0.27.0

---
 srcpkgs/snapcast/patches/boost-1.81.patch     | 51 -------------------
 .../patches/meta_mpd.py-permission-fix.patch  | 19 -------
 srcpkgs/snapcast/template                     |  4 +-
 3 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 srcpkgs/snapcast/patches/boost-1.81.patch
 delete mode 100644 srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch

diff --git a/srcpkgs/snapcast/patches/boost-1.81.patch b/srcpkgs/snapcast/patches/boost-1.81.patch
deleted file mode 100644
index 032bc5213a37..000000000000
--- a/srcpkgs/snapcast/patches/boost-1.81.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: snapcast-0.26.0/server/control_session_http.cpp
-===================================================================
---- snapcast-0.26.0.orig/server/control_session_http.cpp
-+++ snapcast-0.26.0/server/control_session_http.cpp
-@@ -127,8 +127,8 @@ boost::beast::string_view mime_type(boos
- std::string path_cat(boost::beast::string_view base, boost::beast::string_view path)
- {
-     if (base.empty())
--        return path.to_string();
--    std::string result = base.to_string();
-+        return path;
-+    std::string result = base;
-     char constexpr path_separator = '/';
-     if (result.back() == path_separator)
-         result.resize(result.size() - 1);
-@@ -140,7 +140,7 @@ std::string path_cat(boost::beast::strin
- ControlSessionHttp::ControlSessionHttp(ControlMessageReceiver* receiver, tcp::socket&& socket, const ServerSettings::Http& settings)
-     : ControlSession(receiver), socket_(std::move(socket)), settings_(settings)
- {
--    LOG(DEBUG, LOG_TAG) << "ControlSessionHttp, Local IP: " << socket_.local_endpoint().address().to_string() << "\n";
-+    LOG(DEBUG, LOG_TAG) << "ControlSessionHttp, Local IP: " << socket_.local_endpoint().address() << "\n";
- }
- 
- 
-@@ -171,7 +171,7 @@ void ControlSessionHttp::handle_request(
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = why.to_string();
-+        res.body() = why;
-         res.prepare_payload();
-         return res;
-     };
-@@ -182,7 +182,7 @@ void ControlSessionHttp::handle_request(
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = "The resource '" + target.to_string() + "' was not found.";
-+        res.body() = "The resource '" + std::string{target} + "' was not found.";
-         res.prepare_payload();
-         return res;
-     };
-@@ -204,7 +204,7 @@ void ControlSessionHttp::handle_request(
-         res.set(http::field::server, HTTP_SERVER_NAME);
-         res.set(http::field::content_type, "text/html");
-         res.keep_alive(req.keep_alive());
--        res.body() = "An error occurred: '" + what.to_string() + "'";
-+        res.body() = "An error occurred: '" + std::string{what} + "'";
-         res.prepare_payload();
-         return res;
-     };
diff --git a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch b/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch
deleted file mode 100644
index ebff8013f574..000000000000
--- a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch fixes an issue where meta_mpd.py is installed with executable
-permissions only. This results in a 'Permission denied' message for
-03-rewrite-python-shebang, and a fatal error for xbps-create when processing
-the file hash. Fixed upstream in 7ab3daa.
-
-https://github.com/badaix/snapcast/issues/1021
-
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index e1271b80..25432cd5 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -117,6 +117,6 @@ else()
-     install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-     install(FILES etc/index.html COMPONENT server DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver)
-     install(DIRECTORY etc/snapweb/ DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/snapweb)
--    install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/)
-+    install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/)
-     #install(FILES ../debian/snapserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR})
- endif()
diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template
index e330653723ed..2440d44d8f51 100644
--- a/srcpkgs/snapcast/template
+++ b/srcpkgs/snapcast/template
@@ -1,6 +1,6 @@
 # Template file for 'snapcast'
 pkgname=snapcast
-version=0.26.0
+version=0.27.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DBUILD_WITH_TREMOR=OFF
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/badaix/snapcast"
 changelog="https://raw.githubusercontent.com/badaix/snapcast/master/changelog.md"
 distfiles="https://github.com/badaix/snapcast/archive/v${version}.tar.gz"
-checksum=166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683
+checksum=c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba
 
 build_options="avahi pulseaudio"
 build_options_default="avahi pulseaudio"

From c9bb404d0139c953dc45c4428687a657225ce092 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 4 Apr 2023 09:56:44 +1000
Subject: [PATCH 0044/1854] upmpdcli: update to 1.7.9

---
 srcpkgs/upmpdcli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index a2a6b70054bb..68272eb96ea7 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,17 +1,17 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.7.1
+version=1.7.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
-makedepends="jsoncpp-devel libmicrohttpd-devel libmpdclient-devel libupnpp-devel"
+makedepends="jsoncpp-devel libcurl-devel libmicrohttpd-devel libmpdclient-devel libupnpp-devel"
 short_desc="UPnP Media Renderer front-end for MPD"
 maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=9a2e1322c47825f31e2f97ff8c89172e23dd0cea6763f355d7e7ecc71b168d17
+checksum=e0a92acd4c1d292d170fa5247a9014cb7f81a1288c1e4de22b5a8c052223e7b5
 python_version=3
 
 system_accounts="_upmpdcli"

From 1970221acda684b4d5eef26c54e6fb73493dcac2 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Fri, 24 Feb 2023 17:34:19 +1100
Subject: [PATCH 0045/1854] libnpupnp: update to 5.0.2

---
 srcpkgs/libnpupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index fc3b31046507..dc1496cfd692 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=5.0.0
+version=5.0.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=2e5648cf180a425ef57b8c9c0d9dbd77f0314487ea0e0a85ebc6c3ef87cab05b
+checksum=33f90fc14906f2cea1bb7af56677b4e950eed6976e07d98a8e2b2e91b0755558
 
 post_install() {
 	vlicense COPYING

From 6c01be80f439d2e1a245e71f3bf7166a2d419f5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 May 2023 14:48:01 +0200
Subject: [PATCH 0046/1854] fio: update to 3.35.

---
 srcpkgs/fio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 761f2c88d7b4..663bf2b08e3f 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.34
+version=3.35
 revision=1
 build_style=configure
 make_build_args="T_TEST_PROGS="
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=42ea28c78d269c4cc111b7516213f4d4b32986797a710b0ff364232cc7a3a0b7
+checksum=36b98f35622ee594364bfd9a527523a44cda0dda2455ba9f2dcae2cd7dd3859f
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in

From e981386c014f481167889ff1b060e87756a502c7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 May 2023 14:48:45 +0200
Subject: [PATCH 0047/1854] dune: update to 3.8.0.

---
 srcpkgs/dune/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index bc60f1196445..1d38c2419cab 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.7.1
-revision=2
+version=3.8.0
+revision=1
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://dune.build/"
 changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md"
 distfiles="https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"
-checksum=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3
+checksum=f7e2970bfab99c7766ff1a05deff5ad7f82cb2471abca6f72449572293f5f6b4
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-build-info dune-configurator

From 7632cb34759f6eec69f603731176127571310597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 May 2023 00:34:10 +0200
Subject: [PATCH 0048/1854] mpd: update to 0.23.13.

---
 srcpkgs/mpd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index df35e751ea60..9dbd4c935acc 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.12
-revision=2
+version=0.23.13
+revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7
+checksum=a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 1016dfc7f8826a80e388e2055617a860ce5e0667 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 2 May 2023 22:26:02 +0530
Subject: [PATCH 0049/1854] mandrel: update to 22.3.2.1.

---
 srcpkgs/mandrel/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index 503d264c2394..d75ca825cef1 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=22.3.1.0
+version=22.3.2.1
 revision=1
 _java_ver=17
-_mx_ver=6.16.0
+_mx_ver=6.20.3
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,9 +15,9 @@ homepage="https://github.com/graalvm/mandrel"
 distfiles="https://github.com/graalvm/mandrel-packaging/archive/refs/tags/mandrel-${version}-Final.tar.gz>packaging-${version}.tar.gz
  https://github.com/graalvm/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz
  https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz"
-checksum="dd37f4a8f628b8909228f489e12363427df9d0f95d1afedad39a2443b22a806d
- bfe15128e8ffb5fd108ee20477e5ee1572c63405d6d0b93d905185356128dcec
- aeec921e0669c72575dd9af54b5d5413d744dac590c82db46ae2bf60c4dfeb1b"
+checksum="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
+ 4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
+ b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
 

From a9463a748d8473861d6ad4f28a5d4146b77c0e96 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 5 Apr 2023 19:46:13 +0100
Subject: [PATCH 0050/1854] xfsprogs: update to 6.2.0.

---
 srcpkgs/xfsprogs/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 1108d9f6666d..2e55f5e0b458 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,17 +1,19 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=5.19.0
-revision=2
+version=6.2.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-editline=yes --enable-lib64=no --libdir=/usr/lib"
-hostmakedepends="gettext libuuid-devel"
-makedepends="libblkid-devel libedit-devel inih-devel liburcu-devel"
+configure_args="--enable-editline=yes --enable-lib64=no --libdir=/usr/lib
+ --enable-lto"
+hostmakedepends="gettext"
+makedepends="libblkid-devel libedit-devel inih-devel liburcu-devel
+ libuuid-devel"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=4b6c6c98c036a37f6d90c82cb7fe9405d3b5856d9345662032d01ff4b140592c
+checksum=d67dcba5a28e0904b60886b6e5f752bc7c9c3a5c7096153855b5adca9db86c51
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \

From 823351e4607400d50d67cacd6f38b1f7ff96bf33 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 6 May 2023 18:41:36 +0300
Subject: [PATCH 0051/1854] mdcat: install completions for mdless.

---
 srcpkgs/mdcat/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index ef45b736e8ea..4a5e219556bf 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,7 +1,7 @@
 # Template file for 'mdcat'
 pkgname=mdcat
 version=2.0.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
@@ -22,12 +22,14 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_install() {
-	bash_completion=$(find ${wrksrc}/target -name mdcat.bash -print -quit)
-	vcompletion ${bash_completion} bash
-	zsh_completion=$(find ${wrksrc}/target -name _mdcat -print -quit)
-	vcompletion ${zsh_completion} zsh
-	fish_completion=$(find ${wrksrc}/target -name mdcat.fish -print -quit)
-	vcompletion ${fish_completion} fish
+	for command in mdcat mdless; do
+		bash_completion=$(find ${wrksrc}/target -name ${command}.bash -print -quit)
+		vcompletion ${bash_completion} bash ${command}
+		zsh_completion=$(find ${wrksrc}/target -name _${command} -print -quit)
+		vcompletion ${zsh_completion} zsh ${command}
+		fish_completion=$(find ${wrksrc}/target -name ${command}.fish -print -quit)
+		vcompletion ${fish_completion} fish ${command}
+	done
 
 	man_page=$(find ${wrksrc}/target -name mdcat.1 -print -quit)
 	vman ${man_page}

From b803f20dad002cdafa42a24d7555c7f755ae97c6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 20 May 2023 22:55:38 +0530
Subject: [PATCH 0052/1854] when: update to 1.1.46.

---
 srcpkgs/when/template | 9 +++++----
 srcpkgs/when/update   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/when/template b/srcpkgs/when/template
index fdea7a1f2424..3e7703425e20 100644
--- a/srcpkgs/when/template
+++ b/srcpkgs/when/template
@@ -1,15 +1,16 @@
 # Template file for 'when'
 pkgname=when
-version=1.1.41
+version=1.1.46
 revision=1
+_githash=a57ccbdf1d30e28a43a4bc5c68c37c171bb649ab
 hostmakedepends="perl"
 depends="perl"
 short_desc="Minimalistic personal calendar program"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://www.lightandmatter.com/when/when.html"
-distfiles="https://github.com/bcrowell/when/archive/refs/tags/${version}.tar.gz"
-checksum=78bfd3f18e0d3e42797c7aacb16829d2354d935f12e04db9e467d4bec389c884
+homepage="https://lightandmatter.com/when/when.html"
+distfiles="https://bitbucket.org/ben-crowell/when/get/${_githash}.tar.gz"
+checksum=82cd27a97df65f696d1c77762c03e847ff26e72d498f2bd1979f35bee2da021c
 
 do_build() {
 	make when.1
diff --git a/srcpkgs/when/update b/srcpkgs/when/update
index b878260a3563..b7f4537d9fec 100644
--- a/srcpkgs/when/update
+++ b/srcpkgs/when/update
@@ -1 +1 @@
-pattern='current version of When is \K[\d.]+'
+pattern='When \K[\d.]+'

From 725e58e92879ca614a2c4b3b44393750da77698f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 15:49:26 -0500
Subject: [PATCH 0053/1854] consul: Create directories/user

---
 srcpkgs/consul/files/consul/run | 2 +-
 srcpkgs/consul/template         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
index ece1efba0ce4..7583a552d939 100644
--- a/srcpkgs/consul/files/consul/run
+++ b/srcpkgs/consul/files/consul/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
 exec 2>&1
-exec consul agent -config-dir=/etc/consul.d
+exec chpst -u _consul:_consul consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index a9796ff5c796..2d032167d2a7 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -12,6 +12,9 @@ license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
+system_accounts="_consul"
+make_dirs="/etc/consul.d 0755 _consul _consul
+ /var/lib/consul 0750 _consul _consul"
 
 post_install() {
 	vlicense LICENSE

From 020c5e48d491163a66cfaabda852fa67c4bdff41 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 16:19:37 -0500
Subject: [PATCH 0054/1854] consul: Reduce permissions to data-dir

---
 srcpkgs/consul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 2d032167d2a7..7fbe8549d11b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -13,7 +13,7 @@ homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
 system_accounts="_consul"
-make_dirs="/etc/consul.d 0755 _consul _consul
+make_dirs="/etc/consul.d 0755 root _consul
  /var/lib/consul 0750 _consul _consul"
 
 post_install() {

From c5f46b7435d26fa8b3bef015fee92455738b6ea5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:15:36 +0100
Subject: [PATCH 0055/1854] New package: python3-calver-2022.6.26

---
 srcpkgs/python3-calver/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-calver/template

diff --git a/srcpkgs/python3-calver/template b/srcpkgs/python3-calver/template
new file mode 100644
index 000000000000..d89129c203fe
--- /dev/null
+++ b/srcpkgs/python3-calver/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-calver'
+pkgname=python3-calver
+version=2022.6.26
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Setuptools extension for CalVer package versions"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="Apache-2.0"
+homepage="https://github.com/di/calver"
+changelog="https://github.com/di/calver/releases"
+distfiles="${PYPI_SITE}/c/calver/calver-${version}.tar.gz"
+checksum=e05493a3b17517ef1748fbe610da11f10485faa7c416b9d33fd4a52d74894f8b
+make_check=no # PyPI tarball has no tests.

From cf0c23fd63fd473b6a7cf5c8528a571c3641e45c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:15:42 +0100
Subject: [PATCH 0056/1854] New package: python3-trove-classifiers-2023.5.24

---
 srcpkgs/python3-trove-classifiers/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-trove-classifiers/template

diff --git a/srcpkgs/python3-trove-classifiers/template b/srcpkgs/python3-trove-classifiers/template
new file mode 100644
index 000000000000..4a7f7d6ad635
--- /dev/null
+++ b/srcpkgs/python3-trove-classifiers/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-trove-classifiers'
+pkgname=python3-trove-classifiers
+version=2023.5.24
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-calver"
+depends="python3"
+checkdepends="${depends} python3-pytest"
+short_desc="Canonical source for classifiers on PyPI"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="Apache-2.0"
+homepage="https://github.com/pypa/trove-classifiers"
+changelog="https://github.com/pypa/trove-classifiers/releases"
+distfiles="${PYPI_SITE}/t/trove-classifiers/trove-classifiers-${version}.tar.gz"
+checksum=fd5a1546283be941f47540a135bdeae8fb261380a6a204d9c18012f2a1b0ceae

From 84c50ae0fb4ad7c148cb9c6e203b1dab38cfe358 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:15:47 +0100
Subject: [PATCH 0057/1854] hatchling: update to 1.17.0.

---
 srcpkgs/hatchling/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
index 0df8af7b1835..bb221be3e722 100644
--- a/srcpkgs/hatchling/template
+++ b/srcpkgs/hatchling/template
@@ -1,9 +1,10 @@
 # Template file for 'hatchling'
 pkgname=hatchling
-version=1.13.0
+version=1.17.0
 revision=1
 build_style=python3-pep517
-_deps="python3-editables python3-packaging python3-pathspec python3-pluggy"
+_deps="python3-editables python3-packaging python3-pathspec python3-pluggy
+ python3-trove-classifiers"
 hostmakedepends="python3-setuptools ${_deps}"
 depends="${_deps}"
 short_desc="Extensible, standards compliant build backend used by Hatch"
@@ -12,7 +13,7 @@ license="MIT"
 homepage="https://hatch.pypa.io/latest/"
 changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history/hatchling.md"
 distfiles="${PYPI_SITE}/h/hatchling/hatchling-${version}.tar.gz"
-checksum=f8d275a2cc720735286b7c2e2bc35da05761e6d3695c2fa416550395f10c53c7
+checksum=b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930
 
 post_install() {
 	vlicense LICENSE.txt

From eac6404a93f1df2754f41428393cb1a56db40ab4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 16:41:08 +0100
Subject: [PATCH 0058/1854] python3-platformdirs: update to 3.5.1.

---
 srcpkgs/python3-platformdirs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index b01996757d1f..033324479559 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.1.1
+version=3.5.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=024996549ee88ec1a9aa99ff7f8fc819bb59e2c3477b410d90a16d32d6e707aa
+checksum=412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From 8dcb9b0edb8a4ed537130558880e4448ff6fff9a Mon Sep 17 00:00:00 2001
From: Adam Saponara <as@php.net>
Date: Fri, 26 May 2023 02:18:53 -0400
Subject: [PATCH 0059/1854] mle: update to 1.7.2

---
 srcpkgs/mle/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mle/template b/srcpkgs/mle/template
index 9a96bf5443d2..bd6e5665e861 100644
--- a/srcpkgs/mle/template
+++ b/srcpkgs/mle/template
@@ -1,16 +1,20 @@
 # Template file for 'mle'
 pkgname=mle
-version=1.5.0
+version=1.7.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="libtool"
-makedepends="termbox-devel lua54-devel pcre-devel uthash"
+makedepends="lua54-devel pcre2-devel uthash"
 short_desc="Flexible terminal-based text editor (C)"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="Apache-2.0"
 homepage="https://github.com/adsr/mle"
 distfiles="https://github.com/adsr/mle/archive/v${version}.tar.gz"
-checksum=569316485fa3775d0bb7559ac176a63adb29467c7098b14c0072c821feb6226b
+checksum=5275fcfc58d3d4890d074077d94497db488b2648287b3e48e67b00ea517b02ba
+
+do_check() {
+	make test
+}
 
 post_install() {
 	vman mle.1

From 9a385b0bb305feefcd39eeb66a64995eb2b544f4 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 27 May 2023 09:51:17 +0200
Subject: [PATCH 0060/1854] tuxedo-keyboard: update to 3.2.5

---
 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 c72f78b9c867..79d6181124b5 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.3
+version=3.2.5
 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=dcad92d748e0d28ea0fb34d2933724e870f93509c816114d56f224d5abddc4bf
+checksum=ec8f4608018d7702a8b89734b1c91152b597984bf37242924d8f76d270a74580
 
 dkms_modules="tuxedo-keyboard ${version}"
 

From aa51b45aacd003371069057351ba01daf4b6c17e Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Thu, 25 May 2023 00:03:46 -0500
Subject: [PATCH 0061/1854] Signal-Desktop: update to 6.19.0.

---
 srcpkgs/Signal-Desktop/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index adbc695492a0..4c6722055987 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.18.1
+version=6.19.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,14 +14,15 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=1527060bb666a459f6797d7161e237095fc3665323fed30d1cc0bc0828d5311c
+checksum=965702b217b39131c61e62c63fb25b073750a8f6febdffa9db236626124c6e50
 nostrip_files="signal-desktop"
 
 post_extract() {
 	# git-lfs hook needs to be installed for one of the dependencies
 	git lfs install
 
-	vsed 's/"node": "/&>=/' -i package.json
+	#vsed 's/"node": "/&>=/' -i package.json
+	vsed 's/"node": "18.14.0"/"node": ">=16.19.0"/' -i package.json
 
 	# Dependencies have to be installed before applying patch
 	yarn install --ignore-engines --frozen-lockfile

From 446e846beb3b2a1efcb4e0431f5d05d1fa3d78c8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 14:36:31 +0100
Subject: [PATCH 0062/1854] diffutils: update to 3.10.

---
 srcpkgs/diffutils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index 031d06d50ccc..3d0486ee01dd 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -1,7 +1,7 @@
 # Template file for 'diffutils'
 pkgname=diffutils
-version=3.9
-revision=2
+version=3.10
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="gl_cv_func_gettimeofday_clobber=no gl_cv_func_tzset_clobber=no"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/diffutils"
 distfiles="${GNU_SITE}/diffutils/diffutils-${version}.tar.xz"
-checksum=d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1
+checksum=90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e
 
 CFLAGS="-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64"
 

From 94841ee7e6b61cc3a9bdc2b17a2761af1bd8b6f0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 May 2023 23:10:54 +0200
Subject: [PATCH 0063/1854] python3-pwntools: update to 4.10.0.

---
 srcpkgs/python3-pwntools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index 2c33922a7ea2..bfba84977284 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
-version=4.9.0
+version=4.10.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,8 +16,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
-checksum=eea67d182f9170488392998d9b2f1debb75889380505501f07707645fac7e712
-#make_check=no # needs unpackaged rpyc
+checksum=588e89ea678527c0b5b6caeeee7e76e31352e78e2f1cf3dda7bc9acf526e446d
+make_check=no
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From 045019c7b9d5374ebebcdfcbd9c680bdb6bfa5df Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Sat, 27 May 2023 18:34:56 -0400
Subject: [PATCH 0064/1854] lighttpd: update to 1.4.71

---
 srcpkgs/lighttpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 3b7158c1fbe4..04e11bd2209f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.70
+version=1.4.71
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85
+checksum=b8b6915da20396fdc354df3324d5e440169b2e5ea7859e3a775213841325afac
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

From 4bcb0d5128a6389e1e8fbda7f4376a76c4160c91 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Sat, 27 May 2023 18:36:26 -0400
Subject: [PATCH 0065/1854] lighttpd: use default mimetypes list in 1.4.71

lighttpd 1.4.71 now provides a default list of common types for
mimetype.assign if mimetype.assign is not explicitly part of config
---
 srcpkgs/lighttpd/files/lighttpd.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/lighttpd/files/lighttpd.conf b/srcpkgs/lighttpd/files/lighttpd.conf
index 6e7a6cc6c1d1..53e91fc46042 100644
--- a/srcpkgs/lighttpd/files/lighttpd.conf
+++ b/srcpkgs/lighttpd/files/lighttpd.conf
@@ -9,4 +9,3 @@ server.document-root	= "/srv/www/lighttpd"
 server.errorlog		= "/var/log/lighttpd/error.log"
 dir-listing.activate	= "enable"
 index-file.names	= ( "index.html" )
-mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" )

From 705280f476c2c4e52cb77d65ded0e1bdaffbc574 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 27 May 2023 10:59:29 -0400
Subject: [PATCH 0066/1854] iwd: update to 2.5

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index e925c42d9157..25f42b7d02c3 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=2.4
+version=2.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=3a9c5e7ade45162e5c78b3d7035a2f4a6e20ba6b5974097c35a8f615493012f9
+checksum=3441effed58297b63779e706c74884234acb874b07872f8b55e0da28729fda32
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 40503da30e31c41809ad217558b47c0e45fee81b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 27 May 2023 21:45:39 -0400
Subject: [PATCH 0067/1854] wireplumber: create /var/lib/wireplumber

---
 srcpkgs/wireplumber/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index f0ca35159469..80f8f1b7845f 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -16,6 +16,7 @@ changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
 provides="pipewire-session-manager-0_1"
+make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
 
 post_install() {
 	vlicense LICENSE

From ec4ae291e3922465c2e6bb96de4a31b28fdfcb8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 May 2023 16:35:12 +0200
Subject: [PATCH 0068/1854] libtls: update to 3.7.3.

---
 srcpkgs/libtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 8dbe146a61b6..1ea7763b0352 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.7.2
+version=3.7.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="libressl-${version}"
@@ -14,7 +14,7 @@ license="OpenSSL, ISC"
 homepage="http://www.libressl.org/"
 changelog="https://raw.githubusercontent.com/libressl/portable/master/ChangeLog"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
-checksum=b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7
+checksum=7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 patch_args="-Np1 --directory=${build_wrksrc}"

From a88e211d4b797657017988cf22f4bf0d38444532 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 28 May 2023 19:43:14 +0200
Subject: [PATCH 0069/1854] xfce4-pulseaudio-plugin: update to 0.4.6.

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index 0b839a9c157c..6368698f27c0 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
-version=0.4.5
+version=0.4.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/${version%.*}/xfce4-pulseaudio-plugin-${version}.tar.bz2"
-checksum=4425397dea6ba2599a91653dfb8ca91300faaf40be5bf5a73c3e6064bf13c115
+checksum=6e11c0e82444ad0f9390d526c07b67f46ff3b6bc3cd968ee7aad39b769146016

From e33b0dee8f112905d50cdbca8f7819b9dcd4ce73 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 25 May 2023 00:04:19 +0200
Subject: [PATCH 0070/1854] linux6.3: update to 6.3.4

Close: #44070
---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index efab2b7e530f..5ee6e0bed6a0 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.3
+version=6.3.4
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- 06941c036be21c9ec2f09f1e04b3e58b98c086ab6dee8d87a3a28f245259cd63"
+ aa63f11c6dfcf8ad392847fecb31e520cf57da7df096f7c1fbc4e187d1ab8996"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c4e46e2291dbf785142f34294f4dc01401211598 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 11 Nov 2022 14:10:25 +0100
Subject: [PATCH 0071/1854] bzip2-devel: add pkgconfig file

---
 srcpkgs/bzip2/files/bzip2.pc | 11 +++++++++++
 srcpkgs/bzip2/template       |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/bzip2/files/bzip2.pc

diff --git a/srcpkgs/bzip2/files/bzip2.pc b/srcpkgs/bzip2/files/bzip2.pc
new file mode 100644
index 000000000000..a4dd68259cec
--- /dev/null
+++ b/srcpkgs/bzip2/files/bzip2.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: A file compression library
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template
index c39a9427efb1..05a68132b828 100644
--- a/srcpkgs/bzip2/template
+++ b/srcpkgs/bzip2/template
@@ -1,7 +1,7 @@
 # Template file for 'bzip2'
 pkgname=bzip2
 version=1.0.8
-revision=1
+revision=2
 bootstrap=yes
 short_desc="Freely available, patent free, high-quality data compressor"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -35,6 +35,9 @@ do_install() {
 	vinstall libbz2.a 644 usr/lib
 	vinstall bzlib.h 644 usr/include
 
+	vinstall "${FILESDIR}/bzip2.pc" 644 usr/lib/pkgconfig
+	vsed -i "s/@VERSION@/${version}/" "${DESTDIR}/usr/lib/pkgconfig/bzip2.pc"
+
 	vman bzip2.1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1
@@ -46,6 +49,7 @@ bzip2-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}

From 9eefcc528f02929d31728447c79695542a68958e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 29 May 2023 16:08:38 +0200
Subject: [PATCH 0072/1854] ouch: rebuild for bzip2

---
 srcpkgs/ouch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template
index 8de1c57fc327..57205bad80ca 100644
--- a/srcpkgs/ouch/template
+++ b/srcpkgs/ouch/template
@@ -1,8 +1,9 @@
 # Template file for 'ouch'
 pkgname=ouch
 version=0.4.1
-revision=1
+revision=2
 build_style=cargo
+hostmakedepends="pkg-config"
 makedepends="liblzma-devel bzip2-devel libzip-devel"
 short_desc="CLI utility for easily compressing and decompressing files and dirs"
 maintainer="Savoy <savoy@liberation.red>"
@@ -24,5 +25,4 @@ post_install() {
 	for page in artifacts/*.1; do
 		vman ${page}
 	done
-
 }

From f9f776f49cff4a970dd0a63fe9df0084f71f33ff Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 27 May 2023 09:38:01 -0500
Subject: [PATCH 0073/1854] nvidia390: add patches for linux6.3

---
 srcpkgs/nvidia390/files/linux6.3-x64.patch    | 89 +++++++++++++++++++
 srcpkgs/nvidia390/files/linux6.3-x86.patch    | 76 ++++++++++++++++
 .../nvidia-470xx-fix-linux-6.2.patch          |  0
 srcpkgs/nvidia390/template                    | 14 ++-
 4 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nvidia390/files/linux6.3-x64.patch
 create mode 100644 srcpkgs/nvidia390/files/linux6.3-x86.patch
 rename srcpkgs/nvidia390/{patches => files}/nvidia-470xx-fix-linux-6.2.patch (100%)

diff --git a/srcpkgs/nvidia390/files/linux6.3-x64.patch b/srcpkgs/nvidia390/files/linux6.3-x64.patch
new file mode 100644
index 000000000000..f062e780d7a6
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux6.3-x64.patch
@@ -0,0 +1,89 @@
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index 2c4cb7b..f68fcf2 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47)
+ #include <linux/backlight.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
+index 725164a..c35e0ee 100644
+--- a/nvidia-drm/nvidia-drm-fb.c
++++ b/nvidia-drm/nvidia-drm-fb.c
+@@ -29,6 +29,7 @@
+ #include "nvidia-drm-fb.h"
+ #include "nvidia-drm-utils.h"
+ #include "nvidia-drm-gem.h"
++#include "nvidia-drm-helper.h"
+ 
+ #include <drm/drm_crtc_helper.h>
+ 
+diff --git a/nvidia-uvm/uvm8.c b/nvidia-uvm/uvm8.c
+index 11cb373..49e1047 100644
+--- a/nvidia-uvm/uvm8.c
++++ b/nvidia-uvm/uvm8.c
+@@ -658,7 +658,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
+     // Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
+     // so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
+     // with VM_IO, but that causes other mapping issues.
+-    vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
++    vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
+ 
+     vma->vm_ops = &uvm_vm_ops_managed;
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index 0b0a6f2..da891ff 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ int nvidia_mmap_helper(
+             addr  = mmap_start;
+             
+             // Needed for the linux kernel for mapping compound pages
+-            vma->vm_flags |= VM_MIXEDMAP;
++            vm_flags_set(vma, VM_MIXEDMAP);
+ 
+             for (j = 0; j < pages; j++)
+             {
+@@ -471,7 +471,7 @@ int nvidia_mmap_helper(
+             }
+         }
+ 
+-        vma->vm_flags |= VM_IO;
++        vm_flags_set(vma, VM_IO);
+     }
+     else
+     {
+@@ -533,15 +533,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
diff --git a/srcpkgs/nvidia390/files/linux6.3-x86.patch b/srcpkgs/nvidia390/files/linux6.3-x86.patch
new file mode 100644
index 000000000000..b6c7bb1580df
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux6.3-x86.patch
@@ -0,0 +1,76 @@
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index 2c4cb7b..f68fcf2 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47)
+ #include <linux/backlight.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
+index 725164a..c35e0ee 100644
+--- a/nvidia-drm/nvidia-drm-fb.c
++++ b/nvidia-drm/nvidia-drm-fb.c
+@@ -29,6 +29,7 @@
+ #include "nvidia-drm-fb.h"
+ #include "nvidia-drm-utils.h"
+ #include "nvidia-drm-gem.h"
++#include "nvidia-drm-helper.h"
+ 
+ #include <drm/drm_crtc_helper.h>
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index 0b0a6f2..da891ff 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ int nvidia_mmap_helper(
+             addr  = mmap_start;
+             
+             // Needed for the linux kernel for mapping compound pages
+-            vma->vm_flags |= VM_MIXEDMAP;
++            vm_flags_set(vma, VM_MIXEDMAP);
+ 
+             for (j = 0; j < pages; j++)
+             {
+@@ -471,7 +471,7 @@ int nvidia_mmap_helper(
+             }
+         }
+ 
+-        vma->vm_flags |= VM_IO;
++        vm_flags_set(vma, VM_IO);
+     }
+     else
+     {
+@@ -533,15 +533,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
diff --git a/srcpkgs/nvidia390/patches/nvidia-470xx-fix-linux-6.2.patch b/srcpkgs/nvidia390/files/nvidia-470xx-fix-linux-6.2.patch
similarity index 100%
rename from srcpkgs/nvidia390/patches/nvidia-470xx-fix-linux-6.2.patch
rename to srcpkgs/nvidia390/files/nvidia-470xx-fix-linux-6.2.patch
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 5b1900374f36..2f5088b14c01 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.157
-revision=3
+revision=4
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -28,7 +28,7 @@ else
 	checksum=162317a49aa5a521eb888ec12119bfe5a45cec4e8653efc575a2d04fb05bf581
 fi
 
-patch_args="-Np1 --directory=${XBPS_BUILDDIR}/${pkgname}-${version}/${_pkg}/kernel"
+patch_args="-Ntp1 --directory=${XBPS_BUILDDIR}/${pkgname}-${version}/${_pkg}/kernel"
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
 
 do_extract() {
@@ -39,6 +39,16 @@ do_extract() {
 	cd ${_pkg}
 }
 
+do_patch() {
+	patch ${patch_args} -i ${FILESDIR}/nvidia-470xx-fix-linux-6.2.patch
+	case "$XBPS_TARGET_MACHINE" in
+		i686)
+			patch ${patch_args} -i ${FILESDIR}/linux6.3-x86.patch ;;
+		x86_64)
+			patch ${patch_args} -i ${FILESDIR}/linux6.3-x64.patch ;;
+	esac
+}
+
 pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json

From 19337b898f06df724076f9d18fbf915daf0e04e7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 May 2023 06:16:11 -0500
Subject: [PATCH 0074/1854] nvidia470: add patch for linux 6.3

---
 srcpkgs/nvidia470/patches/linux-6.3.patch | 117 ++++++++++++++++++++++
 srcpkgs/nvidia470/template                |   2 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia470/patches/linux-6.3.patch

diff --git a/srcpkgs/nvidia470/patches/linux-6.3.patch b/srcpkgs/nvidia470/patches/linux-6.3.patch
new file mode 100644
index 000000000000..11d29cb19853
--- /dev/null
+++ b/srcpkgs/nvidia470/patches/linux-6.3.patch
@@ -0,0 +1,117 @@
+From a77f2da778f4a62695a6c7d26bba674d59ad9170 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sat, 25 Feb 2023 10:57:09 +0000
+Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.3-rc1
+
+---
+ common/inc/nv-linux.h                   | 13 +++++++++++++
+ nvidia-drm/nvidia-drm-gem-user-memory.c |  7 ++++---
+ nvidia-uvm/uvm.c                        |  2 +-
+ nvidia/nv-mmap.c                        | 12 ++++++------
+ 4 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index f8df9e3..5b22cf1 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1988,4 +1988,17 @@ static inline void nv_mutex_destroy(struct mutex *lock)
+ 
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-gem-user-memory.c b/nvidia-drm/nvidia-drm-gem-user-memory.c
+index 8824daa..3ea9099 100644
+--- a/nvidia-drm/nvidia-drm-gem-user-memory.c
++++ b/nvidia-drm/nvidia-drm-gem-user-memory.c
+@@ -35,6 +35,7 @@
+ #include "linux/dma-buf.h"
+ #include "linux/mm.h"
+ #include "nv-mm.h"
++#include "nv-linux.h"
+ 
+ static inline
+ void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
+@@ -92,9 +93,9 @@ static int __nv_drm_gem_user_memory_mmap(struct nv_drm_gem_object *nv_gem,
+         return -EINVAL;
+     }
+ 
+-    vma->vm_flags &= ~VM_PFNMAP;
+-    vma->vm_flags &= ~VM_IO;
+-    vma->vm_flags |= VM_MIXEDMAP;
++    vm_flags_clear(vma, VM_PFNMAP);
++    vm_flags_clear(vma, VM_IO);
++    vm_flags_set(vma, VM_MIXEDMAP);
+ 
+     return 0;
+ }
+diff --git a/nvidia-uvm/uvm.c b/nvidia-uvm/uvm.c
+index 3e7318d..7eddff7 100644
+--- a/nvidia-uvm/uvm.c
++++ b/nvidia-uvm/uvm.c
+@@ -812,7 +812,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
+     // Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
+     // so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
+     // with VM_IO, but that causes other mapping issues.
+-    vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
++    vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
+ 
+     vma->vm_ops = &uvm_vm_ops_managed;
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index df514c9..8f85ff6 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ static int nvidia_mmap_numa(
+     }
+ 
+     // Needed for the linux kernel for mapping compound pages
+-    vma->vm_flags |= VM_MIXEDMAP;
++    vm_flags_set(vma, VM_MIXEDMAP);
+ 
+     for (i = 0, addr = mmap_context->page_array[0]; i < pages;
+          addr = mmap_context->page_array[++i], start += PAGE_SIZE)
+@@ -596,7 +596,7 @@ int nvidia_mmap_helper(
+         }
+         up(&nvl->mmap_lock);
+ 
+-        vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND;
++        vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND);
+     }
+     else
+     {
+@@ -663,15 +663,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
+-- 
+2.39.2
+
diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index fbe3efc323a2..da0fc142c178 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.182.03
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"

From ea6314cc2e4fc5949a02921b9a693bb178e1a645 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 29 May 2023 10:42:21 +0300
Subject: [PATCH 0075/1854] openvpn: update to 2.6.4.

---
 srcpkgs/openvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 3667d7811a1c..f1b8a5ce2d3a 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.6.2
+version=2.6.4
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -16,7 +16,7 @@ license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
 changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst"
 distfiles="http://build.openvpn.net/downloads/releases/openvpn-${version}.tar.gz"
-checksum=42d561a9af150b21bc914e3b7aa09f88013d2ffa6d5ce75a025a3b34caa948d4
+checksum=371a2a323a99a79299b9b4caa4a31bc7b2cdff63236e68d429f3ee50e75f3dd4
 # t_net.sh fails on CI.
 make_check=ci-skip
 

From 9a000b476e7b34ae02b128b1dac32251f40d0d2a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 28 May 2023 18:56:11 +0100
Subject: [PATCH 0076/1854] ethtool: update to 6.3.

---
 srcpkgs/ethtool/patches/fix-musl.diff | 43 ---------------------------
 srcpkgs/ethtool/template              |  4 +--
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/ethtool/patches/fix-musl.diff

diff --git a/srcpkgs/ethtool/patches/fix-musl.diff b/srcpkgs/ethtool/patches/fix-musl.diff
deleted file mode 100644
index b06c86650b9f..000000000000
--- a/srcpkgs/ethtool/patches/fix-musl.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/marvell.c	2023-01-23 21:03:11.025636022 +0000
-+++ b/marvell.c	2023-01-27 14:02:36.278115472 +0000
-@@ -31,23 +31,23 @@
- static void dump_queue(const char *name, const void *a, int rx)
- {
- 	struct desc {
--		u_int32_t		ctl;
--		u_int32_t		next;
--		u_int32_t		data_lo;
--		u_int32_t		data_hi;
--		u_int32_t		status;
--		u_int32_t		timestamp;
--		u_int16_t		csum2;
--		u_int16_t		csum1;
--		u_int16_t		csum2_start;
--		u_int16_t		csum1_start;
--		u_int32_t		addr_lo;
--		u_int32_t		addr_hi;
--		u_int32_t		count_lo;
--		u_int32_t		count_hi;
--		u_int32_t               byte_count;
--		u_int32_t               csr;
--		u_int32_t               flag;
-+		uint32_t		ctl;
-+		uint32_t		next;
-+		uint32_t		data_lo;
-+		uint32_t		data_hi;
-+		uint32_t		status;
-+		uint32_t		timestamp;
-+		uint16_t		csum2;
-+		uint16_t		csum1;
-+		uint16_t		csum2_start;
-+		uint16_t		csum1_start;
-+		uint32_t		addr_lo;
-+		uint32_t		addr_hi;
-+		uint32_t		count_lo;
-+		uint32_t		count_hi;
-+		uint32_t               byte_count;
-+		uint32_t               csr;
-+		uint32_t               flag;
- 	};
- 	const struct desc *d = a;
- 
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 4ed39b335326..9e8a55fb1574 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=6.1
+version=6.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://www.kernel.org/pub/software/network/ethtool/"
 changelog="https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/plain/NEWS"
 distfiles="https://www.kernel.org/pub/software/network/ethtool/ethtool-${version}.tar.xz"
-checksum=c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90
+checksum=d9425f0a3df138734001fccc4175fe178c025f938460ac25c4ebc39960168822

From 35c9e143a52985c9e5ba9b931b3b87f675e139f5 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:45:41 +0200
Subject: [PATCH 0077/1854] blackbox: update to 1.20220610.

---
 srcpkgs/blackbox/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index c242782d7937..9cd2b3289d4a 100644
--- a/srcpkgs/blackbox/template
+++ b/srcpkgs/blackbox/template
@@ -1,14 +1,14 @@
 # Template file for 'blackbox'
 pkgname=blackbox
-version=1.20181219
-revision=3
+version=1.20220610
+revision=1
 depends="bash gnupg"
 short_desc="Safely store secrets in Git/Mercurial/Subversion"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://github.com/StackExchange/blackbox"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=afd40d1676645ce9aaf4cdbf71352bf1a8f6d426998436cea3ae536881ef5f81
+checksum=f1efcca6680159f244eb44fdb78e92b521760b875fa5a36e4c433b93ed0f87c1
 
 do_install() {
 	for f in bin/*; do

From ac91b7f839f916373f499a2591f22c47bbcc15e9 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:53:00 +0200
Subject: [PATCH 0078/1854] batman-adv: update to 2023.1.

---
 srcpkgs/batman-adv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/batman-adv/template b/srcpkgs/batman-adv/template
index 98b772fc75f9..d6b89a65b54a 100644
--- a/srcpkgs/batman-adv/template
+++ b/srcpkgs/batman-adv/template
@@ -1,13 +1,13 @@
 # Template file for 'batman-adv'
 pkgname=batman-adv
-version=2021.1
+version=2023.1
 revision=1
 short_desc="B.A.T.M.A.N. routing protocol kernel module"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://www.open-mesh.org/"
 distfiles="https://downloads.open-mesh.org/batman/releases/batman-adv-${version}/batman-adv-${version}.tar.gz"
-checksum=bf77843d8dead75342d673ce7021e4ad037447ce18c64056ae1e3202039934d0
+checksum=f46a7286660a5ec3506a1be7ef60b471c51ac70550597d598040479ab7b936b8
 
 dkms_modules="batman-adv ${version}"
 depends="dkms"

From f1de55ad4949984a54478d14ed3b32db37617ce2 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:55:08 +0200
Subject: [PATCH 0079/1854] batctl: update to 2023.1.

---
 srcpkgs/batctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/batctl/template b/srcpkgs/batctl/template
index 5aee697fb8f8..462d73e86141 100644
--- a/srcpkgs/batctl/template
+++ b/srcpkgs/batctl/template
@@ -1,6 +1,6 @@
 # Template file for 'batctl'
 pkgname=batctl
-version=2021.1
+version=2023.1
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://www.open-mesh.net/"
 distfiles="http://downloads.open-mesh.net/batman/releases/batman-adv-${version}/batctl-${version}.tar.gz"
-checksum=44b28cebb46b8ba1bc170bedeef67f69d89503806c429ff8cb113cc01966e176
+checksum=e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1
 
 post_install() {
 	vlicense LICENSES/preferred/MIT

From 1b977782223fd42d48d50006a7abc5b210f01d6f Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:39:31 +0200
Subject: [PATCH 0080/1854] cmc: update to 1.2.0.

---
 srcpkgs/cmc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmc/template b/srcpkgs/cmc/template
index d94d241d7f56..85e939658431 100644
--- a/srcpkgs/cmc/template
+++ b/srcpkgs/cmc/template
@@ -1,13 +1,13 @@
 # Template file for 'cmc'
 pkgname=cmc
-version=1.1.4
-revision=2
+version=1.2.0
+revision=1
 short_desc="SSH ControlMaster Controller"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://github.com/TimidRobot/cmc"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a243f53317af69729d4fd6c022722f3085e3d193d5a5a9a86b59fd281a6a96e1
+checksum=ed032301ca42dd477692d9343744a4a71fa29542d96cea1561eeb5155431b642
 
 do_install() {
 	vbin cmc

From 981e9f8f02aa1478513636ca4936791f064d3c58 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 29 May 2023 15:51:08 +0200
Subject: [PATCH 0081/1854] neovim: update to 0.9.1

---
 srcpkgs/neovim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 19e50b71d0e0..a0397a7a900f 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,6 +1,6 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -16,7 +16,7 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0, Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
-checksum=39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937
+checksum=8db17c2a1f4776dcda00e59489ea0d98ba82f7d1a8ea03281d640e58d8a3a00e
 
 build_options=luajit
 

From b320d8313f7f159d25d83648765bc25c76ecfc43 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 29 May 2023 19:59:58 +1000
Subject: [PATCH 0082/1854] kops: update to 1.26.3

---
 srcpkgs/kops/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 25f8b2b2ac81..9ea81d46c24a 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,7 +1,7 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.26.2
-revision=2
+version=1.26.3
+revision=1
 archs="x86_64*"
 build_style=go
 go_import_path="k8s.io/kops/cmd/kops"
@@ -12,7 +12,7 @@ maintainer="Mate Gabri <iam@theguy.io>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes/kops"
 distfiles="https://github.com/kubernetes/kops/archive/refs/tags/v${version}.tar.gz"
-checksum=01d1af58b3cc2ff0917aa0ef95c7f1761bf3572b90e48608637771c2ba779813
+checksum=10959b7b59f61a6078471eb2da30ad8c839fa96f648c2c9606a3deafce36eb91
 
 post_install() {
 	${DESTDIR}/usr/bin/kops completion bash >kops-completion.bash

From 9e0db2bdc62b5efbce0a77b705791f9834fa54de Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 19:28:17 +0100
Subject: [PATCH 0083/1854] less: update to 633.

---
 srcpkgs/less/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 3a6680224b55..72837b74b51c 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -1,6 +1,6 @@
 # Template file for 'less'
 pkgname=less
-version=608
+version=633
 revision=1
 build_style=gnu-configure
 configure_args="--with-regex=pcre2"
@@ -8,7 +8,10 @@ makedepends="ncurses-devel pcre2-devel"
 short_desc="Pager program similar to more(1)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.greenwoodsoftware.com/less"
+homepage="https://www.greenwoodsoftware.com/less"
 changelog="https://raw.githubusercontent.com/gwsw/less/master/NEWS"
-distfiles="http://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
-checksum=a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209
+distfiles="https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
+checksum=2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f
+# Tests intentionally not included in tarball
+# (https://github.com/gwsw/less/issues/344).
+make_check=no

From 7c74d1cabeed92fcc004559f48ef0c4f81317fd4 Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Sat, 27 May 2023 09:29:56 -0700
Subject: [PATCH 0084/1854] fzf: update to 0.41.1

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 5c52a701a309..678f11097119 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.40.0
+version=0.41.1
 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=9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65
+checksum=982682eaac377c8a55ae8d7491fcd0e888d6c13915d01da9ebb6b7c434d7f4b5
 
 post_install() {
 	cd ${wrksrc}

From c36fadc5c8f324c336031ae8e062ab10d2893c1f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 21 May 2023 16:14:25 +0100
Subject: [PATCH 0085/1854] libwacom: update to 2.7.0.

---
 srcpkgs/libwacom/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 8216a58a086d..dace4de001ce 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,9 +1,8 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=meson
-build_helper="qemu"
 configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
@@ -14,9 +13,11 @@ license="MIT"
 homepage="https://github.com/linuxwacom/libwacom"
 changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
 distfiles="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${version}/libwacom-${version}.tar.xz"
-checksum=2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f
+checksum=853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf
 
-if [ -z "${XBPS_CHECK_PKGS}" ]; then
+if [ "${XBPS_CHECK_PKGS}" ]; then
+	configure_args+=" -Dtests=enabled"
+else
 	configure_args+=" -Dtests=disabled"
 fi
 

From 549671b1be2aea639c7e267e9eb263182a9599dd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 12:29:50 +0100
Subject: [PATCH 0086/1854] apparmor: update to 3.1.4.

---
 srcpkgs/apparmor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 50e2992aafbb..b81fab0d0f02 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,6 +1,6 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.3
+version=3.1.4
 revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
-checksum=b8ffac45d0b283afe574ddd5542142ba1a62c354df110cff862b99201f29c843
+checksum=6bee0c3941836dae2c635fe82f09b666123fcac16563aa0fedf4a63c22b91f40
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

From 1d9a9e2acd07cead98df8ccb9cfa469e57a0183b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 27 May 2023 12:09:28 +0100
Subject: [PATCH 0087/1854] qca-qt5: update to 2.3.6.

---
 srcpkgs/qca-qt5/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index f2409d4a5cca..298348d66e8b 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,9 +1,9 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
-version=2.3.4
+version=2.3.6
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
+configure_args="-DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
 makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
@@ -13,12 +13,18 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://userbase.kde.org/QCA"
 distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
-checksum=6b695881a7e3fd95f73aaee6eaeab96f6ad17e515e9c2b3d4b3272d7862ff5c4
+checksum=ee59d531d4b82fb1685f4d8d74c2caa0777f501800f7426eaa372109a4305249
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
 fi
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTS=1"
+else
+	configure_args+=" -DBUILD_TESTS=0"
+fi
+
 qca-qt5-ossl_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - QCA OSSL plugin"
@@ -35,6 +41,6 @@ qca-qt5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/cmake
 		vmove usr/share/qca-qt5/mkspecs
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }

From 357979d7ed83cd3437be8595c3d042eaf6b64227 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 24 May 2023 10:40:16 +0200
Subject: [PATCH 0088/1854] intellij-idea-community-edition: update to 2023.1

---
 srcpkgs/intellij-idea-community-edition/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 1c5f9d167c22..c681412597c5 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,15 +1,15 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2022.2.2
-revision=2
+version=2023.1
+revision=1
 archs="x86_64"
-depends="jetbrains-jdk-bin giflib libXtst hicolor-icon-theme"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
 short_desc="Java integrated development environment by JetBrains"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
-distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=d645ec79bc95bc383f70c1f453b0aa6188cf6ebe086e0179662b02d9675d4737
+distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"
+checksum=e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa
 repository=nonfree
 nopie=yes
 python_version=3
@@ -22,7 +22,7 @@ do_install() {
 	vmkdir usr/share/pixmaps
 	vmkdir usr/share/icons/hicolor/scalable/apps
 
-	mv bin lib plugins product-info.json build.txt  ${DESTDIR}/usr/lib/intellij-idea
+	mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea
 	mv LICENSE.txt NOTICE.txt license ${DESTDIR}/usr/share/doc/intellij-idea
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/win -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/webp/lib/libwebp/mac -rf

From 0010b44fa39fa5d2c5c973a05e1eda56d1598168 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 01:41:40 +0100
Subject: [PATCH 0089/1854] New package: shotman-0.4.3

---
 srcpkgs/shotman/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/shotman/template

diff --git a/srcpkgs/shotman/template b/srcpkgs/shotman/template
new file mode 100644
index 000000000000..988ac18c3e8d
--- /dev/null
+++ b/srcpkgs/shotman/template
@@ -0,0 +1,28 @@
+# Template file for 'shotman'
+pkgname=shotman
+version=0.4.3
+revision=1
+build_style=cargo
+build_helper="qemu"
+hostmakedepends="pkg-config scdoc"
+makedepends="libxkbcommon-devel"
+depends="slurp"
+short_desc="Uncompromising screenshot GUI for Wayland"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="ISC"
+homepage="https://sr.ht/~whynothugo/shotman"
+changelog="https://git.sr.ht/~whynothugo/shotman/tree/main/item/README.md#changelog"
+distfiles="https://git.sr.ht/~whynothugo/shotman/archive/v${version}.tar.gz"
+checksum=75b5999655473e83a43d029bd7880da4bb6ca7ff0da95dd4b87568a53f097155
+
+export SHOTMAN_VERSION="v${version}"
+
+post_install() {
+	scdoc <shotman.1.scd >shotman.1
+	vman shotman.1
+	vlicense LICENCE.md
+	for shell in bash fish zsh; do
+		vtargetrun "./target/${RUST_TARGET}/release/shotman_completions" "${shell}" >"completions.${shell}"
+		vcompletion "completions.${shell}" "${shell}"
+	done
+}

From f796468b49abab39e0b8d4a8cc176e9be7bbd78c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 29 May 2023 22:24:16 +0200
Subject: [PATCH 0090/1854] lagrange: update to 1.16.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 33cdfbe1695d..569c997fb20a 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.15.8
+version=1.16.2
 revision=1
 build_style=cmake
 configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7511afc24261439d65c51452e38d2c3ca95d97c3a8f42821ffd612274469416b
+checksum=90e3c6cec54ecd0b0afce3952494c46bc6846850da622f66a6394b62b5866c86
 
 post_install() {
 	vlicense LICENSE.md

From 89ce859a6fe78a33ae3e090c7f8a1bf3224768f7 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:18:25 +0200
Subject: [PATCH 0091/1854] haproxy: update to 2.6.13.

---
 srcpkgs/haproxy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 40833cfb9eea..fbf13377f601 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.6.9
-revision=2
+version=2.6.13
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 changelog="https://www.haproxy.org/download/${version%.*}/src/CHANGELOG"
 distfiles="https://www.haproxy.org/download/${version%.*}/src/haproxy-${version}.tar.gz"
-checksum=f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701
+checksum=d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From 6a095be1d4a8994800e9d6aecbab515e7e25afd1 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:04:18 +0200
Subject: [PATCH 0092/1854] calcurse: update to 4.8.1.

---
 srcpkgs/calcurse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template
index aefd36d204da..ef441f2c0582 100644
--- a/srcpkgs/calcurse/template
+++ b/srcpkgs/calcurse/template
@@ -1,6 +1,6 @@
 # Template file for 'calcurse'
 pkgname=calcurse
-version=4.7.1
+version=4.8.1
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -10,7 +10,7 @@ maintainer="silvernode <mollusk@homebutter.com>"
 license="BSD-2-Clause"
 homepage="https://calcurse.org"
 distfiles="https://calcurse.org/files/${pkgname}-${version}.tar.gz"
-checksum=0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
+checksum=d86bb37014fd69b8d83ccb904ac979c6b8ddf59ee3dbc80f5a274525e4d5830a
 
 post_install() {
 	vlicense COPYING

From df186d3221a7656010c94cc7a518034745bfd2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 28 May 2023 16:11:15 +0100
Subject: [PATCH 0093/1854] ImageMagick: update to 7.1.1.10.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 40cfa4db513c..cc78d87b0326 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.1.8
+version=7.1.1.10
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=cac2e4766f2cf1bd301b94ddcc86d6940d52190bfc1f31056eaa39e9cf2abe42
+checksum=5008d827a78b56d436f532e6b6f7b6d4a69aa59342ce3dae00383f4686718c89
 
 subpackages="libmagick libmagick-devel"
 

From 636468c4912ff94754993c3462c2b2dc950066a5 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 25 May 2023 22:00:16 +0300
Subject: [PATCH 0094/1854] dpkg: update to 1.21.22

---
 srcpkgs/dpkg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template
index 7e6ffbed49bb..12e8eef40081 100644
--- a/srcpkgs/dpkg/template
+++ b/srcpkgs/dpkg/template
@@ -1,6 +1,6 @@
 # Template file for 'dpkg'
 pkgname=dpkg
-version=1.21.12
+version=1.21.22
 revision=1
 build_style=gnu-configure
 configure_args="--disable-start-stop-daemon --with-libz --with-libbz2
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://packages.debian.org/dpkg"
 changelog="https://git.dpkg.org/git/dpkg/dpkg.git/plain/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/dpkg/dpkg_${version}.tar.xz"
-checksum=ec7a0e29898f457ea21cc89826601059bce2433d2b4e578a38b2a66d8768559a
+checksum=5a1d15481bba79d7a4899fd55b4b6b18a987ca8d56ee8c43e9cab63b8a0a3545
 
 dpkg-devel_package() {
 	short_desc+=" - development files"

From 0c2acdfd40c83d5d2db2f794fce4114479bc363c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:36:33 -0400
Subject: [PATCH 0095/1854] pipewire: add example config snippet for launching
 pipewire-pulse

---
 srcpkgs/pipewire/files/20-pipewire-pulse.conf | 5 +++++
 srcpkgs/pipewire/template                     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/pipewire/files/20-pipewire-pulse.conf

diff --git a/srcpkgs/pipewire/files/20-pipewire-pulse.conf b/srcpkgs/pipewire/files/20-pipewire-pulse.conf
new file mode 100644
index 000000000000..0a1c391f64dc
--- /dev/null
+++ b/srcpkgs/pipewire/files/20-pipewire-pulse.conf
@@ -0,0 +1,5 @@
+# copy or symlink this file to /etc/pipewire/pipewire.conf.d (system configuration)
+# or ${XDG_CONFIG_HOME}/pipewire/pipewire.conf.d (per-user configuration)
+# to configure pipewire to launch pipewire-pulse directly
+
+context.exec = [ { path = "/usr/bin/pipewire" args = "-c pipewire-pulse.conf" } ]
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 92feaab2a6d7..7ad92c87fa3b 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.71
-revision=1
+revision=2
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -60,6 +60,7 @@ post_install() {
 	vsv pipewire-pulse
 	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
 	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
+	vsconf "${FILESDIR}/20-pipewire-pulse.conf"
 }
 
 libpipewire_package() {

From f1c2b0d298a8ea8ebece29fa097c5dcdde207d73 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:36:57 -0400
Subject: [PATCH 0096/1854] wireplumber: add example config snippet for
 launching wireplumber

---
 srcpkgs/wireplumber/files/10-wireplumber.conf | 5 +++++
 srcpkgs/wireplumber/template                  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wireplumber/files/10-wireplumber.conf

diff --git a/srcpkgs/wireplumber/files/10-wireplumber.conf b/srcpkgs/wireplumber/files/10-wireplumber.conf
new file mode 100644
index 000000000000..e1fdf5dac30a
--- /dev/null
+++ b/srcpkgs/wireplumber/files/10-wireplumber.conf
@@ -0,0 +1,5 @@
+# copy or symlink this file to /etc/pipewire/pipewire.conf.d (system configuration)
+# or ${XDG_CONFIG_HOME}/pipewire/pipewire.conf.d (per-user configuration)
+# to configure pipewire to launch wireplumber directly
+
+context.exec = [ { path = "/usr/bin/wireplumber" args = "" } ]
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 80f8f1b7845f..3584bf374a64 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=3
+revision=4
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -22,6 +22,7 @@ post_install() {
 	vlicense LICENSE
 	vsv wireplumber
 	vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
+	vsconf "${FILESDIR}/10-wireplumber.conf"
 }
 
 wireplumber-devel_package() {

From 4464bbe81bee857beccbdbeb6689a41f1a113d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 May 2023 11:29:37 +0700
Subject: [PATCH 0097/1854] linux6.1: update to 6.1.29.

---
 srcpkgs/linux6.1/files/i386-dotconfig   | 5 +++--
 srcpkgs/linux6.1/files/x86_64-dotconfig | 5 +++--
 srcpkgs/linux6.1/template               | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/linux6.1/files/i386-dotconfig b/srcpkgs/linux6.1/files/i386-dotconfig
index ba39fd18342b..b6996c6b7fe8 100644
--- a/srcpkgs/linux6.1/files/i386-dotconfig
+++ b/srcpkgs/linux6.1/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.1.29 Kernel Configuration
+# Linux/i386 6.1.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -8554,10 +8554,11 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
 CONFIG_TC1100_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m
diff --git a/srcpkgs/linux6.1/files/x86_64-dotconfig b/srcpkgs/linux6.1/files/x86_64-dotconfig
index 2838a50d5549..7da5bb180093 100644
--- a/srcpkgs/linux6.1/files/x86_64-dotconfig
+++ b/srcpkgs/linux6.1/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.1.29 Kernel Configuration
+# Linux/x86_64 6.1.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -8750,9 +8750,10 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 3161bbae2476..381a869231d7 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.29
+version=6.1.30
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 1b78055e7022cb929b9ceb21232e040ffe4ebe8ae946964106b45478c7e39558"
+ 5abf569ed9e144f74a0c41fa2965c8ba3a5608e155a7d81a5364fc87c83fc49a"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c921baee5d49e1f9686b6667d10a2c806b8a1241 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 0098/1854] pipewire: move system service to
 /usr/share/examples/PKGNAME/sv/

remove pipewire-pulse service. this should be launched by pipewire
config if desired
---
 srcpkgs/pipewire/files/README.voidlinux   | 9 ++++++---
 srcpkgs/pipewire/files/pipewire-pulse/run | 8 --------
 srcpkgs/pipewire/files/pipewire/control/t | 2 ++
 srcpkgs/pipewire/files/pipewire/run       | 2 +-
 srcpkgs/pipewire/template                 | 6 +++---
 5 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/pipewire/files/pipewire-pulse/run
 create mode 100755 srcpkgs/pipewire/files/pipewire/control/t
 mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire/run

diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 33892fdef84b..f2c10e37e7cd 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,9 @@ Optional dependencies:
 * `libspa-v4l2` for video camera support
 * `rtkit` for realtime priority acquisition
 
-The system services /etc/sv/pipewire and /etc/sv/pipewire-pulse are
-experimental and only needed in rare cases so using them should be
-avoided in most setups.
+The example system service /usr/share/examples/pipewire/sv/pipewire is
+experimental and only needed in rare cases, so using it should be avoided
+in most setups. To use it, pipewire needs to be configured to launch
+pipewire-pulse and wireplumber as documented at
+
+    https://docs.voidlinux.org/config/media/pipewire.html
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
deleted file mode 100644
index 6eb172b8b19f..000000000000
--- a/srcpkgs/pipewire/files/pipewire-pulse/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-# this service is experimental and most setups should start pipewire as a user,
-# for further information, please refer to the handbook
-! [ -d /run/pulse ] && install -m 755 -g _pipewire -o _pipewire -d /run/pulse
-umask 002
-export PULSE_RUNTIME_PATH=/run/pulse
-exec chpst -u _pipewire:_pipewire pipewire-pulse
diff --git a/srcpkgs/pipewire/files/pipewire/control/t b/srcpkgs/pipewire/files/pipewire/control/t
new file mode 100755
index 000000000000..a095b7bc777a
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
old mode 100644
new mode 100755
index a201626e464d..d932511a9700
--- a/srcpkgs/pipewire/files/pipewire/run
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -6,4 +6,4 @@ exec 2>&1
 umask 002
 export PIPEWIRE_RUNTIME_DIR=/run/pipewire
 export XDG_STATE_HOME=/var/lib
-exec chpst -u _pipewire:_pipewire:audio:video pipewire
+exec chpst -P -u _pipewire:_pipewire:audio:video dbus-run-session pipewire
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7ad92c87fa3b..3e0cffb69a3c 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.71
-revision=2
+revision=3
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -56,8 +56,8 @@ fi
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
-	vsv pipewire
-	vsv pipewire-pulse
+	vmkdir usr/share/examples/sv
+	vcopy ${FILESDIR}/pipewire usr/share/examples/sv/
 	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
 	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
 	vsconf "${FILESDIR}/20-pipewire-pulse.conf"

From 5fcae2816f7d6d5720dedb088b5c74d3c4804478 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 0099/1854] wireplumber: remove system service

if desired, can be launched by pipewire config
---
 srcpkgs/wireplumber/files/wireplumber/control/t |  2 --
 srcpkgs/wireplumber/files/wireplumber/run       | 10 ----------
 srcpkgs/wireplumber/template                    |  3 +--
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
 delete mode 100644 srcpkgs/wireplumber/files/wireplumber/run

diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
deleted file mode 100755
index a095b7bc777a..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
deleted file mode 100644
index 9a28ecdbe9a4..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# this service is experimental and most setups should start pipewire and wireplumber as a user,
-# for further information, please refer to the handbook
-
-sv check dbus >/dev/null 2>&1 || exit 1
-
-exec 2>&1
-
-export XDG_STATE_HOME=/var/lib/pipewire
-exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 3584bf374a64..0014c3357f7c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=4
+revision=5
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,6 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
 
 post_install() {
 	vlicense LICENSE
-	vsv wireplumber
 	vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
 	vsconf "${FILESDIR}/10-wireplumber.conf"
 }

From f4b223593888c6fed09983d869b7d35136115909 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 0100/1854] pulseaudio: move system services to
 /usr/share/examples/PKGNAME/sv/

also fix a couple things in the template
---
 srcpkgs/pulseaudio/files/README.voidlinux |  6 +++---
 srcpkgs/pulseaudio/files/pulseaudio/run   |  0
 srcpkgs/pulseaudio/template               | 14 ++++----------
 3 files changed, 7 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run

diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
 
 Optional dependencies:
 
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..1bbca888f444 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=15.0
-revision=3
+revision=4
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -26,7 +26,7 @@ distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
 checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
 python_version=3
 # FIXME: core-util-test fails
-make_check=yes
+make_check=no
 
 system_groups="pulse-access"
 system_accounts="pulse"
@@ -44,16 +44,10 @@ case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Db_lto=false"
 esac
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		# Disable neon optimizations for the arm* architectures
-		arm*) vsed -e '/  neon/d' -i src/pulsecore/meson.build ;;
-	esac
-}
-
 post_install() {
 	rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
-	vsv pulseaudio
+	vmkdir usr/share/examples/pulseaudio/sv/
+	vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
 	vdoc $FILESDIR/README.voidlinux
 }
 

From ae6b3653755639e2001fc41095579967a7aaa524 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 16:30:05 +0200
Subject: [PATCH 0101/1854] linux5.10: update to 5.10.181.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 5bb69d7c6f17..97c063d99aa2 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.179
+version=5.10.181
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
- d3884dcb74c51054cc11ce243caa801b91f4e1ee0d3e0bf57c84da70307f501d"
+ c04019da6ab852a66bad81382fd9ba1d3a30d1d1fd784f8a0ca4565516b36098"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From a9373694255d8ca2602b680334795a96697ad4b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 16:30:37 +0200
Subject: [PATCH 0102/1854] linux5.15: update to 5.15.114.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 7f946680fa09..04706c462e21 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.111
+version=5.15.114
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- bb4edf93f6db5de96687a860ab53b7eef0ddacbc2adce865484e21247160ef12"
+ 6a252901a4d497ec0a942c009a130c36c27290ac357e22de89bbc941e6b5fe76"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From fae4c1af8f4677cb2381737d09d7771be6bc2111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 29 May 2023 09:25:14 +0700
Subject: [PATCH 0103/1854] virtualbox-ose: update to 7.0.8a.

---
 common/shlibs                                 |   1 +
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |  12 +-
 .../patches/005-gsoap-build.patch             |   6 +-
 .../patches/008-no-vboxvideo.patch            |   2 +-
 .../patches/015-no-update.patch               | 104 +++++++++++
 .../patches/051-file-prefix-map.patch         |   8 +-
 srcpkgs/virtualbox-ose/patches/052-xml.patch  | 163 ++++++++++++++++++
 srcpkgs/virtualbox-ose/template               |  53 +++---
 8 files changed, 308 insertions(+), 41 deletions(-)
 create mode 100644 srcpkgs/virtualbox-ose/patches/015-no-update.patch
 create mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch

diff --git a/common/shlibs b/common/shlibs
index f1e825819fb4..df0384d3b218 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4246,3 +4246,4 @@ 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
 libjodycode.so.2 libjodycode-2.0.1_1
+libgsoapssl++-2.8.124.so gsoap-2.8.124_1
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index b60eb09c0f5f..151892b353bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -2,15 +2,17 @@ VBOX_WITH_ADDITION_DRIVERS =
 VBOX_WITH_INSTALLER = 1
 VBOX_WITH_LINUX_ADDITIONS = 1
 VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
 VBOX_WITH_VIRTIO = 1
 VBOX_WITH_ORIGIN :=
 VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS)
+VBOX_PATH_PACKAGE_DOCS := /usr/share/doc/virtualbox
+VBOX_PATH_APP_DOCS := $(VBOX_PATH_PACKAGE_DOCS)
 VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
@@ -18,12 +20,16 @@ VBOX_NO_LEGACY_XORG_X11 = 1
 PATH_SDK_QT5_INC := /usr/include/qt5
 PATH_SDK_QT6 := /usr
 PATH_SDK_QT6_INC := /usr/include/qt6
+VBOX_WITH_QT5 := 1
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
 #VBOX_GCC_WARN =
 USERNAME = builder@void
+KBUILD_VERBOSE := 2
 
 # fix gsoap missing zlib include and produce errors with --as-needed
 VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
 VBOX_USE_SYSTEM_GL_HEADERS=true
+VBOX_WITH_DOCS :=
+VBOX_WITH_DOCS_PACKING :=
diff --git a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
index b7700e1bd98e..35fa223ab52c 100644
--- a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
+++ b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
@@ -1,11 +1,11 @@
 --- a/src/VBox/Main/webservice/Makefile.kmk
 +++ b/src/VBox/Main/webservice/Makefile.kmk
-@@ -848,7 +848,7 @@ $(if-expr !defined(VBOX_WITHOUT_NOINLINE
- 		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+@@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED
+  		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
 -	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
 +	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
- ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+  ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
  	$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
  	$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
diff --git a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
index 7838fb4e6352..79502012cbcf 100644
--- a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
+++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
@@ -7,5 +7,5 @@
 - DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
 + DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
   SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
-  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
   vboxvideo_drv_system_CFLAGS := \
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
new file mode 100644
index 000000000000..12ee94908c95
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -0,0 +1,104 @@
+
+Description: Disable "Check for Updates" action.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
+Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
+
+--- a/doc/manual/en_US/user_Introduction.xml
++++ b/doc/manual/en_US/user_Introduction.xml
+@@ -6090,14 +6090,14 @@
+           <xref linkend="specialcharacters"/>.
+         </para>
+       </listitem>
+-
++      <!--
+       <listitem>
+         <para>
+           <emphasis role="bold">Update.</emphasis> Enables you to
+           specify various settings for Automatic Updates.
+         </para>
+       </listitem>
+-
++      -->
+       <listitem>
+         <para>
+           <emphasis role="bold">Language.</emphasis> Enables you to
+--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
+ bool UIExtraDataManager::applicationUpdateEnabled()
+ {
+     /* 'True' unless 'restriction' feature allowed: */
+-    return !isFeatureAllowed(GUI_PreventApplicationUpdate);
++    return false;
+ }
+ 
+ QString UIExtraDataManager::applicationUpdateData()
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -47,10 +47,10 @@
+ #ifdef VBOX_WS_WIN
+ # include "UIGlobalSettingsInterface.h"
+ #endif
+-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-# include "UIGlobalSettingsProxy.h"
+-# include "UIGlobalSettingsUpdate.h"
+-#endif
++//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
++//# include "UIGlobalSettingsProxy.h"
++//# include "UIGlobalSettingsUpdate.h"
++//#endif
+ 
+ /* GUI includes: Machine Settings: */
+ #include "UIMachineSettingsAudio.h"
+@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+ 
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* Update page: */
+-    m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
++    //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
+ #endif
+ 
+     /* Language page: */
+@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+ 
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* Proxy page: */
+-    m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
++    //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
+ #endif
+ 
+ #ifdef VBOX_WS_WIN
+@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+                 }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+                 /* Update page: */
+-                case GlobalSettingsPageType_Update:
++                /*case GlobalSettingsPageType_Update:
+                 {
+                     pSettingsPage = new UIGlobalSettingsUpdate;
+                     addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
+                             iPageIndex, "#update", pSettingsPage);
+                     addPageHelpKeyword(iPageIndex, "preferences");
+                     break;
+-                }
++                }*/
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+                 /* Language page: */
+                 case GlobalSettingsPageType_Language:
+@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+                 }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+                 /* Proxy page: */
+-                case GlobalSettingsPageType_Proxy:
++                /*case GlobalSettingsPageType_Proxy:
+                 {
+                     pSettingsPage = new UIGlobalSettingsProxy;
+                     addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
+                             iPageIndex, "#proxy", pSettingsPage);
+                     addPageHelpKeyword(iPageIndex, "preferences");
+                     break;
+-                }
++                }*/
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifdef VBOX_WS_WIN
+                 /* Interface page: */
diff --git a/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch b/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch
index 36952e8321d6..1b65c8bae068 100644
--- a/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch
+++ b/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch
@@ -1,10 +1,8 @@
 Technically -ffile-prefix-map is not OPTimisation flags,
 but it's the easiest flags to be plugged in for all objects
-Index: virtualbox-ose-7.0.4/Config.kmk
-===================================================================
---- virtualbox-ose-7.0.4.orig/Config.kmk
-+++ virtualbox-ose-7.0.4/Config.kmk
-@@ -3680,7 +3680,7 @@ else
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -3721,7 +3721,7 @@ else
   # We should use -fomit-frame-pointer for GCC / -Oy for VCC.
   # -funwind-tables provides support for backtraces in gdb then.
   VBOX_GCC_FP     ?= -fno-omit-frame-pointer
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
new file mode 100644
index 000000000000..81f93ba7a5eb
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/052-xml.patch
@@ -0,0 +1,163 @@
+Fix ftbfs
+From: nezos@hotmail.com
+--- a/doc/manual/en_US/user_VBoxManage.xml
++++ b/doc/manual/en_US/user_VBoxManage.xml
+@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
+       on your particular host.
+     </para>
+ 
+-    <xi:include href="overview_man_VBoxManage-common.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-common.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-list.xml"           xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-list.xml"           xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-showvminfo.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-showvminfo.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-registervm.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-registervm.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-unregistervm.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-unregistervm.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-createvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-createvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-modifyvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-modifyvm.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-clonevm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-clonevm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-movevm.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-movevm.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-encryptvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-encryptvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-cloud.xml"          xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-cloud.xml"          xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-cloudprofile.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-cloudprofile.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-import.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-import.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-export.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-export.xml"         xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-signova.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-signova.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-startvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-startvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-controlvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-controlvm.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-unattended.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-unattended.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-discardstate.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-discardstate.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-adoptstate.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-adoptstate.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-snapshot.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-snapshot.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-closemedium.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-closemedium.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-storageattach.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-storageattach.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-storagectl.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-storagectl.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-bandwidthctl.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-bandwidthctl.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-createmedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-createmedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-modifymedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-modifymedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-clonemedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-clonemedium.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-encryptmedium.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-encryptmedium.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-mediumio.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-mediumio.xml"       xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-setextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-setextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-getextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-getextradata.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-setproperty.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-setproperty.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-usbfilter.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-usbfilter.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-sharedfolder.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-sharedfolder.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-guestproperty.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-guestproperty.xml"  xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-guestcontrol.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-guestcontrol.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-debugvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-debugvm.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-metrics.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-metrics.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-natnetwork.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-natnetwork.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-hostonlyif.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-hostonlyif.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-hostonlynet.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-hostonlynet.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-dhcpserver.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-dhcpserver.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-usbdevsource.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-usbdevsource.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-extpack.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-extpack.xml"        xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-updatecheck.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-updatecheck.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+-    <xi:include href="overview_man_VBoxManage-modifynvram.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
++    <xi:include href="overview_man_VBoxManage-modifynvram.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
+ 
+     <para>
+       Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 4efc26f7da06..c4bc1aa0289a 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,14 +1,14 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=7.0.6
+version=7.0.8a
 revision=1
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
-distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff
+distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
+checksum=7de37359518d467b7f888235175cd388f66e9f16bd9359dd6265fbc95933c1e6
 
 nopie=yes
 lib32disabled=yes
@@ -33,24 +33,22 @@ system_groups="vboxusers"
 
 do_configure() {
 	cp ${FILESDIR}/LocalConfig.kmk .
-	ln -s /bin/echo makeself
-	./configure --disable-docs --disable-java --enable-vde \
+	./configure \
+		--disable-docs --disable-java --enable-vde \
+		--with-makeself="/bin/echo" \
 		--disable-python --disable-kmods --nofatal --enable-webservice
 }
 
 do_build() {
 	export USERNAME="builder@void"
 	vsed -i  src/VBox/Main/webservice/Makefile.kmk \
-		-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
-		-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
+		-e '/webtest_LIBS/,/^webtest_/{/ z$/!s/.*LIB_.*/& z/ }' \
+		-e '/vboxwebsrv_LIBS/,/^vboxwebsrv_/{/ z$/!s/.*LIB_.*/& z/}'
 	source ./env.sh
-	kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all
-	# kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
+	kmk ${makejobs} all
 }
 
 do_install() {
-	local f _osedir _guestdir
-
 	source ./env.sh
 	#
 	# virtualbox-ose.
@@ -129,15 +127,14 @@ virtualbox-ose-dkms_package() {
 		source ${wrksrc}/env.sh
 
 		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
-		local _osedir=${PKGDESTDIR}/usr/src/${sourcepkg}-${version}
-
-		install -d ${_osedir}
-		cp -a . ${_osedir}
-		cp -a ${wrksrc}/include ${_osedir}
-		rm -f ${_osedir}/do_dkms
-		install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf
-		vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \
-			usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules
+
+		rm -f do_dkms
+		sed -s "s/#MODULE_VERSION#/$version/" ${FILESDIR}/${pkgname}.dkms >dkms.conf
+		vmkdir "usr/src/${pkgname%-dkms}-${version}"
+		vcopy . "usr/src/${pkgname%-dkms}-${version}"
+		vcopy ${wrksrc}/include "usr/src/${pkgname%-dkms}-${version}"
+		vinstall ${FILESDIR}/${pkgname}.udev 644 \
+			usr/lib/udev/rules.d 60-${pkgname}.rules
 	}
 }
 virtualbox-ose-guest_package() {
@@ -176,14 +173,12 @@ virtualbox-ose-guest-dkms_package() {
 		source ${wrksrc}/env.sh
 
 		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
-		local _guestdir=${PKGDESTDIR}/usr/src/${sourcepkg}-guest-${version}
-
-		install -d ${_guestdir}
-		cp -a . ${_guestdir}
-		rm -f ${_guestdir}/do_dkms
-		install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.dkms \
-			${_guestdir}/dkms.conf
-		vinstall ${FILESDIR}/${sourcepkg}-guest-dkms.udev 644 \
-			usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules
+
+		sed -s "s/#MODULE_VERSION#/$version/" ${FILESDIR}/${pkgname}.dkms >dkms.conf
+		rm -f do_dkms
+		vmkdir "usr/src/${pkgname%-dkms}-${version}"
+		vcopy . "usr/src/${pkgname%-dkms}-${version}"
+		vinstall ${FILESDIR}/${pkgname}.udev 644 \
+			usr/lib/udev/rules.d 60-${pkgname}.rules
 	}
 }

From d0cb2f2b0fac1b0a92bf72da1c6730fd872ef73a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 30 May 2023 18:00:32 +0200
Subject: [PATCH 0104/1854] github-cli: update to 2.30.0

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index fadddfd0fa2c..f70306706384 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.29.0
+version=2.30.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=f77718f109ff5817cde33eb004137f58bdcd5934b921aed1440c6b3e93e1df27
+checksum=5e66be97f51559dcea3621c8cc3cf2f67bf47bf2e1902014b3ec5689ab4e8add
 
 pre_build() {
 	local _date

From a3e35aa10cb4eb1c9f1e4c67405d64565ba1cc37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 30 May 2023 19:50:16 +0200
Subject: [PATCH 0105/1854] libmicrohttpd: update to 0.9.77.

---
 srcpkgs/libmicrohttpd/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template
index 48c1b7d73e1e..3764646cec11 100644
--- a/srcpkgs/libmicrohttpd/template
+++ b/srcpkgs/libmicrohttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'libmicrohttpd'
 pkgname=libmicrohttpd
-version=0.9.76
-revision=2
+version=0.9.77
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-largefile
@@ -11,11 +11,12 @@ hostmakedepends="texinfo"
 makedepends="libgcrypt-devel gnutls-devel"
 checkdepends="libcurl-devel"
 short_desc="Library embedding HTTP server functionality"
-maintainer="Duncaen <Duncaen@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/libmicrohttpd/"
+changelog="https://git.gnunet.org/libmicrohttpd.git/plain/ChangeLog"
 distfiles="${GNU_SITE}/libmicrohttpd/libmicrohttpd-${version}.tar.gz"
-checksum=f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c
+checksum=9e7023a151120060d2806a6ea4c13ca9933ece4eacfc5c9464d20edddb76b0a0
 
 libmicrohttpd-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 61a95357b6209894aa02a6e7de8f6c6dd72638ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 16:32:38 +0200
Subject: [PATCH 0106/1854] python3-versioningit: update to 2.2.0.

---
 srcpkgs/python3-versioningit/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-versioningit/template b/srcpkgs/python3-versioningit/template
index 7c4ab452b8c2..5fc38e4e6378 100644
--- a/srcpkgs/python3-versioningit/template
+++ b/srcpkgs/python3-versioningit/template
@@ -1,17 +1,25 @@
 # Template file for 'python3-versioningit'
 pkgname=python3-versioningit
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
-depends="python3-packaging python3-setuptools python3-tomli"
+depends="python3-packaging"
+checkdepends="python3-pytest python3-pydantic python3-pytest-mock"
 short_desc="Versioning It with your Version In Git"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/jwodder/versioningit"
 changelog="https://raw.githubusercontent.com/jwodder/versioningit/master/CHANGELOG.md"
 distfiles="https://github.com/jwodder/versioningit/archive/refs/tags/v$version.tar.gz"
-checksum=6379b15a701836a00654a4c3ff82e72f591461289d2718789c1be9af67be7a2f
+checksum=1e7d80cdeee2dbcebaf61d25205c9faac268a1926ff43fc5c7236f45639c3782
+make_check=no # FIXME
+
+pre_check() {
+	vsed -e '/    --cov/d' \
+		-e '/    --no-cov-on-fail/d' \
+		-i tox.ini
+}
 
 post_install() {
 	vlicense LICENSE

From ad9ebffede2446f5c39ae6fe68a32cbd9d7a513b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 16:29:49 +0200
Subject: [PATCH 0107/1854] streamlink: update to 5.5.1.

---
 srcpkgs/streamlink/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 5c82d253dd5f..426d74ceb7b7 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=5.4.0
+version=5.5.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-versioningit"
@@ -15,7 +15,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/$version/streamlink-$version.tar.gz"
-checksum=d854348c19e032140d06ba13ee4d9b96fa838b979b689133dfd9bbdda474310b
+checksum=b2b4fe8d6436dbe7bcec78de2d4bb780156388561435b61a1963156e9fc5fbd0
 make_check_pre="env PYTHONPATH=src"
 make_check=ci-skip # some tests fail when running as root
 

From 4f95f90bd1be645bf1678d9c59378643bf035a29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 20:41:56 +0200
Subject: [PATCH 0108/1854] python3-astroid: update to 2.15.5.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 5c0678f2d82a..9f76303e85b4 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.15.4
+version=2.15.5
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
 distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=a2b2d239476464c63fbfbd0dbebe589cf5ecd48820015dbb9f1c1c986fd2d6dc
+checksum=c819b8f9c97a8365d907d837f1655dca3a0052a494e0c91ec9ad5df48f7a4101

From 434610fe70aa8db54d2709f50efe5a322ec07bfb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 20:41:59 +0200
Subject: [PATCH 0109/1854] python3-mypy: update to 1.3.0.

---
 srcpkgs/python3-mypy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 7b77c480709f..bba64448036b 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=python3-module
 # fails in ci
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://www.mypy-lang.org"
 changelog="https://mypy-lang.blogspot.com"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=f70a40410d774ae23fcb4afbbeca652905a04de7948eaf0b1789c8d1426b72d1
+checksum=e1f4d16e296f5135624b34e8fb741eb0eadedca90862405b1f1fde2040b9bd11
 
 post_install() {
 	make -C docs man

From 3adf0b446cb92961b6e712bf7a31f58e35c17941 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 21:20:02 +0200
Subject: [PATCH 0110/1854] qemu: fix build with gcc 12

---
 srcpkgs/qemu/patches/gcc12.patch | 72 ++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 srcpkgs/qemu/patches/gcc12.patch

diff --git a/srcpkgs/qemu/patches/gcc12.patch b/srcpkgs/qemu/patches/gcc12.patch
new file mode 100644
index 000000000000..2a4b2bd03609
--- /dev/null
+++ b/srcpkgs/qemu/patches/gcc12.patch
@@ -0,0 +1,72 @@
+From 5cb993ff131fca2abef3ce074a20258fd6fce557 Mon Sep 17 00:00:00 2001
+From: Bernhard Beschow <shentey@gmail.com>
+Date: Sat, 18 Mar 2023 19:59:31 +0100
+Subject: [PATCH] qemu/osdep: Switch position of "extern" and "G_NORETURN"
+
+Fixes the Windows build under msys2 using GCC 12 which fails with the following
+error:
+
+  [184/579] Compiling C++ object qga/vss-win32/qga-vss.dll.p/install.cpp.obj
+  FAILED: qga/vss-win32/qga-vss.dll.p/install.cpp.obj
+  "c++" "-m64" "-mcx16" "-Iqga/vss-win32/qga-vss.dll.p" "-Iqga/vss-win32" "-I../src/qga/vss-win32" "-I." "-Iqapi" "-Itrace" "-Iui" "-Iui/shader" "-IC:/msys64/mingw64/include/glib-2.0" "-IC:/msys64/mingw64/lib/glib-2.0/include" "-fdiagnostics-color=auto" "-Wall" "-Winvalid-pch" "-Wnon-virtual-dtor" "-Werror" "-std=gnu++11" "-g" "-iquote" "." "-iquote" "C:/msys64/home/shentey/Projects/qemu/src" "-iquote" "C:/msys64/home/shentey/Projects/qemu/src/include" "-iquote" "C:/msys64/home/shentey/Projects/qemu/src/tcg/i386" "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS" "-D__STDC_FORMAT_MACROS" "-fno-pie" "-no-pie" "-D_GNU_SOURCE" "-D_FILE_OFFSET_BITS=64" "-D_LARGEFILE_SOURCE" "-fno-strict-aliasing" "-fno-common" "-fwrapv" "-Wundef" "-Wwrite-strings" "-Wtype-limits" "-Wformat-security" "-Wformat-y2k" "-Winit-self" "-Wignored-qualifiers" "-Wempty-body" "-Wendif-labels" "-Wexpansion-to-defined" "-Wimplicit-fallthrough=2" "-Wmissing-format-attribute" "-Wno-missing-include-dirs" "-Wno-shift-negative-value" "-Wno-psabi" "-fstack-protector-strong" "-Wno-unknown-pragmas" "-Wno-delete-non-virtual-dtor" "-Wno-non-virtual-dtor" -MD -MQ qga/vss-win32/qga-vss.dll.p/install.cpp.obj -MF "qga/vss-win32/qga-vss.dll.p/install.cpp.obj.d" -o qga/vss-win32/qga-vss.dll.p/install.cpp.obj "-c" ../src/qga/vss-win32/install.cpp
+  In file included from C:/msys64/mingw64/lib/glib-2.0/include/glibconfig.h:9,
+              from C:/msys64/mingw64/include/glib-2.0/glib/gtypes.h:34,
+              from C:/msys64/mingw64/include/glib-2.0/glib/galloca.h:34,
+              from C:/msys64/mingw64/include/glib-2.0/glib.h:32,
+              from C:/msys64/home/shentey/Projects/qemu/src/include/glib-compat.h:32,
+              from C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:144,
+              from ../src/qga/vss-win32/install.cpp:13:
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: standard attributes in middle of decl-specifiers
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: note: standard attributes must precede the decl-specifiers to apply to the declaration, or follow them to apply to the type
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: attribute ignored [-Werror=attributes]
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: note: an attribute that appertains to a type-specifier is ignored
+  1075 | # define G_NORETURN [[noreturn]]
+        |                     ^
+  C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
+  240 | extern G_NORETURN
+        |        ^~~~~~~~~~
+  cc1plus.exe: all warnings being treated as errors
+
+Apparently it also fixes the compilation with Clang 15 (see
+https://gitlab.com/qemu-project/qemu/-/issues/1541 ).
+
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1541
+Signed-off-by: Bernhard Beschow <shentey@gmail.com>
+Message-Id: <20230318185931.181659-1-shentey@gmail.com>
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+---
+ include/qemu/osdep.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
+index f68b5d8708c..9eff0be95bd 100644
+--- a/include/qemu/osdep.h
++++ b/include/qemu/osdep.h
+@@ -237,7 +237,7 @@ extern "C" {
+  * supports QEMU_ERROR, this will be reported at compile time; otherwise
+  * this will be reported at link time due to the missing symbol.
+  */
+-extern G_NORETURN
++G_NORETURN extern
+ void QEMU_ERROR("code path is reachable")
+     qemu_build_not_reached_always(void);
+ #if defined(__OPTIMIZE__) && !defined(__NO_INLINE__)
+-- 
+GitLab
+

From 7acb33e3d70aabf74f265bc3ea7da4b906d1e86c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 21:25:18 +0200
Subject: [PATCH 0111/1854] chatty: fix build

---
 srcpkgs/chatty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index a237d134d69b..80a7c3d5ea6f 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -2,7 +2,7 @@
 pkgname=chatty
 version=0.22
 revision=1
-hostmakedepends="gradle"
+hostmakedepends="gradle openjdk8"
 depends="virtual?java-runtime"
 short_desc="Twitch Chat Client for Desktop"
 maintainer="Frank Steinborn <steinex@nognu.de>"

From f6c4b2a053a42077cc144d17cccb30ae8919bc0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 22:15:32 +0200
Subject: [PATCH 0112/1854] linux5.15: refresh x86_64-dotconfig.

---
 srcpkgs/linux5.15/files/x86_64-dotconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 0b8a930c9085..1d82b2cabc1e 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.102 Kernel Configuration
+# Linux/x86_64 5.15.114 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=123
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -8310,9 +8310,10 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m

From 7a68f2d255f0b14f48085c476215fbecc2eb81a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 30 May 2023 22:17:23 +0200
Subject: [PATCH 0113/1854] linux5.15: refresh i386-dotconfig.

---
 srcpkgs/linux5.15/files/i386-dotconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 6bed18940e59..04fdd1093e91 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.102 Kernel Configuration
+# Linux/i386 5.15.114 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=123
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -8156,10 +8156,11 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
 CONFIG_TC1100_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m

From ba1c9408600b81cb671d205869c43c6a7a59e835 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 22:16:18 +0200
Subject: [PATCH 0114/1854] kodi: fix build with mesa 22.3

---
 srcpkgs/kodi/patches/mesa-22.3.patch | 54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 srcpkgs/kodi/patches/mesa-22.3.patch

diff --git a/srcpkgs/kodi/patches/mesa-22.3.patch b/srcpkgs/kodi/patches/mesa-22.3.patch
new file mode 100644
index 000000000000..f95aab7750bd
--- /dev/null
+++ b/srcpkgs/kodi/patches/mesa-22.3.patch
@@ -0,0 +1,54 @@
+From 5449652abf0bb9dddd0d796de4120e60f19f89a5 Mon Sep 17 00:00:00 2001
+From: Alan Swanson <reiver@improbability.net>
+Date: Mon, 19 Dec 2022 21:28:13 +0200
+Subject: [PATCH] Work around Mesa eglchromium.h removal
+
+I have polished Alan's snippet to buildable state and tested
+on Kodi from Debian sid.
+
+Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
+---
+ cmake/modules/FindEGL.cmake       | 6 ++++++
+ xbmc/windowing/X11/GLContextEGL.h | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake
+index b00fe08a25f95..a68a8db901222 100644
+--- a/cmake/modules/FindEGL.cmake
++++ b/cmake/modules/FindEGL.cmake
+@@ -9,6 +9,7 @@
+ # EGL_INCLUDE_DIRS - the EGL include directory
+ # EGL_LIBRARIES - the EGL libraries
+ # EGL_DEFINITIONS - the EGL definitions
++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h
+ #
+ # and the following imported targets::
+ #
+@@ -35,6 +36,11 @@ if(EGL_FOUND)
+   set(EGL_LIBRARIES ${EGL_LIBRARY})
+   set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
+   set(EGL_DEFINITIONS -DHAS_EGL=1)
++  include(CheckIncludeFiles)
++  check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE)
++  if(HAVE_EGLEXTANGLE)
++    list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1")
++  endif()
+ 
+   if(NOT TARGET EGL::EGL)
+     add_library(EGL::EGL UNKNOWN IMPORTED)
+diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h
+index 99a6a9024e8c6..afea0b7c43eac 100644
+--- a/xbmc/windowing/X11/GLContextEGL.h
++++ b/xbmc/windowing/X11/GLContextEGL.h
+@@ -13,7 +13,11 @@
+ #include "threads/CriticalSection.h"
+ 
+ #include <EGL/eglext.h>
++#ifdef HAVE_EGLEXTANGLE
++#include <EGL/eglext_angle.h>
++#else
+ #include <EGL/eglextchromium.h>
++#endif
+ #include <X11/Xutil.h>
+ 
+ class CGLContextEGL : public CGLContext

From 2f66b6eafbead910220c91e55ae0b8d53a6d8ec4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 22:43:11 +0200
Subject: [PATCH 0115/1854] mopidy: fix build

---
 srcpkgs/mopidy/patches/new-sphinx.patch | 37 +++++++++++++++++++++++++
 srcpkgs/mopidy/template                 |  7 ++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/mopidy/patches/new-sphinx.patch

diff --git a/srcpkgs/mopidy/patches/new-sphinx.patch b/srcpkgs/mopidy/patches/new-sphinx.patch
new file mode 100644
index 000000000000..ae9b5cc1dd51
--- /dev/null
+++ b/srcpkgs/mopidy/patches/new-sphinx.patch
@@ -0,0 +1,37 @@
+From 1b7330884b996e13944e9680b0c0d01f4907b6b5 Mon Sep 17 00:00:00 2001
+From: Stein Magnus Jodal <stein.magnus@jodal.no>
+Date: Sun, 19 Mar 2023 01:52:12 +0100
+Subject: [PATCH] Fix extlinks crash in docs build
+
+Ref https://github.com/sphinx-doc/sphinx/issues/11094
+---
+ docs/conf.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index f17b3c9ae..58bfa70b3 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -131,14 +131,17 @@ def setup(app):
+ # -- Options for extlink extension --------------------------------------------
+ 
+ extlinks = {
+-    "issue": ("https://github.com/mopidy/mopidy/issues/%s", "#"),
+-    "commit": ("https://github.com/mopidy/mopidy/commit/%s", "commit "),
+-    "js": ("https://github.com/mopidy/mopidy.js/issues/%s", "mopidy.js#"),
++    "issue": ("https://github.com/mopidy/mopidy/issues/%s", "#%s"),
++    "commit": ("https://github.com/mopidy/mopidy/commit/%s", "commit %s"),
++    "js": ("https://github.com/mopidy/mopidy.js/issues/%s", "mopidy.js#%s"),
+     "mpris": (
+         "https://github.com/mopidy/mopidy-mpris/issues/%s",
+-        "mopidy-mpris#",
++        "mopidy-mpris#%s",
++    ),
++    "discuss": (
++        "https://discourse.mopidy.com/t/%s",
++        "discourse.mopidy.com/t/%s",
+     ),
+-    "discuss": ("https://discourse.mopidy.com/t/%s", "discourse.mopidy.com/t/"),
+ }
+ 
+ 
diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template
index 292354f84fa9..e5a3dbf917a9 100644
--- a/srcpkgs/mopidy/template
+++ b/srcpkgs/mopidy/template
@@ -31,11 +31,10 @@ post_install() {
 	vbin extra/mopidyctl/mopidyctl
 	vman extra/mopidyctl/mopidyctl.8
 	python3 setup.py build
-	python3 setup.py build_sphinx -b man
-	python3 setup.py build_sphinx -b html
-	vman build/sphinx/man/mopidy.1
+	make -C docs html man
+	vman docs/_build/man/mopidy.1
 	vmkdir usr/share/doc/mopidy/
-	cp -r build/sphinx/html/* ${DESTDIR}/usr/share/doc/mopidy/
+	cp -r docs/_build/html/* ${DESTDIR}/usr/share/doc/mopidy/
 	vinstall ${FILESDIR}/mopidy.conf 644 etc/mopidy/
 	vinstall ${FILESDIR}/logging.conf 644 etc/mopidy/
 	vsv mopidy

From e630406443b3910e8308b563e8688caebb7e59f5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 22:48:49 +0200
Subject: [PATCH 0116/1854] opensonic: fix build

---
 srcpkgs/opensonic/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template
index 36f17b23e5a5..2466a962cb5e 100644
--- a/srcpkgs/opensonic/template
+++ b/srcpkgs/opensonic/template
@@ -2,6 +2,8 @@
 pkgname=opensonic
 version=0.1.4
 revision=10
+_loggcompat_ver=4.4.2
+build_wrksrc="opensnc-src-${version}"
 build_style=cmake
 configure_args="-DCMAKE_C_STANDARD_LIBRARIES=-lalleg"
 hostmakedepends="allegro4-devel cmake"
@@ -11,17 +13,18 @@ short_desc="Open-source game based on the Sonic the Hedgehog universe"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://opensnc.sourceforge.net/"
-_loggcompat_ver=4.4.2
 distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz
  https://github.com/t6/loggcompat/archive/${_loggcompat_ver}.tar.gz"
 checksum="3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
  481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e"
+patch_args="-Np1 --directory=${build_wrksrc}"
 
 replaces="opensonic-data>=0"
 CFLAGS="-I./../loggcompat-${_loggcompat_ver}"
 
 post_extract() {
-	mv ${XBPS_BUILDDIR}/loggcompat-${_loggcompat_ver} .
+	cd ${build_wrksrc}
+	mv ${wrksrc}/loggcompat-${_loggcompat_ver} .
 }
 
 pre_configure() {

From bbeb3b4b2dd15cbcf9ac3710366c26e1297f68f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 23:19:59 +0200
Subject: [PATCH 0117/1854] perl-WWW-Curl: fix build with curl 7.87.0

---
 .../perl-WWW-Curl/patches/curl-7.87.0.patch   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch

diff --git a/srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch b/srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch
new file mode 100644
index 000000000000..54eb52a1697d
--- /dev/null
+++ b/srcpkgs/perl-WWW-Curl/patches/curl-7.87.0.patch
@@ -0,0 +1,40 @@
+From 4d8ca056c900cdb08556bbae2470ebb858369576 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 20 Jan 2023 14:26:50 +0100
+Subject: [PATCH] Adapt to curl-7.87.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+curl-7.87.0 added CURLOPTDEPRECATED and some other helping macros for
+hinting a compiler to produce deprecation warnings. Those are not
+constants for libcurl and clobbered generated curlopt-constants.c
+file:
+
+curlopt-constants.c:19:51: error: 'CURL_DEPRECATED' undeclared (first use in this function)
+   19 |             if (strEQ(name, "DEPRECATED")) return CURL_DEPRECATED;
+      |                                                   ^~~~~~~~~~~~~~~
+
+This patch adjusts curl.h parser in Makefile.PL to skip them.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index b9e6a46..311b03a 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+-- 
+2.39.1
+

From 5b816d6706f7e250a88cab850229d7caa35a6cc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 23:32:19 +0200
Subject: [PATCH 0118/1854] cloudflared: update to 2023.5.1, unbreak

---
 srcpkgs/cloudflared/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index 9bb5281ad6eb..d93781c62d33 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,6 +1,6 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
-version=2023.2.1
+version=2023.5.1
 revision=1
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
@@ -12,8 +12,7 @@ license="Apache-2.0"
 homepage="https://developers.cloudflare.com/argo-tunnel/"
 changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
 distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=468b0953eca6ab189859073067857062c91ed9adb18e12a43527e0dba3aa6409
-broken="doesn't build with go 1.20 due to an old custom version of quic-go https://github.com/cloudflare/cloudflared/issues/888"
+checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""

From f96a99f59fa46cd19bd7ea97362c1e30224c3932 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 30 May 2023 23:38:24 +0200
Subject: [PATCH 0119/1854] wuzz: move go mod tidy to a patch

using go mod tidy while building fixes the build, but checksums are not
checked and xbps-src extract does not work with -I
---
 srcpkgs/wuzz/patches/go-mod-tidy.patch | 81 ++++++++++++++++++++++++++
 srcpkgs/wuzz/template                  |  7 +--
 2 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/wuzz/patches/go-mod-tidy.patch

diff --git a/srcpkgs/wuzz/patches/go-mod-tidy.patch b/srcpkgs/wuzz/patches/go-mod-tidy.patch
new file mode 100644
index 000000000000..6d32b4de6b23
--- /dev/null
+++ b/srcpkgs/wuzz/patches/go-mod-tidy.patch
@@ -0,0 +1,81 @@
+--- a/go.mod
++++ b/go.mod
+@@ -13,6 +13,7 @@ require (
+ 	github.com/mitchellh/go-homedir v1.1.0
+ 	github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1
+ 	github.com/nwidger/jsoncolor v0.3.0
++	github.com/stretchr/testify v1.8.4 // indirect
+ 	github.com/tidwall/gjson v1.6.0
+ 	github.com/tidwall/pretty v1.0.1 // indirect
+ 	github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0
+--- /dev/null
++++ b/go.sum
+@@ -0,0 +1,68 @@
++github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
++github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
++github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
++github.com/alessio/shellescape v1.2.2 h1:8LnL+ncxhWT2TR00dfJRT25JWWrhkMZXneHVWnetDZg=
++github.com/alessio/shellescape v1.2.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
++github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
++github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
++github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
++github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
++github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
++github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
++github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
++github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
++github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
++github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
++github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
++github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
++github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
++github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
++github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
++github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
++github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
++github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 h1:lh3PyZvY+B9nFliSGTn5uFuqQQJGuNrD0MLCokv09ag=
++github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
++github.com/nwidger/jsoncolor v0.3.0 h1:VdTH8Dc0SJoq4pJ8pRxxFZW0/5Ng5akbN4YToCBJDSU=
++github.com/nwidger/jsoncolor v0.3.0/go.mod h1:Cs34umxLbJvgBMnVNVqhji9BhoT/N/KinHqZptQ7cf4=
++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
++github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
++github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
++github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
++github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
++github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
++github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
++github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
++github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
++github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
++github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
++github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
++github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8=
++github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
++github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0 h1:eViiK7U+LXJuAEcnOdp+5jIDp7j9iE2FE8YfWoLExTE=
++github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0/go.mod h1:pUZuomyrQzbA0SQPSwAnDB3TgChnUMfZnSSfcAzpVh8=
++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
++golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
++golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index e48819301dc0..734963b93e21 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -4,18 +4,13 @@ version=0.5.0
 revision=2
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
-hostmakedepends="git"
 short_desc="Interactive cli tool for HTTP inspection"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/asciimoo/wuzz"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+distfiles="https://github.com/asciimoo/wuzz/archive/v${version}.tar.gz"
 checksum=721ea7343698e9f3c69e09eab86b9b1fef828057655f7cebc1de728c2f75151e
 
-post_extract() {
-	go mod tidy
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 7268c4613461faeba56dd0a65392f87d6cc3ad68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 09:29:30 +0700
Subject: [PATCH 0120/1854] linux6.3: update to 6.3.5.

---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 5ee6e0bed6a0..35b5178363f6 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.4
+version=6.3.5
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- aa63f11c6dfcf8ad392847fecb31e520cf57da7df096f7c1fbc4e187d1ab8996"
+ bf66d350e6a4727b8ddbd3a14ddc9033c4b80ffb6d4688269917e1a1a5e4578a"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From b58aba2b1fe33a26f808069f9ad56bfecc483f1a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 25 May 2023 18:29:20 +0200
Subject: [PATCH 0121/1854] qt6ct: bump for qt 6.5.0

---
 srcpkgs/qt6ct/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index 64f166fb4767..34f7947920dc 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6ct'
 pkgname=qt6ct
 version=0.7
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="qt6-tools qt6-base"
 makedepends="qt6-base-devel"

From 3420be33056db15b0a7474657428cb7cc01c02f0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 May 2023 19:23:08 +0530
Subject: [PATCH 0122/1854] common/xbps-src/shutils/update_check.sh: fix url
 for gitlab

---
 common/xbps-src/shutils/update_check.sh | 2 +-
 srcpkgs/goimapnotify/update             | 2 --
 srcpkgs/megapixels/update               | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 srcpkgs/goimapnotify/update
 delete mode 100644 srcpkgs/megapixels/update

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index cd3bb369bdb3..e656cf06fbcc 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -136,7 +136,7 @@ update_check() {
                     */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";;
                     *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";;
                 esac
-                url="$pkgurlname/tags"
+                url="$pkgurlname/-/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
diff --git a/srcpkgs/goimapnotify/update b/srcpkgs/goimapnotify/update
deleted file mode 100644
index b9a4e2b6728e..000000000000
--- a/srcpkgs/goimapnotify/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://gitlab.com/shackra/goimapnotify/-/tags/"
-pattern="goimapnotify-\K[\d.]*(?=\.tar\.gz)"
diff --git a/srcpkgs/megapixels/update b/srcpkgs/megapixels/update
deleted file mode 100644
index 3172862eef09..000000000000
--- a/srcpkgs/megapixels/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://gitlab.com/postmarketOS/megapixels/-/tags"

From 2bbe7a5a12cf852a3673b449e16e8fcc781d3aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 09:49:58 +0700
Subject: [PATCH 0123/1854] ruby-mime-types-data: update to 3.2023.0218.1.

---
 srcpkgs/ruby-mime-types-data/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index fd6da7ef3a8a..111bba9e5960 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
-version=3.2022.0105
-revision=2
+version=3.2023.0218.1
+revision=1
 build_style=gem
 short_desc="Registry for MIME media type definitions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mime-types/mime-types-data/"
 changelog="https://raw.githubusercontent.com/mime-types/mime-types-data/main/History.md"
-checksum=d8c401ba9ea8b648b7145b90081789ec714e91fd625d82c5040079c5ea696f00
+checksum=e90f027e54346bbbf7bd993a97e9cb7270cd4fe41c535ef84bf5d1aefe1e7ede
 
 post_install() {
 	vlicense Licence.md

From 71aabd08cb810f1069e9fc3f33179752615d5196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 09:43:35 +0700
Subject: [PATCH 0124/1854] mime-types: update to 2.1.54.

---
 srcpkgs/mime-types/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mime-types/template b/srcpkgs/mime-types/template
index 92bd95c09eca..8012c539ea4d 100644
--- a/srcpkgs/mime-types/template
+++ b/srcpkgs/mime-types/template
@@ -1,7 +1,7 @@
 # Template file for 'mime-types'
 pkgname=mime-types
 reverts="9_1 9_2 9_3 9_4 9_5"
-version=2.1.53
+version=2.1.54
 revision=1
 # conf_files="/etc/mime.types /etc/nginx/mime.types"
 conf_files="/etc/mime.types"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, MIT"
 homepage="https://pagure.io/mailcap"
 distfiles="https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"
-checksum=5eea2ef17b304977ba3ecb87afad4319fa0440f825e4f6fba6e8fa2ffeb88785
+checksum=9a4032202fc0d2b0858f41b167389a9cfe52ac24ec282e6479b90765319de113
 
 do_build() {
 	: sh generate-nginx-mimetypes.sh <mime.types >mime.types.nginx

From 1a721aad5769d61e0bb101ea60c326d3711ee168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 31 May 2023 12:53:31 +0700
Subject: [PATCH 0125/1854] linux6.1: update to 6.1.31.

---
 srcpkgs/linux6.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 381a869231d7..632c671f13b7 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.30
+version=6.1.31
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 5abf569ed9e144f74a0c41fa2965c8ba3a5608e155a7d81a5364fc87c83fc49a"
+ 2d5754525d09d6696e190bca06d9a466ba3f502976ce89f4f2c5f618e8a288f6"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From f15b2b8643e363053c9962cad3a3c87273bb2764 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Fri, 28 Apr 2023 09:38:01 +0200
Subject: [PATCH 0126/1854] grafana: update to 8.5.24.

---
 srcpkgs/grafana/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index e7abc0a50086..4f1340bcca40 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
-version=8.5.3
-revision=2
+version=8.5.24
+revision=1
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server"
@@ -12,8 +12,8 @@ license="Apache-2.0"
 homepage="https://grafana.com"
 distfiles="https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz
 https://github.com/grafana/grafana/archive/v${version}.tar.gz"
-checksum="94c723358742b7da67323eb8ede32fa51519bca4e907e387f071afd8d8a62220
-39060b9636ac272dea93b5611aefab375cd754ff094975f246f914f2ae33124f"
+checksum="ff088012f356bcece24e5c89f924fed83a3b63736ec2cc9bc2a66341bf8fe00c
+9332fea516f617e6f9b418f28154f4f8f162c2abb3b739cc6ae7fedac21ddc41"
 
 system_accounts="_grafana"
 _grafana_homedir="/var/lib/grafana"

From 194bd970cef0cbbfe3a3479a663313588f73ea80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Dec 2021 20:20:09 -0300
Subject: [PATCH 0127/1854] givaro: update to 4.2.0.

---
 srcpkgs/givaro/patches/197.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/givaro/template          |  9 ++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/givaro/patches/197.patch

diff --git a/srcpkgs/givaro/patches/197.patch b/srcpkgs/givaro/patches/197.patch
new file mode 100644
index 000000000000..bafaff3efbd9
--- /dev/null
+++ b/srcpkgs/givaro/patches/197.patch
@@ -0,0 +1,28 @@
+From ab3d332508c21daff41fb64a8658cdc7cc74fc47 Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Thu, 16 Dec 2021 17:12:25 +0100
+Subject: [PATCH] dom_power argument is now an uint64_t to avoid problem with
+ 32bit machine
+
+---
+ src/kernel/system/givpower.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kernel/system/givpower.h b/src/kernel/system/givpower.h
+index eb784872..5644264d 100644
+--- a/src/kernel/system/givpower.h
++++ b/src/kernel/system/givpower.h
+@@ -71,11 +71,11 @@ namespace Givaro {
+ 
+     //! dom_power
+     template<class D, class TT>
+-    TT& dom_power(TT& res, const TT& n, long l, const D& F)
++    TT& dom_power(TT& res, const TT& n, uint64_t l, const D& F)
+     {
+         if (l == 0) return F.assign(res,F.one) ;
+ 
+-        unsigned long p = (unsigned long) l ;
++        uint64_t p = l;
+         bool is_assg = false ;
+ 
+         TT puiss; F.init(puiss); F.assign(puiss,n) ;
diff --git a/srcpkgs/givaro/template b/srcpkgs/givaro/template
index 9c16de5b1974..52457c02a1ed 100644
--- a/srcpkgs/givaro/template
+++ b/srcpkgs/givaro/template
@@ -1,6 +1,6 @@
 # Template file for 'givaro'
 pkgname=givaro
-version=4.1.1
+version=4.2.0
 revision=1
 build_style=gnu-configure
 makedepends="gmpxx-devel"
@@ -8,16 +8,15 @@ short_desc="C++ library for arithmetic and algebraic computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="CECILL-B"
 homepage="https://github.com/linbox-team/givaro"
+changelog="https://github.com/linbox-team/givaro/raw/master/ChangeLog"
 distfiles="https://github.com/linbox-team/givaro/releases/download/v${version}/givaro-${version}.tar.gz"
-checksum=628049899386e91da245aee6cd446350fbca87e94863bc0d815066c08150487f
+checksum=865e228812feca971dfb6e776a7bc7ac959cf63ebd52b4f05492730a46e1f189
 nocross=yes
 
 build_options="native_build"
 
 if [ -z "$build_option_native_build" ]; then
-	configure_args="--enable-sse --enable-sse2
-	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
-	  --disable-avx --disable-avx2 --disable-fma --disable-fma4"
+	configure_args="--without-archnative"
 fi
 
 post_install() {

From 6757094c2d43a7dee7224c4284633d8831ecd843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Dec 2021 20:20:17 -0300
Subject: [PATCH 0128/1854] fflas-ffpack: update to 2.5.0.

---
 srcpkgs/fflas-ffpack/patches/357.patch | 35 ++++++++++++++++++++++++++
 srcpkgs/fflas-ffpack/template          | 12 ++++-----
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/fflas-ffpack/patches/357.patch

diff --git a/srcpkgs/fflas-ffpack/patches/357.patch b/srcpkgs/fflas-ffpack/patches/357.patch
new file mode 100644
index 000000000000..99fd34efd93b
--- /dev/null
+++ b/srcpkgs/fflas-ffpack/patches/357.patch
@@ -0,0 +1,35 @@
+From 9b6083c663096e9ca85775b79f1f27c848dbeb98 Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Fri, 17 Dec 2021 10:27:02 +0100
+Subject: [PATCH] Fix SimdChooser: on not x86_64 machines its value could be an
+ nonexistant struct
+
+---
+ fflas-ffpack/fflas/fflas_simd.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/fflas-ffpack/fflas/fflas_simd.h b/fflas-ffpack/fflas/fflas_simd.h
+index bf5d30211..84ced0fd8 100644
+--- a/fflas-ffpack/fflas/fflas_simd.h
++++ b/fflas-ffpack/fflas/fflas_simd.h
+@@ -384,6 +384,20 @@ struct SimdChooser<T, true, true> // integral number
+ #endif
+ };
+ 
++#ifndef __x86_64__
++template <>
++struct SimdChooser<uint64_t, true, true>
++{
++    using value = NoSimd<uint64_t>;
++};
++
++template <>
++struct SimdChooser<int64_t, true, true>
++{
++    using value = NoSimd<int64_t>;
++};
++#endif
++
+ template <class T> using Simd = typename SimdChooser<T>::value;
+ 
+ // template <class T> struct SimdChooser<T, true> {
diff --git a/srcpkgs/fflas-ffpack/template b/srcpkgs/fflas-ffpack/template
index 557c644c00a4..2aa599703585 100644
--- a/srcpkgs/fflas-ffpack/template
+++ b/srcpkgs/fflas-ffpack/template
@@ -1,6 +1,6 @@
 # Template file for 'fflas-ffpack'
 pkgname=fflas-ffpack
-version=2.4.3
+version=2.5.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,15 +10,13 @@ short_desc="Finite Field Linear Algebra Subroutines / Package"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="http://linbox-team.github.io/fflas-ffpack/"
-distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/${version}/fflas-ffpack-${version}.tar.gz"
-checksum=f372783a17a9899ee9f88d4c9421d80facccb95556146dad7020d07a03791cc9
+changelog="https://github.com/linbox-team/fflas-ffpack/raw/master/ChangeLog"
+distfiles="https://github.com/linbox-team/fflas-ffpack/releases/download/v${version}/fflas-ffpack-${version}.tar.gz"
+checksum=dafb4c0835824d28e4f823748579be6e4c8889c9570c6ce9cce1e186c3ebbb23
 nocross=yes
 
 build_options="native_build"
 
 if [ -z "$build_option_native_build" ]; then
-	configure_args="--enable-sse --enable-sse2
-	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
-	  --disable-avx --disable-avx2 --disable-fma --disable-fma4
-	  --disable-avx512f --disable-avx512dq --disable-avx512vl"
+	configure_args="--without-archnative"
 fi

From a90c6118f220c586ca722b2c74cb35e58312681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Dec 2021 20:20:20 -0300
Subject: [PATCH 0129/1854] linbox: update to 1.7.0.

---
 srcpkgs/linbox/patches/292.patch              | 24 ++++++++++++
 srcpkgs/linbox/patches/294.patch              | 38 +++++++++++++++++++
 ...8adade10641f1f04f04b589753d928fb5443.patch | 35 -----------------
 .../remove-linboxsage-libs-from-pc.patch      | 23 -----------
 srcpkgs/linbox/template                       | 11 +++---
 5 files changed, 67 insertions(+), 64 deletions(-)
 create mode 100644 srcpkgs/linbox/patches/292.patch
 create mode 100644 srcpkgs/linbox/patches/294.patch
 delete mode 100644 srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
 delete mode 100644 srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch

diff --git a/srcpkgs/linbox/patches/292.patch b/srcpkgs/linbox/patches/292.patch
new file mode 100644
index 000000000000..d3333cc23d0b
--- /dev/null
+++ b/srcpkgs/linbox/patches/292.patch
@@ -0,0 +1,24 @@
+From 49b9cccd0286980c1c1811c3b03df883ef0164df Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Tue, 14 Dec 2021 16:22:33 -0500
+Subject: [PATCH] Only register uint128_t as a TypeName when it's available.
+
+Otherwise, test-fft will fail when it isn't.
+---
+ tests/test-fft.C | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-fft.C b/tests/test-fft.C
+index d19184c2d..5811ebc5d 100644
+--- a/tests/test-fft.C
++++ b/tests/test-fft.C
+@@ -55,7 +55,9 @@ REGISTER_TYPE_NAME(double);
+ REGISTER_TYPE_NAME(uint16_t);
+ REGISTER_TYPE_NAME(uint32_t);
+ REGISTER_TYPE_NAME(uint64_t);
++#ifdef __FFLASFFPACK_HAVE_INT128
+ REGISTER_TYPE_NAME(uint128_t);
++#endif
+ REGISTER_TYPE_NAME(Modular);
+ REGISTER_TYPE_NAME(ModularExtended);
+ 
diff --git a/srcpkgs/linbox/patches/294.patch b/srcpkgs/linbox/patches/294.patch
new file mode 100644
index 000000000000..7c645f165d39
--- /dev/null
+++ b/srcpkgs/linbox/patches/294.patch
@@ -0,0 +1,38 @@
+From f81a1f4a5e0835b7a0f3bb88a0fcbbaa32174cfa Mon Sep 17 00:00:00 2001
+From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
+Date: Wed, 15 Dec 2021 16:00:39 +0100
+Subject: [PATCH] Only register uint128_t as a TypeName when it's available
+
+---
+ benchmarks/benchmark-fft.C                       | 2 ++
+ benchmarks/benchmark-polynomial-matrix-mul-fft.C | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/benchmarks/benchmark-fft.C b/benchmarks/benchmark-fft.C
+index 39b86c9d9..59a8be57c 100644
+--- a/benchmarks/benchmark-fft.C
++++ b/benchmarks/benchmark-fft.C
+@@ -54,7 +54,9 @@ REGISTER_TYPE_NAME(double);
+ REGISTER_TYPE_NAME(uint16_t);
+ REGISTER_TYPE_NAME(uint32_t);
+ REGISTER_TYPE_NAME(uint64_t);
++#ifdef __FFLASFFPACK_HAVE_INT128
+ REGISTER_TYPE_NAME(uint128_t);
++#endif
+ REGISTER_TYPE_NAME(Modular);
+ REGISTER_TYPE_NAME(ModularExtended);
+ 
+diff --git a/benchmarks/benchmark-polynomial-matrix-mul-fft.C b/benchmarks/benchmark-polynomial-matrix-mul-fft.C
+index e9b184bcf..7bf17f33e 100644
+--- a/benchmarks/benchmark-polynomial-matrix-mul-fft.C
++++ b/benchmarks/benchmark-polynomial-matrix-mul-fft.C
+@@ -65,7 +65,9 @@ REGISTER_TYPE_NAME(double);
+ REGISTER_TYPE_NAME(uint16_t);
+ REGISTER_TYPE_NAME(uint32_t);
+ REGISTER_TYPE_NAME(uint64_t);
++#ifdef __FFLASFFPACK_HAVE_INT128
+ REGISTER_TYPE_NAME(uint128_t);
++#endif
+ REGISTER_TYPE_NAME(Modular);
+ REGISTER_TYPE_NAME(ModularExtended);
+ 
diff --git a/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch b/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
deleted file mode 100644
index 5afa078ec7b8..000000000000
--- a/srcpkgs/linbox/patches/892f8adade10641f1f04f04b589753d928fb5443.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 892f8adade10641f1f04f04b589753d928fb5443 Mon Sep 17 00:00:00 2001
-From: Doug Torrance <dtorrance@piedmont.edu>
-Date: Sun, 9 May 2021 12:14:19 -0400
-Subject: [PATCH] Use std::ptrdiff_t for vector iterator difference type
-
-It was previously long (64-bit integers), but this will not be the
-case on 32-bit systems.
-
-Closes: #273
----
- linbox/vector/bit-vector.inl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/linbox/vector/bit-vector.inl b/linbox/vector/bit-vector.inl
-index 5fa84b421..23a22ba47 100644
---- a/linbox/vector/bit-vector.inl
-+++ b/linbox/vector/bit-vector.inl
-@@ -46,7 +46,7 @@ namespace std
- 		typedef LinBox::BitVector::reference reference;
- 		typedef bool *pointer;
- 		typedef bool value_type;
--		typedef long difference_type;
-+		typedef std::ptrdiff_t difference_type;
- 	};
- 
- 	template <>
-@@ -56,7 +56,7 @@ namespace std
- 		typedef LinBox::BitVector::const_reference reference;
- 		typedef const bool *pointer;
- 		typedef bool value_type;
--		typedef long difference_type;
-+		typedef std::ptrdiff_t difference_type;
- 	};
- }
- 
diff --git a/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch b/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch
deleted file mode 100644
index c93915fb1b06..000000000000
--- a/srcpkgs/linbox/patches/remove-linboxsage-libs-from-pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Backported from:
-
-From 426eb97ba762c7663884f57ead0909f2aa3cd6a5 Mon Sep 17 00:00:00 2001
-From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
-Date: Thu, 17 Jan 2019 16:32:19 +0100
-Subject: [PATCH] Remove @LINBOXSAGE_LIBS@ from linbox.pc.in
-
----
- linbox.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linbox.pc.in b/linbox.pc.in
-index 278f127e4..c6b8091eb 100644
---- a/linbox.pc.in
-+++ b/linbox.pc.in
-@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library
- URL: http://github.com/linbox-team/linbox
- Version: @VERSION@
- Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0
--Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
-+Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
- Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@  @IML_CFLAGS@ @FLINT_CFLAGS@ 
- \-------------------------------------------------------
diff --git a/srcpkgs/linbox/template b/srcpkgs/linbox/template
index 096a15b3390b..e6edacdd0a74 100644
--- a/srcpkgs/linbox/template
+++ b/srcpkgs/linbox/template
@@ -1,7 +1,7 @@
 # Template file for 'linbox'
 pkgname=linbox
-version=1.6.3
-revision=2
+version=1.7.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fflas-ffpack"
@@ -9,16 +9,15 @@ short_desc="C++ library for exact, high-performance linear algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://linalg.org"
+changelog="https://github.com/linbox-team/linbox/raw/master/ChangeLog"
 distfiles="https://github.com/linbox-team/linbox/releases/download/v${version}/linbox-${version}.tar.gz"
-checksum=a58a188307b07c57964e844bceb99321d3043a8a4a1fccc082a54928bb9a0057
+checksum=6d2159fd395be0298362dd37f6c696676237bc8e2757341fbc46520e3b466bcc
 nocross=yes
 
 build_options="native_build"
 
 if [ -z "$build_option_native_build" ]; then
-	configure_args="--enable-sse --enable-sse2
-	  --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42
-	  --disable-avx --disable-avx2 --disable-fma --disable-fma4"
+	configure_args="--without-archnative"
 fi
 
 linbox-devel_package() {

From 585b7441860aedbbce08fdb02fcd83b3ca7e571f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Apr 2022 14:25:08 -0300
Subject: [PATCH 0130/1854] maxima: update to 5.46.0, adopt.

Also:
 - disable sbcl on aarch64
 - don't makedepends on emacs (avoid a nocross build dep)
 - move maxima-emacs files to main pkg
---
 ...a43e5234305bd6f1de5909d4ce5d7e1ea864.patch | 24 -------------------
 srcpkgs/maxima/template                       | 20 ++++++++--------
 2 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch

diff --git a/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch b/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch
deleted file mode 100644
index e1ac1e5f6086..000000000000
--- a/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864
-Author: Robert Dodier <robert_dodier@users.sourceforge.net>
-Date:   Mon Oct 11 22:40:13 2021 -0700
-
-    Apply patch #80: "Build a FASL library, needed by SageMath"
-    
-    This modifies maxima.system for ECL only.
-
-diff --git a/src/maxima.system b/src/maxima.system
-index d954bc2b9..525fb778e 100644
---- a/src/maxima.system
-+++ b/src/maxima.system
-@@ -75,6 +75,11 @@
- 			     ;; Convert dir/foo.fas to dir/foo.o
- 			     (make-pathname :type "o" :defaults p))
- 			 files)))
-+	(c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+			  :ld-flags
-+			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+							      (find-package "MAXIMA")))))
-+			    (if (and x (not (string= x ""))) (list x))))
- 	(c::build-program "binary-ecl/maxima" :lisp-files obj
- 			  :ld-flags
- 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 69e85ec833e8..f67b469e3dda 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,19 +1,21 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.45.1
-revision=4
+version=5.46.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
-hostmakedepends="python3 perl emacs texinfo patchelf"
+hostmakedepends="python3 perl texinfo patchelf $(vopt_if ecl ecl)"
 makedepends="$(vopt_if clisp clisp) $(vopt_if sbcl sbcl) $(vopt_if ecl ecl)"
 depends="$(vopt_if clisp clisp) rlwrap"
 checkdepends="gnuplot"
 short_desc="Computer Algebra System"
-maintainer="Bosco Garcia <jboscogg@gmail.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
+changelog="https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${version%.*}.md?format=raw"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=fe9016276970bef214a1a244348558644514d7fdfaa4fc8b9d0e87afcbb4e7dc
+checksum=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07
+nocross=yes
 
 # maxima-sbcl is nopie and should NOT be stripped or it won't work
 nostrip_files=/usr/lib/maxima/$version/binary-sbcl/maxima
@@ -32,7 +34,7 @@ build_options_default="ecl"
 
 # sbcl is only available for these architectures
 case "$XBPS_TARGET_MACHINE" in
-	i686|x86_64*|armv7l|aarch64|ppc64le*)
+	i686|x86_64*|armv7l|ppc64le*)
 		build_options_default+=" sbcl"
 		;;
 esac
@@ -113,11 +115,9 @@ maxima-src_package() {
 }
 
 maxima-emacs_package() {
-	short_desc+=" - Emacs interface"
+	short_desc+=" - transitional dummy package"
 	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
-	pkg_install() {
-		vmove usr/share/emacs
-	}
+	build_style=meta
 }
 
 xmaxima_package() {

From 75e07f4e1b9e4be232c4a9cc72d6d3f348ca30e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 16 Feb 2023 22:53:33 -0300
Subject: [PATCH 0131/1854] sagemath: update to 10.0.

Also:
 - support networkx 3.1 (sagemath#35584)
 - support linbox 1.7.0 (sagemath#35612)
 - support maxima 5.46.0 (sagemath#35619)
 - support sympy 1.12 (sagemath#35635)
---
 srcpkgs/sagemath/files/sage_conf.py           |    1 -
 srcpkgs/sagemath/files/timings2.json          |  405 ++---
 ...-support_singular_4.3.1.p3-5e5737a0c.patch |  205 ---
 .../34980-avoid_factoring_in_is_prime.patch   |   49 -
 .../patches/34994-fix_tests_numpy_1.24.patch  |   58 -
 .../34995-support_tachyon_0.99.2.patch        |   57 -
 ...34997-fix_edge_case_of_integer_check.patch |   36 -
 .../35058-skip_unstable_tests_klyachko.patch  |   22 -
 .../35068-fix_tests_giac_1.9.0.35.patch       |   62 -
 .../patches/35094-support_gap_4.12.patch      | 1303 -----------------
 .../35127-fix_very_slow_test_stream.py.patch  |   15 -
 .../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 |   35 +-
 .../sagemath/patches/35612-linbox_1.7.0.patch |   64 +
 .../patches/35619-maxima_5.46.0.patch         |  569 +++++++
 .../sagemath/patches/35635-sympy_1.12.patch   |   54 +
 srcpkgs/sagemath/patches/get_patches          |   48 +-
 srcpkgs/sagemath/template                     |    8 +-
 23 files changed, 828 insertions(+), 2469 deletions(-)
 delete mode 100644 srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
 delete mode 100644 srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
 delete mode 100644 srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch
 delete mode 100644 srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch
 delete mode 100644 srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch
 delete mode 100644 srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch
 delete mode 100644 srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch
 delete mode 100644 srcpkgs/sagemath/patches/35094-support_gap_4.12.patch
 delete mode 100644 srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch
 delete mode 100644 srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
 delete mode 100644 srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
 delete mode 100644 srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
 delete mode 100644 srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
 delete mode 100644 srcpkgs/sagemath/patches/35423-ipython_8.12.patch
 delete mode 100644 srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
 create mode 100644 srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35635-sympy_1.12.patch

diff --git a/srcpkgs/sagemath/files/sage_conf.py b/srcpkgs/sagemath/files/sage_conf.py
index 00de40f1ee4f..bc5388de8956 100644
--- a/srcpkgs/sagemath/files/sage_conf.py
+++ b/srcpkgs/sagemath/files/sage_conf.py
@@ -1,4 +1,3 @@
 # configuration for sage on void linux
 SAGE_SHARE = "/usr/share/sagemath"
 GAP_SHARE_DIR = "/usr/share/gap"
-GAP_LIB_DIR = "/usr/lib/gap"
diff --git a/srcpkgs/sagemath/files/timings2.json b/srcpkgs/sagemath/files/timings2.json
index bb3098680502..b2b3fe818a20 100644
--- a/srcpkgs/sagemath/files/timings2.json
+++ b/srcpkgs/sagemath/files/timings2.json
@@ -1,281 +1,152 @@
 {
-  "doc.ca.intro.index": {"walltime": 8},
-  "doc.en.constructions.calculus": {"walltime": 64},
-  "doc.en.constructions.plotting": {"walltime": 32},
-  "doc.en.prep.Advanced-2DPlotting": {"walltime": 16},
-  "doc.en.prep.Calculus": {"walltime": 8},
-  "doc.en.prep.Symbolics-and-Basic-Plotting": {"walltime": 8},
-  "doc.en.thematic_tutorials.explicit_methods_in_number_theory.birds_other": {"walltime": 8},
-  "doc.en.thematic_tutorials.explicit_methods_in_number_theory.elliptic_curves": {"walltime": 8},
-  "doc.en.thematic_tutorials.geometry.polyhedra_tutorial": {"walltime": 16},
-  "doc.en.thematic_tutorials.sandpile": {"walltime": 16},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_advanced": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_cartesian": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_change": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_curvilinear": {"walltime": 32},
-  "doc.en.thematic_tutorials.vector_calculus.vector_calc_plane": {"walltime": 16},
-  "doc.ja.tutorial.tour_plotting": {"walltime": 8},
-  "sage.algebras.cluster_algebra": {"walltime": 8},
   "sage.algebras.commutative_dga": {"walltime": 16},
-  "sage.algebras.hecke_algebras.ariki_koike_algebra": {"walltime": 8},
-  "sage.algebras.iwahori_hecke_algebra": {"walltime": 8},
-  "sage.algebras.lie_algebras.classical_lie_algebra": {"walltime": 128},
-  "sage.algebras.lie_algebras.nilpotent_lie_algebra": {"walltime": 16},
-  "sage.algebras.quantum_clifford": {"walltime": 16},
-  "sage.algebras.quantum_groups.fock_space": {"walltime": 8},
-  "sage.algebras.quatalg.quaternion_algebra": {"walltime": 8},
-  "sage.algebras.steenrod.steenrod_algebra": {"walltime": 64},
-  "sage.algebras.steenrod.steenrod_algebra_bases": {"walltime": 8},
-  "sage.algebras.yangian": {"walltime": 8},
-  "sage.arith.misc": {"walltime": 32},
+  "sage.algebras.fusion_rings.f_matrix": {"walltime": 16},
+  "sage.algebras.fusion_rings.fusion_ring": {"walltime": 16},
+  "sage.algebras.hecke_algebras.cubic_hecke_algebra": {"walltime": 8},
+  "sage.algebras.lie_conformal_algebras.n2_lie_conformal_algebra": {"walltime": 8},
+  "sage.algebras.quantum_clifford": {"walltime": 8},
+  "sage.algebras.steenrod.steenrod_algebra": {"walltime": 8},
   "sage.calculus.calculus": {"walltime": 16},
   "sage.calculus.desolvers": {"walltime": 8},
-  "sage.calculus.functional": {"walltime": 8},
-  "sage.calculus.riemann": {"walltime": 64},
-  "sage.calculus.tests": {"walltime": 16},
-  "sage.calculus.transforms.dwt": {"walltime": 16},
+  "sage.calculus.riemann": {"walltime": 8},
   "sage.calculus.transforms.fft": {"walltime": 8},
   "sage.categories.coxeter_groups": {"walltime": 8},
-  "sage.categories.finite_monoids": {"walltime": 16},
-  "sage.categories.lie_conformal_algebras": {"walltime": 8},
+  "sage.categories.finite_monoids": {"walltime": 8},
   "sage.categories.loop_crystals": {"walltime": 8},
-  "sage.categories.pushout": {"walltime": 8},
-  "sage.categories.super_hopf_algebras_with_basis": {"walltime": 32},
-  "sage.categories.super_lie_conformal_algebras": {"walltime": 8},
-  "sage.coding.ag_code": {"walltime": 64},
-  "sage.coding.ag_code_decoders": {"walltime": 128},
-  "sage.coding.binary_code": {"walltime": 8},
-  "sage.coding.linear_code": {"walltime": 16},
-  "sage.combinat.backtrack": {"walltime": 32},
-  "sage.combinat.chas.wqsym": {"walltime": 32},
-  "sage.combinat.cluster_algebra_quiver.cluster_seed": {"walltime": 64},
-  "sage.combinat.cluster_algebra_quiver.quiver": {"walltime": 128},
-  "sage.combinat.crystals.affine_factorization": {"walltime": 16},
-  "sage.combinat.crystals.alcove_path": {"walltime": 32},
-  "sage.combinat.crystals.highest_weight_crystals": {"walltime": 8},
-  "sage.combinat.crystals.kirillov_reshetikhin": {"walltime": 16},
-  "sage.combinat.crystals.letters": {"walltime": 8},
-  "sage.combinat.crystals.littelmann_path": {"walltime": 16},
-  "sage.combinat.crystals.mv_polytopes": {"walltime": 16},
-  "sage.combinat.crystals.pbw_crystal": {"walltime": 16},
-  "sage.combinat.crystals.star_crystal": {"walltime": 8},
-  "sage.combinat.designs.bibd": {"walltime": 8},
-  "sage.combinat.designs.database": {"walltime": 16},
+  "sage.coding.ag_code": {"walltime": 32},
+  "sage.coding.ag_code_decoders": {"walltime": 32},
+  "sage.coding.linear_code": {"walltime": 32},
+  "sage.combinat.designs.database": {"walltime": 8},
   "sage.combinat.designs.difference_family": {"walltime": 8},
-  "sage.combinat.designs.gen_quadrangles_with_spread": {"walltime": 128},
-  "sage.combinat.designs.orthogonal_arrays_build_recursive": {"walltime": 16},
-  "sage.combinat.designs.orthogonal_arrays_find_recursive": {"walltime": 8},
-  "sage.combinat.diagram_algebras": {"walltime": 64},
-  "sage.combinat.fqsym": {"walltime": 32},
-  "sage.combinat.free_prelie_algebra": {"walltime": 8},
-  "sage.combinat.fully_commutative_elements": {"walltime": 8},
-  "sage.combinat.grossman_larson_algebras": {"walltime": 8},
-  "sage.combinat.interval_posets": {"walltime": 8},
+  "sage.combinat.designs.orthogonal_arrays_build_recursive": {"walltime": 8},
   "sage.combinat.k_regular_sequence": {"walltime": 8},
   "sage.combinat.k_tableau": {"walltime": 16},
   "sage.combinat.matrices.hadamard_matrix": {"walltime": 8},
   "sage.combinat.multiset_partition_into_sets_ordered": {"walltime": 8},
-  "sage.combinat.ncsf_qsym.ncsf": {"walltime": 16},
-  "sage.combinat.ncsf_qsym.qsym": {"walltime": 16},
-  "sage.combinat.partition": {"walltime": 16},
-  "sage.combinat.partition_kleshchev": {"walltime": 16},
+  "sage.combinat.ncsf_qsym.ncsf": {"walltime": 8},
+  "sage.combinat.ncsf_qsym.qsym": {"walltime": 8},
+  "sage.combinat.partition": {"walltime": 8},
   "sage.combinat.partition_tuple": {"walltime": 8},
-  "sage.combinat.posets.moebius_algebra": {"walltime": 16},
+  "sage.combinat.permutation": {"walltime": 8},
   "sage.combinat.posets.posets": {"walltime": 8},
-  "sage.combinat.rigged_configurations.kr_tableaux": {"walltime": 32},
-  "sage.combinat.rigged_configurations.rigged_configurations": {"walltime": 16},
-  "sage.combinat.rigged_configurations.tensor_product_kr_tableaux": {"walltime": 16},
+  "sage.combinat.rigged_configurations.kr_tableaux": {"walltime": 8},
   "sage.combinat.root_system.associahedron": {"walltime": 8},
-  "sage.combinat.root_system.branching_rules": {"walltime": 8},
-  "sage.combinat.root_system.fusion_ring": {"walltime": 8},
-  "sage.combinat.root_system.integrable_representations": {"walltime": 16},
-  "sage.combinat.root_system.non_symmetric_macdonald_polynomials": {"walltime": 16},
-  "sage.combinat.root_system.pieri_factors": {"walltime": 8},
-  "sage.combinat.root_system.plot": {"walltime": 32},
-  "sage.combinat.root_system.root_lattice_realization_algebras": {"walltime": 16},
-  "sage.combinat.root_system.root_lattice_realizations": {"walltime": 16},
-  "sage.combinat.root_system.root_system": {"walltime": 8},
-  "sage.combinat.root_system.weyl_group": {"walltime": 8},
-  "sage.combinat.rsk": {"walltime": 32},
-  "sage.combinat.sf.classical": {"walltime": 16},
-  "sage.combinat.sf.jack": {"walltime": 16},
-  "sage.combinat.sf.k_dual": {"walltime": 16},
-  "sage.combinat.sf.llt": {"walltime": 16},
-  "sage.combinat.sf.macdonald": {"walltime": 64},
-  "sage.combinat.sf.new_kschur": {"walltime": 8},
-  "sage.combinat.sf.sfa": {"walltime": 32},
-  "sage.combinat.shifted_primed_tableau": {"walltime": 16},
+  "sage.combinat.root_system.non_symmetric_macdonald_polynomials": {"walltime": 8},
+  "sage.combinat.root_system.plot": {"walltime": 16},
+  "sage.combinat.root_system.root_lattice_realizations": {"walltime": 8},
+  "sage.combinat.rsk": {"walltime": 8},
+  "sage.combinat.sf.k_dual": {"walltime": 8},
+  "sage.combinat.sf.sf": {"walltime": 8},
+  "sage.combinat.sf.sfa": {"walltime": 8},
+  "sage.combinat.shifted_primed_tableau": {"walltime": 8},
   "sage.combinat.skew_tableau": {"walltime": 8},
-  "sage.combinat.symmetric_group_algebra": {"walltime": 16},
-  "sage.combinat.tableau": {"walltime": 32},
-  "sage.combinat.tableau_tuple": {"walltime": 32},
-  "sage.combinat.tiling": {"walltime": 16},
-  "sage.combinat.tutorial": {"walltime": 16},
-  "sage.combinat.words.paths": {"walltime": 64},
-  "sage.crypto.block_cipher.des": {"walltime": 16},
-  "sage.crypto.mq.sr": {"walltime": 64},
-  "sage.crypto.sbox": {"walltime": 16},
+  "sage.combinat.species.generating_series": {"walltime": 8},
+  "sage.combinat.tableau": {"walltime": 8},
+  "sage.combinat.tableau_tuple": {"walltime": 8},
+  "sage.combinat.tiling": {"walltime": 8},
+  "sage.combinat.tutorial": {"walltime": 8},
   "sage.crypto.sboxes": {"walltime": 8},
   "sage.doctest.forker": {"walltime": 16},
-  "sage.doctest.sources": {"walltime": 64},
-  "sage.doctest.test": {"walltime": 128},
-  "sage.dynamics.arithmetic_dynamics.projective_ds": {"walltime": 64},
-  "sage.dynamics.arithmetic_dynamics.wehlerK3": {"walltime": 8},
-  "sage.dynamics.cellular_automata.glca": {"walltime": 8},
+  "sage.dynamics.arithmetic_dynamics.projective_ds": {"walltime": 32},
   "sage.dynamics.cellular_automata.solitons": {"walltime": 8},
-  "sage.dynamics.complex_dynamics.mandel_julia": {"walltime": 16},
   "sage.functions.bessel": {"walltime": 16},
-  "sage.functions.exp_integral": {"walltime": 8},
   "sage.functions.hypergeometric": {"walltime": 8},
+  "sage.functions.orthogonal_polys": {"walltime": 8},
   "sage.functions.other": {"walltime": 16},
   "sage.functions.piecewise": {"walltime": 8},
-  "sage.games.quantumino": {"walltime": 8},
-  "sage.geometry.cone": {"walltime": 32},
-  "sage.geometry.fan": {"walltime": 8},
   "sage.geometry.hyperbolic_space.hyperbolic_geodesic": {"walltime": 8},
-  "sage.geometry.hyperplane_arrangement.arrangement": {"walltime": 16},
-  "sage.geometry.hyperplane_arrangement.library": {"walltime": 8},
+  "sage.geometry.hyperplane_arrangement.arrangement": {"walltime": 8},
   "sage.geometry.hyperplane_arrangement.plot": {"walltime": 8},
-  "sage.geometry.lattice_polytope": {"walltime": 16},
-  "sage.geometry.polyhedral_complex": {"walltime": 8},
-  "sage.geometry.polyhedron.base": {"walltime": 32},
-  "sage.geometry.polyhedron.library": {"walltime": 32},
-  "sage.geometry.polyhedron.plot": {"walltime": 8},
+  "sage.geometry.polyhedron.base": {"walltime": 8},
+  "sage.geometry.polyhedron.base5": {"walltime": 8},
+  "sage.geometry.polyhedron.base6": {"walltime": 16},
+  "sage.geometry.polyhedron.library": {"walltime": 16},
   "sage.geometry.riemannian_manifolds.parametrized_surface3d": {"walltime": 16},
-  "sage.geometry.triangulation.base": {"walltime": 32},
-  "sage.geometry.triangulation.point_configuration": {"walltime": 16},
-  "sage.graphs.chrompoly": {"walltime": 8},
-  "sage.graphs.connectivity": {"walltime": 16},
-  "sage.graphs.generators.basic": {"walltime": 16},
-  "sage.graphs.generators.classical_geometries": {"walltime": 32},
-  "sage.graphs.generators.distance_regular": {"walltime": 256},
-  "sage.graphs.generators.families": {"walltime": 32},
-  "sage.graphs.generators.smallgraphs": {"walltime": 16},
-  "sage.graphs.generic_graph": {"walltime": 32},
-  "sage.graphs.genus": {"walltime": 16},
+  "sage.graphs.connectivity": {"walltime": 8},
+  "sage.graphs.generators.classical_geometries": {"walltime": 8},
+  "sage.graphs.generators.distance_regular": {"walltime": 32},
+  "sage.graphs.generators.smallgraphs": {"walltime": 8},
+  "sage.graphs.generic_graph": {"walltime": 16},
   "sage.graphs.graph": {"walltime": 16},
-  "sage.graphs.graph_generators": {"walltime": 8},
   "sage.graphs.graph_list": {"walltime": 8},
   "sage.graphs.graph_plot": {"walltime": 8},
-  "sage.graphs.strongly_regular_db": {"walltime": 16},
-  "sage.groups.cubic_braid": {"walltime": 16},
-  "sage.groups.fqf_orthogonal": {"walltime": 16},
-  "sage.groups.libgap_mixin": {"walltime": 8},
-  "sage.groups.libgap_morphism": {"walltime": 8},
-  "sage.groups.lie_gps.nilpotent_lie_group": {"walltime": 16},
-  "sage.groups.matrix_gps.finitely_generated": {"walltime": 8},
-  "sage.groups.matrix_gps.heisenberg": {"walltime": 32},
-  "sage.groups.matrix_gps.linear": {"walltime": 8},
-  "sage.groups.perm_gps.cubegroup": {"walltime": 16},
-  "sage.groups.perm_gps.partn_ref.refinement_graphs": {"walltime": 8},
+  "sage.graphs.strongly_regular_db": {"walltime": 8},
+  "sage.groups.cactus_group": {"walltime": 8},
+  "sage.groups.cubic_braid": {"walltime": 8},
+  "sage.groups.lie_gps.nilpotent_lie_group": {"walltime": 8},
+  "sage.groups.matrix_gps.finitely_generated_gap": {"walltime": 8},
   "sage.groups.perm_gps.permgroup": {"walltime": 8},
   "sage.groups.perm_gps.permgroup_named": {"walltime": 8},
-  "sage.homology.hochschild_complex": {"walltime": 8},
   "sage.homology.homology_vector_space_with_basis": {"walltime": 8},
-  "sage.interacts.test_jupyter": {"walltime": 16},
-  "sage.interfaces.ecm": {"walltime": 8},
-  "sage.interfaces.expect": {"walltime": 8},
-  "sage.interfaces.gap": {"walltime": 16},
-  "sage.interfaces.maxima": {"walltime": 8},
-  "sage.interfaces.maxima_abstract": {"walltime": 64},
-  "sage.interfaces.psage": {"walltime": 8},
-  "sage.interfaces.sage0": {"walltime": 8},
-  "sage.lfunctions.zero_sums": {"walltime": 8},
-  "sage.libs.eclib.interface": {"walltime": 16},
+  "sage.interfaces.gap": {"walltime": 8},
+  "sage.interfaces.gap_workspace": {"walltime": 8},
+  "sage.interfaces.sage0": {"walltime": 16},
+  "sage.libs.eclib.interface": {"walltime": 32},
   "sage.libs.eclib.mwrank": {"walltime": 16},
-  "sage.libs.gap.test_long": {"walltime": 32},
-  "sage.libs.giac": {"walltime": 32},
   "sage.manifolds.catalog": {"walltime": 8},
-  "sage.manifolds.chart": {"walltime": 32},
+  "sage.manifolds.chart": {"walltime": 16},
   "sage.manifolds.chart_func": {"walltime": 8},
   "sage.manifolds.continuous_map": {"walltime": 8},
-  "sage.manifolds.differentiable.affine_connection": {"walltime": 128},
+  "sage.manifolds.differentiable.affine_connection": {"walltime": 32},
   "sage.manifolds.differentiable.automorphismfield": {"walltime": 32},
-  "sage.manifolds.differentiable.automorphismfield_group": {"walltime": 8},
   "sage.manifolds.differentiable.bundle_connection": {"walltime": 8},
-  "sage.manifolds.differentiable.characteristic_cohomology_class": {"walltime": 64},
+  "sage.manifolds.differentiable.characteristic_cohomology_class": {"walltime": 8},
   "sage.manifolds.differentiable.curve": {"walltime": 16},
-  "sage.manifolds.differentiable.degenerate": {"walltime": 32},
-  "sage.manifolds.differentiable.degenerate_submanifold": {"walltime": 16},
-  "sage.manifolds.differentiable.diff_form": {"walltime": 64},
+  "sage.manifolds.differentiable.degenerate": {"walltime": 16},
+  "sage.manifolds.differentiable.degenerate_submanifold": {"walltime": 8},
+  "sage.manifolds.differentiable.diff_form": {"walltime": 32},
   "sage.manifolds.differentiable.diff_map": {"walltime": 8},
   "sage.manifolds.differentiable.examples.euclidean": {"walltime": 32},
   "sage.manifolds.differentiable.examples.sphere": {"walltime": 32},
   "sage.manifolds.differentiable.integrated_curve": {"walltime": 32},
-  "sage.manifolds.differentiable.levi_civita_connection": {"walltime": 32},
-  "sage.manifolds.differentiable.manifold": {"walltime": 16},
-  "sage.manifolds.differentiable.manifold_homset": {"walltime": 16},
+  "sage.manifolds.differentiable.levi_civita_connection": {"walltime": 16},
+  "sage.manifolds.differentiable.manifold": {"walltime": 8},
+  "sage.manifolds.differentiable.manifold_homset": {"walltime": 8},
   "sage.manifolds.differentiable.metric": {"walltime": 64},
   "sage.manifolds.differentiable.mixed_form": {"walltime": 16},
-  "sage.manifolds.differentiable.mixed_form_algebra": {"walltime": 8},
   "sage.manifolds.differentiable.multivectorfield": {"walltime": 64},
-  "sage.manifolds.differentiable.pseudo_riemannian": {"walltime": 16},
-  "sage.manifolds.differentiable.pseudo_riemannian_submanifold": {"walltime": 128},
-  "sage.manifolds.differentiable.scalarfield": {"walltime": 16},
+  "sage.manifolds.differentiable.pseudo_riemannian": {"walltime": 8},
+  "sage.manifolds.differentiable.pseudo_riemannian_submanifold": {"walltime": 32},
+  "sage.manifolds.differentiable.scalarfield": {"walltime": 8},
   "sage.manifolds.differentiable.scalarfield_algebra": {"walltime": 8},
-  "sage.manifolds.differentiable.tangent_vector": {"walltime": 16},
+  "sage.manifolds.differentiable.tangent_vector": {"walltime": 8},
   "sage.manifolds.differentiable.tensorfield": {"walltime": 128},
   "sage.manifolds.differentiable.tensorfield_paral": {"walltime": 16},
-  "sage.manifolds.differentiable.vector_bundle": {"walltime": 16},
-  "sage.manifolds.differentiable.vectorfield": {"walltime": 64},
-  "sage.manifolds.differentiable.vectorframe": {"walltime": 8},
+  "sage.manifolds.differentiable.vectorfield": {"walltime": 16},
   "sage.manifolds.point": {"walltime": 16},
   "sage.manifolds.scalarfield": {"walltime": 16},
-  "sage.manifolds.scalarfield_algebra": {"walltime": 8},
-  "sage.manifolds.section": {"walltime": 32},
-  "sage.manifolds.trivialization": {"walltime": 8},
-  "sage.manifolds.vector_bundle": {"walltime": 8},
-  "sage.matrix.benchmark": {"walltime": 8},
+  "sage.manifolds.section": {"walltime": 16},
   "sage.matrix.matrix2": {"walltime": 16},
-  "sage.matrix.matrix_integer_dense": {"walltime": 16},
-  "sage.matrix.matrix_integer_dense_hnf": {"walltime": 32},
-  "sage.matrix.matrix_mod2_dense": {"walltime": 8},
   "sage.matrix.matrix_rational_dense": {"walltime": 8},
   "sage.matrix.special": {"walltime": 8},
-  "sage.matroids.catalog": {"walltime": 64},
   "sage.misc.cachefunc": {"walltime": 16},
-  "sage.misc.cython": {"walltime": 8},
   "sage.misc.functional": {"walltime": 8},
   "sage.misc.randstate": {"walltime": 16},
-  "sage.misc.sagedoc": {"walltime": 64},
-  "sage.misc.sageinspect": {"walltime": 32},
-  "sage.modular.abvar.abvar": {"walltime": 16},
+  "sage.misc.sagedoc": {"walltime": 16},
+  "sage.misc.sageinspect": {"walltime": 16},
+  "sage.misc.trace": {"walltime": 8},
+  "sage.modular.abvar.abvar": {"walltime": 8},
   "sage.modular.abvar.homspace": {"walltime": 8},
-  "sage.modular.abvar.lseries": {"walltime": 8},
-  "sage.modular.arithgroup.arithgroup_perm": {"walltime": 8},
-  "sage.modular.arithgroup.tests": {"walltime": 8},
-  "sage.modular.btquotients.pautomorphicform": {"walltime": 32},
-  "sage.modular.hypergeometric_motive": {"walltime": 16},
-  "sage.modular.local_comp.local_comp": {"walltime": 32},
-  "sage.modular.local_comp.type_space": {"walltime": 16},
-  "sage.modular.modform.ambient_R": {"walltime": 16},
-  "sage.modular.modform.constructor": {"walltime": 8},
-  "sage.modular.modform.cuspidal_submodule": {"walltime": 16},
-  "sage.modular.modform.element": {"walltime": 64},
-  "sage.modular.modform.ring": {"walltime": 64},
-  "sage.modular.modform.space": {"walltime": 8},
+  "sage.modular.btquotients.btquotient": {"walltime": 8},
+  "sage.modular.btquotients.pautomorphicform": {"walltime": 16},
+  "sage.modular.hecke.submodule": {"walltime": 8},
+  "sage.modular.hypergeometric_motive": {"walltime": 8},
+  "sage.modular.local_comp.local_comp": {"walltime": 16},
+  "sage.modular.local_comp.type_space": {"walltime": 8},
+  "sage.modular.modform.element": {"walltime": 32},
   "sage.modular.modform_hecketriangle.abstract_space": {"walltime": 16},
   "sage.modular.modform_hecketriangle.graded_ring_element": {"walltime": 16},
   "sage.modular.modform_hecketriangle.hecke_triangle_group_element": {"walltime": 32},
   "sage.modular.modform_hecketriangle.readme": {"walltime": 16},
-  "sage.modular.modform_hecketriangle.space": {"walltime": 8},
   "sage.modular.modsym.ambient": {"walltime": 16},
   "sage.modular.modsym.space": {"walltime": 8},
-  "sage.modular.pollack_stevens.modsym": {"walltime": 64},
-  "sage.modular.pollack_stevens.padic_lseries": {"walltime": 32},
-  "sage.modules.finite_submodule_iter": {"walltime": 16},
-  "sage.modules.free_module": {"walltime": 16},
-  "sage.modules.free_module_element": {"walltime": 8},
-  "sage.modules.free_module_integer": {"walltime": 32},
-  "sage.modules.free_quadratic_module_integer_symmetric": {"walltime": 8},
-  "sage.modules.torsion_quadratic_module": {"walltime": 16},
+  "sage.modular.overconvergent.genus0": {"walltime": 8},
+  "sage.modular.pollack_stevens.modsym": {"walltime": 8},
+  "sage.modules.fp_graded.morphism": {"walltime": 8},
+  "sage.modules.free_module": {"walltime": 8},
   "sage.parallel.map_reduce": {"walltime": 8},
-  "sage.plot.animate": {"walltime": 16},
-  "sage.plot.arrow": {"walltime": 8},
-  "sage.plot.circle": {"walltime": 8},
-  "sage.plot.complex_plot": {"walltime": 8},
+  "sage.plot.complex_plot": {"walltime": 16},
   "sage.plot.contour_plot": {"walltime": 32},
-  "sage.plot.density_plot": {"walltime": 8},
   "sage.plot.graphics": {"walltime": 32},
   "sage.plot.line": {"walltime": 8},
   "sage.plot.matrix_plot": {"walltime": 16},
@@ -283,115 +154,53 @@
   "sage.plot.plot": {"walltime": 64},
   "sage.plot.plot3d.base": {"walltime": 8},
   "sage.plot.plot3d.implicit_plot3d": {"walltime": 16},
-  "sage.plot.plot3d.implicit_surface": {"walltime": 8},
-  "sage.plot.plot3d.parametric_plot3d": {"walltime": 8},
+  "sage.plot.plot3d.parametric_plot3d": {"walltime": 16},
   "sage.plot.plot3d.parametric_surface": {"walltime": 8},
   "sage.plot.plot3d.plot3d": {"walltime": 16},
-  "sage.plot.plot3d.tachyon": {"walltime": 8},
-  "sage.plot.plot3d.transform": {"walltime": 32},
   "sage.plot.point": {"walltime": 8},
   "sage.plot.polygon": {"walltime": 8},
   "sage.plot.streamline_plot": {"walltime": 8},
-  "sage.quadratic_forms.genera.genus": {"walltime": 16},
-  "sage.quadratic_forms.quadratic_form__automorphisms": {"walltime": 8},
-  "sage.quadratic_forms.quadratic_form__local_representation_conditions": {"walltime": 64},
-  "sage.quadratic_forms.quadratic_form__neighbors": {"walltime": 8},
-  "sage.quadratic_forms.quadratic_form__siegel_product": {"walltime": 8},
   "sage.repl.ipython_extension": {"walltime": 8},
-  "sage.rings.asymptotic.asymptotic_expansion_generators": {"walltime": 64},
+  "sage.rings.asymptotic.asymptotic_expansion_generators": {"walltime": 16},
   "sage.rings.asymptotic.asymptotic_ring": {"walltime": 8},
-  "sage.rings.asymptotic.asymptotics_multivariate_generating_functions": {"walltime": 32},
-  "sage.rings.asymptotic.term_monoid": {"walltime": 8},
-  "sage.rings.continued_fraction": {"walltime": 8},
+  "sage.rings.asymptotic.asymptotics_multivariate_generating_functions": {"walltime": 8},
   "sage.rings.finite_rings.finite_field_base": {"walltime": 8},
-  "sage.rings.function_field.function_field": {"walltime": 128},
-  "sage.rings.function_field.function_field_valuation": {"walltime": 64},
+  "sage.rings.function_field.function_field": {"walltime": 8},
   "sage.rings.function_field.ideal": {"walltime": 8},
-  "sage.rings.function_field.place": {"walltime": 8},
-  "sage.rings.integer": {"walltime": 64},
-  "sage.rings.invariants.invariant_theory": {"walltime": 8},
-  "sage.rings.number_field.bdd_height": {"walltime": 8},
-  "sage.rings.number_field.number_field": {"walltime": 64},
-  "sage.rings.number_field.number_field_element": {"walltime": 16},
-  "sage.rings.number_field.splitting_field": {"walltime": 8},
-  "sage.rings.number_field.totallyreal": {"walltime": 16},
-  "sage.rings.number_field.totallyreal_rel": {"walltime": 8},
-  "sage.rings.padics.padic_base_leaves": {"walltime": 64},
-  "sage.rings.padics.padic_extension_leaves": {"walltime": 64},
-  "sage.rings.padics.padic_generic_element": {"walltime": 16},
-  "sage.rings.padics.padic_lattice_element": {"walltime": 32},
-  "sage.rings.padics.relative_extension_leaves": {"walltime": 32},
+  "sage.rings.lazy_series": {"walltime": 8},
+  "sage.rings.lazy_series_ring": {"walltime": 32},
+  "sage.rings.number_field.number_field": {"walltime": 32},
+  "sage.rings.number_field.number_field_element": {"walltime": 8},
+  "sage.rings.padics.padic_base_leaves": {"walltime": 8},
+  "sage.rings.padics.padic_generic_element": {"walltime": 8},
   "sage.rings.polynomial.multi_polynomial_ideal": {"walltime": 8},
-  "sage.rings.polynomial.multi_polynomial_sequence": {"walltime": 8},
-  "sage.rings.polynomial.ore_function_element": {"walltime": 8},
   "sage.rings.polynomial.polynomial_element": {"walltime": 16},
-  "sage.rings.polynomial.polynomial_rational_flint": {"walltime": 8},
   "sage.rings.qqbar": {"walltime": 16},
-  "sage.rings.tests": {"walltime": 16},
-  "sage.rings.valuation.augmented_valuation": {"walltime": 32},
-  "sage.rings.valuation.mapped_valuation": {"walltime": 64},
-  "sage.rings.valuation.valuation": {"walltime": 8},
-  "sage.sandpiles.sandpile": {"walltime": 16},
+  "sage.sandpiles.sandpile": {"walltime": 8},
   "sage.schemes.curves.affine_curve": {"walltime": 16},
   "sage.schemes.curves.closed_point": {"walltime": 8},
   "sage.schemes.curves.projective_curve": {"walltime": 32},
-  "sage.schemes.cyclic_covers.cycliccover_finite_field": {"walltime": 64},
   "sage.schemes.elliptic_curves.BSD": {"walltime": 8},
   "sage.schemes.elliptic_curves.Qcurves": {"walltime": 8},
-  "sage.schemes.elliptic_curves.constructor": {"walltime": 32},
-  "sage.schemes.elliptic_curves.ell_curve_isogeny": {"walltime": 16},
-  "sage.schemes.elliptic_curves.ell_egros": {"walltime": 32},
-  "sage.schemes.elliptic_curves.ell_finite_field": {"walltime": 8},
+  "sage.schemes.elliptic_curves.ell_curve_isogeny": {"walltime": 8},
   "sage.schemes.elliptic_curves.ell_generic": {"walltime": 8},
-  "sage.schemes.elliptic_curves.ell_modular_symbols": {"walltime": 16},
-  "sage.schemes.elliptic_curves.ell_number_field": {"walltime": 128},
+  "sage.schemes.elliptic_curves.ell_modular_symbols": {"walltime": 8},
   "sage.schemes.elliptic_curves.ell_point": {"walltime": 8},
-  "sage.schemes.elliptic_curves.ell_rational_field": {"walltime": 128},
-  "sage.schemes.elliptic_curves.gal_reps_number_field": {"walltime": 32},
-  "sage.schemes.elliptic_curves.gp_simon": {"walltime": 16},
-  "sage.schemes.elliptic_curves.heegner": {"walltime": 32},
-  "sage.schemes.elliptic_curves.height": {"walltime": 64},
-  "sage.schemes.elliptic_curves.isogeny_class": {"walltime": 32},
-  "sage.schemes.elliptic_curves.isogeny_small_degree": {"walltime": 64},
-  "sage.schemes.elliptic_curves.kraus": {"walltime": 16},
+  "sage.schemes.elliptic_curves.ell_rational_field": {"walltime": 32},
+  "sage.schemes.elliptic_curves.height": {"walltime": 8},
+  "sage.schemes.elliptic_curves.isogeny_small_degree": {"walltime": 16},
   "sage.schemes.elliptic_curves.mod_sym_num": {"walltime": 8},
   "sage.schemes.elliptic_curves.padic_lseries": {"walltime": 8},
-  "sage.schemes.elliptic_curves.padics": {"walltime": 16},
-  "sage.schemes.elliptic_curves.saturation": {"walltime": 16},
-  "sage.schemes.elliptic_curves.sha_tate": {"walltime": 32},
-  "sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field": {"walltime": 64},
-  "sage.schemes.hyperelliptic_curves.hyperelliptic_generic": {"walltime": 8},
-  "sage.schemes.hyperelliptic_curves.hyperelliptic_padic_field": {"walltime": 32},
-  "sage.schemes.hyperelliptic_curves.monsky_washnitzer": {"walltime": 8},
-  "sage.schemes.projective.projective_rational_point": {"walltime": 8},
-  "sage.schemes.riemann_surfaces.riemann_surface": {"walltime": 64},
+  "sage.schemes.elliptic_curves.padics": {"walltime": 8},
+  "sage.schemes.elliptic_curves.sha_tate": {"walltime": 16},
+  "sage.schemes.hyperelliptic_curves.hyperelliptic_padic_field": {"walltime": 16},
+  "sage.schemes.riemann_surfaces.riemann_surface": {"walltime": 32},
   "sage.schemes.toric.chow_group": {"walltime": 8},
-  "sage.schemes.toric.sheaf.klyachko": {"walltime": 8},
-  "sage.stats.distributions.discrete_gaussian_integer": {"walltime": 8},
-  "sage.stats.time_series": {"walltime": 8},
-  "sage.structure.coerce_dict": {"walltime": 32},
   "sage.structure.element": {"walltime": 16},
-  "sage.structure.sage_object": {"walltime": 8},
   "sage.symbolic.expression": {"walltime": 32},
-  "sage.symbolic.integration.integral": {"walltime": 32},
-  "sage.symbolic.random_tests": {"walltime": 32},
+  "sage.symbolic.integration.integral": {"walltime": 16},
   "sage.symbolic.relation": {"walltime": 8},
-  "sage.tests.book_schilling_zabrocki_kschur_primer": {"walltime": 32},
-  "sage.tests.book_stein_ent": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.combinat_doctest": {"walltime": 32},
-  "sage.tests.books.computational-mathematics-with-sagemath.float_doctest": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.graphique_doctest": {"walltime": 32},
-  "sage.tests.books.computational-mathematics-with-sagemath.graphtheory_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.integration_doctest": {"walltime": 32},
-  "sage.tests.books.computational-mathematics-with-sagemath.mpoly_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.nonlinear_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.recequadiff_doctest": {"walltime": 8},
-  "sage.tests.books.computational-mathematics-with-sagemath.sol.graphique_doctest": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.sol.numbertheory_doctest": {"walltime": 16},
-  "sage.tests.books.computational-mathematics-with-sagemath.sol.polynomes_doctest": {"walltime": 16},
-  "sage.tests.cmdline": {"walltime": 64},
-  "sage.tests.gosper-sum": {"walltime": 16},
-  "sage.tests.parigp": {"walltime": 8},
-  "sage.topology.simplicial_complex": {"walltime": 8},
-  "sage.topology.simplicial_complex_examples": {"walltime": 16}
+  "sage.tests.book_schilling_zabrocki_kschur_primer": {"walltime": 16},
+  "sage.tests.book_stein_ent": {"walltime": 8},
+  "sage.topology.simplicial_complex": {"walltime": 16}
 }
diff --git a/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch b/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
deleted file mode 100644
index f2f825e4fb10..000000000000
--- a/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini
-index 2e33a405d36..313463d2fea 100644
---- a/build/pkgs/singular/checksums.ini
-+++ b/build/pkgs/singular/checksums.ini
-@@ -1,5 +1,5 @@
- tarball=singular-VERSION.tar.gz
--sha1=6c2b622d3681e2de3d58d30c654d43d3e32b720c
--md5=abb1e37c794472e7760655358ab66054
--cksum=17455733
-+sha1=28bb3ee97ef48d04dfa96de182fd93eebe08426c
-+md5=fc0a4f5720dadba45a52ee94324ce00c
-+cksum=1573851737
- upstream_url=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-1/singular-VERSION.tar.gz
-diff --git a/build/pkgs/singular/package-version.txt b/build/pkgs/singular/package-version.txt
-index 11300c77e7d..66e2bede53a 100644
---- a/build/pkgs/singular/package-version.txt
-+++ b/build/pkgs/singular/package-version.txt
-@@ -1 +1 @@
--4.3.1p1
-+4.3.1p3
-diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd
-index 8e3ac314b67..747a6b1e2fb 100644
---- a/src/sage/libs/singular/decl.pxd
-+++ b/src/sage/libs/singular/decl.pxd
-@@ -574,7 +574,7 @@ cdef extern from "singular/Singular/libsingular.h":
- 
-     # gets a component out of a polynomial vector
- 
--    poly *pTakeOutComp1(poly **, int)
-+    poly *pTakeOutComp(poly **, int)
- 
-     # deep copy p
- 
-diff --git a/src/sage/libs/singular/singular.pyx b/src/sage/libs/singular/singular.pyx
-index d8ea7b07f3c..3a1271cd59f 100644
---- a/src/sage/libs/singular/singular.pyx
-+++ b/src/sage/libs/singular/singular.pyx
-@@ -1726,20 +1726,21 @@ cdef int overflow_check(unsigned long e, ring *_ring) except -1:
- 
-     Whether an overflow occurs or not partially depends
-     on the number of variables in the ring. See trac ticket
--    :trac:`11856`. With Singular 4, it is by default optimized
--    for at least 4 variables on 64-bit and 2 variables on 32-bit,
--    which in both cases makes a maximal default exponent of
--    2^16-1.
-+    :trac:`11856`.
- 
-     EXAMPLES::
- 
-         sage: P.<x,y> = QQ[]
--        sage: y^(2^16-1)
--        y^65535
--        sage: y^2^16
-+        sage: y^(2^30)
-+        Traceback (most recent call last):             # 32-bit
-+        ...                                            # 32-bit
-+        OverflowError: exponent overflow (1073741824)  # 32-bit
-+        y^1073741824  # 64-bit
-+        sage: y^2^32
-         Traceback (most recent call last):
-         ...
--        OverflowError: exponent overflow (65536)
-+        OverflowError: Python int too large to convert to C unsigned long  # 32-bit
-+        OverflowError: exponent overflow (4294967296)  # 64-bit
-     """
-     if unlikely(e > _ring.bitmask):
-         raise OverflowError("exponent overflow (%d)"%(e))
-diff --git a/src/sage/rings/polynomial/multi_polynomial_ideal.py b/src/sage/rings/polynomial/multi_polynomial_ideal.py
-index 7dc058a22f0..71494eddbc0 100644
---- a/src/sage/rings/polynomial/multi_polynomial_ideal.py
-+++ b/src/sage/rings/polynomial/multi_polynomial_ideal.py
-@@ -60,7 +60,7 @@
- Note that the result of a computation is not necessarily reduced::
- 
-     sage: (a+b)^17
--    256*a*b^16 + 256*b^17
-+    a*b^16 + b^17
-     sage: S(17) == 0
-     True
- 
-diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-index 4dad016b33f..9bf67dd1425 100644
---- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-+++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-@@ -193,7 +193,7 @@ from sage.libs.singular.decl cimport (
-     p_IsUnit, p_IsOne, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete,
-     p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize,
-     idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD,
--    p_LmIsConstant, pTakeOutComp1, singclap_gcd, pp_Mult_qq, p_GetMaxExp,
-+    p_LmIsConstant, pTakeOutComp, singclap_gcd, pp_Mult_qq, p_GetMaxExp,
-     pLength, kNF, p_Neg, p_Minus_mm_Mult_qq, p_Plus_mm_Mult_qq,
-     pDiff, singclap_resultant, p_Normalize,
-     prCopyR, prCopyR_NoSort)
-@@ -1587,7 +1587,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             9/4
- 
-             sage: P.monomial_quotient(x,y) # Note the wrong result
--            x*y^65535*z^65535
-+            x*y^65535*z^65535      # 32-bit
-+            x*y^1048575*z^1048575  # 64-bit
- 
-             sage: P.monomial_quotient(x,P(1))
-             x
-@@ -2247,10 +2248,11 @@ cdef class MPolynomial_libsingular(MPolynomial):
-             9/4*x^2 - 1/4*y^2 - y - 1
- 
-             sage: P.<x,y> = PolynomialRing(QQ,order='lex')
--            sage: (x^2^15) * x^2^15
-+            sage: (x^2^32) * x^2^32
-             Traceback (most recent call last):
-             ...
--            OverflowError: exponent overflow (...)
-+            OverflowError: Python int too large to convert to C unsigned long  # 32-bit
-+            OverflowError: exponent overflow (...)  # 64-bit
-         """
-         # all currently implemented rings are commutative
-         cdef poly *_p
-@@ -2371,10 +2373,11 @@ cdef class MPolynomial_libsingular(MPolynomial):
-             ValueError: not a 2nd power
- 
-             sage: P.<x,y> = PolynomialRing(QQ,order='lex')
--            sage: (x+y^2^15)^10
-+            sage: (x+y^2^32)^10
-             Traceback (most recent call last):
-             ....
--            OverflowError: exponent overflow (...)
-+            OverflowError: Python int too large to convert to C unsigned long  # 32-bit
-+            OverflowError: exponent overflow (...)  # 64-bit
- 
-         Test fractional powers (:trac:`22329`)::
- 
-@@ -3461,7 +3464,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
-             x^10000
-             no overflow
- 
--            sage: n = 1000
-+            sage: n = 100000
-             sage: try:
-             ....:     f = x^n
-             ....:     f.subs(x = x^n)
-@@ -4567,7 +4570,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
-         l = []
-         for i from 0 <= i < IDELEMS(res):
-             for j from 1 <= j <= IDELEMS(_I):
--                l.append( new_MP(parent, pTakeOutComp1(&res.m[i], j)) )
-+                l.append( new_MP(parent, pTakeOutComp(&res.m[i], 1)) )
- 
-         id_Delete(&fI, r)
-         id_Delete(&_I, r)
-@@ -4635,7 +4638,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
- 
-             sage: f = 3*x
-             sage: f.reduce([2*x,y])
--            3*x
-+            x
- 
-         The reduction is not canonical when ``I`` is not a Groebner
-         basis::
-diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx
-index 1c9f35e56ba..587511c3888 100644
---- a/src/sage/rings/polynomial/plural.pyx
-+++ b/src/sage/rings/polynomial/plural.pyx
-@@ -1619,10 +1619,10 @@ cdef class NCPolynomial_plural(RingElement):
-             sage: P = A.g_algebra(relations={y*x:-x*y + z},  order='lex')
-             sage: P.inject_variables()
-             Defining x, z, y
--            sage: (x^2^15) * x^2^15
-+            sage: (x^2^31) * x^2^31
-             Traceback (most recent call last):
-             ...
--            OverflowError: exponent overflow (65536)
-+            OverflowError: exponent overflow (2147483648)
-         """
-         # all currently implemented rings are commutative
-         cdef poly *_p
-@@ -1689,10 +1689,10 @@ cdef class NCPolynomial_plural(RingElement):
-             sage: P = A.g_algebra(relations={y*x:-x*y + z},  order='lex')
-             sage: P.inject_variables()
-             Defining x, z, y
--            sage: (x+y^2^15)^10
-+            sage: (x+y^2^31)^10
-             Traceback (most recent call last):
-             ....
--            OverflowError: exponent overflow (327680)
-+            OverflowError: exponent overflow (2147483648)
-         """
-         if type(exp) is not Integer:
-             try:
-diff --git a/src/sage/structure/element.pyx b/src/sage/structure/element.pyx
-index b5d83ef71b6..5c45b3fb528 100644
---- a/src/sage/structure/element.pyx
-+++ b/src/sage/structure/element.pyx
-@@ -2705,10 +2705,10 @@ cdef class RingElement(ModuleElement):
-         with Singular 4::
- 
-             sage: K.<x,y> = ZZ[]
--            sage: (x^12345)^54321
-+            sage: (x^123456)^654321
-             Traceback (most recent call last):
-             ...
--            OverflowError: exponent overflow (670592745)
-+            OverflowError: exponent overflow (...)
-         """
-         return arith_generic_power(self, n)
- 
diff --git a/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch b/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
deleted file mode 100644
index ee0f0e656b28..000000000000
--- a/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/sage/rings/number_field/number_field_ideal.py b/src/sage/rings/number_field/number_field_ideal.py
-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,38 @@ def is_prime(self):
-             False
-             sage: K.ideal(17).is_prime()  # ramified
-             False
-+
-+        TESTS:
-+
-+        Check that we do not factor the norm of the ideal, this used
-+        to take half an hour, see :trac:`33360`::
-+
-+            sage: K.<a,b,c> = NumberField([x^2-2,x^2-3,x^2-5])
-+            sage: t = (((-2611940*c + 1925290/7653)*b - 1537130/7653*c
-+            ....:       + 10130950)*a + (1343014/7653*c - 8349770)*b
-+            ....:       + 6477058*c - 2801449990/4002519)
-+            sage: t.is_prime()
-+            False
-         """
-         try:
-             return self._pari_prime is not None
-         except AttributeError:
--            F = self.factor()  # factorization with caching
--            if len(F) != 1 or F[0][1] != 1:
--                self._pari_prime = None
--            else:
--                self._pari_prime = F[0][0]._pari_prime
--            return self._pari_prime is not None
-+            pass
-+
-+        K = self.number_field().pari_nf()
-+        I = self.pari_hnf()
-+
-+        candidate = K.idealismaximal(I) or None
-+
-+        # PARI uses probabilistic primality testing inside idealismaximal().
-+        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
- 
-     def pari_prime(self):
-         r"""
diff --git a/srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch b/srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch
deleted file mode 100644
index 91f06fd4d173..000000000000
--- a/srcpkgs/sagemath/patches/34994-fix_tests_numpy_1.24.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/sage/misc/persist.pyx b/src/sage/misc/persist.pyx
-index 3ac5f1cc2b0..cb1f327c199 100644
---- a/src/sage/misc/persist.pyx
-+++ b/src/sage/misc/persist.pyx
-@@ -157,7 +157,7 @@ def load(*filename, compress=True, verbose=True, **kwargs):
-         ....:     _ = f.write(code)
-         sage: load(t)
-         sage: hello
--        <fortran object>
-+        <fortran ...>
-     """
-     import sage.repl.load
-     if len(filename) != 1:
-diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
-index 6f0aeab87ae..b77c69b2f77 100644
---- a/src/sage/plot/complex_plot.pyx
-+++ b/src/sage/plot/complex_plot.pyx
-@@ -461,6 +461,8 @@ def complex_to_rgb(z_values, contoured=False, tiled=False,
-             rgb[i, j, 2] = b
- 
-     sig_off()
-+    nan_indices = np.isnan(rgb).any(-1)     # Mask for undefined points
-+    rgb[nan_indices] = 1                    # Make nan_indices white
-     return rgb
- 
- 
-diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py
-index 3bc2b76b58e..388c2d1391d 100644
---- a/src/sage/plot/histogram.py
-+++ b/src/sage/plot/histogram.py
-@@ -87,13 +87,8 @@ def get_minmax_data(self):
- 
-         TESTS::
- 
--            sage: h = histogram([10,3,5], normed=True)[0]
--            doctest:warning...:
--            DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead.
--            See https://trac.sagemath.org/25260 for details.
-+            sage: h = histogram([10,3,5], density=True)[0]
-             sage: h.get_minmax_data()
--            doctest:warning ...
--            ...VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy.
-             {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0}
-         """
-         import numpy
-diff --git a/src/sage/repl/ipython_extension.py b/src/sage/repl/ipython_extension.py
-index 798671aab42..cad6a47ca8b 100644
---- a/src/sage/repl/ipython_extension.py
-+++ b/src/sage/repl/ipython_extension.py
-@@ -405,7 +405,7 @@ def fortran(self, line, cell):
-             ....: C END FILE FIB1.F
-             ....: ''')
-             sage: fib
--            <fortran object>
-+            <fortran ...>
-             sage: from numpy import array
-             sage: a = array(range(10), dtype=float)
-             sage: fib(a, 10)
diff --git a/srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch b/srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch
deleted file mode 100644
index 2769e87f6a4b..000000000000
--- a/srcpkgs/sagemath/patches/34995-support_tachyon_0.99.2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py
-index 23671e50892..ce1d50f71bc 100644
---- a/src/sage/interfaces/tachyon.py
-+++ b/src/sage/interfaces/tachyon.py
-@@ -683,12 +683,14 @@
- #*****************************************************************************
- 
- import os
-+import re
- 
- from sage.cpython.string import bytes_to_str
- from sage.misc.pager import pager
- from sage.misc.superseded import deprecation
- from sage.misc.temporary_file import tmp_filename
- from sage.structure.sage_object import SageObject
-+from sage.misc.cachefunc import cached_method
- 
- 
- class TachyonRT(SageObject):
-@@ -799,6 +801,11 @@ def __call__(self, model, outfile='sage.png', verbose=1, extra_opts=''):
-             Parser failed due to an input file syntax error.
-             Aborting render.
-         """
-+        if self.version() >= '0.99.2':
-+            # this keyword was changed in 0.99.2
-+            model = model.replace(
-+                    "              focallength ",
-+                    "              focaldist ")
-         modelfile = tmp_filename(ext='.dat')
-         with open(modelfile, 'w') as file:
-             file.write(model)
-@@ -851,6 +858,25 @@ def usage(self, use_pager=True):
-         else:
-             print(r)
- 
-+    @cached_method
-+    def version(self):
-+        """
-+        Returns the version of the Tachyon raytracer being used.
-+
-+        TESTS::
-+
-+            sage: tachyon_rt.version()  # random
-+            0.98.9
-+            sage: tachyon_rt.version() >= '0.98.9'
-+            True
-+        """
-+        with os.popen('tachyon') as f:
-+            r = f.readline()
-+        res = re.search(r"Version ([\d.]*)", r)
-+        # debian patches tachyon so it won't report the version
-+        # we hardcode '0.99' since that's indeed the version they ship
-+        return res[1] if res else '0.99'
-+
-     def help(self, use_pager=True):
-         """
-         Deprecated: type 'sage.interfaces.tachyon?' for help
diff --git a/srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch b/srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch
deleted file mode 100644
index 11eb20d4f735..000000000000
--- a/srcpkgs/sagemath/patches/34997-fix_edge_case_of_integer_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/sage/arith/long.pxd b/src/sage/arith/long.pxd
-index 1c9a53387a0..d96b98f247c 100644
---- a/src/sage/arith/long.pxd
-+++ b/src/sage/arith/long.pxd
-@@ -270,6 +270,17 @@ cdef inline bint integer_check_long_py(x, long* value, int* err):
-         sage: L += [-x for x in L] + [0, long_min()]
-         sage: for v in L:
-         ....:     assert check_long_py(int(v)) == v
-+        sage: check_long_py(int(2^60))
-+        1152921504606846976                 # 64-bit
-+        'Overflow (...)'                    # 32-bit
-+        sage: check_long_py(int(2^61))
-+        2305843009213693952                 # 64-bit
-+        'Overflow (...)'                    # 32-bit
-+        sage: check_long_py(int(2^62))
-+        4611686018427387904                 # 64-bit
-+        'Overflow (...)'                    # 32-bit
-+        sage: check_long_py(int(2^63))
-+        'Overflow (...)'
-         sage: check_long_py(int(2^100))
-         'Overflow (...)'
-         sage: check_long_py(int(long_max() + 1))
-@@ -309,7 +320,12 @@ cdef inline bint integer_check_long_py(x, long* value, int* err):
- 
-     cdef long lead
-     cdef long lead_2_overflow = (<long>1) << (BITS_IN_LONG - PyLong_SHIFT)
--    cdef long lead_3_overflow = (<long>1) << (BITS_IN_LONG - 2 * PyLong_SHIFT)
-+    cdef long lead_3_overflow
-+    if BITS_IN_LONG < 2 * PyLong_SHIFT:
-+        # in this case 3 digit is always overflow
-+        lead_3_overflow = 0
-+    else:
-+        lead_3_overflow = (<long>1) << (BITS_IN_LONG - 2 * PyLong_SHIFT)
-     if size == 0:
-         value[0] = 0
-         err[0] = 0
diff --git a/srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch b/srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch
deleted file mode 100644
index c4d7d5c779d1..000000000000
--- a/srcpkgs/sagemath/patches/35058-skip_unstable_tests_klyachko.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/sage/schemes/toric/sheaf/klyachko.py b/src/sage/schemes/toric/sheaf/klyachko.py
-index b1304a16913..77fae4b7545 100644
---- a/src/sage/schemes/toric/sheaf/klyachko.py
-+++ b/src/sage/schemes/toric/sheaf/klyachko.py
-@@ -26,7 +26,7 @@
-     (0, 0, 18, 16, 1)
-     sage: Gtilde = G_sum.random_deformation()
-     sage: V = Gtilde.wedge(2) * K                     # long time
--    sage: V.cohomology(dim=True, weight=(0,0,0,0))    # long time
-+    sage: V.cohomology(dim=True, weight=(0,0,0,0))    # long time  # random failure (see #32773)
-     (0, 0, 3, 0, 0)
- 
- REFERENCES:
-@@ -948,7 +948,7 @@ def random_deformation(self, epsilon=None):
-            sage: V.cohomology(dim=True, weight=(0,))
-            (1, 0)
-            sage: Vtilde = V.random_deformation()
--           sage: Vtilde.cohomology(dim=True, weight=(0,))
-+           sage: Vtilde.cohomology(dim=True, weight=(0,))  # random failure (see #32773)
-            (1, 0)
-         """
-         filt = self._filt.random_deformation(epsilon)
diff --git a/srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch b/srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch
deleted file mode 100644
index d9a9835c696b..000000000000
--- a/srcpkgs/sagemath/patches/35068-fix_tests_giac_1.9.0.35.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9ac7840134054155545e24fa3e66402d42b91c0f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 20 Jan 2023 21:36:27 +0100
-Subject: [PATCH] Fix tests with giac 1.9.0.35
-
----
- src/sage/libs/giac/giac.pyx   |  3 +--
- src/sage/symbolic/relation.py | 15 +++++----------
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/sage/libs/giac/giac.pyx b/src/sage/libs/giac/giac.pyx
-index 4e451dba5e7..ccad5169836 100644
---- a/src/sage/libs/giac/giac.pyx
-+++ b/src/sage/libs/giac/giac.pyx
-@@ -374,8 +374,7 @@ def _giac(s):
- 
-         sage: x = libgiac('x')
-         sage: (1+2*sin(3*x)).solve(x).simplify()
--        Warning, argument is not an equation, solving 1+2*sin(3*x)=0
--        list[-pi/18,7*pi/18]
-+        ...list[-pi/18,7*pi/18]
- 
-         sage: libgiac.solve('sin(3*x)>2*sin(x)',x)
-         Traceback (most recent call last):
-diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
-index e9dbc0fea30..b8896a94be9 100644
---- a/src/sage/symbolic/relation.py
-+++ b/src/sage/symbolic/relation.py
-@@ -935,8 +935,7 @@ def solve(f, *args, **kwds):
- 
-         sage: f = (sin(x) - 8*cos(x)*sin(x))*(sin(x)^2 + cos(x)) - (2*cos(x)*sin(x) - sin(x))*(-2*sin(x)^2 + 2*cos(x)^2 - cos(x))
-         sage: solve(f, x, algorithm='giac')
--        ...
--        [-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
-+        ...[-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
- 
-         sage: x, y = SR.var('x,y')
-         sage: solve([x+y-4,x*y-3],[x,y],algorithm='giac')
-@@ -1440,19 +1439,15 @@ def _giac_solver(f, x, solution_dict=False):
-     EXAMPLES::
- 
-         sage: solve([(2/3)^x-2], [x], algorithm='giac')
--        ...
--        [[-log(2)/(log(3) - log(2))]]
-+        ...[[-log(2)/(log(3) - log(2))]]
-         sage: solve([(2/3)^x-2], [x], algorithm='giac', solution_dict=True)
--        ...
--        [{x: -log(2)/(log(3) - log(2))}]
-+        ...[{x: -log(2)/(log(3) - log(2))}]
- 
-         sage: f = (sin(x) - 8*cos(x)*sin(x))*(sin(x)^2 + cos(x)) - (2*cos(x)*sin(x) - sin(x))*(-2*sin(x)^2 + 2*cos(x)^2 - cos(x))
-         sage: solve(f, x, algorithm='giac')
--        ...
--        [-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
-+        ...[-2*arctan(sqrt(2)), 0, 2*arctan(sqrt(2)), pi]
-         sage: solve(f, x, algorithm='giac', solution_dict=True)
--        ...
--        [{x: -2*arctan(sqrt(2))}, {x: 0}, {x: 2*arctan(sqrt(2))}, {x: pi}]
-+        ...[{x: -2*arctan(sqrt(2))}, {x: 0}, {x: 2*arctan(sqrt(2))}, {x: pi}]
- 
-         sage: x, y = SR.var('x,y')
-         sage: solve([x+y-7,x*y-10],[x,y],algorithm='giac')
diff --git a/srcpkgs/sagemath/patches/35094-support_gap_4.12.patch b/srcpkgs/sagemath/patches/35094-support_gap_4.12.patch
deleted file mode 100644
index 499e0c71e256..000000000000
--- a/srcpkgs/sagemath/patches/35094-support_gap_4.12.patch
+++ /dev/null
@@ -1,1303 +0,0 @@
-diff --git a/build/pkgs/gap/checksums.ini b/build/pkgs/gap/checksums.ini
-index 066e943308a..b0ea8ba8818 100644
---- a/build/pkgs/gap/checksums.ini
-+++ b/build/pkgs/gap/checksums.ini
-@@ -1,5 +1,5 @@
- tarball=gap-VERSION.tar.gz
--sha1=4ecdd281b8f430282fb9b12690b06e0a26abde10
--md5=85dc9e459d5b6c66fcad9f468afd3e3e
--cksum=1351843158
-+sha1=a6e36f3f874a2c46f51561402634497eab705cca
-+md5=c5cd9f272f2703d7a3649ad7193b2d90
-+cksum=2760477284
- upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz
-diff --git a/build/pkgs/gap/package-version.txt b/build/pkgs/gap/package-version.txt
-index d782fca8f64..f1cd7de1de5 100644
---- a/build/pkgs/gap/package-version.txt
-+++ b/build/pkgs/gap/package-version.txt
-@@ -1 +1 @@
--4.11.1
-+4.12.2
-diff --git a/build/pkgs/gap/spkg-check.in b/build/pkgs/gap/spkg-check.in
-index d9791d33293..d2fccda6e04 100644
---- a/build/pkgs/gap/spkg-check.in
-+++ b/build/pkgs/gap/spkg-check.in
-@@ -3,6 +3,13 @@ cd src
- # #28728: Fix test failure in tst/testinstall/strings.tst
- export LC_CTYPE=en_US.UTF-8
- 
-+# #34391: in GAP 4.12 some packages need GAP package io
-+#         to let tests run, otherwise this hangs. Thus we install io here.
-+cd pkg/io
-+./configure --with-gaproot=../..
-+make
-+cd ../..
-+
- make testinstall
- if [[ $? -ne 0 ]]; then
-     exit 1
-diff --git a/build/pkgs/gap/spkg-install.in b/build/pkgs/gap/spkg-install.in
-index 2ceadf99db4..e2c8b4dca54 100644
---- a/build/pkgs/gap/spkg-install.in
-+++ b/build/pkgs/gap/spkg-install.in
-@@ -8,8 +8,7 @@ export CFLAGS=$CFLAGS_NON_NATIVE
- export CXXFLAGS=$CXXFLAGS_NON_NATIVE
- 
- GAP_BUILD_ROOT="$(pwd)"
--GAP_ROOT="$SAGE_LOCAL/share/gap"
--DESTDIR_GAP_ROOT="$SAGE_DESTDIR$GAP_ROOT"
-+GAP_ROOT="$SAGE_LOCAL/lib/gap"
- 
- # Enable debug info if requested.
- # Note that -g3 allows you to use preprocessor macros in gdb which are widely used
-@@ -17,37 +16,17 @@ if [ "$SAGE_DEBUG" = yes ] ; then
-     export CFLAGS="-O0 -g3 -DDEBUG_MASTERPOINTERS -DDEBUG_GLOBAL_BAGS -DDEBUG_FUNCTIONS_BAGS $CFLAGS"
- fi
- 
--sdh_configure $SAGE_CONFIGURE_GMP
--sdh_make -j1
-+# LDFLAGS hack below needed by Semigroups package
-+sdh_configure $SAGE_CONFIGURE_GMP LDFLAGS="-pthread" --prefix=$SAGE_LOCAL
-+sdh_make
- 
--# GAP's "make install" is work in progress; we use bits and pieces of it
--# but we install many things manually.
--sdh_make install-headers install-libgap
--
--# Install config.h, which is not currently handled by `make install-headers`
--sdh_install gen/config.h "$SAGE_LOCAL/include/gap"
--
--# Now install the gap executable as "gap-bin"; it will be called normally
--# through our wrapper script that sets the appropriate GAP_ROOT
--SAGE_BIN="$SAGE_LOCAL/bin"
--mkdir -p "$SAGE_DESTDIR$SAGE_BIN" || sdh_die "Failed to create the directory $SAGE_BIN"
--
--./libtool --mode=install install gap "$SAGE_DESTDIR$SAGE_BIN/gap-bin" || \
--    sdh_die "Failed to install gap-bin to $SAGE_BIN"
--
--./libtool --mode=install install gac "$SAGE_DESTDIR$SAGE_BIN/gac" || \
--    sdh_die "Failed to install gac to $SAGE_BIN"
--
--# Now copy additional files GAP needs to run (and a few optional bits) into
--# GAP_ROOT; we don't need everything from the source tree
--sdh_install bin doc gen grp lib src tst sysinfo.gap "$GAP_ROOT"
--
--# GAP's copy of libtool is also used by the toolchain for build GAP packages
--# (i.e. by gac)
--sdh_install libtool "$GAP_ROOT"
-+sdh_make_install
-+# sdh_make install-headers install-libgap
-+# The 'packagemanager' package expects this https://github.com/gap-packages/PackageManager/issues/105
-+mkdir -p "$SAGE_LOCAL/lib/gap/bin"
- 
- # Install only the minimal packages GAP needs to run
--sdh_install pkg/GAPDoc-* pkg/primgrp-* pkg/SmallGrp-* pkg/transgrp "$GAP_ROOT"/pkg
-+sdh_install pkg/gapdoc pkg/primgrp pkg/smallgrp pkg/transgrp "$GAP_ROOT"/pkg
- 
- # Install additional packages that are not strictly required, but that are
- # typically "expected" to be loaded: These are the default packages that are
-@@ -58,50 +37,25 @@ sdh_install pkg/GAPDoc-* pkg/primgrp-* pkg/SmallGrp-* pkg/transgrp "$GAP_ROOT"/p
- # Also include atlasrep which is a dependency of tomlib
- sdh_install \
-     pkg/atlasrep \
--    pkg/autpgrp-* \
--    pkg/alnuth-* \
--    pkg/crisp-* \
--    pkg/ctbllib-* \
--    pkg/FactInt-* \
-+    pkg/autodoc \
-+    pkg/autpgrp \
-+    pkg/alnuth \
-+    pkg/crisp \
-+    pkg/ctbllib \
-+    pkg/factint \
-     pkg/fga \
--    pkg/irredsol-* \
--    pkg/laguna-* \
--    pkg/PackageManager-* \
--    pkg/polenta-* \
--    pkg/polycyclic-* \
--    pkg/resclasses-* \
--    pkg/sophus-* \
--    pkg/tomlib-* \
-+    pkg/irredsol \
-+    pkg/laguna \
-+    pkg/packagemanager \
-+    pkg/polenta \
-+    pkg/polycyclic \
-+    pkg/radiroot \
-+    pkg/resclasses \
-+    pkg/sophus \
-+    pkg/tomlib \
-+    pkg/utils \
-     "$GAP_ROOT"/pkg
- 
--# Install the GAP startup script; ensure it is executable
--sdh_install -T ../gap "$SAGE_BIN/gap"
--chmod +x "$SAGE_DESTDIR$SAGE_BIN/gap"
--
--# Create symlinks under $GAP_ROOT for these executables, as they are expected
--# (especially when building kernel packages) to exist
--ln -sf "../../bin/gap-bin" "$DESTDIR_GAP_ROOT/gap"
--ln -sf "../../bin/gac" "$DESTDIR_GAP_ROOT/gac"
--
--# Fix the $GAP_ROOT/bin/<arch>/src symlink to be relative (otherwise it links
--# to the actual path of the sources GAP was compiled from)
--for srclink in "$DESTDIR_GAP_ROOT"/bin/*/src; do
--    rm -f "$srclink"
--    ln -s "../../src" "$srclink"
--done
--
--# Additional fixups for some files after they have been copied into their
--# destination directory.  gac and sysinfo.gap are generated files that contain
--# in them hard-coded references to the GAP build directory, which will soon
--# be going away.  This breaks the build toolchain for some compiled GAP
--# packages.  We need to replace these paths with the final GAP_ROOT path.  The
--# below will work so long as neither of these paths contain '|', and if they do
--# then god help you.  https://trac.sagemath.org/ticket/27218
--sed -i -e "s|$GAP_BUILD_ROOT|$GAP_ROOT|g" \
--    "$SAGE_DESTDIR$SAGE_BIN/gac" "$DESTDIR_GAP_ROOT/sysinfo.gap" \
--    "$DESTDIR_GAP_ROOT/bin/gap.sh" "$DESTDIR_GAP_ROOT/doc/make_doc" || \
--    sdh_die "Failed to fix up hard-coded paths in GAP build tools."
--
- # TODO: This seems unnecessary--we are already installing all of doc/ to
- # GAP_ROOT, which is necessary for some functionality in GAP to work.  Do
- # we need this?  Maybe doc/gap could just be a symlink to gap/doc??
-diff --git a/build/pkgs/gap/spkg-legacy-uninstall b/build/pkgs/gap/spkg-legacy-uninstall
-index d17eb939eb7..a8e5c59e1fb 100755
---- a/build/pkgs/gap/spkg-legacy-uninstall
-+++ b/build/pkgs/gap/spkg-legacy-uninstall
-@@ -4,6 +4,8 @@ rm -rf "$SAGE_LOCAL/gap/gap-4."*
- rm -rf "$SAGE_SHARE/gap"
- rm -f "$SAGE_LOCAL/gap/latest"
- rm -f "$SAGE_LOCAL/bin/gap"
-+rm -f "$SAGE_LOCAL/bin/gac"
- 
--# Remove old libgap headers
-+# Remove old libgap headers and library
- rm -rf "$SAGE_LOCAL/include/gap"
-+rm -rf "$SAGE_LOCAL/lib/gap"
-diff --git a/build/pkgs/gap/spkg-prerm.in b/build/pkgs/gap/spkg-prerm.in
-deleted file mode 100644
-index 661d92621fa..00000000000
---- a/build/pkgs/gap/spkg-prerm.in
-+++ /dev/null
-@@ -1,6 +0,0 @@
--# These generated files are placed in directory provided by the SPKG, so
--# delete the generated files first so that their parent directories can be
--# removed during installation
--GAP_ROOT="$SAGE_LOCAL/share/gap"
--rm -f "$GAP_ROOT/pkg/atlasrep/datagens/"*.*
--rm -f "$GAP_ROOT/pkg/atlasrep/dataword/"*.*
-diff --git a/build/pkgs/gap_packages/patches/cohomolo-gcc10.patch b/build/pkgs/gap_packages/patches/cohomolo-gcc10.patch
-deleted file mode 100644
-index e45fe7d9c6f..00000000000
---- a/build/pkgs/gap_packages/patches/cohomolo-gcc10.patch
-+++ /dev/null
-@@ -1,150 +0,0 @@
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c b/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c
--index 3bbdc45..7df699f 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/crp1.c
--@@ -8,9 +8,8 @@ extern short sp[],**mat[],*psp[],**imcos[],**cpco[],lorb[],
-- short *cst,**cpst,***cdpst,**svptr,*cp,*rel;
-- short *spst,**pspst,**pptr,**cpptr,npt,nb,nph,nph2,npg,npg2,
--       rno,orno,coh_index,*invg;
---FILE  *ip,*op;
-- 
---void seeknln (void) { while (getc(ip)!='\n'); }
--+void seeknln (FILE *ip) { while (getc(ip)!='\n'); }
-- 
-- /* This program differs from most other permutation programs in that perms are
--    all stored in the single array sp. Schreier vectors are stored in the short
--@@ -23,13 +22,14 @@ void seeknln (void) { while (getc(ip)!='\n'); }
-- int 
-- crprog1 (void)
-- { short *pc,*qc,ex,neg; int x;
--+  FILE  *ip,*op;
--   short i,j,k,l,m,n,cl,rl,*p,ocl,im,pt,pt1,pn,ipt;
--   if ((ip=fopen(inf2,"r"))== 0)
--   { fprintf(stderr,"Cannot open %s.\n",inf2); return(-1);}
--   fscanf(ip,"%hd%hd%hd%hd",&npt,&nph,&nb,&k);
--   if (nb>=mb) {fprintf(stderr,"nb too big. Increase MB.\n"); return(-1);}
--   if (k<=2) {fprintf(stderr,"inf2 has illegal format.\n"); return(-1); }
---  seeknln(); seeknln();
--+  seeknln(ip); seeknln(ip);
--   for (i=1;i<=nb;i++) fscanf(ip,"%hd",lorb+i);
--   pptr=psp-1; pspst=psp+nph; svptr=cpsp-1;  cpst=cpsp+nb;
--   invg=sp; nph2=2*nph; spst=sp+nph2;
--@@ -37,7 +37,7 @@ crprog1 (void)
--   { pptr[i]=spst+(i-1)*npt-1; p=pptr[i];
--     for (j=1;j<=npt;j++) {fscanf(ip,"%hd",&k); p[k]=j; }
--     invg[2*i-2]=2*i-1; invg[2*i-1]=2*i-2;
---    seeknln();
--+    seeknln(ip);
--   }
--   spst+=(npt*nph);
--   for (i=1;i<=nb;i++)
--@@ -75,7 +75,7 @@ crprog1 (void)
--   strcpy(inf1,inf0); strcat(inf1,".rel");
--   if ((ip=fopen(inf1,"r"))==0)
--   { fprintf(stderr,"Cannot open %s.\n",inf1); return(-1);}
---  fscanf(ip,"%hd%hd",&k,&rno); seeknln();
--+  fscanf(ip,"%hd%hd",&k,&rno); seeknln(ip);
--   op=fopen(outft,"w");
-- /* Now we have read everything in, and the computation can start */
--   orno=0;
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c b/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c
--index a7396b2..658496f 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/nq+chfns.c
--@@ -20,8 +20,6 @@ short  mexp=MEXP,mcl=MCL,no,rel[RSP],wt[MEXP],exp,*rpf,*rpb,
-- extern short  prime,dim,*spv,**spm,mspace[],*vec[],**mat[],cp[],pinv[],opmats,
--         mm,mv;
-- extern int msp;
---FILE *ip,*op;
---
-- 
-- int 
-- calcmats (void)
--@@ -59,7 +57,7 @@ calcmats (void)
--   }
--   for (i=1;i<=exp;i++) trans(mat[i+exp],mat[i]);
--   if (opmats)
---  { op=fopen(outf,"w");
--+  { FILE *op=fopen(outf,"w");
--     fprintf(op,"%4d%4d%4d\n",prime,dim,exp);
--     for (i=1;i<=exp;i++) printmat(mat[i]); 
--     fclose(op);
--@@ -71,6 +69,7 @@ int
-- rdmats (void)
-- /* reads matrices of generators of P */
-- { short i; int quot;
--+  FILE *ip;
--   ip=fopen(inf4,"r");
--   if (ip==0)
--   { fprintf(stderr,"Cannot open %s\n ",inf4); return(-1); }
--@@ -90,12 +89,12 @@ rdmats (void)
--   fclose(ip);
--   return(0);
-- }
---FILE *ip;
-- 
-- int 
-- ingp (int inp)
-- /* Read in output of respcrun -s */
-- { short i,j,k,l,m,*orpf,**pcp;
--+  FILE *ip;
--   ip=fopen(inf3,"r");
--   if (ip==0) { fprintf(stderr,"Cannot open %s\n",inf3); return(-1); }
--   fscanf(ip,"%hd%hd%hd%hd%hd%hd",&prime,&exp,&i,&no,&j,&m);
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c
--index 0896551..6841bc8 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmfns.c
--@@ -9,7 +9,6 @@ extern short  intexp,mexp,mng,wksp,
--        spugen[],*tlintg[];
-- extern int ptrsp,rsp;
-- short  fac;
---FILE *ip,*op;
-- 
-- int 
-- ingp (void)
--@@ -18,6 +17,7 @@ ingp (void)
--    of nqrun, and tails are also read in.
-- */
-- { short i,j,k,l,m,x,y,no,*orpf,*orpb,**pcp;  char tails;
--+  FILE *ip;
--   if ((ip=fopen(inf1,"r"))==0)
--   { fprintf(stderr,"Cannot open %s.\n",inf1); return(-1); }
--   fscanf(ip,"%hd%hd%hd%hd%hd%hd",&prime,&exp,&nng,&no,&class,&m);
--@@ -89,6 +89,7 @@ int
-- outgp (void)
-- /* The PCP is output, together with tails */
-- { short i,k,l,**pcp,*b,*e,*c;
--+  FILE *op;
--   op=fopen(outf,"w");
--   fprintf(op,"%4d%4d%4d%4d%4d%4d\n",prime,exp,nng,exp,class,1);
--   for (i=1;i<=exp;i++) fprintf(op,"%4d",wt[i]); fprintf(op,"\n");
--@@ -379,7 +380,7 @@ restart:
--     nng--; mnng--; enexpnt--;
--     if (nng==0)
--     { if (gap)
---      { op=fopen(outfm,"w"); fprintf(op,"COHOMOLO.Multiplier:=[];\n");
--+      { FILE *op=fopen(outfm,"w"); fprintf(op,"COHOMOLO.Multiplier:=[];\n");
--         fclose(op);
--         printf("All new generators eliminated. Multiplier is trivial.\n");
--       }
--diff --git a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c
--index 01cf914..0144883 100644
----- a/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c
--+++ b/pkg/cohomolo-1.6.8/standalone/progs.d/nqmp.c
--@@ -9,7 +9,6 @@ extern short  intexp,mng,mexp,wksp,
--        spugen[],*intg[],*imintg[],*tlintg[];
-- extern int ptrsp,rsp;
-- short  *wf,*wc; char norm;
---FILE *ip,*op;
-- 
-- /* The data structures for this program and for nqrun are similar.
--    d1 and d2 contain definitions of generators. (Def. comes from commutator
--@@ -35,6 +34,7 @@ nqmprog (void)
-- { short i,j,k,l,m,d,*gi,*gj,*ti,*tj,cl,def,*ps,*pf,**dp,*nrpb,*p,*orpf,*orpb,
--         nb,np,k1,*rno,*covrel,**pgen,tdef,sgn;
--   char nt;
--+  FILE *ip,*op;
--   if (ingp() == -1) {fprintf(stderr,"Input error.\n"); return(-1); }
--   eexpnt=expnt+exp; enexpnt=nexpnt+nng;
-- 
-diff --git a/build/pkgs/gap_packages/patches/guava_leon_includes.patch b/build/pkgs/gap_packages/patches/guava_leon_includes.patch
-deleted file mode 100644
-index cdcd19cc3e8..00000000000
---- a/build/pkgs/gap_packages/patches/guava_leon_includes.patch
-+++ /dev/null
-@@ -1,13 +0,0 @@
----- a/pkg/guava-3.15/src/leon/src/generate.c	Sat Feb 29 09:02:10 2020
----- b/pkg/guava-3.15/src/leon/src/generate.c	Thu Sep 24 13:58:36 2020
--***************
--*** 115,120 ****
----- 115,122 ----
--  #include "groupio.h"
--  #include "enum.h"
--  #include "storage.h"
--+ #include "chbase.h"
--+ #include "inform.h"
--  
--  #ifdef ALT_TIME_HEADER
--  #include "cputime.h"
-diff --git a/build/pkgs/gap_packages/spkg-install.in b/build/pkgs/gap_packages/spkg-install.in
-index 168e6b11532..6dff182a48f 100644
---- a/build/pkgs/gap_packages/spkg-install.in
-+++ b/build/pkgs/gap_packages/spkg-install.in
-@@ -1,4 +1,4 @@
--GAP_ROOT="$SAGE_LOCAL/share/gap"
-+GAP_ROOT="$SAGE_LOCAL/lib/gap"
- PKG_DIR="$GAP_ROOT/pkg"
- 
- PKG_SRC_DIR="$(pwd)/src/pkg"
-@@ -11,33 +11,31 @@ cd "$PKG_SRC_DIR"
- #    (GAP 4.8.6 still had it, but this is gone in 4.10)
- 
- sdh_install \
--    aclib-* \
--    AutoDoc-* \
--    corelg-* \
--    crime-* \
-+    aclib \
-+    corelg \
-+    crime \
-     cryst \
-     crystcat \
--    design-* \
-+    design \
-     gbnp \
--    genss-* \
--    hap-* \
--    hapcryst-* \
--    hecke-* \
--    images-* \
--    liealgdb-* \
--    liepring-* \
--    liering-* \
--    loops-* \
--    MapClass-* \
--    polymaking-* \
--    qpa-* \
--    quagroup-* \
--    radiroot-* \
--    repsn-* \
--    sla-* \
--    sonata-* \
--    Toric-* \
--    utils-* \
-+    genss \
-+    hap \
-+    hapcryst \
-+    hecke \
-+    images \
-+    liealgdb \
-+    liepring \
-+    liering \
-+    loops \
-+    mapclass \
-+    polymaking \
-+    qpa \
-+    quagroup \
-+    repsn \
-+    singular \
-+    sla \
-+    sonata \
-+    toric \
-     "$PKG_DIR"
- 
- install_compiled_pkg()
-@@ -45,27 +43,23 @@ install_compiled_pkg()
-     local pkg="$1"
-     # Install the bin/ dir (where compiled modules should end up)
-     # under <prefix>/lib/gap; we then symlink to it later
--    sdh_install bin "$SAGE_LOCAL/lib/gap/pkg/$pkg"
-+    sdh_install * "$SAGE_LOCAL/lib/gap/pkg/$pkg"
- 
-+    # TODO:
-     # Clean up any build artificts before installing the rest of the package
-     # Also remove configure/Makefiles
-     # Note: None, if any of the packages really have a proper install target
--    make clean  # Works for some packages but not all
--    rm -rf bin/
--    rm -rf configure configure.* config.* autogen.sh *.m4 Makefile* m4/
-+    #make clean  # Works for some packages but not all
-+    #rm -rf bin/
-+    #rm -rf configure configure.* config.* autogen.sh *.m4 Makefile* m4/
- 
--    # Create the bin/ symlink
--    ln -s "$SAGE_LOCAL/lib/gap/pkg/$pkg/bin" bin
--
--    # Install the rest of the package files
--    sdh_install * "$PKG_DIR/$pkg"
- }
- 
- # Build and install compiled packages:
- #
- # These packages have an old ./configure that take the GAP_ROOT as a positional
- # argument
--for pkg in cohomolo-* crypting-* grape-* guava-* orb-* datastructures-*
-+for pkg in cohomolo crypting grape guava orb datastructures
- do
-     echo "Building GAP package $pkg"
-     CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
-@@ -91,7 +85,7 @@ pararr=( " " " " "--with-external-planarity" "--with-external-libsemigroups" )
- ##############################################################################
- 
- parind=0
--for pkg in nq-* io-* digraphs-* semigroups-*
-+for pkg in nq io digraphs semigroups
- do
-     echo "Building GAP package $pkg"
-     cd "$PKG_SRC_DIR/$pkg"
-diff --git a/build/pkgs/libsemigroups/checksums.ini b/build/pkgs/libsemigroups/checksums.ini
-index 62c4268515f..4e13a36cb35 100644
---- a/build/pkgs/libsemigroups/checksums.ini
-+++ b/build/pkgs/libsemigroups/checksums.ini
-@@ -1,5 +1,5 @@
- tarball=libsemigroups-VERSION.tar.gz
--sha1=2b16c095cc5ffd3f77a71dfbf48cce188e054c03
--md5=7082cadcf7a195ccb93175cd72b6db95
--cksum=1501022358
-+sha1=86375824b47ce4b0e23570122e873f67136d0c0a
-+md5=ff79ad5fbc8bfeb64d48faaf24106b98
-+cksum=2845045455
- upstream_url=https://github.com/libsemigroups/libsemigroups/releases/download/vVERSION/libsemigroups-VERSION.tar.gz
-diff --git a/build/pkgs/libsemigroups/package-version.txt b/build/pkgs/libsemigroups/package-version.txt
-index 9084fa2f716..f90b1afc082 100644
---- a/build/pkgs/libsemigroups/package-version.txt
-+++ b/build/pkgs/libsemigroups/package-version.txt
-@@ -1 +1 @@
--1.1.0
-+2.3.2
-diff --git a/build/pkgs/libsemigroups/spkg-install.in b/build/pkgs/libsemigroups/spkg-install.in
-index 2aaf0e99043..128b54d2f99 100644
---- a/build/pkgs/libsemigroups/spkg-install.in
-+++ b/build/pkgs/libsemigroups/spkg-install.in
-@@ -1,4 +1,4 @@
- cd src
--sdh_configure
-+sdh_configure --disable-eigen
- sdh_make
- sdh_make_install
-diff --git a/build/pkgs/singular/spkg-configure.m4 b/build/pkgs/singular/spkg-configure.m4
-index d4d145defe3..6a85631f624 100644
---- a/build/pkgs/singular/spkg-configure.m4
-+++ b/build/pkgs/singular/spkg-configure.m4
-@@ -9,52 +9,7 @@ SAGE_SPKG_CONFIGURE([singular], [
-        AC_MSG_CHECKING([that Singular's help is working])
-        AS_IF([test x`printf "system(\"--browser\", \"builtin\"); \n help;" | Singular 2>&1 | grep "error occurred"` = x], [
-         AC_MSG_RESULT(yes)
--        dnl We have Singular. Now determine the shared library path on
--        dnl platforms on which sage.libs.singular needs to reload the library with RTLD_GLOBAL.
--        AS_CASE([$host_os],
--          [cygwin*], [dnl Nothing to do
--                     ],
--                     [dnl Use pkg-config to get singular's libdir while we're at it. As a
--                      dnl moral compromise for using pkg-config, this ultimately allows us
--                      dnl to pass an absolute path to dlopen(), which is the only approach
--                      dnl that POSIX guarantees will work.
--                      PKG_CHECK_VAR([SINGULAR_LIB_DIR], [Singular], [libdir])
--                      dnl The acl_shlibext variable is set in the top-level configure.ac.
--                      AC_LANG_PUSH(C)
--                      ORIG_LIBS="${LIBS}"
--                      LIBS="${LIBS} -ldl"
--                      AC_MSG_CHECKING([if we can dlopen($LIBSINGULAR_PATH)])
--                      LIBSINGULAR_PATH="${SINGULAR_LIB_DIR}/libSingular.${acl_shlibext}"
--
--                      dnl if we can dlopen() it, substitute the name for sage_conf;
--                      dnl otherwise, fall back to using the SPKG.
--                      AC_RUN_IFELSE(
--                        [AC_LANG_PROGRAM(
--                          [[#include <dlfcn.h>]],
--                          [[void* h = dlopen("${LIBSINGULAR_PATH}", RTLD_LAZY | RTLD_GLOBAL);
--                            if (h == 0) { return 1; } else { return dlclose(h); }]]
--                        )], [
--                          AC_MSG_RESULT(yes)
--                        ], [
--                          dnl try Debian-specific name
--                          LIBSINGULAR_PATH="${SINGULAR_LIB_DIR}/libsingular-Singular.${acl_shlibext}"
--                          AC_RUN_IFELSE(
--                           [AC_LANG_PROGRAM(
--                             [[#include <dlfcn.h>]],
--                             [[void* h = dlopen("${LIBSINGULAR_PATH}", RTLD_LAZY | RTLD_GLOBAL);
--                               if (h == 0) { return 1; } else { return dlclose(h); }]]
--                           )], [
--                             AC_MSG_RESULT(yes)
--                           ], [
--                            AC_MSG_RESULT(no)
--                            sage_spkg_install_singular=yes
--                          ], [AC_MSG_RESULT(yes)])
--                        ], [AC_MSG_RESULT(yes)])
--
--                      AC_LANG_POP()
--                      LIBS="${ORIG_LIBS}"
--                     ]
--       )], [
-+       ], [
-        AC_MSG_RESULT(no)
-        sage_spkg_install_singular=yes
-        ]
-@@ -64,20 +19,4 @@ SAGE_SPKG_CONFIGURE([singular], [
-       ])
-     ])
-   ])
--],[],[],[
--  dnl Post-check phase
--  dnl We make the sage_conf substitutions here, because the "default"
--  dnl substitution needs to be made even if we skipped the system-Singular
--  dnl checks themselves.
--  AS_IF([test "x${sage_spkg_install_singular}" = "xyes"], [
--    AS_CASE([$host_os],
--      [cygwin*], [dnl Nothing to do
--                 ],
--                 [dnl Set shared library path, needed for reloading the library with RTLD_GLOBAL
--                  LIBSINGULAR_PATH="\$SAGE_LOCAL/lib/libSingular.${acl_shlibext}"
--                 ]
--    )
--  ])
--
--  AC_SUBST(LIBSINGULAR_PATH, "${LIBSINGULAR_PATH}")
- ])
-diff --git a/pkgs/sage-conf/_sage_conf/_conf.py.in b/pkgs/sage-conf/_sage_conf/_conf.py.in
-index 6cd28f558a8..d66bdb3d264 100644
---- a/pkgs/sage-conf/_sage_conf/_conf.py.in
-+++ b/pkgs/sage-conf/_sage_conf/_conf.py.in
-@@ -55,9 +55,6 @@ THREEJS_DIR = SAGE_LOCAL + "/share/threejs-sage"
- OPENMP_CFLAGS = "@OPENMP_CFLAGS@"
- OPENMP_CXXFLAGS = "@OPENMP_CXXFLAGS@"
- 
--# The full absolute path to the main Singular library.
--LIBSINGULAR_PATH = "@LIBSINGULAR_PATH@".replace('$SAGE_LOCAL', SAGE_LOCAL)
--
- # Installation location of wheels. This is determined at configuration time
- # and does not depend on the installation location of sage-conf.
- SAGE_SPKG_WHEELS = "@SAGE_VENV@".replace('${SAGE_LOCAL}', SAGE_LOCAL) + "/var/lib/sage/wheels"
-diff --git a/src/doc/en/thematic_tutorials/lie/weyl_groups.rst b/src/doc/en/thematic_tutorials/lie/weyl_groups.rst
-index c917338e444..182e74aad20 100644
---- a/src/doc/en/thematic_tutorials/lie/weyl_groups.rst
-+++ b/src/doc/en/thematic_tutorials/lie/weyl_groups.rst
-@@ -139,12 +139,12 @@ string, which you can print::
-     X.1      1  1  1  1  1  1  1  1  1  1  1  1  1
-     X.2      1 -1  1  1 -1  1  1 -1 -1 -1  1  1  1
-     X.3      2  .  2 -1  .  2  2  .  .  . -1  2  2
--    X.4      3 -1 -1  .  1 -1  3 -1  1 -1  . -1  3
--    X.5      3 -1 -1  .  1  3 -1 -1 -1  1  . -1  3
--    X.6      3  1 -1  . -1 -1  3  1 -1  1  . -1  3
--    X.7      3  1 -1  . -1  3 -1  1  1 -1  . -1  3
--    X.8      3 -1  3  . -1 -1 -1 -1  1  1  . -1  3
--    X.9      3  1  3  .  1 -1 -1  1 -1 -1  . -1  3
-+    X.4      3 -1 -1  .  1  3 -1 -1 -1  1  . -1  3
-+    X.5      3  1 -1  . -1  3 -1  1  1 -1  . -1  3
-+    X.6      3 -1  3  . -1 -1 -1 -1  1  1  . -1  3
-+    X.7      3 -1 -1  .  1 -1  3 -1  1 -1  . -1  3
-+    X.8      3  1  3  .  1 -1 -1  1 -1 -1  . -1  3
-+    X.9      3  1 -1  . -1 -1  3  1 -1  1  . -1  3
-     X.10     4 -2  . -1  .  .  .  2  .  .  1  . -4
-     X.11     4  2  . -1  .  .  . -2  .  .  1  . -4
-     X.12     6  . -2  .  . -2 -2  .  .  .  .  2  6
-diff --git a/src/sage/coding/codecan/autgroup_can_label.pyx b/src/sage/coding/codecan/autgroup_can_label.pyx
-index de5db985e0b..c83b9264e44 100644
---- a/src/sage/coding/codecan/autgroup_can_label.pyx
-+++ b/src/sage/coding/codecan/autgroup_can_label.pyx
-@@ -76,7 +76,7 @@ columns do share the same coloring::
-     ((1,),
-      (2,),
-      (3, 5, 4),
--     (6, 19, 16, 9, 21, 10, 8, 15, 14, 11, 20, 13, 12, 7, 17, 18))
-+     (6, 19, 16, 21, 9, 10, 15, 8, 20, 11, 14, 13, 7, 12, 18, 17))
- 
- We can also restrict the group action to linear isometries::
- 
-diff --git a/src/sage/coding/linear_code.py b/src/sage/coding/linear_code.py
-index a3ac3ca1547..bfb9f8696e8 100644
---- a/src/sage/coding/linear_code.py
-+++ b/src/sage/coding/linear_code.py
-@@ -465,27 +465,27 @@ def automorphism_group_gens(self, equivalence="semilinear"):
-             0
-             sage: C = codes.HammingCode(GF(4, 'z'), 3)
-             sage: C.automorphism_group_gens()
--            ([((1, 1, 1, 1, 1, z + 1, z, z + 1, z, z, z, 1, 1, z + 1, z + 1, z, z + 1, z, z + 1, z + 1, z + 1); (1,14,6,7,4,10,11,19)(2,8,16,13,3,17,21,15)(9,12,18,20), Ring endomorphism of Finite Field in z of size 2^2
-+            ([((1, 1, 1, z, z + 1, 1, 1, 1, 1, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z); (1,13,14,20)(2,21,8,18,7,16,19,15)(3,10,5,12,17,9,6,4), Ring endomorphism of Finite Field in z of size 2^2
-+                Defn: z |--> z + 1),
-+              ((z, 1, z, z, z, z + 1, z, z, z, z, z, z, z + 1, z, z, z, z, z + 1, z, z, z); (1,11,5,12,3,19)(2,8)(6,18,13)(7,17,15)(9,10,14,16,20,21), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z + 1),
--              ((z + 1, 1, 1, z, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z + 1, 1, z, z + 1, z + 1, z); (1,18,6,19,2,9,17,10,13,14,21,11,4,5,12)(3,20,7,16,8), Ring endomorphism of Finite Field in z of size 2^2
--                Defn: z |--> z),
-               ((z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z); (), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z)],
-              362880)
-             sage: C.automorphism_group_gens(equivalence="linear")
--            ([((z + 1, 1, z + 1, z + 1, z + 1, z, 1, z, 1, 1, 1, 1, z + 1, z + 1, z + 1, z, z, 1, z, z, z); (1,15,2,8,16,18,3)(4,9,12,13,20,10,11)(5,21,14,6,7,19,17), Ring endomorphism of Finite Field in z of size 2^2
-+            ([((z, 1, z + 1, z + 1, 1, z + 1, z, 1, z + 1, z + 1, 1, z, 1, z + 1, z, 1, z, 1, z + 1, 1, 1); (1,12,11,10,6,8,9,20,13,21,5,14,3,16,17,19,7,4,2,15,18), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
--              ((z + 1, z + 1, z + 1, z + 1, z + 1, 1, z, 1, z, z, z, 1, z, 1, 1, 1, z + 1, z + 1, z + 1, 1, z); (1,15,21,8,9)(2,18,5,3,11,16,7,10,19,13,12,4,17,6,20), Ring endomorphism of Finite Field in z of size 2^2
-+              ((z + 1, z + 1, z + 1, z, 1, 1, z, z, 1, z + 1, z, 1, 1, z, 1, z + 1, z, z + 1, z + 1, 1, z); (1,3,18,2,17,6,19)(4,15,13,20,7,14,16)(5,11,8,21,12,9,10), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
-               ((z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1, z + 1); (), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z)],
-              181440)
-             sage: C.automorphism_group_gens(equivalence="permutational")
--            ([((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,19)(3,17)(4,21)(5,20)(7,14)(9,12)(10,16)(11,15), Ring endomorphism of Finite Field in z of size 2^2
-+            ([((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,11)(3,10)(4,9)(5,7)(12,21)(14,20)(15,19)(16,17), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
--              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,11)(3,10)(4,9)(5,7)(12,21)(14,20)(15,19)(16,17), Ring endomorphism of Finite Field in z of size 2^2
-+              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (2,18)(3,19)(4,10)(5,16)(8,13)(9,14)(11,21)(15,20), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
--              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,17)(2,8)(3,14)(4,10)(7,12)(9,19)(13,18)(15,20), Ring endomorphism of Finite Field in z of size 2^2
-+              ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (1,19)(3,17)(4,21)(5,20)(7,14)(9,12)(10,16)(11,15), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z),
-               ((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); (2,13)(3,14)(4,20)(5,11)(8,18)(9,19)(10,15)(16,21), Ring endomorphism of Finite Field in z of size 2^2
-                 Defn: z |--> z)],
-@@ -691,10 +691,10 @@ def _canonize(self, equivalence):
-             sage: C_iso == aut_group_can_label.get_canonical_form()
-             True
-             sage: aut_group_can_label.get_autom_gens()
--            [((1, 1, 1, 1, 1, z + 1, z, z + 1, z, z, z, 1, 1, z + 1, z + 1, z, z + 1, z, z + 1, z + 1, z + 1); (1,14,6,7,4,10,11,19)(2,8,16,13,3,17,21,15)(9,12,18,20), Ring endomorphism of Finite Field in z of size 2^2
-+            [((1, 1, 1, z, z + 1, 1, 1, 1, 1, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z); (1,13,14,20)(2,21,8,18,7,16,19,15)(3,10,5,12,17,9,6,4), Ring endomorphism of Finite Field in z of size 2^2
-+               Defn: z |--> z + 1),
-+             ((z, 1, z, z, z, z + 1, z, z, z, z, z, z, z + 1, z, z, z, z, z + 1, z, z, z); (1,11,5,12,3,19)(2,8)(6,18,13)(7,17,15)(9,10,14,16,20,21), Ring endomorphism of Finite Field in z of size 2^2
-                Defn: z |--> z + 1),
--             ((z + 1, 1, 1, z, z + 1, z, z, z + 1, z + 1, z + 1, 1, z + 1, z, z, 1, z + 1, 1, z, z + 1, z + 1, z); (1,18,6,19,2,9,17,10,13,14,21,11,4,5,12)(3,20,7,16,8), Ring endomorphism of Finite Field in z of size 2^2
--               Defn: z |--> z),
-              ((z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z, z); (), Ring endomorphism of Finite Field in z of size 2^2
-                Defn: z |--> z)]
-         """
-diff --git a/src/sage/combinat/posets/posets.py b/src/sage/combinat/posets/posets.py
-index 2836d59d960..8c882d5ac3b 100644
---- a/src/sage/combinat/posets/posets.py
-+++ b/src/sage/combinat/posets/posets.py
-@@ -8813,7 +8813,7 @@ def _libgap_(self):
-             sage: libgap(P)  # optional - gap_packages
-             <A poset on 5 points>
-             sage: A = libgap(GF(2)).PosetAlgebra(P); A  # optional - gap_packages
--            <GF(2)[<quiver with 5 vertices and 5 arrows>]/<two-sided ideal in <GF(2)[<quiver with 5 vertices and 5 arrows>]>, (1 generators)>>
-+            <GF(2)[<quiver with 5 vertices and 5 arrows>]/<two-sided ideal in <GF(2)[<quiver with 5 vertices and 5 arrows>]>, (1 generator)>>
-             sage: A.Dimension()  # optional - gap_packages
-             13
-         """
-diff --git a/src/sage/combinat/root_system/hecke_algebra_representation.py b/src/sage/combinat/root_system/hecke_algebra_representation.py
-index 6b756bafc30..8ac99319bec 100644
---- a/src/sage/combinat/root_system/hecke_algebra_representation.py
-+++ b/src/sage/combinat/root_system/hecke_algebra_representation.py
-@@ -357,7 +357,7 @@ def Tw(self, word, signs=None, scalar=None):
-             sage: q1, q2 = K.gens()
-             sage: KW = W.algebra(K)
-             sage: x = KW.an_element(); x
--            123 + 3*32 + 2*3 + e
-+            123 + 3*2312 + 2*31 + e
- 
-             sage: T = KW.demazure_lusztig_operators(q1,q2)
-             sage: T12 = T.Tw( (1,2) )
-diff --git a/src/sage/combinat/symmetric_group_algebra.py b/src/sage/combinat/symmetric_group_algebra.py
-index b8a0bebab44..9bccba124c8 100644
---- a/src/sage/combinat/symmetric_group_algebra.py
-+++ b/src/sage/combinat/symmetric_group_algebra.py
-@@ -101,7 +101,7 @@ def SymmetricGroupAlgebra(R, W, category=None):
-         sage: SGA.group()
-         Weyl Group of type ['A', 3] (as a matrix group acting on the ambient space)
-         sage: SGA.an_element()
--        s1*s2*s3 + 3*s3*s2 + 2*s3 + 1
-+        s1*s2*s3 + 3*s2*s3*s1*s2 + 2*s3*s1 + 1
- 
-     The preferred way to construct the symmetric group algebra is to
-     go through the usual ``algebra`` method::
-diff --git a/src/sage/env.py b/src/sage/env.py
-index 911f34b1bc6..5f7aca8599c 100644
---- a/src/sage/env.py
-+++ b/src/sage/env.py
-@@ -197,7 +197,8 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
- GRAPHS_DATA_DIR = var("GRAPHS_DATA_DIR", join(SAGE_SHARE, "graphs"))
- ELLCURVE_DATA_DIR = var("ELLCURVE_DATA_DIR", join(SAGE_SHARE, "ellcurves"))
- POLYTOPE_DATA_DIR = var("POLYTOPE_DATA_DIR", join(SAGE_SHARE, "reflexive_polytopes"))
--GAP_ROOT_DIR = var("GAP_ROOT_DIR", join(SAGE_SHARE, "gap"))
-+GAP_LIB_DIR = var("GAP_LIB_DIR", join(SAGE_LOCAL, "lib", "gap"))
-+GAP_SHARE_DIR = var("GAP_SHARE_DIR", join(SAGE_SHARE, "gap"))
- THEBE_DIR = var("THEBE_DIR", join(SAGE_SHARE, "thebe"))
- COMBINATORIAL_DESIGN_DATA_DIR = var("COMBINATORIAL_DESIGN_DATA_DIR", join(SAGE_SHARE, "combinatorial_designs"))
- CREMONA_MINI_DATA_DIR = var("CREMONA_MINI_DATA_DIR", join(SAGE_SHARE, "cremona"))
-@@ -229,12 +230,6 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
- LIE_INFO_DIR = var("LIE_INFO_DIR", join(SAGE_LOCAL, "lib", "LiE"))
- SINGULAR_BIN = var("SINGULAR_BIN") or "Singular"
- 
--# The path to libSingular, to be passed to dlopen(). This will
--# typically be set to an absolute path in sage_conf, but the relative
--# fallback path here works on systems where dlopen() searches the
--# system's library locations.
--LIBSINGULAR_PATH = var("LIBSINGULAR_PATH", "libSingular.so")
--
- # OpenMP
- OPENMP_CFLAGS = var("OPENMP_CFLAGS", "")
- OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "")
-@@ -255,81 +250,6 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
- SAGE_GAP_COMMAND = var('SAGE_GAP_COMMAND', _gap_cmd)
- 
- 
--def _get_shared_lib_path(*libnames: str) -> Optional[str]:
--    """
--    Return the full path to a shared library file installed in
--    ``$SAGE_LOCAL/lib`` or the directories associated with the
--    Python sysconfig.
--
--    This can also be passed more than one library name (e.g. for cases where
--    some library may have multiple names depending on the platform) in which
--    case the first one found is returned.
--
--    This supports most *NIX variants (in which ``lib<libname>.so`` is found
--    under ``$SAGE_LOCAL/lib``), macOS (same, but with the ``.dylib``
--    extension), and Cygwin (under ``$SAGE_LOCAL/bin/cyg<libname>.dll``,
--    or ``$SAGE_LOCAL/bin/cyg<libname>-*.dll`` for versioned DLLs).
--
--    For distributions like Debian that use a multiarch layout, we also try the
--    multiarch lib paths (i.e. ``/usr/lib/<arch>/``).
--
--    This returns ``None`` if no matching library file could be found.
--
--    EXAMPLES::
--
--        sage: from sage.env import _get_shared_lib_path
--        sage: "gap" in _get_shared_lib_path("gap")
--        True
--        sage: _get_shared_lib_path("an_absurd_lib") is None
--        True
--
--    """
--
--    for libname in libnames:
--        search_directories: List[Path] = []
--        patterns: List[str] = []
--        if sys.platform == 'cygwin':
--            # Later down we take the first matching DLL found, so search
--            # SAGE_LOCAL first so that it takes precedence
--            if SAGE_LOCAL:
--                search_directories.append(Path(SAGE_LOCAL) / 'bin')
--            search_directories.append(Path(sysconfig.get_config_var('BINDIR')))
--            # Note: The following is not very robust, since if there are multible
--            # versions for the same library this just selects one more or less
--            # at arbitrary. However, practically speaking, on Cygwin, there
--            # will only ever be one version
--            patterns = [f'cyg{libname}.dll', f'cyg{libname}-*.dll']
--        else:
--            if sys.platform == 'darwin':
--                ext = 'dylib'
--            else:
--                ext = 'so'
--
--            if SAGE_LOCAL:
--                search_directories.append(Path(SAGE_LOCAL) / 'lib')
--            libdir = sysconfig.get_config_var('LIBDIR')
--            if libdir is not None:
--                libdir = Path(libdir)
--                search_directories.append(libdir)
--
--                multiarchlib = sysconfig.get_config_var('MULTIARCH')
--                if multiarchlib is not None:
--                    search_directories.append(libdir / multiarchlib),
--
--            patterns = [f'lib{libname}.{ext}']
--
--        for directory in search_directories:
--            for pattern in patterns:
--                path = next(directory.glob(pattern), None)
--                if path is not None:
--                    return str(path.resolve())
--
--    # Just return None if no files were found
--    return None
--
--# locate libgap shared object
--GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", ""))
--
- # post process
- if DOT_SAGE is not None and ' ' in DOT_SAGE:
-     if UNAME[:6] == 'CYGWIN':
-diff --git a/src/sage/groups/abelian_gps/abelian_group_gap.py b/src/sage/groups/abelian_gps/abelian_group_gap.py
-index a4b047113c5..86090b43535 100644
---- a/src/sage/groups/abelian_gps/abelian_group_gap.py
-+++ b/src/sage/groups/abelian_gps/abelian_group_gap.py
-@@ -338,7 +338,7 @@ def _element_constructor_(self, x, check=True):
-         if isinstance(x, AbelianGroupElement_gap):
-             try:
-                 if x in self._cover:
--                    x = self.gap().NaturalHomomorphism().Image(x.gap())
-+                    x = self._cover.gap().NaturalHomomorphismByNormalSubgroup(self._relations).Image(x.gap())
-                 else:
-                     x = x.gap()
-             except AttributeError:
-@@ -1043,7 +1043,7 @@ def natural_homomorphism(self):
-             From: Abelian group with gap, generator orders (4,)
-             To:   Quotient abelian group with generator orders (2,)
-         """
--        phi = self.gap().NaturalHomomorphism()
-+        phi = self._cover.gap().NaturalHomomorphismByNormalSubgroup(self._relations)
-         Hom = self._cover.Hom(self)
-         return Hom(phi)
- 
-diff --git a/src/sage/groups/finitely_presented.py b/src/sage/groups/finitely_presented.py
-index 8d6e443683c..1beb01af87f 100644
---- a/src/sage/groups/finitely_presented.py
-+++ b/src/sage/groups/finitely_presented.py
-@@ -596,9 +596,9 @@ def gap(self):
-             sage: k = G.rewriting_system()
-             sage: k.gap()
-             Knuth Bendix Rewriting System for Monoid( [ a, A, b, B ] ) with rules
--            [ [ a^2, <identity ...> ], [ a*A, <identity ...> ],
--              [ A*a, <identity ...> ], [ b^2, <identity ...> ],
--              [ b*B, <identity ...> ], [ B*b, <identity ...> ] ]
-+            [ [ a*A, <identity ...> ], [ A*a, <identity ...> ],
-+              [ b*B, <identity ...> ], [ B*b, <identity ...> ],
-+              [ a^2, <identity ...> ], [ b^2, <identity ...> ] ]
-         """
-         return self._gap
- 
-diff --git a/src/sage/groups/fqf_orthogonal.py b/src/sage/groups/fqf_orthogonal.py
-index 7fc4dbe7548..e5eccd45942 100644
---- a/src/sage/groups/fqf_orthogonal.py
-+++ b/src/sage/groups/fqf_orthogonal.py
-@@ -143,7 +143,7 @@ class FqfOrthogonalGroup(AbelianGroupAutomorphismGroup_subgroup):
-         [2/3   0   0]
-         [  0 2/3   0]
-         [  0   0 4/3]
--        generated by 2 elements
-+        generated by 3 elements
-         sage: q = matrix.diagonal(QQ, [3/2, 1/4, 1/4])
-         sage: T = TorsionQuadraticForm(q)
-         sage: T.orthogonal_group().order()
-diff --git a/src/sage/groups/libgap_wrapper.pyx b/src/sage/groups/libgap_wrapper.pyx
-index d25121aa792..dc81b71635b 100644
---- a/src/sage/groups/libgap_wrapper.pyx
-+++ b/src/sage/groups/libgap_wrapper.pyx
-@@ -25,7 +25,7 @@ Note how we call the constructor of both superclasses to initialize
- its output via LibGAP::
- 
-     sage: FooGroup()
--    <pc group of size 3 with 1 generators>
-+    <pc group of size 3 with 1 generator>
-     sage: type(FooGroup().gap())
-     <class 'sage.libs.gap.element.GapElement'>
- 
-@@ -106,7 +106,7 @@ class ParentLibGAP(SageObject):
-         ....:         ParentLibGAP.__init__(self, lg)
-         ....:         Group.__init__(self)
-         sage: FooGroup()
--        <pc group of size 3 with 1 generators>
-+        <pc group of size 3 with 1 generator>
-     """
- 
-     def __init__(self, libgap_parent, ambient=None):
-@@ -461,7 +461,7 @@ cdef class ElementLibGAP(MultiplicativeGroupElement):
-         ....:         ParentLibGAP.__init__(self, lg)
-         ....:         Group.__init__(self)
-         sage: FooGroup()
--        <pc group of size 3 with 1 generators>
-+        <pc group of size 3 with 1 generator>
-         sage: FooGroup().gens()
-         (f1,)
-     """
-diff --git a/src/sage/groups/matrix_gps/finitely_generated.py b/src/sage/groups/matrix_gps/finitely_generated.py
-index a6d3dc02513..63956ad5f10 100644
---- a/src/sage/groups/matrix_gps/finitely_generated.py
-+++ b/src/sage/groups/matrix_gps/finitely_generated.py
-@@ -563,9 +563,6 @@ def as_permutation_group(self, algorithm=None, seed=None):
-             21499084800
-             sage: P = G.as_permutation_group()
-             sage: Psmaller = G.as_permutation_group(algorithm="smaller", seed=6)
--            sage: P == Psmaller  # see the note below
--            True
--            sage: Psmaller = G.as_permutation_group(algorithm="smaller")
-             sage: P == Psmaller
-             False
-             sage: P.cardinality()
-diff --git a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx
-index f2ccca042ac..47d6862333c 100644
---- a/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx
-+++ b/src/sage/groups/perm_gps/partn_ref2/refinement_generic.pyx
-@@ -427,7 +427,7 @@ cdef class LabelledBranching:
-             sage: from sage.groups.perm_gps.partn_ref2.refinement_generic import LabelledBranching
-             sage: L = LabelledBranching(3)
-             sage: L.small_generating_set()
--            []
-+            [()]
-             sage: L.add_gen(libgap.eval('(1,2,3)'))
-             sage: L.small_generating_set()
-             [(1,2,3)]
-diff --git a/src/sage/groups/perm_gps/permgroup.py b/src/sage/groups/perm_gps/permgroup.py
-index ebdf7c4c6eb..fb14008c8e0 100644
---- a/src/sage/groups/perm_gps/permgroup.py
-+++ b/src/sage/groups/perm_gps/permgroup.py
-@@ -926,7 +926,7 @@ def _coerce_map_from_(self, G):
-            sage: f = PG._coerce_map_from_(MG)
-            sage: mg = MG.an_element()
-            sage: p = f(mg); p
--           (2,33,32,23,31,55)(3,49,38,44,40,28)(4,17,59,62,58,46)(5,21,47,20,43,8)(6,53,50)(7,37,12,57,14,29)(9,41,56,34,64,10)(11,25,19)(13,61,26,51,22,15)(16,45,36)(18,27,35,48,52,54)(24,63,42)(30,39,60)
-+           (1,2,6,19,35,33)(3,9,26,14,31,23)(4,13,5)(7,22,17)(8,24,12)(10,16,32,27,20,28)(11,30,18)(15,25,36,34,29,21)
-            sage: PG(p._gap_()) == p
-            True
- 
-@@ -972,12 +972,12 @@ def _coerce_map_from_(self, G):
-             sage: P = G.as_permutation_group(algorithm='smaller', seed=5)
-             sage: P1 = G.as_permutation_group()
-             sage: P == P1
--            False
-+            True
-             sage: g1, g2, g3 = G.gens()
-             sage: P(g1*g2)
--            (1,3,7,12)(2,4,8,10)(5,11)(6,9)
-+            (1,4,13,11)(2,5,14,18)(3,15,8,16)(6,7)(9,20,19,12)(10,17)
-             sage: P1(g1*g2)
--            (2,29,25,68)(3,57,13,54)(4,11,72,37)(5,39,60,23)(6,64,75,63)(7,21,50,73)(8,46,38,32)(9,74,35,18)(10,44,49,48)(12,16,34,71)(14,79,27,40)(15,26)(17,62,59,76)(19,78,70,65)(20,22,58,51)(24,33,36,43)(28,81,80,52)(30,53,56,69)(31,61)(41,42,67,55)(45,77)(47,66)
-+            (1,4,13,11)(2,5,14,18)(3,15,8,16)(6,7)(9,20,19,12)(10,17)
- 
-         Another check for :trac:`5583`::
- 
-@@ -1302,7 +1302,7 @@ def gens_small(self):
-             sage: G.gens_small() # random
-             [('b','c'), ('a','c','b')] ## (on 64-bit Linux)
-             [('a','b'), ('a','c','b')] ## (on Solaris)
--            sage: len(G.gens_small()) == 2
-+            sage: len(G.gens_small()) == 2 # random
-             True
-         """
-         gens = self._libgap_().SmallGeneratingSet()
-@@ -4370,17 +4370,23 @@ def is_transitive(self, domain=None):
- 
-         ::
- 
--            sage: G = PermutationGroup([[(1,2,3,4,5)],[(1,2)]]) #S_5 on [1..5]
--            sage: G.is_transitive([1,4,5])
-+            sage: G = PermutationGroup([[(1,2,3,4,5)],[(1,2)],[(6,7)]])
-+            sage: G.is_transitive([1,2,3,4,5])
-             True
--            sage: G.is_transitive([2..6])
-+            sage: G.is_transitive([1..7])
-             False
-             sage: G.is_transitive(G.non_fixed_points())
--            True
-+            False
-             sage: H = PermutationGroup([[(1,2,3)],[(4,5,6)]])
-             sage: H.is_transitive(H.non_fixed_points())
-             False
- 
-+        If `G` does not act on the domain, it always returns ``False``::
-+
-+            sage: G = PermutationGroup([[(1,2,3,4,5)],[(1,2)]]) #S_5 on [1..5]
-+            sage: G.is_transitive([1,4,5])
-+            False
-+
-         Note that this differs from the definition in GAP, where
-         ``IsTransitive`` returns whether the group is transitive on the
-         set of points moved by the group.
-@@ -4436,12 +4442,16 @@ def is_primitive(self, domain=None):
-             sage: G = PermutationGroup([[(1,2,3,4)],[(2,4)]])
-             sage: G.is_primitive([1..4])
-             False
--            sage: G.is_primitive([1,2,3])
--            True
-             sage: G = PermutationGroup([[(3,4,5,6)],[(3,4)]]) #S_4 on [3..6]
-             sage: G.is_primitive(G.non_fixed_points())
-             True
- 
-+        If `G` does not act on the domain, it always returns ``False``::
-+
-+            sage: G = PermutationGroup([[(1,2,3,4)],[(2,4)]])
-+            sage: G.is_primitive([1,2,3])
-+            False
-+
-         """
-         #If the domain is not a subset of self.domain(), then the
-         #action isn't primitive.
-diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py
-index 7ae1792e9de..ecaa9fd2341 100644
---- a/src/sage/interfaces/gap.py
-+++ b/src/sage/interfaces/gap.py
-@@ -1512,6 +1512,8 @@ def gap_reset_workspace(max_workspace_size=None, verbose=False):
-     """
-     # Create new workspace with filename WORKSPACE
-     g = Gap(use_workspace_cache=False, max_workspace_size=None)
-+    g.eval('ColorPrompt(false)')
-+    g.eval('SetUserPreference("UseColorPrompt", false)')
-     g.eval('SetUserPreference("HistoryMaxLines", 30)')
-     from sage.tests.gap_packages import all_installed_packages
-     for pkg in all_installed_packages(gap=g):
-diff --git a/src/sage/interfaces/gap_workspace.py b/src/sage/interfaces/gap_workspace.py
-index 33a87dd5076..03b40be6856 100644
---- a/src/sage/interfaces/gap_workspace.py
-+++ b/src/sage/interfaces/gap_workspace.py
-@@ -16,7 +16,8 @@
- import os
- import time
- import hashlib
--from sage.env import DOT_SAGE, GAP_SO
-+import subprocess
-+from sage.env import DOT_SAGE, HOSTNAME, GAP_LIB_DIR, GAP_SHARE_DIR
- 
- 
- def gap_workspace_file(system="gap", name="workspace", dir=None):
-@@ -59,11 +60,13 @@ def gap_workspace_file(system="gap", name="workspace", dir=None):
-     if dir is None:
-         dir = os.path.join(DOT_SAGE, 'gap')
- 
--    if GAP_SO:
--        h = hashlib.sha1(GAP_SO.encode('utf-8')).hexdigest()
--    else:
--        h = 'unknown'
--    return os.path.join(dir, '%s-%s-%s' % (system, name, h))
-+    data = f'{GAP_LIB_DIR}:{GAP_SHARE_DIR}'
-+    for path in GAP_LIB_DIR, GAP_SHARE_DIR:
-+        sysinfo = os.path.join(path, "sysinfo.gap")
-+        if os.path.exists(sysinfo):
-+            data += subprocess.getoutput(f'. "{sysinfo}" && echo ":$GAP_VERSION:$GAParch"')
-+    h = hashlib.sha1(data.encode('utf-8')).hexdigest()
-+    return os.path.join(dir, f'{system}-{name}-{HOSTNAME}-{h}')
- 
- 
- def prepare_workspace_dir(dir=None):
-diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx
-index c555ea0333c..e3db3934baf 100644
---- a/src/sage/libs/gap/element.pyx
-+++ b/src/sage/libs/gap/element.pyx
-@@ -130,6 +130,7 @@ cdef char *capture_stdout(Obj func, Obj obj):
-     """
-     cdef Obj s, stream, output_text_string
-     cdef UInt res
-+    cdef TypOutputFile output
-     # The only way to get a string representation of an object that is truly
-     # consistent with how it would be represented at the GAP REPL is to call
-     # ViewObj on it.  Unfortunately, ViewObj *prints* to the output stream,
-@@ -145,12 +146,12 @@ cdef char *capture_stdout(Obj func, Obj obj):
-         output_text_string = GAP_ValueGlobalVariable("OutputTextString")
-         stream = CALL_2ARGS(output_text_string, s, GAP_True)
- 
--        if not OpenOutputStream(stream):
-+        if not OpenOutputStream(&output, stream):
-             raise GAPError("failed to open output capture stream for "
-                            "representing GAP object")
- 
-         CALL_1ARGS(func, obj)
--        CloseOutput()
-+        CloseOutput(&output)
-         return CSTR_STRING(s)
-     finally:
-         GAP_Leave()
-diff --git a/src/sage/libs/gap/gap_includes.pxd b/src/sage/libs/gap/gap_includes.pxd
-index 6d22e32540b..6111d18a5c7 100644
---- a/src/sage/libs/gap/gap_includes.pxd
-+++ b/src/sage/libs/gap/gap_includes.pxd
-@@ -76,8 +76,10 @@ cdef extern from "gap/intobj.h" nogil:
- 
- 
- cdef extern from "gap/io.h" nogil:
--    UInt OpenOutputStream(Obj stream)
--    UInt CloseOutput()
-+    ctypedef struct TypOutputFile:
-+        pass
-+    UInt OpenOutputStream(TypOutputFile* output, Obj stream)
-+    UInt CloseOutput(TypOutputFile* output)
- 
- 
- cdef extern from "gap/libgap-api.h" nogil:
-diff --git a/src/sage/libs/gap/libgap.pyx b/src/sage/libs/gap/libgap.pyx
-index b1a64e57939..6a36613aa8c 100644
---- a/src/sage/libs/gap/libgap.pyx
-+++ b/src/sage/libs/gap/libgap.pyx
-@@ -695,7 +695,7 @@ class Gap(Parent):
-             sage: libgap.List
-             <Gap function "List">
-             sage: libgap.GlobalRandomSource
--            <RandomSource in IsGlobalRandomSource>
-+            <RandomSource in IsGAPRandomSource>
-         """
-         if name in dir(self.__class__):
-             return getattr(self.__class__, name)
-diff --git a/src/sage/libs/gap/saved_workspace.py b/src/sage/libs/gap/saved_workspace.py
-index ad5adec36d0..7636707f557 100644
---- a/src/sage/libs/gap/saved_workspace.py
-+++ b/src/sage/libs/gap/saved_workspace.py
-@@ -8,7 +8,7 @@
- 
- import os
- import glob
--from sage.env import GAP_ROOT_DIR
-+from sage.env import GAP_LIB_DIR
- from sage.interfaces.gap_workspace import gap_workspace_file
- 
- 
-@@ -31,7 +31,7 @@ def timestamp():
-     """
-     libgap_dir = os.path.dirname(__file__)
-     libgap_files = glob.glob(os.path.join(libgap_dir, '*'))
--    gap_packages = glob.glob(os.path.join(GAP_ROOT_DIR, 'pkg', '*'))
-+    gap_packages = glob.glob(os.path.join(GAP_LIB_DIR, 'pkg', '*'))
-     files = libgap_files + gap_packages
-     if len(files) == 0:
-         print('Unable to find LibGAP files.')
-diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
-index 344ab88c42a..eaa659d64c7 100644
---- a/src/sage/libs/gap/util.pyx
-+++ b/src/sage/libs/gap/util.pyx
-@@ -13,7 +13,7 @@ Utility functions for GAP
- #*****************************************************************************
- 
- from libc.signal cimport signal, SIGCHLD, SIG_DFL
--from posix.dlfcn cimport dlopen, dlclose, RTLD_NOW, RTLD_GLOBAL
-+from posix.dlfcn cimport dlopen, dlclose, dlerror, RTLD_LAZY, RTLD_GLOBAL
- 
- from cpython.exc cimport PyErr_Fetch, PyErr_Restore
- from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE
-@@ -164,33 +164,6 @@ cdef void gasman_callback() with gil:
- ### Initialization of GAP ##################################################
- ############################################################################
- 
--def gap_root():
--    """
--    Find the location of the GAP root install which is stored in the gap
--    startup script.
--
--    EXAMPLES::
--
--        sage: from sage.libs.gap.util import gap_root
--        sage: gap_root()   # random output
--        '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
--    """
--    if os.path.exists(sage.env.GAP_ROOT_DIR):
--        return sage.env.GAP_ROOT_DIR
--
--    # Attempt to figure out the appropriate GAP_ROOT by reading the
--    # local/bin/gap shell script; this is an ugly hack that exists for
--    # historical reasons; the best approach to setting where Sage looks for
--    # the appropriate GAP_ROOT is to set the GAP_ROOT_DIR variable
--    SAGE_LOCAL = sage.env.SAGE_LOCAL
--    with open(os.path.join(SAGE_LOCAL, 'bin', 'gap')) as f:
--        gap_sh = f.read().splitlines()
--    gapdir = next(x for x in gap_sh if x.strip().startswith('GAP_ROOT'))
--    gapdir = gapdir.split('"')[1]
--    gapdir = gapdir.replace('$SAGE_LOCAL', SAGE_LOCAL)
--    return gapdir
--
--
- # To ensure that we call initialize_libgap only once.
- cdef bint _gap_is_initialized = False
- 
-@@ -232,12 +205,12 @@ cdef initialize():
-     # this isn't portable
- 
-     cdef void* handle
--    libgapname = str_to_bytes(sage.env.GAP_SO)
--    handle = dlopen(libgapname, RTLD_NOW | RTLD_GLOBAL)
-+    # reload the current module to force reload of libgap (see #33446)
-+    lib = str_to_bytes(__loader__.path, FS_ENCODING, "surrogateescape")
-+    handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
-     if handle is NULL:
--        raise RuntimeError(
--                "Could not dlopen() libgap even though it should already "
--                "be loaded!")
-+        err = dlerror()
-+        raise RuntimeError(f"Could not reload gap library with RTLD_GLOBAL ({err})")
-     dlclose(handle)
- 
-     # Define argv variable, which we will pass in to
-@@ -245,7 +218,7 @@ cdef initialize():
-     cdef char* argv[16]
-     argv[0] = "sage"
-     argv[1] = "-l"
--    s = str_to_bytes(gap_root(), FS_ENCODING, "surrogateescape")
-+    s = str_to_bytes(sage.env.GAP_LIB_DIR + ";" + sage.env.GAP_SHARE_DIR, FS_ENCODING, "surrogateescape")
-     argv[2] = s
- 
-     argv[3] = "-m"
-@@ -362,15 +335,9 @@ cdef Obj gap_eval(str gap_string) except? NULL:
-         GAPError: Error, Variable: 'Complex' must have a value
-         Syntax error: ; expected in stream:1
-         Complex Field with 53 bits of precision;;
--         ^^^^^^^^^^^^
-+                ^^^^^
-         Error, Variable: 'with' must have a value
--        Syntax error: ; expected in stream:1
--        Complex Field with 53 bits of precision;;
--         ^^^^^^^^^^^^^^^^^^^^
-         Error, Variable: 'bits' must have a value
--        Syntax error: ; expected in stream:1
--        Complex Field with 53 bits of precision;;
--         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-         Error, Variable: 'precision' must have a value
- 
-     Test that on a subsequent attempt we get the same message (no garbage was
-diff --git a/src/sage/libs/singular/singular.pyx b/src/sage/libs/singular/singular.pyx
-index d8ea7b07f3c..4beb1774df9 100644
---- a/src/sage/libs/singular/singular.pyx
-+++ b/src/sage/libs/singular/singular.pyx
-@@ -1705,14 +1705,7 @@ cdef object si2sa_intvec(intvec *v):
- cdef extern from *: # hack to get at cython macro
-     int unlikely(int)
- 
--cdef extern from "dlfcn.h":
--    void *dlopen(char *, long)
--    char *dlerror()
--    void dlclose(void *handle)
--
--cdef extern from "dlfcn.h":
--    cdef long RTLD_LAZY
--    cdef long RTLD_GLOBAL
-+from posix.dlfcn cimport dlopen, dlclose, dlerror, RTLD_LAZY, RTLD_GLOBAL
- 
- cdef int overflow_check(unsigned long e, ring *_ring) except -1:
-     """
-@@ -1762,8 +1755,6 @@ cdef init_libsingular():
- 
-     cdef void *handle = NULL
- 
--    from sage.env import LIBSINGULAR_PATH
--    lib = str_to_bytes(LIBSINGULAR_PATH, FS_ENCODING, "surrogateescape")
- 
-     # This is a workaround for https://github.com/Singular/Singular/issues/1113
-     # and can be removed once that fix makes it into release of Singular that
-@@ -1780,10 +1771,12 @@ cdef init_libsingular():
- 
-     import platform
-     if not platform.system().startswith("CYGWIN"):
-+        # reload the current module to force reload of libSingular (see #33446)
-+        lib = str_to_bytes(__loader__.path, FS_ENCODING, "surrogateescape")
-         handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
-         if not handle:
-             err = dlerror()
--            raise ImportError(f"cannot load Singular library from {LIBSINGULAR_PATH} ({err})")
-+            raise RuntimeError(f"Could not reload Singular library with RTLD_GLOBAL ({err})")
- 
-     # load SINGULAR
-     siInit(lib)
-diff --git a/src/sage/tests/gap_packages.py b/src/sage/tests/gap_packages.py
-index 2e4518ca226..c302b169b8a 100644
---- a/src/sage/tests/gap_packages.py
-+++ b/src/sage/tests/gap_packages.py
-@@ -103,7 +103,7 @@ def all_installed_packages(ignore_dot_gap=False, gap=None):
- 
-         sage: from sage.tests.gap_packages import all_installed_packages
-         sage: all_installed_packages()
--        (...'GAPDoc'...)
-+        (...'gapdoc'...)
-         sage: all_installed_packages(ignore_dot_gap=True) == all_installed_packages(gap=gap, ignore_dot_gap=True)
-         True
-     """
diff --git a/srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch b/srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch
deleted file mode 100644
index d331a6573e1c..000000000000
--- a/srcpkgs/sagemath/patches/35127-fix_very_slow_test_stream.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/sage/data_structures/stream.py b/src/sage/data_structures/stream.py
-index f8f6dc6a186..002e925f02f 100644
---- a/src/sage/data_structures/stream.py
-+++ b/src/sage/data_structures/stream.py
-@@ -2090,8 +2090,8 @@ def compute_product(self, n, la):
-             sage: f = Stream_exact([1]) # irrelevant for this test
-             sage: g = Stream_function(lambda n: s[n], True, 0)
-             sage: h = Stream_plethysm(f, g, True, p)
--            sage: B = p[2, 2, 1](sum(s[i] for i in range(7)))
--            sage: all(h.compute_product(k, Partition([2, 2, 1])) == B.restrict_degree(k) for k in range(7))
-+            sage: B = p[2, 2, 1](sum(p(s[i]) for i in range(7)))  # long time
-+            sage: all(h.compute_product(k, Partition([2, 2, 1])) == B.restrict_degree(k) for k in range(7))  # long time
-             True
-         """
-         # This is the approximate order of the result
diff --git a/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch b/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
deleted file mode 100644
index 007f3324cfe4..000000000000
--- a/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index 1e0a708e8068..000000000000
--- a/srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index fc3e40da2a88..000000000000
--- a/srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index ea210e20ae52..000000000000
--- a/srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 46bda084e48e..000000000000
--- a/srcpkgs/sagemath/patches/35423-ipython_8.12.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 2cdc674d4f9e..000000000000
--- a/srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
index 66eedecff7c6..9331258986d3 100644
--- a/srcpkgs/sagemath/patches/35584-networkx_3.1.patch
+++ b/srcpkgs/sagemath/patches/35584-networkx_3.1.patch
@@ -1,8 +1,8 @@
 diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py
-index c2e42bcbd3..b6a10efbf4 100644
+index c2e42bcbd38..0d13f071dc4 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):
+@@ -6786,13 +6786,26 @@ 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}
@@ -18,15 +18,20 @@ index c2e42bcbd3..b6a10efbf4 100644
 +        if cliques is None:
 +            cliques = self.cliques_maximal()
 +
-+        if vertices in self: # single vertex
++        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 }
++
++        from collections import Counter
++        count = Counter()
++
++        for c in cliques:
++            count.update(c)
++
++        return {v : count[v] 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):
+@@ -7493,17 +7506,32 @@ def cliques_containing_vertex(self, vertices=None, cliques=None):
  
              sage: C = Graph('DJ{')
              sage: C.cliques_containing_vertex()
@@ -62,7 +67,7 @@ index c2e42bcbd3..b6a10efbf4 100644
  
          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):
+@@ -7518,8 +7546,20 @@ 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)]]
          """
@@ -71,11 +76,17 @@ index c2e42bcbd3..b6a10efbf4 100644
 +        if cliques is None:
 +            cliques = self.cliques_maximal()
 +
-+        if vertices in self: # single vertex
++        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 }
++
++        from collections import defaultdict
++        d = defaultdict(list)
++
++        for c in cliques:
++            for v in c:
++                d[v].append(c)
++
++        return {v : d[v] for v in vertices or self}
  
      @doc_index("Clique-related methods")
      def clique_complex(self):
diff --git a/srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch b/srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch
new file mode 100644
index 000000000000..58dddf34a69d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35612-linbox_1.7.0.patch
@@ -0,0 +1,64 @@
+diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
+index 7794c9edc39..1753277b1f1 100644
+--- a/src/sage/libs/linbox/conversion.pxd
++++ b/src/sage/libs/linbox/conversion.pxd
+@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
+     - v -- linbox vector
+     """
+     cdef Vector_integer_dense res = P()
+-    cdef cppvector[Integer] * vec = &v.refRep()
+     cdef size_t i
+     for i in range(<size_t> res._degree):
+-        mpz_set(res._entries[i], vec[0][i].get_mpz_const())
++        mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
+ 
+     return res
+diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
+index 9112d151f8b..bfeda4b6042 100644
+--- a/src/sage/libs/linbox/linbox.pxd
++++ b/src/sage/libs/linbox/linbox.pxd
+@@ -32,7 +32,6 @@ cdef extern from "linbox/matrix/dense-matrix.h":
+         ctypedef Modular_double Field
+         ctypedef double Element
+         DenseMatrix_Modular_double(Field F, size_t m, size_t n)
+-        DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
+         void setEntry(size_t i, size_t j, Element& a)
+         Element &getEntry(size_t i, size_t j)
+ 
+@@ -42,7 +41,6 @@ cdef extern from "linbox/matrix/dense-matrix.h":
+         ctypedef Modular_float Field
+         ctypedef float Element
+         DenseMatrix_Modular_float(Field F, size_t m, size_t n)
+-        DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
+         void setEntry(size_t i, size_t j, Element& a)
+         Element &getEntry(size_t i, size_t j)
+ 
+@@ -101,7 +99,6 @@ cdef extern from "linbox/vector/vector.h":
+         DenseVector_integer (Field &F)
+         DenseVector_integer (Field &F, long& m)
+         DenseVector_integer (Field &F, cppvector[Integer]&)
+-        cppvector[Element]& refRep()
+         size_t size()
+         void resize(size_t)
+         void resize(size_t n, const Element&)
+diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
+index abf29badce6..68b869ce314 100644
+--- a/src/sage/matrix/matrix_modn_dense_template.pxi
++++ b/src/sage/matrix/matrix_modn_dense_template.pxi
+@@ -221,9 +221,14 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
+         return 0,[]
+ 
+     cdef ModField *F = new ModField(<long>modulus)
+-    cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols)
+-    cdef Py_ssize_t r = reducedRowEchelonize(A[0])
++    cdef DenseMatrix *A = new DenseMatrix(F[0], nrows, ncols)
++
+     cdef Py_ssize_t i,j
++    for i in range(nrows):
++        for j in range(ncols):
++            A.setEntry(i, j, entries[i*ncols+j])
++
++    cdef Py_ssize_t r = reducedRowEchelonize(A[0])
+     for i in range(nrows):
+         for j in range(ncols):
+             entries[i*ncols+j] = <celement>A.getEntry(i,j)
diff --git a/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
new file mode 100644
index 000000000000..0220b4300c30
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
@@ -0,0 +1,569 @@
+diff --git a/build/pkgs/ecl/dependencies b/build/pkgs/ecl/dependencies
+index cda6316bf5a..51a953403e9 100644
+--- a/build/pkgs/ecl/dependencies
++++ b/build/pkgs/ecl/dependencies
+@@ -1,4 +1,4 @@
+-$(MP_LIBRARY) readline gc libffi
++$(MP_LIBRARY) readline gc libffi info
+ 
+ ----------
+ All lines of this file are ignored except the first.
+diff --git a/build/pkgs/ecl/spkg-configure.m4 b/build/pkgs/ecl/spkg-configure.m4
+index ae1e0ac5e1a..7dbcfa6377b 100644
+--- a/build/pkgs/ecl/spkg-configure.m4
++++ b/build/pkgs/ecl/spkg-configure.m4
+@@ -35,10 +35,7 @@ SAGE_SPKG_CONFIGURE([ecl], [
+     AC_SUBST(SAGE_ECL_CONFIG, [$ECL_CONFIG])
+   fi
+ 
+-  # Maxima cannot yet be provided by the system, so we always use
++  # Kenzo cannot yet be provided by the system, so we always use
+   # the SAGE_LOCAL path for now.
+-  AC_SUBST(SAGE_MAXIMA_FAS, ['${prefix}'/lib/ecl/maxima.fas])
+-
+-  # Likewise for the optional Kenzo SPKG
+   AC_SUBST(SAGE_KENZO_FAS, ['${prefix}'/lib/ecl/kenzo.fas])
+ ])
+diff --git a/build/pkgs/ecl/spkg-install.in b/build/pkgs/ecl/spkg-install.in
+index ee1667aec16..72083337942 100644
+--- a/build/pkgs/ecl/spkg-install.in
++++ b/build/pkgs/ecl/spkg-install.in
+@@ -31,18 +31,6 @@ cp "$SAGE_ROOT"/config/config.* src
+ 
+ if [ x"$SAGE_SPKG_INSTALL_DOCS" != xyes ] ; then
+     ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
+-else
+-    # ECL 2020 needs modern makeinfo
+-    command -v texi2any >/dev/null 2>&1
+-    if [ $? -ne 0 ]; then # texi2any not found -> makeinfo too old, if present
+-        ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
+-    else
+-        if makeinfo -c foo 2>&1 | grep -q invalid; then
+-            # makeinfo found but does not support all options that ecl
+-            # likes to use
+-            ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
+-        fi
+-    fi
+ fi
+ 
+ sdh_configure $SAGE_CONFIGURE_GMP \
+diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4
+index 5859e35f12e..b677184b7be 100644
+--- a/build/pkgs/giac/spkg-configure.m4
++++ b/build/pkgs/giac/spkg-configure.m4
+@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([giac], [
+        m4_pushdef([GIAC_MAX_VERSION], [1.9.999])
+        AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
+          AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
+-            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
++            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n -1)
+             AS_IF([test -n "$giac_version"], [
+                 AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
+                     AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [
+diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
+index 0980a4b8ef8..85fe1ea4731 100644
+--- a/build/pkgs/info/spkg-configure.m4
++++ b/build/pkgs/info/spkg-configure.m4
+@@ -1,4 +1,14 @@
+ SAGE_SPKG_CONFIGURE([info], [
+   AC_PATH_PROG(INFO, info)
+-  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes])
++  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes
++    ], [
++     dnl very old makeinfo are not texi2any, newer are symlinks to texi2any
++     AC_PATH_PROG(TEXI2ANY, texi2any)
++     AS_IF([test -z "${TEXI2ANY}"], [sage_spkg_install_info=yes
++       ], [
++        AS_IF([makeinfo -c foo 2>&1 | grep -q invalid], [
++         dnl makeinfo found, but too old, and  does not support all options that ecl likes to use
++         sage_spkg_install_info=yes])
++       ])
++    ])
+ ])
+diff --git a/build/pkgs/info/spkg-install.in b/build/pkgs/info/spkg-install.in
+index 8086e4b2ec8..3ea8c053669 100644
+--- a/build/pkgs/info/spkg-install.in
++++ b/build/pkgs/info/spkg-install.in
+@@ -1,2 +1,2 @@
+-cd src/info
++cd src
+ sdh_make_install
+diff --git a/build/pkgs/info/type b/build/pkgs/info/type
+index 134d9bc32d5..a6a7b9cd726 100644
+--- a/build/pkgs/info/type
++++ b/build/pkgs/info/type
+@@ -1 +1 @@
+-optional
++standard
+diff --git a/build/pkgs/maxima/checksums.ini b/build/pkgs/maxima/checksums.ini
+index a804c7b831f..0f594389fe6 100644
+--- a/build/pkgs/maxima/checksums.ini
++++ b/build/pkgs/maxima/checksums.ini
+@@ -1,5 +1,5 @@
+ tarball=maxima-VERSION.tar.gz
+-sha1=ed15d5285794413ba94412079eca3d0fa55a47bf
+-md5=9b9ae1dace55b1386739dabaa9122e60
+-cksum=1765409766
++sha1=1010594e6d6082bbd8efaac1b7756ec1721a4ed5
++md5=3c01f1daa6936e11d8713fef7751d3fe
++cksum=2420393096
+ upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
+diff --git a/build/pkgs/maxima/distros/arch.txt b/build/pkgs/maxima/distros/arch.txt
+index 6400290f44d..6ac052fa62b 100644
+--- a/build/pkgs/maxima/distros/arch.txt
++++ b/build/pkgs/maxima/distros/arch.txt
+@@ -1 +1 @@
+-maxima-ecl
++maxima-fas
+diff --git a/build/pkgs/maxima/distros/cygwin.txt b/build/pkgs/maxima/distros/cygwin.txt
+new file mode 100644
+index 00000000000..f5fe3fdc6cb
+--- /dev/null
++++ b/build/pkgs/maxima/distros/cygwin.txt
+@@ -0,0 +1 @@
++maxima
+diff --git a/build/pkgs/maxima/distros/freebsd.txt b/build/pkgs/maxima/distros/freebsd.txt
+new file mode 100644
+index 00000000000..766a71b5074
+--- /dev/null
++++ b/build/pkgs/maxima/distros/freebsd.txt
+@@ -0,0 +1 @@
++math/maxima
+diff --git a/build/pkgs/maxima/distros/gentoo.txt b/build/pkgs/maxima/distros/gentoo.txt
+new file mode 100644
+index 00000000000..85fb33f1610
+--- /dev/null
++++ b/build/pkgs/maxima/distros/gentoo.txt
+@@ -0,0 +1,2 @@
++sci-mathematics/maxima[ecls]
++
+diff --git a/build/pkgs/maxima/package-version.txt b/build/pkgs/maxima/package-version.txt
+index 83476624dc0..5681375f3be 100644
+--- a/build/pkgs/maxima/package-version.txt
++++ b/build/pkgs/maxima/package-version.txt
+@@ -1 +1 @@
+-5.45.0.p0
++5.46.0
+diff --git a/build/pkgs/maxima/patches/matrixexp.patch b/build/pkgs/maxima/patches/matrixexp.patch
+deleted file mode 100644
+index 5c8527c33bf..00000000000
+--- a/build/pkgs/maxima/patches/matrixexp.patch
++++ /dev/null
+@@ -1,15 +0,0 @@
+-diff --git a/share/linearalgebra/matrixexp.lisp b/share/linearalgebra/matrixexp.lisp
+-index 218bf35..f2fd468 100644
+---- a/share/linearalgebra/matrixexp.lisp
+-+++ b/share/linearalgebra/matrixexp.lisp
+-@@ -138,8 +138,8 @@
+- 	   (print `(ratvars = ,$ratvars gcd = '$gcd algebraic = ,$algebraic))
+- 	   (print `(ratfac = ,$ratfac))
+- 	   (merror "Unable to find the spectrum")))
+--   
+--    (setq res ($fullratsimp (ncpower (sub (mult z ($ident n)) mat) -1) z))
+-+
+-+    (setq res ($fullratsimp ($invert_by_lu (sub (mult z ($ident n)) mat) '$crering) z))
+-     (setq m (length sp))
+-     (dotimes (i m)
+-       (setq zi (nth i sp))
+diff --git a/build/pkgs/maxima/patches/maxima.system.patch b/build/pkgs/maxima/patches/maxima.system.patch
+deleted file mode 100644
+index 74db62e7f9f..00000000000
+--- a/build/pkgs/maxima/patches/maxima.system.patch
++++ /dev/null
+@@ -1,25 +0,0 @@
+-diff --git a/src/maxima.system b/src/maxima.system
+-index 76f2452..cf25f51 100644
+---- a/src/maxima.system
+-+++ b/src/maxima.system
+-@@ -1,5 +1,8 @@
+- ;;; -*- Lisp -*-
+- 
+-+(require :cmp)
+-+(setf c::*compile-in-constants* t)
+-+
+- (in-package :cl-user)
+- 
+- (pushnew :cl *features*)
+-@@ -75,6 +78,11 @@
+- 			     ;; Convert dir/foo.fas to dir/foo.o
+- 			     (make-pathname :type "o" :defaults p))
+- 			 files)))
+-+	(c::build-fasl "binary-ecl/maxima" :lisp-files obj
+-+			  :ld-flags
+-+			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+-+							      (find-package "MAXIMA")))))
+-+			    (if (and x (not (string= x ""))) (list x))))
+- 	(c::build-program "binary-ecl/maxima" :lisp-files obj
+- 			  :ld-flags
+- 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+diff --git a/build/pkgs/maxima/spkg-configure.m4 b/build/pkgs/maxima/spkg-configure.m4
+new file mode 100644
+index 00000000000..dc54525320e
+--- /dev/null
++++ b/build/pkgs/maxima/spkg-configure.m4
+@@ -0,0 +1,46 @@
++SAGE_SPKG_CONFIGURE([maxima], [
++  m4_pushdef([SAGE_MAXIMA_MINVER],["5.45.0"])dnl this version and higher allowed
++  SAGE_SPKG_DEPCHECK([ecl], [
++    dnl First check for the "maxima" executable in the user's PATH, because
++    dnl we still use pexpect to communicate with it in a few places.
++    AC_CACHE_CHECK([for Maxima >= $SAGE_MAXIMA_MINVER], [ac_cv_path_MAXIMA], [
++        AC_PATH_PROGS_FEATURE_CHECK([MAXIMA], [maxima], [
++            maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n -1\
++                | $SED -n -e 's/Maxima *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
++            AS_IF([test -n "$maxima_version"], [
++                AX_COMPARE_VERSION([$maxima_version], [ge], [SAGE_MAXIMA_MINVER], [
++                    ac_cv_path_MAXIMA="$ac_path_MAXIMA"
++                    ac_path_MAXIMA_found=:
++                ])
++            ])
++        ])
++    ])
++    SAGE_MAXIMA="$ac_cv_path_MAXIMA"
++    AS_IF([test -z "${SAGE_MAXIMA}"], [
++      sage_spkg_install_maxima=yes
++    ],[
++      dnl If we have the executable, check also for the ECL library.
++      AC_MSG_CHECKING([if ECL can "require" the maxima module])
++      AS_IF([ecl --eval "(require 'maxima)" --eval "(quit)" \
++               >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD], [
++        AC_MSG_RESULT(yes)
++      ], [
++        AC_MSG_RESULT(no)
++        sage_spkg_install_maxima=yes
++      ])
++    ])
++  ])
++  m4_popdef([SAGE_MAXIMA_MINVER])
++],[],[],[
++  # post-check
++  AS_IF([test x$sage_spkg_install_maxima = xyes], [
++    dnl Leaving this variable empty will tell sagelib to load
++    dnl the maxima library (within ECL) by name instead of by
++    dnl absolute path.
++    SAGE_MAXIMA='${prefix}'/bin/maxima
++    SAGE_MAXIMA_FAS='${prefix}'/lib/ecl/maxima.fas
++  ])
++
++  AC_SUBST(SAGE_MAXIMA, "${SAGE_MAXIMA}")
++  AC_SUBST(SAGE_MAXIMA_FAS, "${SAGE_MAXIMA_FAS}")
++])
+diff --git a/build/pkgs/maxima/spkg-install.in b/build/pkgs/maxima/spkg-install.in
+index 3ae6382f9ba..cdb6fbf2069 100644
+--- a/build/pkgs/maxima/spkg-install.in
++++ b/build/pkgs/maxima/spkg-install.in
+@@ -28,28 +28,6 @@ echo
+ echo "Now configuring Maxima..."
+ sdh_configure --enable-ecl git_found=false
+ 
+-# Note the following is regression in maxima build system
+-# see https://sourceforge.net/p/maxima/bugs/3278/
+-# and https://sourceforge.net/p/maxima/bugs/2878/
+-# For the previous time it was fixed.
+-#---------------------------------------------------------------
+-# Touching html and info file to avoid to regenerate them.
+-# This must be done after configuration since the timestamp need
+-# to be later than include-maxima.texi which is generated at
+-# configuration time
+-for i in doc/info/*.html ; do
+-    touch "${i}"
+-done
+-touch doc/info/maxima.info*
+-# Maxima 5.44.0 build_html.sh is not compatible with makeinfo 4.8
+-# (which is /usr/bin/makeinfo on macOS).  #30063
+-# Do not build the HTML docs unless the user asks for it,
+-# in which case it is their problem to install a better
+-# makeinfo version.
+-if [[ "$SAGE_SPKG_INSTALL_DOCS" != yes ]] ; then
+-touch doc/info/maxima_toc.html interfaces/xmaxima/doc/xmaxima.html
+-fi
+-
+ #---------------------------------------------------------------
+ 
+ sdh_make
+diff --git a/build/pkgs/tox/spkg-configure.m4 b/build/pkgs/tox/spkg-configure.m4
+index 7d8ade4c14b..3de0b9b710d 100644
+--- a/build/pkgs/tox/spkg-configure.m4
++++ b/build/pkgs/tox/spkg-configure.m4
+@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([tox], [
+        m4_pushdef([TOX4_MIN_VERSION], [4.0.15])
+        AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [
+          AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [
+-            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -1)
++            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n -1)
+             AS_IF([test -n "$tox_version"], [
+                 AX_COMPARE_VERSION([$tox_version], [lt], [4], [
+                     AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [
+diff --git a/pkgs/sage-conf/_sage_conf/_conf.py.in b/pkgs/sage-conf/_sage_conf/_conf.py.in
+index d66bdb3d264..f2e197b45ed 100644
+--- a/pkgs/sage-conf/_sage_conf/_conf.py.in
++++ b/pkgs/sage-conf/_sage_conf/_conf.py.in
+@@ -9,9 +9,11 @@ VERSION = "@PACKAGE_VERSION@"
+ SAGE_LOCAL = "@prefix@"
+ SAGE_ROOT = "@SAGE_ROOT@"
+ 
+-MAXIMA = "@prefix@/bin/maxima"
++# The path to the standalone maxima executable.
++MAXIMA = "@SAGE_MAXIMA@".replace('${prefix}', SAGE_LOCAL)
+ 
+-# Delete this line if your ECL can load maxima without further prodding.
++# Set this to the empty string if your ECL can load maxima without
++# further prodding.
+ MAXIMA_FAS = "@SAGE_MAXIMA_FAS@".replace('${prefix}', SAGE_LOCAL)
+ 
+ # Delete this line if your ECL can load Kenzo without further prodding.
+diff --git a/src/bin/sage-env b/src/bin/sage-env
+index a7da60df28f..13b54fa7e92 100644
+--- a/src/bin/sage-env
++++ b/src/bin/sage-env
+@@ -440,9 +440,6 @@ if [ -d "$DOT_SAGE" ] ; then
+     fi
+ fi
+ 
+-if [ -n "$SAGE_LOCAL" ]; then
+-    export MAXIMA_PREFIX="$SAGE_LOCAL"
+-fi
+ export MAXIMA_USERDIR="$DOT_SAGE/maxima"
+ 
+ if [ -n "$SAGE_LOCAL" ]; then
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index dae380180ac..ee8f632e94c 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -136,10 +136,11 @@
+     [          1/2*(e^(2*sqrt(x)) + 1)*e^(x - sqrt(x)) 1/2*(x*e^(2*sqrt(x)) - x)*sqrt(x)*e^(x - sqrt(x))]
+     [  1/2*(e^(2*sqrt(x)) - 1)*e^(x - sqrt(x))/x^(3/2)           1/2*(e^(2*sqrt(x)) + 1)*e^(x - sqrt(x))]
+ 
+-And complex exponentiation works now::
++Complex exponentiation works, but may require a patched version of
++maxima (:trac:`32898`) for now::
+ 
+     sage: M = i*matrix([[pi]])
+-    sage: e^M
++    sage: e^M  # not tested, requires patched maxima
+     [-1]
+     sage: M = i*matrix([[pi,0],[0,2*pi]])
+     sage: e^M
+@@ -1186,8 +1187,18 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+         e
+         sage: f.limit(x=5)
+         7776/3125
+-        sage: f.limit(x=1.2)
++
++    Domain to real, a regression in 5.46.0, see https://sf.net/p/maxima/bugs/4138 ::
++
++        sage: maxima_calculus.eval("domain:real")
++        ...
++        sage: f.limit(x=1.2).n()
+         2.06961575467...
++        sage: maxima_calculus.eval("domain:complex");
++        ...
++
++    Otherwise, it works ::
++
+         sage: f.limit(x=I, taylor=True)
+         (-I + 1)^I
+         sage: f(x=1.2)
+@@ -1215,7 +1226,7 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+     With this example, Maxima is looking for a LOT of information::
+ 
+         sage: assume(a>0)
+-        sage: limit(x^a,x=0)
++        sage: limit(x^a,x=0)  # random - maxima 5.46.0 does not need extra assumption
+         Traceback (most recent call last):
+         ...
+         ValueError: Computation failed since Maxima requested additional
+@@ -1224,7 +1235,7 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+          more details)
+         Is a an integer?
+         sage: assume(a,'integer')
+-        sage: limit(x^a, x=0)
++        sage: limit(x^a, x=0)  # random - maxima 5.46.0 does not need extra assumption
+         Traceback (most recent call last):
+         ...
+         ValueError: Computation failed since Maxima requested additional
+@@ -2251,10 +2262,10 @@ def symbolic_expression_from_maxima_string(x, equals_sub=False, maxima=maxima):
+         True
+         sage: sefms("x # 3") == SR(x != 3)
+         True
+-        sage: solve([x != 5], x)
+-        [[x - 5 != 0]]
++        sage: solve([x != 5], x) in [[[x - 5 != 0]], [[x < 5], [5 < x]]]
++        True
+         sage: solve([2*x==3, x != 5], x)
+-        [[x == (3/2), (-7/2) != 0]]
++        [[x == (3/2)...
+ 
+     Make sure that we don't accidentally pick up variables in the maxima namespace (:trac:`8734`)::
+ 
+diff --git a/src/sage/functions/exp_integral.py b/src/sage/functions/exp_integral.py
+index e6c888c64b6..f314e525145 100644
+--- a/src/sage/functions/exp_integral.py
++++ b/src/sage/functions/exp_integral.py
+@@ -601,8 +601,8 @@ class Function_log_integral_offset(BuiltinFunction):
+         1/log(x)
+         sage: f.integrate(x)
+         -x*log_integral(2) + x*log_integral(x) - Ei(2*log(x))
+-        sage: Li(x).integrate(x,2.0,4.5)
+-        -2.5*log_integral(2) + 5.799321147411334
++        sage: Li(x).integrate(x,2.0,4.5).n(digits=10)
++        3.186411697
+         sage: N(f.integrate(x,2.0,3.0))   # abs tol 1e-15
+         0.601621785860587
+ 
+diff --git a/src/sage/interfaces/expect.py b/src/sage/interfaces/expect.py
+index 68ae715e4c3..84adf0341b5 100644
+--- a/src/sage/interfaces/expect.py
++++ b/src/sage/interfaces/expect.py
+@@ -620,7 +620,7 @@ def quit(self, verbose=False):
+ 
+             sage: a = maxima('y')
+             sage: maxima.quit(verbose=True)
+-            Exiting Maxima with PID ... running .../bin/maxima...
++            Exiting Maxima with PID ... running ...maxima...
+             sage: a._check_valid()
+             Traceback (most recent call last):
+             ...
+diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py
+index 27b1e98a6ac..4829560f98b 100644
+--- a/src/sage/interfaces/maxima.py
++++ b/src/sage/interfaces/maxima.py
+@@ -622,11 +622,6 @@ def _start(self):
+             sage: m.is_running()
+             True
+ 
+-        Test that we can use more than 256MB RAM (see :trac:`6772`)::
+-
+-            sage: a = maxima(10)^(10^5)
+-            sage: b = a^600              # long time -- about 10-15 seconds
+-
+         """
+         Expect._start(self)
+         self._sendline(r":lisp (defun tex-derivative (x l r) (tex (if $derivabbrev (tex-dabbrev x) (tex-d x '\\partial)) l r lop rop ))")
+@@ -634,9 +629,6 @@ def _start(self):
+         # Don't use ! for factorials (#11539)
+         self._sendline(":lisp (remprop 'mfactorial 'grind)")
+ 
+-        # Remove limit on the max heapsize (since otherwise it defaults
+-        # to 256MB with ECL).
+-        self._sendline(":lisp (ext:set-limit 'ext:heap-size 0)")
+         self._eval_line('0;')
+ 
+         # set random seed
+diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
+index c263ac65f02..bba8504aa92 100644
+--- a/src/sage/interfaces/maxima_lib.py
++++ b/src/sage/interfaces/maxima_lib.py
+@@ -934,8 +934,15 @@ def sr_limit(self, expr, v, a, dir=None):
+             e
+             sage: limit(f,x = 5)
+             7776/3125
+-            sage: limit(f,x = 1.2)
++
++        Domain to real, a regression in 5.46.0, see https://sf.net/p/maxima/bugs/4138 ::
++
++            sage: maxima_calculus.eval("domain:real")
++            ...
++            sage: limit(f,x = 1.2).n()
+             2.06961575467...
++            sage: maxima_calculus.eval("domain:complex");
++            ...
+             sage: var('a')
+             a
+             sage: limit(x^a,x=0)
+@@ -947,7 +954,7 @@ def sr_limit(self, expr, v, a, dir=None):
+             for more details)
+             Is a positive, negative or zero?
+             sage: assume(a>0)
+-            sage: limit(x^a,x=0)
++            sage: limit(x^a,x=0)  # random - not needed for maxima 5.46.0
+             Traceback (most recent call last):
+             ...
+             ValueError: Computation failed ...
+diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx
+index e2e6449dfa9..15914b0be3e 100644
+--- a/src/sage/matrix/matrix2.pyx
++++ b/src/sage/matrix/matrix2.pyx
+@@ -15425,9 +15425,10 @@ cdef class Matrix(Matrix1):
+ 
+         TESTS:
+ 
+-        Check that sparse matrices are handled correctly (:trac:`28935`)::
++        Sparse matrices are handled correctly (:trac:`28935`), but may
++        require a patched version of maxima (:trac:`32898`) for now::
+ 
+-            sage: matrix.diagonal([0], sparse=True).exp()
++            sage: matrix.diagonal([0], sparse=True).exp()  # not tested, requires patched maxima
+             [1]
+             sage: matrix.zero(CBF, 2, sparse=True).exp()
+             [1.000000000000000                 0]
+diff --git a/src/sage/matrix/matrix_symbolic_dense.pyx b/src/sage/matrix/matrix_symbolic_dense.pyx
+index 19ca5c85cb2..58a25e002f6 100644
+--- a/src/sage/matrix/matrix_symbolic_dense.pyx
++++ b/src/sage/matrix/matrix_symbolic_dense.pyx
+@@ -402,7 +402,8 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             [1/2*(e^(2*x) + 1)*e^(-x) 1/2*(e^(2*x) - 1)*e^(-x)]
+             [1/2*(e^(2*x) - 1)*e^(-x) 1/2*(e^(2*x) + 1)*e^(-x)]
+ 
+-        Exp works on 0x0 and 1x1 matrices::
++        Exponentiation works on 0x0 and 1x1 matrices, but the 1x1 example
++        requires a patched version of maxima (:trac:`32898`) for now::
+ 
+             sage: m = matrix(SR,0,[]); m
+             []
+@@ -410,7 +411,7 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             []
+             sage: m = matrix(SR,1,[2]); m
+             [2]
+-            sage: m.exp()
++            sage: m.exp()  # not tested, requires patched maxima
+             [e^2]
+ 
+         Commuting matrices `m, n` have the property that
+@@ -451,7 +452,6 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             [                       0 1/2*(e^(2*x) + 1)*e^(-x) 1/2*(e^(2*x) - 1)*e^(-x)                        0]
+             [                       0 1/2*(e^(2*x) - 1)*e^(-x) 1/2*(e^(2*x) + 1)*e^(-x)                        0]
+             [1/2*(e^(2*x) - 1)*e^(-x)                        0                        0 1/2*(e^(2*x) + 1)*e^(-x)]
+-
+         """
+         if not self.is_square():
+             raise ValueError("exp only defined on square matrices")
+diff --git a/src/sage/symbolic/integration/integral.py b/src/sage/symbolic/integration/integral.py
+index c82e9ed73c3..e84ad357ee2 100644
+--- a/src/sage/symbolic/integration/integral.py
++++ b/src/sage/symbolic/integration/integral.py
+@@ -741,14 +741,14 @@ def integrate(expression, v=None, a=None, b=None, algorithm=None, hold=False):
+ 
+         sage: _ = var('x,y')
+         sage: f = log(x^2+y^2)
+-        sage: res = integral(f,x,0.0001414, 1.); res
++        sage: res = integral(f,x,1414/10^7, 1); res
+         Traceback (most recent call last):
+         ...
+-        ValueError: Computation failed since Maxima requested additional constraints; using the 'assume' command before evaluation *may* help (example of legal syntax is 'assume(50015104*y^2-50015103>0)', see `assume?` for more details)
+-        Is 50015104*y^2-50015103 positive, negative or zero?
++        ValueError: Computation failed since Maxima requested additional constraints; using the 'assume' command before evaluation *may* help ...
++        Is ... positive, negative or zero?
+         sage: assume(y>1)
+-        sage: res = integral(f,x,0.0001414, 1.); res
+-        2*y*arctan(1.0/y) - 2*y*arctan(0.0001414/y) + 1.0*log(1.0*y^2 + 1.0) - 0.0001414*log(1.0*y^2 + 1.9993959999999997e-08) - 1.9997172
++        sage: res = integral(f,x,1414/10^7, 1); res
++        -2*y*arctan(707/5000000/y) + 2*y*arctan(1/y) + log(y^2 + 1) - 707/5000000*log(y^2 + 499849/25000000000000) - 4999293/2500000
+         sage: nres = numerical_integral(f.subs(y=2), 0.0001414, 1.); nres
+         (1.4638323264144..., 1.6251803529759...e-14)
+         sage: res.subs(y=2).n()
+diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
+index 94813315181..a72ab547c76 100644
+--- a/src/sage/symbolic/relation.py
++++ b/src/sage/symbolic/relation.py
+@@ -1787,8 +1787,8 @@ def solve_ineq_fourier(ineq, vars=None):
+         sage: y = var('y')
+         sage: solve_ineq_fourier([x+y<9,x-y>4],[x,y])
+         [[y + 4 < x, x < -y + 9, y < (5/2)]]
+-        sage: solve_ineq_fourier([x+y<9,x-y>4],[y,x])
+-        [[y < min(x - 4, -x + 9)]]
++        sage: solve_ineq_fourier([x+y<9,x-y>4],[y,x])[0][0](x=42)
++        y < -33
+ 
+         sage: solve_ineq_fourier([x^2>=0])
+         [[x < +Infinity]]
diff --git a/srcpkgs/sagemath/patches/35635-sympy_1.12.patch b/srcpkgs/sagemath/patches/35635-sympy_1.12.patch
new file mode 100644
index 000000000000..9cfc69c2adb6
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35635-sympy_1.12.patch
@@ -0,0 +1,54 @@
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index dae380180ac..ca3c59e63d2 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -1690,8 +1690,11 @@ def laplace(ex, t, s, algorithm='maxima'):
+ 
+     Testing SymPy::
+ 
+-        sage: laplace(t^n, t, s, algorithm='sympy')
+-        (gamma(n + 1)/(s*s^n), 0, re(n) > -1)
++        sage: F, a, cond = laplace(t^n, t, s, algorithm='sympy')
++        sage: a, cond
++        (0, re(n) > -1)
++        sage: F.simplify()
++        s^(-n - 1)*gamma(n + 1)
+ 
+     Testing Maxima::
+ 
+@@ -1700,17 +1703,19 @@ def laplace(ex, t, s, algorithm='maxima'):
+ 
+     Check that :trac:`24212` is fixed::
+ 
+-        sage: laplace(cos(t^2), t, s, algorithm='sympy')
+-        (-1/2*sqrt(pi)*(sqrt(2)*cos(1/4*s^2)*fresnel_sin(1/2*sqrt(2)*s/sqrt(pi)) -
+-        sqrt(2)*fresnel_cos(1/2*sqrt(2)*s/sqrt(pi))*sin(1/4*s^2) - cos(1/4*pi + 1/4*s^2)),
+-        0, True)
++        sage: F, a, cond = laplace(cos(t^2), t, s, algorithm='sympy')
++        sage: a, cond
++        (0, True)
++        sage: F._sympy_().simplify()
++        sqrt(pi)*(sqrt(2)*sin(s**2/4)*fresnelc(sqrt(2)*s/(2*sqrt(pi))) -
++        sqrt(2)*cos(s**2/4)*fresnels(sqrt(2)*s/(2*sqrt(pi))) + cos(s**2/4 + pi/4))/2
+ 
+     Testing result from SymPy that Sage doesn't know how to handle::
+ 
+         sage: laplace(cos(-1/t), t, s, algorithm='sympy')
+         Traceback (most recent call last):
+         ...
+-        AttributeError: Unable to convert SymPy result (=meijerg(((), ()), ((-1/2, 0, 1/2), (0,)), s**2/16)/4) into Sage
++        AttributeError: Unable to convert SymPy result (=meijerg(((), ()), ((-1/2, 0, 1/2), (0,)), ...)/4) into Sage
+     """
+     if not isinstance(ex, (Expression, Function)):
+         ex = SR(ex)
+@@ -1817,8 +1822,8 @@ def inverse_laplace(ex, s, t, algorithm='maxima'):
+ 
+     Transform an expression involving a time-shift, via SymPy::
+ 
+-        sage: inverse_laplace(1/s^2*exp(-s), s, t, algorithm='sympy')
+-        -(log(e^(-t)) + 1)*heaviside(t - 1)
++        sage: inverse_laplace(1/s^2*exp(-s), s, t, algorithm='sympy').simplify()
++        (t - 1)*heaviside(t - 1)
+ 
+     The same instance with Giac::
+ 
diff --git a/srcpkgs/sagemath/patches/get_patches b/srcpkgs/sagemath/patches/get_patches
index 871ae38577fd..049694826d20 100755
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 URL_BASE_PR="https://github.com/sagemath/sage/pull/"
-URL_BASE_COMPARE="https://github.com/sagemath/sage/compare/9.8..."
+URL_BASE_COMPARE="https://github.com/sagemath/sage/compare/10.0..."
 
 case "$1" in
 	-n)  DO=echo ;;
@@ -15,49 +15,13 @@ get_pr() {
 	$DO wget "$URL_BASE_PR$pr.$ext" -O "$pr-$desc.patch"
 }
 
-get_trac() {
-	ticket=$1
-	desc=$(echo "$2" | sed -e 's/ /_/g')
-	commit=$3
-	$DO wget "$URL_BASE_COMPARE$commit.diff" -O "$ticket-$desc-$commit.patch"
-}
-
 # run from patches dir
 cd $(dirname "$0")
 
-# merged in 10.0.beta0
-get_trac 34851 "support singular 4.3.1.p3" 5e5737a0c
-get_pr 35068 "fix tests giac 1.9.0.35" patch
-
-# 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"
-
-# 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"
+# positive review
+get_pr 35584 "networkx 3.1"
+get_pr 35612 "linbox 1.7.0"
+get_pr 35635 "sympy 1.12"
 
 # needs review
-get_pr 35584 "networkx 3.1"
+get_pr 35619 "maxima 5.46.0"
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 66a543efd21d..6fc7c3b2b4a8 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
-version=9.8
-revision=2
+version=10.0
+revision=1
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
 _bindir=/usr/lib/sagemath/$version/bin
@@ -31,8 +31,10 @@ short_desc="Open source mathematics software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="http://sagemath.org/"
+changelog="https://github.com/sagemath/sage/releases"
 distfiles="https://github.com/sagemath/sage/archive/refs/tags/$version.tar.gz"
-checksum=2aff28bd1d18c2d526581f5298acb8336f5b92db5675a7403dec8eaf9a86bc4c
+checksum=60858efd0d1f2526486740962bf72c99f9141a56caf8395f3291fded276faf55
+nocross="due to ntl (flintlib), fflas-ffpack, givaro, linbox, cysignals, sympow, maxima"
 
 do_configure() {
 	# git tree needs bootstrapping

From 07c3beb58d81668931db0769967e8ed3b77776d3 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Tue, 30 May 2023 08:38:01 -0400
Subject: [PATCH 0132/1854] font-iosevka: update to 24.1.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 988e59ad4a0b..55aba82b0fe2 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=22.0.1
+version=24.1.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
 changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
 distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="d9ab0abfb29f5fc0605d83728609dedaeb1bb855135a21621b179062a365ef35
- b7ebe51edf62d9d1dbcfb9478628492fe819638923ccf2f7fcf428ecf9cbb449"
+checksum="52207eccbf8dc8cad208f55efb6ba692361ef6de12faa0716b36a2a123db5522
+ 01cdb5c52ada9275e8a30878ef1b709283694a23b877e2f2519fe1940c6b2136"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 2a693c2ff5ce928a20c742d77312332f26add25d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 29 May 2023 22:30:13 -0400
Subject: [PATCH 0133/1854] davmail: update to 6.1.0.

Closes: #44161.
---
 srcpkgs/davmail/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template
index 9659b4f14dd4..1652c266ecfe 100644
--- a/srcpkgs/davmail/template
+++ b/srcpkgs/davmail/template
@@ -1,16 +1,17 @@
 # Template file for 'davmail'
 pkgname=davmail
-version=6.0.1
+version=6.1.0
 revision=1
-_commit=3390
+_commit=3423
 hostmakedepends="openjdk8 apache-ant"
+depends="virtual?java-runtime"
 short_desc="POP/IMAP/SMTP/Caldav/Carddav/LDAP exchange gateway"
 maintainer="Anachron <gith@cron.world>"
 license="GPL-2.0-only"
 homepage="https://davmail.sourceforge.net"
 changelog="https://raw.githubusercontent.com/mguessan/davmail/master/RELEASE-NOTES.md"
 distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz"
-checksum=ce3b33cd187787a30ccc136e75f1cdf197b0a2874c20ab3f3ea3e426b32b9ab1
+checksum=08e7103d14e9f05ec269caceef7585dcf8be202a35c471fa6fc12729cf99ef2f
 
 do_build() {
 	. /etc/profile.d/openjdk.sh
@@ -24,11 +25,11 @@ do_install() {
 	vmkdir usr/share/davmail/lib
 	vcopy "lib/*" usr/share/davmail/lib
 	vbin src/bin/davmail
-}
 
-post_install() {
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64) return 0 ;;
+		x86_64) ;;
+		*) rm -f ${DESTDIR}/usr/share/davmail/lib/swt-* ;;
 	esac
-	rm -f ${DESTDIR}/usr/share/davmail/lib/swt-*
+
+	vsconf src/etc/davmail.properties
 }

From 9fab13e5c6edb5d2d069c36bccd1b42e34435f98 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 31 May 2023 21:10:45 +0200
Subject: [PATCH 0134/1854] wine: update to 8.9.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7877166ba57c..785393a98776 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.8
+version=8.9
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="d40b083c57639eb5e252452143c9ec34b7b2bce43e30822586eea37f0c63b3c7
- e92c6560ae6d6e72a28ef5606cd5f847d70833ad6c60e79a744aa5840e7628e6"
+checksum="8cdf86b250d9080fcd4e3b939680fcd38ebf0f274a7afa2dcc65f74fa2c1b320
+ ad5fef3487240033aed83c0a7d5b449c85b2d1af5aeb7efe02db12903221a9d4"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 01f525578a95d31b8f043131d4398dcfd7e9e247 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 31 May 2023 21:16:01 +0200
Subject: [PATCH 0135/1854] linux5.4: update to 5.4.244.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 086a942c2a48..e1e9d22352c9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.243
+version=5.4.244
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- abebc3a5d9f564288af5ef8bb4a87683c46c297506d6ebf980617822a63a457e"
+ c1055b17cae94cefd31aac8da0cd4099f607c38765c8b1e590a760c0370ab7cc"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From a8ff8c8263121746a117fa6ec046dd7e3b1d37e5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 31 May 2023 21:18:19 +0200
Subject: [PATCH 0136/1854] linux4.19: update to 4.19.284.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a99e036ad5d7..3128f4bd1480 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.283
+version=4.19.284
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 987395f7696c4fa35fc80beacfbaf4ca44e89b080686b96721ee792e5d599bd1"
+ 1ddfab2ee12c010d3291716d0d03f485d50b8c69e0afb0111bec16acdc9d4be2"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 74eda941ea09d68c4ecd3fbcbad4d7dcd13ddb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Finbar=20=C3=93=20Deaghaidh?= <finbar@tutanota.com>
Date: Fri, 7 Apr 2023 16:40:32 +0100
Subject: [PATCH 0137/1854] New package: spotify-player-0.14.0

---
 srcpkgs/spotify-player/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/spotify-player/template

diff --git a/srcpkgs/spotify-player/template b/srcpkgs/spotify-player/template
new file mode 100644
index 000000000000..9716e81041ad
--- /dev/null
+++ b/srcpkgs/spotify-player/template
@@ -0,0 +1,18 @@
+# Template file for 'spotify-player'
+pkgname=spotify-player
+version=0.14.0
+revision=1
+build_style=cargo
+make_install_args="--path spotify_player"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel alsa-lib-devel dbus-devel"
+short_desc="Command driven spotify player"
+maintainer="Thang Pham <phamducthang1234@gmail.com>"
+license="MIT"
+homepage="https://github.com/aome510/spotify-player"
+distfiles="https://github.com/aome510/spotify-player/archive/refs/tags/v${version}.tar.gz"
+checksum=3cb80919faacc0b50537b6161a464a27818b3fbf916f44e47290cf9bab7bf490
+
+post_install() {
+	vlicense LICENSE
+}

From 19abc55bff484a7bb87b5c5f1e2fb26c4985fdef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:40:00 -0400
Subject: [PATCH 0138/1854] maturin: update to 1.0.1.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index c8863f56181e..210d359f7e56 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.15.2
+version=1.0.1
 revision=1
 build_style=python3-pep517
 build_helper="qemu rust"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=605cfe879c68295eedcf0e874676c469dab34f293d58c496ad9c99e64da9cc0e
+checksum=c4141615078313a5afbb581fefc4b3673c24466d37c939dc44a816a265067c74
 # Tests use unstable features and fail to build
 make_check=no
 

From 70d0fd4f52ccae249a2e93d5f0c8e51a002ebcce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:41:37 -0400
Subject: [PATCH 0139/1854] python-Cython: update to 0.29.35.

---
 srcpkgs/python-Cython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 0b5f7582fea7..5248a14c8bca 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.34
+version=0.29.35
 revision=1
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=1909688f5d7b521a60c396d20bba9e47a1b2d2784bfb085401e1e1e7d29a29a8
+checksum=6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527
 # Tests are flaky
 make_check=no
 

From dc837ff3c096b8fce647cfe8a2cf6dbbaa7e2e9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:41:55 -0400
Subject: [PATCH 0140/1854] python3-deprecated: update to 1.2.14.

---
 srcpkgs/python3-deprecated/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-deprecated/template b/srcpkgs/python3-deprecated/template
index 01e4d5c5357a..e3c260b6448f 100644
--- a/srcpkgs/python3-deprecated/template
+++ b/srcpkgs/python3-deprecated/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-deprecated'
 pkgname=python3-deprecated
-version=1.2.13
-revision=2
+version=1.2.14
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-wrapt"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/tantale/deprecated"
 changelog="https://raw.githubusercontent.com/tantale/deprecated/master/CHANGELOG.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=771e20e93bb4bc497bd9955829d36074dd7608962846c0b34a92ff68ed7ebad9
+checksum=3309fa073e6c13a126be9fb88959a02689b15a066fa7e222a07b62325e9673a7
 
 post_install() {
 	vlicense LICENSE.rst

From ad91bea21ac44c2dbecee37b805a7ed3d906d575 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:42:46 -0400
Subject: [PATCH 0141/1854] python3-imageio: update to 2.30.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 28cd2454bea9..ad3e419c67fd 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.28.1
+version=2.30.0
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=27c7c0004c62fc890198e0534177b4fad1a31d2ee9cfe0e957abacf597e37230
+checksum=15e8ae8a63575040253a772cb476b7ce4e4d762200fb6086e08802784c7d394b
 
 post_install() {
 	vlicense LICENSE

From 035db8d6535ed0b415a3b9e8ec0da45d584e0567 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:49:16 -0400
Subject: [PATCH 0142/1854] python3-pandas: update to 2.0.2.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index ef9c866929ae..db885e486567 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-versioneer"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=821ea98fc1ed84ec53546a1526b2b373c2101d4a9736b4384f10cd9fd5ae12a6
+checksum=44f41cb263726716ff513081bf57ea62fec704f367e3fc8adb15e54991c98273
 # Builds seem to sometimes have missing symbol problems;
 # the intermittent nature suggests this might be a race
 disable_parallel_build=yes

From 3dcea6c48660a6937d198bba34fc8e36feb88fed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:50:12 -0400
Subject: [PATCH 0143/1854] python3-pyzmq: update to 25.1.0.

---
 srcpkgs/python3-pyzmq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 8d3372c02333..d7403f464dff 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=25.0.2
+version=25.1.0
 revision=1
 build_style=python3-module
 make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
@@ -14,7 +14,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6b8c1bbb70e868dc88801aa532cae6bd4e3b5233784692b786f17ad2962e5149
+checksum=80c41023465d36280e801564a69cbfce8ae85ff79b080e1913f6e90481fb8957
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From e285c437aecaf22816026626e67bcbd8c5780456 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:50:32 -0400
Subject: [PATCH 0144/1854] python3-setuptools: update to 67.8.0.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 67404db9c06c..77bf9caa877e 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=67.7.2
+version=67.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990
+checksum=62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 5887e715922df4a5b7f57de7bcb35363057dc7f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 13:54:20 -0400
Subject: [PATCH 0145/1854] python3-xyzservices: update to 2023.5.0.

---
 srcpkgs/python3-xyzservices/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-xyzservices/template b/srcpkgs/python3-xyzservices/template
index 7dd8a79f6839..5cb6c8803baf 100644
--- a/srcpkgs/python3-xyzservices/template
+++ b/srcpkgs/python3-xyzservices/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-xyzservices'
 pkgname=python3-xyzservices
-version=2023.2.0
+version=2023.5.0
 revision=1
 build_style=python3-module
 # Provider tests require unpackaged 'mercantile'
 make_check_args="--ignore=xyzservices/tests/test_providers.py"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3"
 checkdepends="python3-pytest python3-requests"
 short_desc="Source of XYZ tiles providers"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://xyzservices.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/geopandas/xyzservices/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/x/xyzservices/xyzservices-${version}.tar.gz"
-checksum=3342bba410d7941290eed0e58a2e5aadb0f7b97863ec4283b283c406ee723a28
+checksum=f0ffaeb7f1c090cff98de6e9a5d4c1c3dde5a8c30f98044dc1e12b11d4576ebc
 
 post_install() {
 	vlicense LICENSE

From f296f57e23f8e7f20b5a366676aeb1e25bddfe9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 14:08:34 -0400
Subject: [PATCH 0146/1854] xpra: update to 4.4.5.

---
 srcpkgs/xpra/patches/setup.patch | 16 ++++++++--------
 srcpkgs/xpra/template            |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xpra/patches/setup.patch b/srcpkgs/xpra/patches/setup.patch
index 39e063654625..237f04308b1a 100644
--- a/srcpkgs/xpra/patches/setup.patch
+++ b/srcpkgs/xpra/patches/setup.patch
@@ -2,9 +2,9 @@ Make sure the build script pulls the right CFLAGS and prevent -Werror. In
 addition, remove a stray CUDA README that is only supposed to installed when
 CUDA is actually available.
 
---- ./setup.py
-+++ ./setup.py
-@@ -710,7 +710,7 @@
+--- a/setup.py
++++ b/setup.py
+@@ -750,7 +750,7 @@
      #we have to add the python cflags:
      if not (is_Fedora() or is_Debian() or is_CentOS() or is_RedHat() or is_AlmaLinux() or is_RockyLinux() or is_OracleLinux() or is_openSUSE()):
          import sysconfig
@@ -13,7 +13,7 @@ CUDA is actually available.
              add_to_keywords(kw, 'extra_compile_args', cflag)
  
      def add_tokens(s, add_to="extra_link_args"):
-@@ -769,7 +769,7 @@
+@@ -809,7 +809,7 @@
              #as of Cython 0.26 + clang 4.0. Other version combinations may require
              #(un)commenting other switches.
              if not hascflag("-Wno-error"):
@@ -22,7 +22,7 @@ CUDA is actually available.
              addcflags(
                  "-Wno-deprecated-register",
                  "-Wno-unused-command-line-argument",
-@@ -783,7 +783,7 @@
+@@ -823,7 +823,7 @@
                  )
          else:
              if not hascflag("-Wno-error"):
@@ -31,12 +31,12 @@ CUDA is actually available.
              if NETBSD:
                  #see: http://trac.cython.org/ticket/395
                  addcflags("-fno-strict-aliasing")
-@@ -2213,8 +2213,6 @@
+@@ -2252,8 +2252,6 @@
          if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED:
              add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll"))
  
 -add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"])
 -
- tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc")
+ tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc",
+      extra_compile_args="-Wno-error=sign-compare" if get_gcc_version()<(8, ) else None)
  
- toggle_packages(argb_ENABLED, "xpra.codecs.argb")
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 38f83283b1e5..ee8ce4ec78a9 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.4.4
+version=4.4.5
 revision=1
 build_style=python3-module
 make_build_args="--without-cuda_kernels --without-cuda_rebuild"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=63f6b82efde9393a42bbeefc1a35926d636decf32f9b2076800b999d7b418cfc
+checksum=591bd39953cebbfba1a4543bab280b7c1065c3179318f37a41539e954d0709a2
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 # Tests don't run properly without package installed
 make_check=no

From 9d5dd8063d345468ed753efe37824701e489cb93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 31 May 2023 22:16:04 +0200
Subject: [PATCH 0147/1854] gdb: update to 13.2.

---
 srcpkgs/gdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 37d43a994294..0712062a82dc 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=13.1
+version=13.2
 revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
@@ -21,7 +21,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0
+checksum=fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
 make_check=extended  # Tests take too long, not all of them pass.
 
 python_version="3"

From 35ea0fd45e2b6b1c200b581f31b52a627585a075 Mon Sep 17 00:00:00 2001
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
Date: Wed, 31 May 2023 16:09:44 +0300
Subject: [PATCH 0148/1854] libmicrohttpd: remove unused dependencies, fix

Closes: https://github.com/void-linux/void-packages/pull/44191
---
 srcpkgs/libmicrohttpd/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template
index 3764646cec11..a13b5cbd02b0 100644
--- a/srcpkgs/libmicrohttpd/template
+++ b/srcpkgs/libmicrohttpd/template
@@ -1,20 +1,18 @@
 # Template file for 'libmicrohttpd'
 pkgname=libmicrohttpd
 version=0.9.77
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
- --enable-largefile
  --enable-https
  --enable-messages"
-hostmakedepends="texinfo"
-makedepends="libgcrypt-devel gnutls-devel"
+makedepends="gnutls-devel"
 checkdepends="libcurl-devel"
 short_desc="Library embedding HTTP server functionality"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/libmicrohttpd/"
-changelog="https://git.gnunet.org/libmicrohttpd.git/plain/ChangeLog"
+changelog="https://git.gnunet.org/libmicrohttpd.git/plain/ChangeLog?h=v${version}"
 distfiles="${GNU_SITE}/libmicrohttpd/libmicrohttpd-${version}.tar.gz"
 checksum=9e7023a151120060d2806a6ea4c13ca9933ece4eacfc5c9464d20edddb76b0a0
 

From 30b3517297bfa3ff9810b825798be55ff6c2c4e4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 30 May 2023 22:00:52 +0100
Subject: [PATCH 0149/1854] libvterm: update to 0.3.2.

---
 srcpkgs/libvterm/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index a7a7042e0e23..ff5976ef63d5 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,6 +1,6 @@
 # Template file for 'libvterm'
 pkgname=libvterm
-version=0.3.1
+version=0.3.2
 revision=1
 build_style=gnu-makefile
 make_install_target="install-lib install-inc"
@@ -10,13 +10,13 @@ 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=25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397
+checksum=91eb5088069f4e6edab69e14c4212f6da0192e65695956dc048016a0dab8bcf6
 
 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
+		vsed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool
+		vsed -e "s,libtool,./libtool,g" -i Makefile
 	fi
 }
 
@@ -29,8 +29,8 @@ libvterm-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}
 }

From b605edd4109e919a3dc85c1c2ed2789deb39333d Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 21 May 2023 00:39:37 +0200
Subject: [PATCH 0150/1854] lf: update to r30.

---
 srcpkgs/lf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 585e097bfa77..22e9de8d19e7 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r29
+version=r30
 revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=82ec6e926941e1819aecaace32ed9a57597b714b5bbc5ff98dd519f1fa2239fa
+checksum=6f8bc88797710926867a74f3ef68e408e05758bb399266d2841bf0d341d4c146
 
 post_install() {
 	vlicense LICENSE

From 7dc0ee51229621d5c3c82989d366c45ad831ed60 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 21 May 2023 03:39:46 +0300
Subject: [PATCH 0151/1854] Komikku: update to 1.21.1

---
 srcpkgs/Komikku/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 3ca825a50a39..8214aedeb432 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=1.19.0
+version=1.21.1
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config
@@ -17,4 +17,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=e30234915397584bf7b09c50daf99a75692eaff4b7212551e6272fdf17fe8d37
+checksum=303919974aa860b542e486d0321149a882f3f667309b2216899ea5f1633c860f

From e4266b039b435bce4bfb918c559e2566d76ccc11 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 10 Feb 2023 21:01:57 +0530
Subject: [PATCH 0152/1854] zstd: update to 1.5.5.

---
 srcpkgs/zstd/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 2c6bb5a9cda9..ae4776940811 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.5.2
+version=1.5.5
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -8,9 +8,10 @@ checkdepends="gtest-devel tar"
 short_desc="Fast real-time compression algorithm - CLI tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
-homepage="http://www.zstd.net"
+homepage="https://facebook.github.io/zstd/"
+changelog="https://raw.githubusercontent.com/facebook/zstd/dev/CHANGELOG"
 distfiles="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz"
-checksum=7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0
+checksum=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4
 
 do_build() {
 	make ${makejobs} PREFIX=/usr lib-mt

From 7247e059b74cb15a2651e8a6cc38ef02622e154e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 1 Jun 2023 06:47:42 -0500
Subject: [PATCH 0153/1854] python3-rich: update to 13.4.1.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 521205268be3..914fac194563 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=13.3.5
+version=13.4.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=2d11b9b8dd03868f09b4fffadc84a6a8cda574e40dc90821bd845720ebb8e89c
+checksum=76f6b65ea7e5c5d924ba80e322231d7cb5b5981aa60bfc1e694f1bc097fe6fe1
 make_check=extended # some checks only work on windows
 
 post_install() {

From 48df7da012d2e3e945aca51d76d083d39b5ff681 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 1 Jun 2023 06:48:11 -0500
Subject: [PATCH 0154/1854] xml2rfc: update to 3.17.2.

---
 srcpkgs/xml2rfc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 6ed6c1c8fabc..1058373efeee 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
 # Template file for 'xml2rfc'
 pkgname=xml2rfc
-version=3.17.1
+version=3.17.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ietf-tools.github.io/xml2rfc/"
 distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=977e5de43c6eb2855f20cd69fa4634912daa312334b3e6d7495c1e6946e267c2
+checksum=168183289de769bf53adb80f02986f73bb4e6934fa73a85c89a82be7a2b6f01d
 make_check=no # too many dependencies
 
 post_install() {

From b6b7f173c596186ee773f22fa086b40e172e88a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 May 2023 15:54:39 +0200
Subject: [PATCH 0155/1854] libuninameslist: update to 20230523.

---
 srcpkgs/libuninameslist/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libuninameslist/template b/srcpkgs/libuninameslist/template
index 526ec6e0449e..e74ddb282f61 100644
--- a/srcpkgs/libuninameslist/template
+++ b/srcpkgs/libuninameslist/template
@@ -1,6 +1,6 @@
 # Template file for 'libuninameslist'
 pkgname=libuninameslist
-version=20221022
+version=20230523
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/fontforge/libuninameslist"
 distfiles="https://github.com/fontforge/libuninameslist/archive/${version}.tar.gz"
-checksum=eb9e77ef3f4212f42e82004f04dd7766d4c153faa22c6b379c0a1516d6370a7c
+checksum=612936a22dddf6ef2c8a6739185d9d749cb409ebc658d232eb418f78820c7a18
 
 pre_configure() {
 	autoreconf -fi

From 4c583cb674f1a16f060c301c3707fd9712b220e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 May 2023 15:56:41 +0200
Subject: [PATCH 0156/1854] minify: update to 2.12.6.

---
 srcpkgs/minify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 063fc8108beb..3d71f543e395 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.12.5
-revision=2
+version=2.12.6
+revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=b4c91412320138564ee6c208b498ad9f8118465932f6c3664cabbdc5735f677d
+checksum=c5ab7bc5f71e2b9686db73d46013bc2ad15e97824acf477508ae5a39bae920d2
 
 post_install() {
 	vlicense LICENSE

From 90f85c48cbfa8eeeffd4d35b18b9c386e602794e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Jun 2023 13:52:34 +0200
Subject: [PATCH 0157/1854] sbcl: update to 2.3.5.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index f0b3c905a115..9ce15d3284f5 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.3.4
+version=2.3.5
 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=f11b4764c6eabdb27e5a9c46b217204d11bcda534e73bf97073d57831d209c4e
+checksum=89c90720cf9d05dbcd90d690e381a2514c0f1807159e0d7222220c5a8c2d5186
 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+=" 2ea6f7648f05aa1384c83331f1b6d7b018f20fbe621f7d3e57bab7c5c2899508"
+	checksum+=" c4a9f2b30eeb74db0f069538458b955cfef46eecccc771b17ab250e9c144122d"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From c26ca9daf3e3dde1a488d416b06b547bbd765a4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Jun 2023 13:57:39 +0200
Subject: [PATCH 0158/1854] perl-Locale-gettext: fix distfile url.

---
 srcpkgs/perl-Locale-gettext/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index 584ddbe176bd..bfa895f47353 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Locale-gettext'
 pkgname=perl-Locale-gettext
 version=1.07
-revision=12
+revision=13
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
@@ -9,6 +9,6 @@ depends="${makedepends}"
 short_desc="Permits access from Perl to the gettext() family of functions"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
-homepage="https://metacpan.org/release/gettext"
-distfiles="${CPAN_SITE}/Locale/gettext-${version}.tar.gz"
+homepage="https://metacpan.org/release/Locale-gettext"
+distfiles="${CPAN_SITE}/Locale/PVANDRY/Locale-gettext-${version}.tar.gz"
 checksum=909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15

From 112e12707b2b958e2e39a74c211c4ad721390d2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 1 Jun 2023 14:16:06 +0200
Subject: [PATCH 0159/1854] libX11: update to 1.8.5.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 12f6460344f4..c87251bc7f32 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.8.4
+version=1.8.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libx11"
 distfiles="${XORG_SITE}/lib/libX11-${version}.tar.xz"
-checksum=c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518
+checksum=e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561
 
 post_install() {
 	vlicense COPYING

From 3df00d9f53c95a16e995f8ab90cb9bd8e2d81df1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 17 May 2023 10:29:21 -0400
Subject: [PATCH 0160/1854] python3-cryptography_vectors: update to 41.0.0.

---
 srcpkgs/python3-cryptography_vectors/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 03820c77e330..8a900ad9d118 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,16 +1,16 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=39.0.2
+version=41.0.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 short_desc="Test vectors for python3-cryptography"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=a68f106f7a4322cf1e7ed51e3fc6d5c1e0b11d337ed918ec879e8afe0c2a5220
+checksum=7c77787f6f1e3065aed0af9b0113d3736f2d0a80e0ed1ddbd296cf5ac638df00
 
 post_install() {
 	vlicense LICENSE

From e82215ce376d11fd4d42081e78eda8ab0bed8c52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 17 May 2023 10:38:16 -0400
Subject: [PATCH 0161/1854] python3-cryptography: update to 41.0.0.

---
 srcpkgs/python3-cryptography/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index c20ac3848c02..f5a45e5277a5 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,23 +1,23 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=39.0.2
+version=41.0.0
 revision=1
 build_style=python3-module
 build_helper="rust"
 make_check_args="--ignore tests/bench/test_x509.py --ignore tests/bench/test_aead.py"
-hostmakedepends="python3-setuptools-rust python3-cffi cargo"
+hostmakedepends="python3-setuptools-rust python3-cffi cargo pkg-config"
 makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytest-xdist
  python3-iso8601 python3-pytz python3-cryptography_vectors
- python3-pretend python3-hypothesis $depends"
+ python3-pretend python3-hypothesis python3-pytest-benchmark $depends"
 short_desc="Python3 library that provides cryptographic recipes and primitives"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=bc5b871e977c8ee5a1bbc42fa8d19bcc08baf0c51cbf1586b0e87a2694dde42f
+checksum=6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 6ac0c96a4d1d96db798bb3d09abd2e8a93df5114 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 09:51:52 -0400
Subject: [PATCH 0162/1854] python3-PyJWT: update to 2.7.0.

---
 srcpkgs/python3-PyJWT/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index f9ad9a2125fa..4cfacce25953 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
-version=2.1.0
-revision=3
+version=2.7.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://pyjwt.readthedocs.io/"
 distfiles="https://github.com/jpadilla/pyjwt/archive/${version}.tar.gz"
-checksum=054d212924baff4052fc587d71b8d489082e675c22d86a035a133b119e79bb29
+checksum=9a4e2843c027dc4ee0c0b514e3b21b7549b40b75fd8f50351f6b6e9ab2807f40
 
 post_install() {
 	vlicense LICENSE

From d1ba1b9f4adc9d1064281416bb38d71778d51c2b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 09:52:18 -0400
Subject: [PATCH 0163/1854] python3-openssl: update to 23.2.0.

---
 srcpkgs/python3-openssl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
index e21b02bf2942..0823e4fa891a 100644
--- a/srcpkgs/python3-openssl/template
+++ b/srcpkgs/python3-openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-openssl'
 pkgname=python3-openssl
-version=23.1.1
+version=23.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
-checksum=841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7
+checksum=276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	# https://github.com/pyca/pyopenssl/issues/974

From 961b9d81511bee471e3f9638e47c6f03bb2c7be3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 10:04:52 -0400
Subject: [PATCH 0164/1854] python3-fido2: update to 1.1.1.

---
 srcpkgs/python3-fido2/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index c63372c96a19..e0153c6fa3a9 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-fido2'
 pkgname=python3-fido2
 _pkgname=fido2
-version=1.1.0
+version=1.1.1
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3-six python3-cryptography python3-pyscard"
 # Missing fakefs will be pulled from pypi
 checkdepends="$depends python3-mock python3-pytest"
@@ -13,12 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/Yubico/python-fido2"
 distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2b4b4e620c2100442c20678e0e951ad6d1efb3ba5ca8ebb720c4c8d543293674
-
-post_extract() {
-	# pytest mis-recognises this file as a test case
-	rm -f examples/test_config.py
-}
+checksum=5dc495ca8c59c1c337383b4b8c314d46b92d5c6fc650e71984c6d7f954079fc3
 
 post_install() {
 	vlicense COPYING

From 62beb260a26de9b0bc494a933219294a5676f603 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 10:07:26 -0400
Subject: [PATCH 0165/1854] python3-ntlm-auth: enable tests

---
 srcpkgs/python3-ntlm-auth/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-ntlm-auth/template b/srcpkgs/python3-ntlm-auth/template
index 81dba6f7dcef..0f9f4950039c 100644
--- a/srcpkgs/python3-ntlm-auth/template
+++ b/srcpkgs/python3-ntlm-auth/template
@@ -5,6 +5,7 @@ revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-six python3-cryptography"
+checkdepends="python3-pytest python3-requests $depends"
 short_desc="Creates NTLM authentication structures"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 70d5c30693fd888823a34952d82c2f4bb9a9b5b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 31 May 2023 10:11:06 -0400
Subject: [PATCH 0166/1854] yubikey-manager: update to 5.1.1.

---
 srcpkgs/yubikey-manager/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
index 0792f9e3a4c0..e744cfeb88ff 100644
--- a/srcpkgs/yubikey-manager/template
+++ b/srcpkgs/yubikey-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'yubikey-manager'
 pkgname=yubikey-manager
-version=5.0.0
+version=5.1.1
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="libfido2 python3-click python3-fido2 python3-cryptography
  python3-setuptools python3-keyring python3-pyscard"
 checkdepends="$depends python3-pytest python3-makefun"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://developers.yubico.com/yubikey-manager/"
 distfiles="https://developers.yubico.com/yubikey-manager/Releases/${pkgname/-/_}-${version}.tar.gz"
-checksum=c741747200ced1b5803dfdef6718b07a41e109ccb03dd7b72d3a307a3fb33bb5
+checksum=6487db976d8b5b52965db55d084f9d2aef2b96f77da785dc13f6dfdd3302aace
 
 post_install() {
 	vman man/ykman.1

From b5e5d96b26ef9728d790b98849c1328679a9ad70 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Fri, 19 May 2023 23:38:31 -0500
Subject: [PATCH 0167/1854] easyrsa: update to 3.1.4.

---
 srcpkgs/easyrsa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 6fb6ad6faa42..8c43250148a0 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,6 +1,6 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
-version=3.1.2
+version=3.1.4
 revision=1
 depends="openssl"
 short_desc="Simple shell based CA utility"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, ISC"
 homepage="https://github.com/OpenVPN/easy-rsa"
 changelog="https://github.com/OpenVPN/easy-rsa/raw/master/ChangeLog"
 distfiles="https://github.com/OpenVPN/easy-rsa/releases/download/v${version}/EasyRSA-${version}.tgz"
-checksum="d63cf129490ffd6d8792ede7344806c506c82c32428b5bb609ad97ca6a6e4499"
+checksum=4f987a4b5209b934440b6469a38e99c40964b973f2d296a0ddb72464b41dfe48
 conf_files="/etc/easyrsa/vars /etc/easyrsa/openssl-easyrsa.cnf /etc/easyrsa/x509-types/*"
 
 do_install() {

From ebfe96b31c0b06762945b2cb91c2ce66e175c390 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 27 May 2023 21:07:16 +0530
Subject: [PATCH 0168/1854] gallery-dl: update to 1.25.5.

---
 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 19fda8b0e952..d782205eb048 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.4
+version=1.25.5
 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=57aebeaa508ed537fe9b12ab1d045bc250e8f87bd980b470f973b981718a2f70
+checksum=a6a036c19702a48709130db07468e9716277915ad4e5ea37cb63abdc8321fd87
 
 pre_build() {
 	make man completion

From efd8ff49cfe15611c83a608c9700bf3d23816e8e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 May 2023 03:02:11 -0700
Subject: [PATCH 0169/1854] gtk4: fix TreeList item order

This also fixes an issue in nautilus where removed items appear at the front of
the file list.
---
 ...7d7f1d0f1aea8a5697a50299594ef523faf7.patch | 100 ++++++++++++++++++
 srcpkgs/gtk4/template                         |   2 +-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch

diff --git a/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch b/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
new file mode 100644
index 000000000000..6232575a9395
--- /dev/null
+++ b/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
@@ -0,0 +1,100 @@
+From 4f47683710bbb4b56c286c6ee6a5c394fcf2b755 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 29 Mar 2023 02:23:46 +0000
+Subject: [PATCH] Merge branch 'wip/otte/trelistmodel-fixage' into 'main'
+
+treelistmodel: Don't add items in reverse
+
+Closes #5707
+
+See merge request GNOME/gtk!5744
+
+(cherry picked from commit c5a53f235a2ed1b0acd0a8c29153e62377262d04)
+
+1718db14 treelistmodel: Don't add items in reverse
+cd860beb Add a test for splicing treelistmodel
+---
+ gtk/gtktreelistmodel.c        |  2 +-
+ testsuite/gtk/treelistmodel.c | 46 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 47 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
+index dd3b3009ccc..1e55323c0a4 100644
+--- a/gtk/gtktreelistmodel.c
++++ b/gtk/gtktreelistmodel.c
+@@ -357,7 +357,7 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
+     }
+ 
+   tree_added = added;
+-  for (i = 0; i < added; i++)
++  for (i = added; i-- > 0;)
+     {
+       child = gtk_rb_tree_insert_before (node->children, child);
+       child->parent = node;
+diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c
+index 941ac3d306b..98493a3ba56 100644
+--- a/testsuite/gtk/treelistmodel.c
++++ b/testsuite/gtk/treelistmodel.c
+@@ -261,6 +261,51 @@ test_remove_some (void)
+   g_object_unref (tree);
+ }
+ 
++static void
++splice (GListStore *store,
++        guint       pos,
++        guint       removed,
++        guint      *numbers,
++        guint       added)
++{
++  GObject **objects = g_newa (GObject *, added);
++  guint i;
++
++  for (i = 0; i < added; i++)
++    {
++      /* 0 cannot be differentiated from NULL, so don't use it */
++      g_assert_cmpint (numbers[i], !=, 0);
++      objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
++      g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
++    }
++
++  g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
++
++  for (i = 0; i < added; i++)
++    g_object_unref (objects[i]);
++}
++
++static void
++test_splice (void)
++{
++  GtkTreeListModel *tree = new_model (100, TRUE);
++  gpointer item;
++
++  assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
++  assert_changes (tree, "");
++
++  item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
++  g_assert_true (G_IS_LIST_MODEL (item));
++  splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
++  /* expected */
++  assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
++  /* real outcome */
++  // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
++  assert_changes (tree, "2-5+5");
++
++  g_object_unref (tree);
++}
++
+ /* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
+ typedef struct _DemoNode DemoNode;
+ 
+@@ -391,6 +436,7 @@ main (int argc, char *argv[])
+ 
+   g_test_add_func ("/treelistmodel/expand", test_expand);
+   g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
++  g_test_add_func ("/treelistmodel/remove_splice", test_splice);
+   g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
+ 
+   return g_test_run ();
+-- 
+GitLab
+
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index a2566d4042d3..5fafa50f6f33 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=4.10.3
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dman-pages=true -Dgtk_doc=true

From 144be636c3a0ba48745d49d10b8fbae771b78664 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Jun 2023 16:07:29 +0200
Subject: [PATCH 0170/1854] libvirt: update to 9.4.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index e1cd1aa616f0..7e29d08bda26 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=9.3.0
+version=9.4.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=751179b08e5a73b6cfd93200d110df199eaa3973f3554ba2ebcbd71e272bebe1
+checksum=4862a82f76f3e40f6046e58c8acda281bd5935d1d33eb211d198c856456fd6a5
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From cbe35f8d1302cabac48c12ded0eb04f55cc733d5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 2 Jun 2023 16:13:34 +0200
Subject: [PATCH 0171/1854] libvirt-python3: update to 9.4.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 2ec08b26459a..ea6323be55fd 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.3.0
+version=9.4.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=9c761d88b4ddcf65b324043944da4f18f82471c74d9371d2372d3b4e0f19861b
+checksum=2d0adcb54ca1dd1ddc72b45a39894941ff3659f18d61382229ed9029f6274a7f
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 79fdff831f409998246408aac5ba9885fac9ae15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 2 Jun 2023 22:35:39 +0700
Subject: [PATCH 0172/1854] wireplumber: add elogind modules

---
 srcpkgs/wireplumber-elogind  |  1 +
 srcpkgs/wireplumber/template | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/wireplumber-elogind

diff --git a/srcpkgs/wireplumber-elogind b/srcpkgs/wireplumber-elogind
new file mode 120000
index 000000000000..00ad6b20db5e
--- /dev/null
+++ b/srcpkgs/wireplumber-elogind
@@ -0,0 +1 @@
+wireplumber
\ No newline at end of file
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 0014c3357f7c..5d7510f0d9bb 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,12 +1,12 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=5
+revision=6
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
 hostmakedepends="pkg-config glib-devel python3-lxml doxygen gettext"
-makedepends="libglib-devel pipewire-devel lua54-devel"
+makedepends="libglib-devel pipewire-devel lua54-devel elogind-devel"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -25,7 +25,7 @@ post_install() {
 }
 
 wireplumber-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -34,3 +34,11 @@ wireplumber-devel_package() {
 		vmove usr/share/gir-1.0
 	}
 }
+
+wireplumber-elogind_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - elogind integration"
+	pkg_install() {
+		vmove "usr/lib/wireplumber-${version%.*}/libwireplumber-module-logind.so"
+	}
+}

From 084808aef1feb33269bc432794e264d1c1e5d932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 2 Jun 2023 22:35:17 +0700
Subject: [PATCH 0173/1854] git: update to 2.41.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index c97868e23fcf..65b72ea703e1 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.40.1
+version=2.41.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2
+checksum=e748bafd424cfe80b212cbc6f1bbccc3a47d4862fb1eb7988877750478568040
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 553716847d246cf839507028708c5274113f01fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 0174/1854] shotwell: update to 0.32.1.

---
 srcpkgs/shotwell/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 0a5f0718780c..2e1dc4287794 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,14 +1,15 @@
 # Template file for 'shotwell'
 pkgname=shotwell
-version=0.31.5
+version=0.32.1
 revision=1
 build_style=meson
 hostmakedepends="gcr-devel gettext glib-devel itstool
- libgee08-devel libgexiv2-devel pkg-config vala-devel"
+ libgee-devel libgexiv2-devel pkg-config vala-devel"
 makedepends="gst-plugins-base1-devel libgdata-devel
- libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel
+ libgee-devel libgexiv2-devel libgphoto2-devel libgudev-devel
  libraw-devel libsecret-devel libchamplain-devel libwebp-devel
- rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel"
+ rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel
+ libportal-gtk3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Open source photo manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +17,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
 changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19
+checksum=4ac4517416ad8aa23b44e75c34bd6e16bab7363fa20991bb09bacdfab3f763ce
 lib32disabled=yes
 
 post_extract() {

From 3ca5bb335018003ce4b4789221bd5db2ecb4ab0d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jun 2023 20:26:23 +0200
Subject: [PATCH 0175/1854] fotoxx: remove unused libraw build dep

---
 srcpkgs/fotoxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 881aa8f3891d..ffee06a684f6 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libchamplain-devel libraw-devel"
+makedepends="libchamplain-devel"
 depends="desktop-file-utils exiftool xdg-utils dcraw"
 short_desc="Free open source program for image editing and collection management"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"

From 1f369ab44317cb75d22829b76f3a51e1a80d7335 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH 0176/1854] chronograf: update to 1.10.1, makedepends on
 nodejs, python3

---
 srcpkgs/chronograf/patches/lmdb.patch      | 11 +++++++++++
 srcpkgs/chronograf/patches/noscripts.patch | 10 ++++++++++
 srcpkgs/chronograf/template                | 19 +++++++------------
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/chronograf/patches/lmdb.patch
 create mode 100644 srcpkgs/chronograf/patches/noscripts.patch

diff --git a/srcpkgs/chronograf/patches/lmdb.patch b/srcpkgs/chronograf/patches/lmdb.patch
new file mode 100644
index 000000000000..f79ff3fb11ac
--- /dev/null
+++ b/srcpkgs/chronograf/patches/lmdb.patch
@@ -0,0 +1,11 @@
+--- a/package.json	2023-05-11 10:30:54.448958871 -0400
++++ b/package.json	2023-05-11 10:31:44.786945716 -0400
+@@ -32,5 +32,8 @@
+     "process": "^0.11.10",
+     "querystring-es3": "^0.2.1",
+     "util": "^0.12.4"
++  },
++  "resolutions": {
++     "lmdb": "^2.8.0"
+   }
+ }
diff --git a/srcpkgs/chronograf/patches/noscripts.patch b/srcpkgs/chronograf/patches/noscripts.patch
new file mode 100644
index 000000000000..ef7c67e74857
--- /dev/null
+++ b/srcpkgs/chronograf/patches/noscripts.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2023-05-09 14:10:03.975291850 -0400
++++ b/Makefile	2023-05-09 14:13:17.400831107 -0400
+@@ -72,7 +72,7 @@
+ ifndef YARN
+ 	$(error Please install yarn 1.19.1+)
+ else
+-	cd ui && yarn --no-progress --no-emoji
++	cd ui && yarn --no-progress --no-emoji --ignore-scripts
+ 	@touch .jsdep
+ endif
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..ef562ad65c9e 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,19 +1,19 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"
 go_ldflags="-X main.version=${version}"
-hostmakedepends="dep go-bindata nodejs-lts yarn"
+hostmakedepends="dep go-bindata nodejs yarn python3"
 short_desc="Open source monitoring and visualization UI for the TICK stack"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
-distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
@@ -24,12 +24,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
 }
 
 post_install() {

From 55059bd0e3d8b9b1f69781ac2419e8a6214a6f26 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 2 Jun 2023 22:45:37 +0200
Subject: [PATCH 0177/1854] wireplumber: do not use make_dirs with account from
 different package

Closes: https://github.com/void-linux/void-packages/issues/44231
---
 srcpkgs/wireplumber/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 5d7510f0d9bb..bb0c9f8d785f 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.14
-revision=6
+revision=7
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -16,7 +16,6 @@ changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
 checksum=b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea
 provides="pipewire-session-manager-0_1"
-make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
 
 post_install() {
 	vlicense LICENSE

From 94eedc6def7785ecceae679f2dbc3728686c3d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jun 2023 09:11:38 +0700
Subject: [PATCH 0178/1854] libxfce4ui: update to 4.18.4.

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 3c3f495a78aa..909c8e284d8e 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,6 +1,6 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
-version=4.18.3
+version=4.18.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=afa3a46eeed3ab612d2f7e1308edaf5819f6c33ccc16c13080efabd58f010abd
+checksum=87eefe797c6d26de3f754de48872faf131f1b5fc93fb88e22f5c7886a842cb4c
 
 # Package build options
 build_options="gir"

From 62002a2ccb2e6c991f5794630db7b9a0b441f9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jun 2023 09:11:33 +0700
Subject: [PATCH 0179/1854] xfce4-session: update to 4.18.3.

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 29778465e4c7..66eb0aa43cd1 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
-version=4.18.2
+version=4.18.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
@@ -14,4 +14,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=01ff7fe8d4c2091adefc2925c6b7bb93152ba0732e95c9b9e64d8207fdbdeb8a
+checksum=382f93e096ec6493098719cab8cc31b93ad9bb469c0715c0c5117d75fe7394ec

From 7803aedd8660013caac641ccb94409d1a99f3b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 3 Jun 2023 09:11:30 +0700
Subject: [PATCH 0180/1854] xfce4-panel: update to 4.18.4.

---
 srcpkgs/xfce4-panel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 18d06d914bed..90ebda66bd07 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.18.3
+version=4.18.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b
+checksum=32304f82094ea3779741f968dc851032d8790eb78f3aa01676520b96cfacfb54
 
 # Package build options
 build_options="gir"

From d2949ca4e7b0eea942aaf2d085aab016122ea9f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Jun 2023 11:06:59 +0200
Subject: [PATCH 0181/1854] perl-Module-Build-Tiny: update to 0.046.

---
 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 2a3c60d55d25..8f12c01fdca6 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.045
+version=0.046
 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=d20692eee246d0b329b7f7659f36286b14ae0696fe91078a64b7078f8876d300
+checksum=be193027e2debb4c9926434aaf1aa46c9fc7bf4db83dcc347eb6e359ee878289

From 86adaea52382c407d243330237bd6591d0f632f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 3 Jun 2023 15:08:29 +0200
Subject: [PATCH 0182/1854] opam: update to 2.1.5.

---
 srcpkgs/opam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index e0765733c350..46e4a305f2b9 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,6 +1,6 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.4
+version=2.1.5
 revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="https://opam.ocaml.org/"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=06aa6c96ccf68bb8be3864d984bd7c54329eabb4082d7c07232cd4d18c55e7c4
+checksum=2eb2a21f4d64d1eb2eece2e8d28678be823d3f6846c28fc0fbd5645738fe0f81
 nocross=yes
 disable_parallel_build=yes
 make_check=ci-skip # uses bwrap

From a0c170ee0e6168da63431504f876134a3d6cff2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:48:29 +0200
Subject: [PATCH 0183/1854] libraw: update to 0.21.1.

---
 common/shlibs           | 4 ++--
 srcpkgs/libraw/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..16eefd439b2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -915,8 +915,8 @@ libdiscid.so.0 libdiscid-0.2.2_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
-libraw.so.20 libraw-0.20.2_1
-libraw_r.so.20 libraw-0.20.2_1
+libraw.so.23 libraw-0.21.0_1
+libraw_r.so.23 libraw-0.21.0_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index b5393b77b7e7..3e72337dfbdc 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -1,6 +1,6 @@
 # Template file for 'libraw'
 pkgname=libraw
-version=0.20.2
+version=0.21.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -11,7 +11,7 @@ license="LGPL-2.1-only, CDDL-1.0"
 homepage="https://www.libraw.org"
 changelog="https://github.com/LibRaw/LibRaw/raw/${version%.*}-stable/Changelog.txt"
 distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz"
-checksum=dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6
+checksum=630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd
 
 pre_configure() {
 	autoreconf -fi

From f7ef23d44aa0de3ce872d7d4c01b321185564760 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:39 +0200
Subject: [PATCH 0184/1854] efl: revbump for libraw 0.21

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index c3ef8348c196..db34290abbe1 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.26.2
-revision=4
+revision=5
 build_style=meson
 configure_args="
  -Dbuild-examples=false

From 770637babf74eb9d3e6173724bc1cb604e7e0716 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 0185/1854] gegl: revbump for libraw 0.21

---
 srcpkgs/gegl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index ab5dcdae833b..ce14c44fc7f4 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
 version=0.4.44
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=true -Dvapigen=enabled

From e64f6ba4421a1df82b7942baf1e9a2032cb22361 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 0186/1854] gthumb: revbump for libraw 0.21

---
 srcpkgs/gthumb/patches/libraw-0.21.patch | 67 ++++++++++++++++++++++++
 srcpkgs/gthumb/template                  |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gthumb/patches/libraw-0.21.patch

diff --git a/srcpkgs/gthumb/patches/libraw-0.21.patch b/srcpkgs/gthumb/patches/libraw-0.21.patch
new file mode 100644
index 000000000000..ee1faf6b07cf
--- /dev/null
+++ b/srcpkgs/gthumb/patches/libraw-0.21.patch
@@ -0,0 +1,67 @@
+From da0d3f22a5c3a141211d943e7d963d14090011ec Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Fri, 23 Dec 2022 17:37:03 +0100
+Subject: [PATCH] Fixed build with libraw 0.21
+
+---
+ extensions/raw_files/gth-metadata-provider-raw.c | 2 +-
+ extensions/raw_files/gth-metadata-provider-raw.h | 7 +++++++
+ extensions/raw_files/main.c                      | 4 ++--
+ 3 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/raw_files/gth-metadata-provider-raw.c b/extensions/raw_files/gth-metadata-provider-raw.c
+index 2d9f5020c..1aa8a727e 100644
+--- a/extensions/raw_files/gth-metadata-provider-raw.c
++++ b/extensions/raw_files/gth-metadata-provider-raw.c
+@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self,
+ 	if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
+ 		return;
+ 
+-	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++	raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+ 	if (raw_data == NULL)
+ 		goto fatal_error;
+ 
+diff --git a/extensions/raw_files/gth-metadata-provider-raw.h b/extensions/raw_files/gth-metadata-provider-raw.h
+index 6406c68bf..cf19434df 100644
+--- a/extensions/raw_files/gth-metadata-provider-raw.h
++++ b/extensions/raw_files/gth-metadata-provider-raw.h
+@@ -25,6 +25,13 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <gthumb.h>
++#include <libraw.h>
++
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
++#else
++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
++#endif
+ 
+ #define GTH_TYPE_METADATA_PROVIDER_RAW         (gth_metadata_provider_raw_get_type ())
+ #define GTH_METADATA_PROVIDER_RAW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_METADATA_PROVIDER_RAW, GthMetadataProviderRaw))
+diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
+index 25829c120..0673c2c75 100644
+--- a/extensions/raw_files/main.c
++++ b/extensions/raw_files/main.c
+@@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 	size_t         size;
+ 	GthImage      *image = NULL;
+ 
+-	raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++	raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+ 	if (raw_data == NULL) {
+ 		_libraw_set_gerror (error, errno);
+ 		goto fatal_error;
+@@ -300,7 +300,7 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
+ 		if ((original_width != NULL) && (original_height != NULL)) {
+ 			libraw_close (raw_data);
+ 
+-			raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++			raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+ 			if (raw_data == NULL)
+ 				goto fatal_error;
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index 4da54add6ae8..7e8de5b6817a 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,7 +1,7 @@
 # Template file for 'gthumb'
 pkgname=gthumb
 version=3.12.2
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
 makedepends="webkit2gtk-devel json-glib-devel libsecret-devel librsvg-devel

From d8197d09bf424340202065e4e9a2770bc0132c23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:40 +0200
Subject: [PATCH 0187/1854] io.elementary.photos: revbump for libraw 0.21

---
 srcpkgs/io.elementary.photos/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 606b6ba2edc5..42237ef45750 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.photos'
 pkgname=io.elementary.photos
 version=2.7.5
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
  glib-devel python3-scour"

From 2e01cc5cbb1c0c4cd5b808c33986722ec13ee45d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 0188/1854] kimageformats: revbump for libraw 0.21

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index f42919b9a60f..4e4a02383fd3 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.105.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From a7cdc6e2a554dfe51feafd6d061acee62f9dc0d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 0189/1854] krita: revbump for libraw 0.21

---
 srcpkgs/krita/patches/libraw-0.21.patch | 28 +++++++++++++++++++++++++
 srcpkgs/krita/template                  |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/krita/patches/libraw-0.21.patch

diff --git a/srcpkgs/krita/patches/libraw-0.21.patch b/srcpkgs/krita/patches/libraw-0.21.patch
new file mode 100644
index 000000000000..fd2d40e5cc7b
--- /dev/null
+++ b/srcpkgs/krita/patches/libraw-0.21.patch
@@ -0,0 +1,28 @@
+From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 16:28:38 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa71..71425f909c2 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+     d->setProgress(0.3);
+ 
+     raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++    raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+     raw.imgdata.params.shot_select = shotSelect;
++#endif
+     ret                            = raw.unpack();
+ 
+     if (ret != LIBRAW_SUCCESS)
+-- 
+GitLab
+
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1ca223394960..f070ef21bfb3 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=5
+revision=6
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 1b0671ac49cbfc593ea4e13cbbb60deedc6f699f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:41 +0200
Subject: [PATCH 0190/1854] kstars: revbump for libraw 0.21

---
 srcpkgs/kstars/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 661cbdcde170..29d6ae2f997c 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
 # Template file for 'kstars'
 pkgname=kstars
 version=3.6.0
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
  kconfig"
@@ -19,3 +19,4 @@ license="GPL-2.0-or-later"
 homepage="https://edu.kde.org/kstars/"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=c1dbf64ce38f201dd5446dd732ce7c8bf1ef30367dc2f11102105036c949db91
+make_check=no # FIXME

From 51db3585e1673fd75304ae630227603f85191e81 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:42 +0200
Subject: [PATCH 0191/1854] libkdcraw5: revbump for libraw 0.21

---
 srcpkgs/libkdcraw5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 9287282dc3dc..27e416dca9f8 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
 version=23.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
  gettext"

From 0fb5b3e17d55dd5ebf1656b7ae84ff031730d98a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:42 +0200
Subject: [PATCH 0192/1854] nomacs: revbump for libraw 0.21

---
 srcpkgs/nomacs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index ce4e7f7093da..57d3a1e98e84 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,7 +1,7 @@
 # Template file for 'nomacs'
 pkgname=nomacs
 version=3.16.224
-revision=4
+revision=5
 build_wrksrc=ImageLounge
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_TRANSLATIONS=1

From b88f0b9cd14cc26b3c5202bb037565f1f7343f2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 0193/1854] openimageio: revbump for libraw 0.21

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 9b38ace50f7e..c2d36b4b3539 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From aa0d0959f3d0e3c2cef4c1f78512806ef3fc2b59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 1 Jun 2023 20:56:43 +0200
Subject: [PATCH 0194/1854] siril: revbump for libraw 0.21

---
 srcpkgs/siril/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index e88f30fb6178..84332f79d060 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=9
+revision=10
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From 39799f22f642f03e1329dcf11a4f524798487725 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jun 2023 20:47:11 +0200
Subject: [PATCH 0195/1854] shotwell: revbump for libraw 0.21

---
 srcpkgs/shotwell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 2e1dc4287794..60ee544de0be 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,7 +1,7 @@
 # Template file for 'shotwell'
 pkgname=shotwell
 version=0.32.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gcr-devel gettext glib-devel itstool
  libgee-devel libgexiv2-devel pkg-config vala-devel"

From 5017b1a58971950afe0c5b0ea200778ab4cb6dae Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 3 Jun 2023 09:39:08 -0500
Subject: [PATCH 0196/1854] delta: update to 0.16.4.

---
 srcpkgs/delta/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 154bbaa578c5..ab06413387f0 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.15.1
+version=0.16.4
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,12 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
-checksum=b9afd2f80ae1d57991a19832d6979c7080a568d42290a24e59d6a2a82cbc1728
-
-post_patch() {
-	# fixes an indexmap error when cross compiling
-	cargo update --package autocfg@1.0.1 --precise 1.1.0
-}
+checksum=66380e92d422881fae6526aee14bedf8124ea17903bcf6d22633e658bd509190
 
 pre_build() {
 	export RUSTONIG_SYSTEM_LIBONIG=1

From 5901a0279c686c06fa0d5f210203092e594d318c Mon Sep 17 00:00:00 2001
From: Andrew B <abenson+void@gmail.com>
Date: Sat, 3 Jun 2023 10:01:24 -0500
Subject: [PATCH 0197/1854] sqlmap: update to 1.7.6.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 86788928ca40..e3b3a0fde44a 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.7.5
+version=1.7.6
 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=0bed6c991d02efa39deaa93293ef1183e6d54b63c1c12b585f5ffc0e9dee20e9
+checksum=035df3f8d3eda65723318d3e1faa5e271e82774a151f4ff706e79ed5b49e2b27
 python_version=3
 
 do_install() {

From 7021fe80f9219e6d5c70c27d04a47307001a0230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 19 May 2023 15:50:26 +0200
Subject: [PATCH 0198/1854] homebank: update to 5.6.4.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 98c88597e494..0f2226d38d81 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.6.3
+version=5.6.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 changelog="http://homebank.free.fr/ChangeLog"
 distfiles="http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"
-checksum=419475f564bbd9be7f4101b1197ce53ea21e8374bcf0505391406317ed823828
+checksum=81e1ff4186cf1fa90b48978272011887fa7c0b7b066438bd494f4a0f80ff95b9
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 620b20e4bd26e795d683aeb7ab657d60846f7791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 20 May 2023 17:11:10 +0200
Subject: [PATCH 0199/1854] doctl: update to 1.96.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index f14a0aca930b..03c6ca38bb4f 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.95.0
+version=1.96.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -15,4 +15,4 @@ license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 changelog="https://raw.githubusercontent.com/digitalocean/doctl/main/CHANGELOG.md"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=1b3d054fd18f2b4c424b0fd116ee298881f3954075194c6cbaf3bbdb03fdb22c
+checksum=5963bfb113632df33d0ef6c2d076cedd180f73ce82f3162e7d1bc93b190a9951

From 288f7dd58a6288c498641ad7b8d234278e3ea7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 22 May 2023 13:08:54 +0200
Subject: [PATCH 0200/1854] python3-dominate: update to 2.8.0.

---
 srcpkgs/python3-dominate/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template
index c38fa2d9d35a..19e0f070382a 100644
--- a/srcpkgs/python3-dominate/template
+++ b/srcpkgs/python3-dominate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dominate'
 pkgname=python3-dominate
-version=2.7.0
-revision=2
+version=2.8.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -11,4 +11,12 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Knio/dominate"
 distfiles="https://github.com/Knio/dominate/archive/${version}.tar.gz"
-checksum=f2bf3f12c10e25b9d632d20f1560fa9a1c91409f47e8f64e0fa0b9e12aedc20f
+checksum=4e55f84b8446fe4338a7acaf60bbb1cb133a81c4c7a46a196b904c9f8387d377
+
+pre_check() {
+	# this fix the failed test in i686
+	# https://github.com/Knio/dominate/issues/175
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		vsed -i '/3713141171098444831/i  \\t\t1692341442, # i686' tests/test_dom_tag.py
+	fi
+}

From 369fd5d765c13a6186d33f8c3074cd7a36df7e9a Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 31 May 2023 18:20:33 -0500
Subject: [PATCH 0201/1854] Signal-Desktop: update to 6.20.0.

---
 srcpkgs/Signal-Desktop/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 4c6722055987..fec02583a29a 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,34 +1,38 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.19.0
+version=6.20.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
 # https://git.alpinelinux.org/aports/tree/testing/signal-desktop
 # ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
 archs="x86_64"
-hostmakedepends="git git-lfs nodejs python3 tar yarn"
+hostmakedepends="git git-lfs nodeenv python3 tar"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
 maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=965702b217b39131c61e62c63fb25b073750a8f6febdffa9db236626124c6e50
+checksum=fc92011c51da6792215eb92d48afc17f1967caeade1307daaa13884244d7a3b0
 nostrip_files="signal-desktop"
 
 post_extract() {
 	# git-lfs hook needs to be installed for one of the dependencies
 	git lfs install
 
-	#vsed 's/"node": "/&>=/' -i package.json
-	vsed 's/"node": "18.14.0"/"node": ">=16.19.0"/' -i package.json
+	# use nodeenv since we have that in the repos already
+	nodeenv --node='18.14.0' signal-node
+	. ./signal-node/bin/activate
+
+	npm install -g yarn
 
 	# Dependencies have to be installed before applying patch
 	yarn install --ignore-engines --frozen-lockfile
 }
 
 do_build() {
+	. ./signal-node/bin/activate
 	yarn generate
 	yarn build-release
 }

From 108ccdbcb29f52098c3bcd8bfe890e310e773a88 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 20 Nov 2022 19:47:36 +0100
Subject: [PATCH 0202/1854] nodejs: merge with nodejs-lts

nodejs 16 is an LTS version and nodejs-lts version 12 is EOL
---
 srcpkgs/nodejs-lts                            |   1 +
 srcpkgs/nodejs-lts-devel                      |   2 +-
 .../patches/ppc-fixes-for-older-models.patch  | 847 ------------------
 srcpkgs/nodejs-lts/patches/ppc32.patch        |  20 -
 srcpkgs/nodejs-lts/patches/shared-uv.patch    |  25 -
 .../patches/xxx-ppc-hwcap-musl.patch          |  24 -
 srcpkgs/nodejs-lts/template                   | 104 ---
 srcpkgs/nodejs-lts/update                     |   2 -
 srcpkgs/nodejs/template                       |  18 +-
 9 files changed, 17 insertions(+), 1026 deletions(-)
 create mode 120000 srcpkgs/nodejs-lts
 delete mode 100644 srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
 delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch
 delete mode 100644 srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch
 delete mode 100644 srcpkgs/nodejs-lts/template
 delete mode 100644 srcpkgs/nodejs-lts/update

diff --git a/srcpkgs/nodejs-lts b/srcpkgs/nodejs-lts
new file mode 120000
index 000000000000..0c524b775308
--- /dev/null
+++ b/srcpkgs/nodejs-lts
@@ -0,0 +1 @@
+nodejs
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-devel b/srcpkgs/nodejs-lts-devel
index c9a495a2e35b..0c524b775308 120000
--- a/srcpkgs/nodejs-lts-devel
+++ b/srcpkgs/nodejs-lts-devel
@@ -1 +1 @@
-nodejs-lts
\ No newline at end of file
+nodejs
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch b/srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
deleted file mode 100644
index 3a3630f1ad4d..000000000000
--- a/srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
+++ /dev/null
@@ -1,847 +0,0 @@
-Fix PowerPC CPU detection and codegen to work with more processors.
-
-This patch defines the correct optional Power ISA features that the
-PPC code generator needs in order to run without crashing on v2.01
-and older CPUs such as PPC 970 (G5) or NXP e6500, and to run more
-efficiently on CPUs with features that weren't being used before.
-
-PowerPC ISA v2.01 and older CPUs don't have FP round to int instructions,
-and PowerPC ISA v2.06 and older are missing support for unsigned 64-bit
-to/from double, as well as integer to/from single-precision float.
-
-Add a new FP_ROUND_TO_INT CPU feature to determine whether to generate
-FP round to int, and add a new PPC_7_PLUS feature to determine whether
-to use the v2.06 FPR conversion instructions or generate an alternate
-sequence to handle large 64-bit unsigned ints, and single-precision 
-using the v2.01 instructions with handling for large uint64_t values
-as well as rounding results from double to single-precision.
-
-Also add a new POP_COUNT feature for the popcnt opcodes added in v2.06,
-which are also present in the NXP e5500 and e6500 cores, which are
-otherwise missing many of the features added since v2.01.
-
-By defining an ICACHE_SNOOP feature bit to replace the poorly-named
-"LWSYNC", the meaning of the instruction cache flushing fast path,
-and the CPUs that can use it, are more clearly defined. In addition,
-for the other PowerPC chips, the loop to flush the data and instruction
-cache blocks has been split into two loops, with a single "sync" and
-"isync" after each loop, which should be more efficient, and also handles
-the few CPUs with differing data and instruction cache line sizes.
-
-In the macro assembler methods, in addition to providing an alternate
-path for FP conversion opcodes added in POWER7 (ISA v2.06), unnecessary
-instructions to move sp down and then immediately back up were replaced
-with negative offsets from the current sp. This should be faster, and also
-sp is supposed to point to a back chain at all times (V8 may not do this).
-
-This patch also fixes ppc64 big-endian ELFv1 builds (not needed for Void).
-
---- a/deps/v8/src/base/cpu.cc	2022-02-15 21:11:46.291387457 -0800
-+++ b/deps/v8/src/base/cpu.cc	2022-02-17 23:01:40.624597523 -0800
-@@ -10,7 +10,7 @@
- #if V8_OS_LINUX
- #include <linux/auxvec.h>  // AT_HWCAP
- #endif
--#if V8_GLIBC_PREREQ(2, 16)
-+#if V8_GLIBC_PREREQ(2, 16) || (V8_OS_LINUX && V8_HOST_ARCH_PPC)
- #include <sys/auxv.h>  // getauxval()
- #endif
- #if V8_OS_QNX
-@@ -611,57 +611,56 @@
- 
- #ifndef USE_SIMULATOR
- #if V8_OS_LINUX
--  // Read processor info from /proc/self/auxv.
--  char* auxv_cpu_type = nullptr;
--  FILE* fp = fopen("/proc/self/auxv", "r");
--  if (fp != nullptr) {
--#if V8_TARGET_ARCH_PPC64
--    Elf64_auxv_t entry;
--#else
--    Elf32_auxv_t entry;
--#endif
--    for (;;) {
--      size_t n = fread(&entry, sizeof(entry), 1, fp);
--      if (n == 0 || entry.a_type == AT_NULL) {
--        break;
--      }
--      switch (entry.a_type) {
--        case AT_PLATFORM:
--          auxv_cpu_type = reinterpret_cast<char*>(entry.a_un.a_val);
--          break;
--        case AT_ICACHEBSIZE:
--          icache_line_size_ = entry.a_un.a_val;
--          break;
--        case AT_DCACHEBSIZE:
--          dcache_line_size_ = entry.a_un.a_val;
--          break;
--      }
--    }
--    fclose(fp);
--  }
-+  // Read processor info from getauxval() (needs at least glibc 2.18 or musl).
-+  icache_line_size_ = static_cast<int>(getauxval(AT_ICACHEBSIZE));
-+  dcache_line_size_ = static_cast<int>(getauxval(AT_DCACHEBSIZE));
-+  const unsigned long hwcap = getauxval(AT_HWCAP);
-+  const unsigned long hwcap2 = getauxval(AT_HWCAP2);
-+  const char* platform = reinterpret_cast<const char*>(getauxval(AT_PLATFORM));
-+
-+  // NOTE: AT_HWCAP ISA version bits aren't cumulative, so it's necessary
-+  // to compare against a mask of all supported versions and CPUs, up to
-+  // ISA v2.06, which *is* set for later CPUs. In contrast, the AT_HWCAP2
-+  // ISA version bits from v2.07 onward are set cumulatively, so POWER10
-+  // will set the ISA version bits from v2.06 (in AT_HWCAP) through v3.1.
-+
-+  // i-cache coherency requires Power ISA v2.02 or later; has its own flag.
-+  has_icache_snoop_ = (hwcap & PPC_FEATURE_ICACHE_SNOOP);
-+
-+  // requires Power ISA v2.03 or later, or the HAS_ISEL bit (e.g. e6500).
-+  has_isel_ = (hwcap & (PPC_FEATURE_POWER5_PLUS | PPC_FEATURE_ARCH_2_05 |
-+      PPC_FEATURE_PA6T | PPC_FEATURE_POWER6_EXT | PPC_FEATURE_ARCH_2_06)) ||
-+      (hwcap2 & PPC_FEATURE2_HAS_ISEL);
-+
-+  // hwcap mask for older 64-bit PPC CPUs with Altivec, e.g. G5, Cell.
-+  static const unsigned long kHwcapMaskPPCG5 =
-+      (PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC);
- 
-   part_ = -1;
--  if (auxv_cpu_type) {
--    if (strcmp(auxv_cpu_type, "power10") == 0) {
--      part_ = PPC_POWER10;
--    }
--    else if (strcmp(auxv_cpu_type, "power9") == 0) {
--      part_ = PPC_POWER9;
--    } else if (strcmp(auxv_cpu_type, "power8") == 0) {
--      part_ = PPC_POWER8;
--    } else if (strcmp(auxv_cpu_type, "power7") == 0) {
--      part_ = PPC_POWER7;
--    } else if (strcmp(auxv_cpu_type, "power6") == 0) {
--      part_ = PPC_POWER6;
--    } else if (strcmp(auxv_cpu_type, "power5") == 0) {
--      part_ = PPC_POWER5;
--    } else if (strcmp(auxv_cpu_type, "ppc970") == 0) {
--      part_ = PPC_G5;
--    } else if (strcmp(auxv_cpu_type, "ppc7450") == 0) {
--      part_ = PPC_G4;
--    } else if (strcmp(auxv_cpu_type, "pa6t") == 0) {
--      part_ = PPC_PA6T;
--    }
-+  if (hwcap2 & PPC_FEATURE2_ARCH_3_1) {
-+    part_ = PPC_POWER10;
-+  } else if (hwcap2 & PPC_FEATURE2_ARCH_3_00) {
-+    part_ = PPC_POWER9;
-+  } else if (hwcap2 & PPC_FEATURE2_ARCH_2_07) {
-+    part_ = PPC_POWER8;
-+  } else if (hwcap & PPC_FEATURE_ARCH_2_06) {
-+    part_ = PPC_POWER7;
-+  } else if (hwcap & PPC_FEATURE_ARCH_2_05) {
-+    part_ = PPC_POWER6;
-+  } else if (hwcap & (PPC_FEATURE_POWER5 | PPC_FEATURE_POWER5_PLUS)) {
-+    part_ = PPC_POWER5;
-+  } else if (hwcap & PPC_FEATURE_PA6T) {
-+    part_ = PPC_PA6T;
-+  } else if (strcmp(platform, "ppce6500") == 0) {
-+    part_ = PPC_E6500;
-+  } else if (strcmp(platform, "ppce5500") == 0) {
-+    part_ = PPC_E5500;
-+  } else if ((hwcap & kHwcapMaskPPCG5) == kHwcapMaskPPCG5) {
-+    part_ = PPC_G5;
-+  } else if (hwcap & PPC_FEATURE_HAS_ALTIVEC) {
-+    part_ = PPC_G4;
-+  } else {
-+    part_ = PPC_G3;
-   }
- 
- #elif V8_OS_AIX
-@@ -682,9 +681,13 @@
-       part_ = PPC_POWER6;
-       break;
-     case POWER_5:
-+    default:
-       part_ = PPC_POWER5;
-       break;
-   }
-+
-+  has_icache_snoop_ = true;
-+  has_isel_ = (part_ != PPC_POWER5);    // isel was added in POWER5+ (v2.03)
- #endif  // V8_OS_AIX
- #endif  // !USE_SIMULATOR
- #endif  // V8_HOST_ARCH_PPC
---- a/deps/v8/src/base/cpu.h	2022-02-15 21:11:46.291387457 -0800
-+++ b/deps/v8/src/base/cpu.h	2022-02-17 19:54:08.768614805 -0800
-@@ -71,9 +71,12 @@
-     PPC_POWER8,
-     PPC_POWER9,
-     PPC_POWER10,
-+    PPC_G3,
-     PPC_G4,
-     PPC_G5,
--    PPC_PA6T
-+    PPC_PA6T,
-+    PPC_E5500,
-+    PPC_E6500
-   };
- 
-   // General features
-@@ -116,6 +119,10 @@
-   bool is_fp64_mode() const { return is_fp64_mode_; }
-   bool has_msa() const { return has_msa_; }
- 
-+  // PowerPC features
-+  bool has_icache_snoop() const { return has_icache_snoop_; }
-+  bool has_isel() const { return has_isel_; }
-+
-  private:
-   char vendor_[13];
-   int stepping_;
-@@ -157,6 +164,8 @@
-   bool is_fp64_mode_;
-   bool has_non_stop_time_stamp_counter_;
-   bool has_msa_;
-+  bool has_icache_snoop_;
-+  bool has_isel_;
- };
- 
- }  // namespace base
---- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc	2022-02-01 10:53:09.000000000 -0800
-+++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc	2022-02-18 22:55:36.676461343 -0800
-@@ -706,13 +706,25 @@
- 
- void TurboAssembler::ConvertIntToFloat(Register src, DoubleRegister dst) {
-   MovIntToDouble(dst, src, r0);
--  fcfids(dst, dst);
-+
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    fcfids(dst, dst);
-+  } else {
-+    fcfid(dst, dst);
-+    frsp(dst, dst);
-+  }
- }
- 
- void TurboAssembler::ConvertUnsignedIntToFloat(Register src,
-                                                DoubleRegister dst) {
-   MovUnsignedIntToDouble(dst, src, r0);
--  fcfids(dst, dst);
-+
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    fcfids(dst, dst);
-+  } else {
-+    fcfid(dst, dst);
-+    frsp(dst, dst);
-+  }
- }
- 
- #if V8_TARGET_ARCH_PPC64
-@@ -724,20 +736,52 @@
- 
- void TurboAssembler::ConvertUnsignedInt64ToFloat(Register src,
-                                                  DoubleRegister double_dst) {
--  MovInt64ToDouble(double_dst, src);
--  fcfidus(double_dst, double_dst);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    MovInt64ToDouble(double_dst, src);
-+    fcfidus(double_dst, double_dst);
-+  } else {
-+    ConvertUnsignedInt64ToDouble(src, double_dst);
-+    frsp(double_dst, double_dst);
-+  }
- }
- 
- void TurboAssembler::ConvertUnsignedInt64ToDouble(Register src,
-                                                   DoubleRegister double_dst) {
--  MovInt64ToDouble(double_dst, src);
--  fcfidu(double_dst, double_dst);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    MovInt64ToDouble(double_dst, src);
-+    fcfidu(double_dst, double_dst);
-+  } else {
-+    Label negative;
-+    Label done;
-+    cmpi(src, Operand::Zero());
-+    blt(&negative);
-+    std(src, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    lfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    fcfid(double_dst, double_dst);
-+    b(&done);
-+    bind(&negative);
-+    // Note: GCC saves the lowest bit, then ORs it after shifting right 1 bit,
-+    // presumably for better rounding. This version only shifts right 1 bit.
-+    srdi(r0, src, Operand(1));
-+    std(r0, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    lfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    fcfid(double_dst, double_dst);
-+    fadd(double_dst, double_dst, double_dst);
-+    bind(&done);
-+   }
- }
- 
- void TurboAssembler::ConvertInt64ToFloat(Register src,
-                                          DoubleRegister double_dst) {
-   MovInt64ToDouble(double_dst, src);
--  fcfids(double_dst, double_dst);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    fcfids(double_dst, double_dst);
-+  } else {
-+    fcfid(double_dst, double_dst);
-+    frsp(double_dst, double_dst);
-+  }
- }
- #endif
- 
-@@ -767,15 +811,56 @@
- void TurboAssembler::ConvertDoubleToUnsignedInt64(
-     const DoubleRegister double_input, const Register dst,
-     const DoubleRegister double_dst, FPRoundingMode rounding_mode) {
--  if (rounding_mode == kRoundToZero) {
--    fctiduz(double_dst, double_input);
-+  if (CpuFeatures::IsSupported(PPC_7_PLUS)) {
-+    if (rounding_mode == kRoundToZero) {
-+      fctiduz(double_dst, double_input);
-+    } else {
-+      SetRoundingMode(rounding_mode);
-+      fctidu(double_dst, double_input);
-+      ResetRoundingMode();
-+    }
-+
-+    MovDoubleToInt64(dst, double_dst);
-   } else {
--    SetRoundingMode(rounding_mode);
--    fctidu(double_dst, double_input);
--    ResetRoundingMode();
-+    Label safe_size;
-+    Label done;
-+    mov(dst, Operand(1593835520));  // bit pattern for 2^63 as a float
-+    stw(dst, MemOperand(sp, -kFloatSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    lfs(double_dst, MemOperand(sp, -kFloatSize));
-+    fcmpu(double_input, double_dst);
-+    blt(&safe_size);
-+    // Subtract 2^63, then OR the top bit of the uint64 to add back
-+    fsub(double_dst, double_input, double_dst);
-+    if (rounding_mode == kRoundToZero) {
-+      fctidz(double_dst, double_dst);
-+    } else {
-+      SetRoundingMode(rounding_mode);
-+      fctid(double_dst, double_dst);
-+      ResetRoundingMode();
-+    }
-+    // set r0 to -1, then clear all but the MSB.
-+    mov(r0, Operand(-1));
-+    rldicr(r0, r0, 0, 0);
-+    stfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    ld(dst, MemOperand(sp, -kDoubleSize));
-+    xor_(dst, dst, r0);
-+    b(&done);
-+    // Handling for values smaller than 2^63.
-+    bind(&safe_size);
-+    if (rounding_mode == kRoundToZero) {
-+      fctidz(double_dst, double_input);
-+    } else {
-+      SetRoundingMode(rounding_mode);
-+      fctid(double_dst, double_input);
-+      ResetRoundingMode();
-+    }
-+    stfd(double_dst, MemOperand(sp, -kDoubleSize));
-+    nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
-+    ld(dst, MemOperand(sp, -kDoubleSize));
-+    bind(&done);
-   }
--
--  MovDoubleToInt64(dst, double_dst);
- }
- #endif
- 
-@@ -2097,19 +2182,17 @@
-   }
- #endif
- 
--  addi(sp, sp, Operand(-kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
-   mov(scratch, Operand(litVal.ival));
--  std(scratch, MemOperand(sp));
-+  std(scratch, MemOperand(sp, -kDoubleSize));
- #else
-   LoadIntLiteral(scratch, litVal.ival[0]);
--  stw(scratch, MemOperand(sp, 0));
-+  stw(scratch, MemOperand(sp, -kDoubleSize));
-   LoadIntLiteral(scratch, litVal.ival[1]);
--  stw(scratch, MemOperand(sp, 4));
-+  stw(scratch, MemOperand(sp, -kDoubleSize + 4));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(result, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(result, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovIntToDouble(DoubleRegister dst, Register src,
-@@ -2123,18 +2206,16 @@
- #endif
- 
-   DCHECK(src != scratch);
--  subi(sp, sp, Operand(kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
-   extsw(scratch, src);
--  std(scratch, MemOperand(sp, 0));
-+  std(scratch, MemOperand(sp, -kDoubleSize));
- #else
-   srawi(scratch, src, 31);
--  stw(scratch, MemOperand(sp, Register::kExponentOffset));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovUnsignedIntToDouble(DoubleRegister dst, Register src,
-@@ -2148,18 +2229,16 @@
- #endif
- 
-   DCHECK(src != scratch);
--  subi(sp, sp, Operand(kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
-   clrldi(scratch, src, Operand(32));
--  std(scratch, MemOperand(sp, 0));
-+  std(scratch, MemOperand(sp, -kDoubleSize));
- #else
-   li(scratch, Operand::Zero());
--  stw(scratch, MemOperand(sp, Register::kExponentOffset));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovInt64ToDouble(DoubleRegister dst,
-@@ -2174,16 +2253,14 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
- #if V8_TARGET_ARCH_PPC64
--  std(src, MemOperand(sp, 0));
-+  std(src, MemOperand(sp, -kDoubleSize));
- #else
--  stw(src_hi, MemOperand(sp, Register::kExponentOffset));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- #if V8_TARGET_ARCH_PPC64
-@@ -2198,12 +2275,10 @@
-     return;
-   }
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stw(src_hi, MemOperand(sp, Register::kExponentOffset));
--  stw(src_lo, MemOperand(sp, Register::kMantissaOffset));
-+  stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  stw(src_lo, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- #endif
- 
-@@ -2218,12 +2293,10 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(dst, MemOperand(sp));
--  stw(src, MemOperand(sp, Register::kMantissaOffset));
-+  stfd(dst, MemOperand(sp, -kDoubleSize));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::InsertDoubleHigh(DoubleRegister dst, Register src,
-@@ -2237,12 +2310,10 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(dst, MemOperand(sp));
--  stw(src, MemOperand(sp, Register::kExponentOffset));
-+  stfd(dst, MemOperand(sp, -kDoubleSize));
-+  stw(src, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfd(dst, MemOperand(sp));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lfd(dst, MemOperand(sp, -kDoubleSize));
- }
- 
- void TurboAssembler::MovDoubleLowToInt(Register dst, DoubleRegister src) {
-@@ -2253,11 +2324,9 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(src, MemOperand(sp));
-+  stfd(src, MemOperand(sp, -kDoubleSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lwz(dst, MemOperand(sp, Register::kMantissaOffset));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- }
- 
- void TurboAssembler::MovDoubleHighToInt(Register dst, DoubleRegister src) {
-@@ -2269,11 +2338,9 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(src, MemOperand(sp));
-+  stfd(src, MemOperand(sp, -kDoubleSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lwz(dst, MemOperand(sp, Register::kExponentOffset));
--  addi(sp, sp, Operand(kDoubleSize));
-+  lwz(dst, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
- }
- 
- void TurboAssembler::MovDoubleToInt64(
-@@ -2288,32 +2355,26 @@
-   }
- #endif
- 
--  subi(sp, sp, Operand(kDoubleSize));
--  stfd(src, MemOperand(sp));
-+  stfd(src, MemOperand(sp, -kDoubleSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
- #if V8_TARGET_ARCH_PPC64
--  ld(dst, MemOperand(sp, 0));
-+  ld(dst, MemOperand(sp, -kDoubleSize));
- #else
--  lwz(dst_hi, MemOperand(sp, Register::kExponentOffset));
--  lwz(dst, MemOperand(sp, Register::kMantissaOffset));
-+  lwz(dst_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset));
-+  lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset));
- #endif
--  addi(sp, sp, Operand(kDoubleSize));
- }
- 
- void TurboAssembler::MovIntToFloat(DoubleRegister dst, Register src) {
--  subi(sp, sp, Operand(kFloatSize));
--  stw(src, MemOperand(sp, 0));
-+  stw(src, MemOperand(sp, -kFloatSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lfs(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kFloatSize));
-+  lfs(dst, MemOperand(sp, -kFloatSize));
- }
- 
- void TurboAssembler::MovFloatToInt(Register dst, DoubleRegister src) {
--  subi(sp, sp, Operand(kFloatSize));
--  stfs(src, MemOperand(sp, 0));
-+  stfs(src, MemOperand(sp, -kFloatSize));
-   nop(GROUP_ENDING_NOP);  // LHS/RAW optimization
--  lwz(dst, MemOperand(sp, 0));
--  addi(sp, sp, Operand(kFloatSize));
-+  lwz(dst, MemOperand(sp, -kFloatSize));
- }
- 
- void TurboAssembler::Add(Register dst, Register src, intptr_t value,
---- a/deps/v8/src/codegen/ppc/cpu-ppc.cc	2022-02-15 21:11:46.291387457 -0800
-+++ b/deps/v8/src/codegen/ppc/cpu-ppc.cc	2022-02-17 20:38:08.816098185 -0800
-@@ -8,14 +8,12 @@
- 
- #include "src/codegen/cpu-features.h"
- 
--#define INSTR_AND_DATA_CACHE_COHERENCY LWSYNC
--
- namespace v8 {
- namespace internal {
- 
- void CpuFeatures::FlushICache(void* buffer, size_t size) {
- #if !defined(USE_SIMULATOR)
--  if (CpuFeatures::IsSupported(INSTR_AND_DATA_CACHE_COHERENCY)) {
-+  if (CpuFeatures::IsSupported(ICACHE_SNOOP)) {
-     __asm__ __volatile__(
-         "sync \n"
-         "icbi 0, %0  \n"
-@@ -26,25 +24,33 @@
-     return;
-   }
- 
--  const int kCacheLineSize = CpuFeatures::icache_line_size();
--  intptr_t mask = kCacheLineSize - 1;
-+  const int kInstrCacheLineSize = CpuFeatures::icache_line_size();
-+  const int kDataCacheLineSize = CpuFeatures::dcache_line_size();
-+  intptr_t ic_mask = kInstrCacheLineSize - 1;
-+  intptr_t dc_mask = kDataCacheLineSize - 1;
-   byte* start =
--      reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~mask);
-+      reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~dc_mask);
-   byte* end = static_cast<byte*>(buffer) + size;
--  for (byte* pointer = start; pointer < end; pointer += kCacheLineSize) {
--    __asm__(
-+  for (byte* pointer = start; pointer < end; pointer += kDataCacheLineSize) {
-+    __asm__ __volatile__(
-         "dcbf 0, %0  \n"
--        "sync        \n"
--        "icbi 0, %0  \n"
--        "isync       \n"
-         : /* no output */
-         : "r"(pointer));
-   }
-+  __asm__ __volatile__("sync");
- 
-+  start =
-+      reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~ic_mask);
-+  for (byte* pointer = start; pointer < end; pointer += kInstrCacheLineSize) {
-+    __asm__ __volatile__(
-+        "icbi 0, %0  \n"
-+        : /* no output */
-+        : "r"(pointer));
-+  }
-+  __asm__ __volatile__("isync");
- #endif  // !USE_SIMULATOR
- }
- }  // namespace internal
- }  // namespace v8
- 
--#undef INSTR_AND_DATA_CACHE_COHERENCY
- #endif  // V8_TARGET_ARCH_PPC
---- a/deps/v8/src/codegen/ppc/assembler-ppc.cc	2022-02-15 21:11:46.295387559 -0800
-+++ b/deps/v8/src/codegen/ppc/assembler-ppc.cc	2022-02-18 00:11:07.887257174 -0800
-@@ -57,58 +57,62 @@
- void CpuFeatures::ProbeImpl(bool cross_compile) {
-   supported_ |= CpuFeaturesImpliedByCompiler();
-   icache_line_size_ = 128;
-+  dcache_line_size_ = 128;
- 
-   // Only use statically determined features for cross compile (snapshot).
-   if (cross_compile) return;
- 
--// Detect whether frim instruction is supported (POWER5+)
--// For now we will just check for processors we know do not
--// support it
- #ifndef USE_SIMULATOR
-   // Probe for additional features at runtime.
-   base::CPU cpu;
--  if (cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << MODULO);
--  }
-+  switch (cpu.part()) {
-+    case base::CPU::PPC_POWER10:
-+    case base::CPU::PPC_POWER9:
-+      supported_ |= (1u << MODULO);
-+      // fallthrough
-+
-+    case base::CPU::PPC_POWER8:
- #if V8_TARGET_ARCH_PPC64
--  if (cpu.part() == base::CPU::PPC_POWER8 || 
--      cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << FPR_GPR_MOV);
--  }
-+      supported_ |= (1u << FPR_GPR_MOV);
- #endif
--  if (cpu.part() == base::CPU::PPC_POWER6 ||
--      cpu.part() == base::CPU::PPC_POWER7 ||
--      cpu.part() == base::CPU::PPC_POWER8 || 
--      cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << LWSYNC);
-+      // fallthrough
-+
-+    case base::CPU::PPC_POWER7:
-+      supported_ |= (1u << PPC_7_PLUS);
-+      supported_ |= (1u << POP_COUNT);
-+      // fallthrough
-+
-+    case base::CPU::PPC_POWER6:
-+    case base::CPU::PPC_POWER5:
-+    case base::CPU::PPC_PA6T:
-+      supported_ |= (1u << FP_ROUND_TO_INT);
-+      break;
-+
-+    // Special cases below. Otherwise, assume no special features.
-+    // NXP e5500/e6500 have popcnt but not much else since ISA v2.01.
-+    case base::CPU::PPC_E5500:
-+    case base::CPU::PPC_E6500:
-+      supported_ |= (1u << POP_COUNT);
-+      break;
-   }
--  if (cpu.part() == base::CPU::PPC_POWER7 ||
--      cpu.part() == base::CPU::PPC_POWER8 || 
--      cpu.part() == base::CPU::PPC_POWER9 || 
--      cpu.part() == base::CPU::PPC_POWER10) {
--    supported_ |= (1u << ISELECT);
--    supported_ |= (1u << VSX);
-+  if (cpu.has_isel()) {
-+    supported_ |= (1u << ISELECT);      // ISA v2.03, plus some NXP CPUs
-   }
--#if V8_OS_LINUX
--  if (!(cpu.part() == base::CPU::PPC_G5 || cpu.part() == base::CPU::PPC_G4)) {
--    // Assume support
--    supported_ |= (1u << FPU);
-+  if (cpu.has_icache_snoop()) {
-+    supported_ |= (1u << ICACHE_SNOOP); // ISA v2.02; has its own hwcap flag
-   }
-   if (cpu.icache_line_size() != base::CPU::UNKNOWN_CACHE_LINE_SIZE) {
-     icache_line_size_ = cpu.icache_line_size();
-   }
--#elif V8_OS_AIX
--  // Assume support FP support and default cache line size
--  supported_ |= (1u << FPU);
--#endif
-+  if (cpu.dcache_line_size() != base::CPU::UNKNOWN_CACHE_LINE_SIZE) {
-+    dcache_line_size_ = cpu.dcache_line_size();
-+  }
- #else  // Simulator
--  supported_ |= (1u << FPU);
--  supported_ |= (1u << LWSYNC);
-+  supported_ |= (1u << FP_ROUND_TO_INT);
-+  supported_ |= (1u << ICACHE_SNOOP);
-   supported_ |= (1u << ISELECT);
--  supported_ |= (1u << VSX);
-+  supported_ |= (1u << POP_COUNT);
-+  supported_ |= (1u << PPC_7_PLUS);
-   supported_ |= (1u << MODULO);
- #if V8_TARGET_ARCH_PPC64
-   supported_ |= (1u << FPR_GPR_MOV);
-@@ -129,7 +133,13 @@
- }
- 
- void CpuFeatures::PrintFeatures() {
--  printf("FPU=%d\n", CpuFeatures::IsSupported(FPU));
-+  printf("FP_ROUND_TO_INT=%d\n", CpuFeatures::IsSupported(FP_ROUND_TO_INT));
-+  printf("ICACHE_SNOOP=%d\n", CpuFeatures::IsSupported(ICACHE_SNOOP));
-+  printf("ISELECT=%d\n", CpuFeatures::IsSupported(ISELECT));
-+  printf("POP_COUNT=%d\n", CpuFeatures::IsSupported(POP_COUNT));
-+  printf("PPC_7_PLUS=%d\n", CpuFeatures::IsSupported(PPC_7_PLUS));
-+  printf("FPR_GPR_MOV=%d\n", CpuFeatures::IsSupported(FPR_GPR_MOV));
-+  printf("MODULO=%d\n", CpuFeatures::IsSupported(MODULO));
- }
- 
- Register ToRegister(int num) {
---- a/deps/v8/src/codegen/cpu-features.h	2022-02-15 21:11:46.295387559 -0800
-+++ b/deps/v8/src/codegen/cpu-features.h	2022-02-17 21:10:09.853266061 -0800
-@@ -13,6 +13,7 @@
- 
- // CPU feature flags.
- enum CpuFeature {
-+#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64
-   // x86
-   SSE4_2,
-   SSE4_1,
-@@ -26,11 +27,15 @@
-   LZCNT,
-   POPCNT,
-   ATOM,
-+
-+#elif V8_TARGET_ARCH_ARM
-   // ARM
-   // - Standard configurations. The baseline is ARMv6+VFPv2.
-   ARMv7,        // ARMv7-A + VFPv3-D32 + NEON
-   ARMv7_SUDIV,  // ARMv7-A + VFPv4-D32 + NEON + SUDIV
-   ARMv8,        // ARMv8-A (+ all of the above)
-+
-+#elif V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64
-   // MIPS, MIPS64
-   FPU,
-   FP64FPU,
-@@ -38,12 +43,18 @@
-   MIPSr2,
-   MIPSr6,
-   MIPS_SIMD,  // MSA instructions
-+
-+#elif V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64
-   // PPC
--  FPR_GPR_MOV,
--  LWSYNC,
--  ISELECT,
--  VSX,
--  MODULO,
-+  FP_ROUND_TO_INT,  // ISA v2.02 (POWER5)
-+  ICACHE_SNOOP,     // ISA v2.02 (POWER5)
-+  ISELECT,          // ISA v2.03 (POWER5+ and some NXP cores)
-+  PPC_7_PLUS,       // ISA v2.06 (POWER7)
-+  POP_COUNT,        // ISA v2.06 (POWER7 and NXP e5500/e6500)
-+  FPR_GPR_MOV,      // ISA v2.07 (POWER8)
-+  MODULO,           // ISA v3.0  (POWER9)
-+
-+#elif V8_TARGET_ARCH_S390X
-   // S390
-   DISTINCT_OPS,
-   GENERAL_INSTR_EXT,
-@@ -51,14 +62,17 @@
-   VECTOR_FACILITY,
-   VECTOR_ENHANCE_FACILITY_1,
-   MISC_INSTR_EXT2,
-+#endif
- 
-   NUMBER_OF_CPU_FEATURES,
- 
-+#if V8_TARGET_ARCH_ARM
-   // ARM feature aliases (based on the standard configurations above).
-   VFPv3 = ARMv7,
-   NEON = ARMv7,
-   VFP32DREGS = ARMv7,
-   SUDIV = ARMv7_SUDIV
-+#endif
- };
- 
- // CpuFeatures keeps track of which features are supported by the target CPU.
---- a/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc	2022-02-15 21:11:46.299387660 -0800
-+++ b/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc	2022-02-15 21:11:49.123459271 -0800
-@@ -2393,16 +2393,26 @@
- // static
- MachineOperatorBuilder::Flags
- InstructionSelector::SupportedMachineOperatorFlags() {
--  return MachineOperatorBuilder::kFloat32RoundDown |
--         MachineOperatorBuilder::kFloat64RoundDown |
--         MachineOperatorBuilder::kFloat32RoundUp |
--         MachineOperatorBuilder::kFloat64RoundUp |
--         MachineOperatorBuilder::kFloat32RoundTruncate |
--         MachineOperatorBuilder::kFloat64RoundTruncate |
--         MachineOperatorBuilder::kFloat64RoundTiesAway |
--         MachineOperatorBuilder::kWord32Popcnt |
--         MachineOperatorBuilder::kWord64Popcnt;
-+  MachineOperatorBuilder::Flags flags = MachineOperatorBuilder::Flag::kNoFlags;
-+  // FP rounding to integer instructions require Power ISA v2.02 or later.
-+  if (CpuFeatures::IsSupported(FP_ROUND_TO_INT)) {
-+    flags |= MachineOperatorBuilder::kFloat32RoundDown |
-+             MachineOperatorBuilder::kFloat64RoundDown |
-+             MachineOperatorBuilder::kFloat32RoundUp |
-+             MachineOperatorBuilder::kFloat64RoundUp |
-+             MachineOperatorBuilder::kFloat32RoundTruncate |
-+             MachineOperatorBuilder::kFloat64RoundTruncate |
-+             MachineOperatorBuilder::kFloat64RoundTiesAway;
-+  }
-+  // Population count requires Power ISA v2.06, or NXP e5500/e6500.
-+  if (CpuFeatures::IsSupported(POP_COUNT)) {
-+    flags |= MachineOperatorBuilder::kWord32Popcnt;
-+#if V8_TARGET_ARCH_PPC64
-+    flags |= MachineOperatorBuilder::kWord64Popcnt;
-+#endif
-+  }
-   // We omit kWord32ShiftIsSafe as s[rl]w use 0x3F as a mask rather than 0x1F.
-+  return flags;
- }
- 
- // static
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index ddfceb2f2179..000000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
-   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
deleted file mode 100644
index 01e95f15b477..000000000000
--- a/srcpkgs/nodejs-lts/patches/shared-uv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/deps/uvwasi/uvwasi.gyp
-+++ b/deps/uvwasi/uvwasi.gyp
-@@ -18,9 +18,6 @@
-         'src/wasi_rights.c',
-         'src/wasi_serdes.c',
-       ],
--      'dependencies': [
--        '../uv/uv.gyp:libuv',
--      ],
-       'direct_dependent_settings': {
-         'include_dirs': ['include']
-       },
-@@ -31,6 +28,12 @@
-             '_POSIX_C_SOURCE=200112',
-           ],
-         }],
-+        [ 'node_shared_libuv=="false"', {
-+          'dependencies': [ '../uv/uv.gyp:libuv' ],
-+        }],
-+        [ 'node_shared_libuv=="true"', {
-+          'libraries': [ '-luv' ],
-+        }]
-       ],
-     }
-   ]
diff --git a/srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch b/srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch
deleted file mode 100644
index 952892caed38..000000000000
--- a/srcpkgs/nodejs-lts/patches/xxx-ppc-hwcap-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 558ab896cbdd90259950c631ba29a1c66bf4c2d3
-Author: q66 <daniel@octaforge.org>
-Date:   Mon Feb 28 23:53:22 2022 +0100
-
-    add some hwcap bits fallbacks
-
-diff --git a/deps/v8/src/base/cpu.cc b/deps/v8/src/base/cpu.cc
-index a1b21d2..8e52802 100644
---- a/deps/v8/src/base/cpu.cc
-+++ b/deps/v8/src/base/cpu.cc
-@@ -768,6 +768,13 @@ CPU::CPU()
- 
- #elif V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64
- 
-+#ifndef PPC_FEATURE2_HAS_ISEL
-+#define PPC_FEATURE2_HAS_ISEL 0x08000000
-+#endif
-+#ifndef PPC_FEATURE2_ARCH_3_1
-+#define PPC_FEATURE2_ARCH_3_1 0x00040000
-+#endif
-+
- #ifndef USE_SIMULATOR
- #if V8_OS_LINUX
-   // Read processor info from getauxval() (needs at least glibc 2.18 or musl).
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
deleted file mode 100644
index d88dca8e6ee5..000000000000
--- a/srcpkgs/nodejs-lts/template
+++ /dev/null
@@ -1,104 +0,0 @@
-# Template file for 'nodejs-lts'
-pkgname=nodejs-lts
-version=12.22.10
-revision=3
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=1eeec68b530da4aced730e2af9e07a1ced8148337708f37fc8b4eddc3b6dc9e9
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser and llhttp"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts-10"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc64*) ;;
-	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
-esac
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --cross-compiling"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-post_configure() {
-	# Fix linking against llhttp
-	sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-10-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 537f8229dab9..000000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K12[\d.]+(?=\/)'
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index a53792a6544f..d4e821e86bcd 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=16.19.0
-revision=2
+revision=3
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
  $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
@@ -27,7 +27,7 @@ desc_option_cares="Enable shared c-ares"
 build_options_default="ssl libuv icu nghttp2 cares"
 
 replaces="iojs>=0"
-conflicts="nodejs-lts nodejs-lts-10"
+conflicts="nodejs-lts-10"
 provides="nodejs-runtime-0_1"
 
 # https://build.voidlinux.org/builders/i686_builder/builds/27325/steps/shell_3/logs/stdio
@@ -100,8 +100,20 @@ do_install() {
 
 nodejs-devel_package() {
 	short_desc+=" (development files)"
-	conflicts="nodejs-lts-devel nodejs-lts-10-devel"
+	conflicts="nodejs-lts-10-devel"
 	pkg_install() {
 		vmove usr/include
 	}
 }
+
+nodejs-lts_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" LTS"
+	build_style=meta
+}
+
+nodejs-lts-devel_package() {
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=" LTS (development files)"
+	build_style=meta
+}

From 4c7445dcdda2b4d83a3b471d65d0cf6ce86cb35f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 6 Dec 2022 16:11:24 +0100
Subject: [PATCH 0203/1854] llhttp: remove nodejs-lts comment

nodejs-lts is now merged to nodejs
---
 srcpkgs/llhttp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 7c367836045b..b2fbc9dd7932 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
 # Template file for 'llhttp'
 
-# When this package is updated, nodejs and nodejs-lts may need to be updated
+# When this package is updated, nodejs may need to be updated
 # or at least a revbump in the same pull request since they work in-sync.
 
 pkgname=llhttp

From d918b9bfe90959dca0583f71107ea69962ea86ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 22 Dec 2022 10:43:50 +0100
Subject: [PATCH 0204/1854] nodejs: update to 18.16.0.

---
 ...s-v8-src-trap-handler-trap-handler.h.patch | 31 ------------
 srcpkgs/nodejs/patches/cross-aarch64.patch    | 48 ++++++++++++-------
 srcpkgs/nodejs/template                       |  8 ++--
 3 files changed, 35 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch

diff --git a/srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch b/srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch
deleted file mode 100644
index 56529af97223..000000000000
--- a/srcpkgs/nodejs/patches/999-deps-v8-src-trap-handler-trap-handler.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/nxhack/openwrt-node-packages/blob/master/node/patches/v16.x/999-deps-v8-src-trap-handler-trap-handler.h.patch
-
---- a/deps/v8/src/trap-handler/trap-handler.h
-+++ b/deps/v8/src/trap-handler/trap-handler.h
-@@ -17,19 +17,16 @@ namespace v8 {
- namespace internal {
- namespace trap_handler {
- 
--// X64 on Linux, Windows, MacOS, FreeBSD.
--#if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 &&                        \
--    ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_MACOSX || \
--     V8_OS_FREEBSD)
-+#if V8_TARGET_ARCH_X64 && V8_OS_LINUX && !V8_OS_ANDROID
- #define V8_TRAP_HANDLER_SUPPORTED true
--// Arm64 (non-simulator) on Mac.
--#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX
-+#elif V8_TARGET_ARCH_X64 && V8_OS_WIN
- #define V8_TRAP_HANDLER_SUPPORTED true
--// Arm64 simulator on x64 on Linux or Mac.
--#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && (V8_OS_LINUX || V8_OS_MACOSX)
--#define V8_TRAP_HANDLER_VIA_SIMULATOR
-+#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
-+#define V8_TRAP_HANDLER_SUPPORTED true
-+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
-+#define V8_TRAP_HANDLER_SUPPORTED true
-+#elif V8_HOST_ARCH_ARM64 && V8_TARGET_ARCH_ARM64 && V8_OS_MACOSX
- #define V8_TRAP_HANDLER_SUPPORTED true
--// Everything else is unsupported.
- #else
- #define V8_TRAP_HANDLER_SUPPORTED false
- #endif
diff --git a/srcpkgs/nodejs/patches/cross-aarch64.patch b/srcpkgs/nodejs/patches/cross-aarch64.patch
index 3b96c87f2fdb..fa05cb15813e 100644
--- a/srcpkgs/nodejs/patches/cross-aarch64.patch
+++ b/srcpkgs/nodejs/patches/cross-aarch64.patch
@@ -1,29 +1,43 @@
-From 4ac90c41065d338c4305cf6dc39e3084b21a7f79 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 20 Nov 2022 19:22:03 +0100
-Subject: [PATCH] Revert "build: enable pointer authentication for branch
- protection on arm64"
+From 6bdf9dc3ec7dbff00acef081f4e3dd3e061fd744 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Tue, 6 Dec 2022 11:27:49 +0100
+Subject: [PATCH] build: fix arm64 cross-compilation
 
-This reverts commit 938212f3e74a74d0b436941aa24e71425ff666c5.
+Commit 938212f added -msign-return-address=all to _all_ cflags but that
+is wrong when cross-compiling, it should only be added to the target's
+cflags.
+
+Fixes: https://github.com/nodejs/node/issues/42888
 ---
- configure.py | 4 ----
- 1 file changed, 4 deletions(-)
+ configure.py | 2 --
+ node.gyp     | 3 +++
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/configure.py b/configure.py
-index d3192ca04c..2d049eb938 100755
+index 40e0395e..9de3148f 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -1241,10 +1241,6 @@ def configure_node(o):
+@@ -1294,9 +1294,7 @@ def configure_node(o):
  
    o['variables']['want_separate_host_toolset'] = int(cross_compiling)
  
 -  # Enable branch protection for arm64
--  if target_arch == 'arm64':
+   if target_arch == 'arm64':
 -    o['cflags']+=['-msign-return-address=all']
--
+     o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
+ 
    if options.node_snapshot_main is not None:
-     if options.shared:
-       # This should be possible to fix, but we will need to refactor the
--- 
-2.38.1
-
+diff --git a/node.gyp b/node.gyp
+index cf52281b..5218d941 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -112,6 +112,9 @@
+     },
+ 
+     'conditions': [
++      ['target_arch=="arm64"', {
++          'cflags': ['-msign-return-address=all'],  # Pointer authentication.
++      }],
+       ['OS in "aix os400"', {
+         'ldflags': [
+           '-Wl,-bnoerrmsg',
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index d4e821e86bcd..14f17fd3167f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=16.19.0
-revision=3
+version=18.16.0
+revision=1
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
  $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.gz"
-checksum=8b8a2939fa5f654ff61cae29b12118c24109273458ecbe6162ad8a8858309e0d
+checksum=6a4f5c5d76e5c50cef673099e56f19bc3266ae363f56ca0ab77dd2f3c5088c6d
 python_version=3
 
 build_options="ssl libuv icu nghttp2 cares"
@@ -41,7 +41,7 @@ fi
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	ppc*) broken="Node 16.x does not support 32-bit ppc" ;;
+	ppc*) broken="Node 18.x does not support 32-bit ppc" ;;
 esac
 
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

From 5b40d7d95ce9a7d85d9810dfb32cd7342056c8d1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Tue, 16 May 2023 10:59:54 +0400
Subject: [PATCH 0205/1854] go: update to 1.20.4.

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index df491a31e18d..18ee1751f2f9 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.3
+version=1.20.4
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=e447b498cde50215c4f7619e5124b0fc4e25fb5d16ea47271c47f278e7aa763a
+checksum=9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git

From 4ebe2b4e0631bce0e9588b2537634d380c8944f8 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Thu, 13 Apr 2023 21:06:27 +0200
Subject: [PATCH 0206/1854] evince: update to 44.1

---
 srcpkgs/evince/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 81d808d5b9b9..a3b6471a6612 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,12 +1,11 @@
 # Template file for 'evince'
 pkgname=evince
-version=44.0
-revision=2
+version=44.1
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
- -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled
- -Dnautilus=false"
+ -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled"
 hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen)
  glib-devel itstool pkg-config perl-XML-Parser appstream-glib desktop-file-utils"
 # XXX missing packages for DVI backend.
@@ -21,7 +20,7 @@ homepage="https://wiki.gnome.org/Apps/Evince"
 #changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/evince/${version%.*}/evince-${version}.tar.xz"
-checksum=339ee9e005dd7823a13fe21c71c2ec6d2c4cb74548026e4741eee7b2703e09da
+checksum=15afd3bb15ffb38fecab34c23350950ad270ab03a85b94e333d9dd7ee6a74314
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 145dede42300734d78b92495f5001cd082610ed6 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 22 May 2023 05:32:53 +0300
Subject: [PATCH 0207/1854] Tuba: update to 0.3.2

---
 srcpkgs/Tuba/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Tuba/template b/srcpkgs/Tuba/template
index fc2974bde2e0..18cf6d24e3b2 100644
--- a/srcpkgs/Tuba/template
+++ b/srcpkgs/Tuba/template
@@ -1,14 +1,17 @@
 # Template file for 'Tuba'
 pkgname=Tuba
-version=0.2.0
+version=0.3.2
 revision=1
 build_style=meson
 configure_args="-Ddistro=true"
 hostmakedepends="pkg-config gettext desktop-file-utils vala glib-devel"
-makedepends="libadwaita-devel libgee-devel libsecret-devel gtksourceview5-devel"
+makedepends="libadwaita-devel libgee-devel libsecret-devel gtksourceview5-devel
+ libwebp-devel"
+depends="webp-pixbuf-loader"
+checkdepends="appstream-glib"
 short_desc="Browse the fediverse"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://tuba.geopjr.dev/"
 distfiles="https://github.com/GeopJr/Tuba/archive/refs/tags/v${version}.tar.gz"
-checksum=c698206bbbd06a1ce5a6e8cc9e6590411dc1cce1dde87fb0e34d8e35432ee2b1
+checksum=1458b343f069efca00b0b5da49b9eb4b529e49de3d701da06d9529828be19cf9

From 9b63356baeb1596264727d8ccd6409281a6e3eb0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:13:18 +0200
Subject: [PATCH 0208/1854] scite: update to 5.3.6.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 1b6ad2444b13..e11787636604 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.3.5
+version=5.3.6
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=a6527831ef8d658697bca30638149884f9d0afb3f748c86f5d27ed8b0bd1aa6e
+checksum=a30d1fb2572fbcfc543baa2f58ee968643f67431390af1330769c8ed2879e3ca
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 821fdc7df9543e0dfacf3e9d4cdddec2ff9507e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:14:08 +0200
Subject: [PATCH 0209/1854] xscope: update to 1.4.4.

---
 srcpkgs/xscope/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xscope/template b/srcpkgs/xscope/template
index 62f3c85a0848..425ac554a66a 100644
--- a/srcpkgs/xscope/template
+++ b/srcpkgs/xscope/template
@@ -1,6 +1,6 @@
 # Template file for 'xscope'
 pkgname=xscope
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X Window Protocol Viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
-checksum=50604759481ac9f747d75b3fd1ad1bab846656d5aa2b3cee5d0e4cb814273985
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=820d6708fce16e449a3cb8e62c2a0f49551e589d6595633deab82643e6a90c83
 
 post_install() {
 	vlicense COPYING

From 5882aaaf47ed03039b9cfc5c368c3514b0037e92 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:15:05 +0200
Subject: [PATCH 0210/1854] xwd: update to 1.0.9.

---
 srcpkgs/xwd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..8cb4a9665c6a 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,6 +1,6 @@
 # Template file for 'xwd'
 pkgname=xwd
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Dump an image of an X window"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f
 
 post_install() {
 	vlicense COPYING

From e11e9c108732bed39a0450ebd7cc99d223cd56f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:15:50 +0200
Subject: [PATCH 0211/1854] ugrep: update to 3.12.0.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index ec41b9347bd7..eb60f284250b 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.11.2
+version=3.12.0
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a314cc6fe149eef9bc0f0d69c6b331d9d4491a100677c1b3fbb2159806cca2dd
+checksum=f69330b74a2d2e46c878c19da3453e97d92ae960d0e1a92a853481cb889fca3e
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 7fc5ed23f35c3c707822a310d6c3ac0bada5631b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 4 Jun 2023 18:34:52 +0200
Subject: [PATCH 0212/1854] python3-zstandard: update to 0.21.0.

Closes: https://github.com/void-linux/void-packages/issues/44257
---
 srcpkgs/python3-zstandard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index 3296feb90d65..514c067a62bc 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zstandard'
 pkgname=python3-zstandard
-version=0.19.0
+version=0.21.0
 revision=1
 build_style=python3-module
 make_build_args="--system-zstd"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/indygreg/python-zstandard"
 changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
 distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=8106c216bcaed7b70e6515b407adbfd21dd84c9855c9771530e0a3561b130454
+checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
 
 pre_check() {
 	# The skipped test ignored due to failure, see:

From 4f63ded1f44e827a92ae33210559f29dec0bb15b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 4 Jun 2023 14:41:29 -0500
Subject: [PATCH 0213/1854] delta: update to 0.16.5.

---
 srcpkgs/delta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index ab06413387f0..7904e323b89f 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.16.4
+version=0.16.5
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
-checksum=66380e92d422881fae6526aee14bedf8124ea17903bcf6d22633e658bd509190
+checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
 
 pre_build() {
 	export RUSTONIG_SYSTEM_LIBONIG=1

From 743bd074d9a8452edaa38fd703d2616173991be7 Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Wed, 24 May 2023 22:34:20 +0200
Subject: [PATCH 0214/1854] rustypaste: update to 0.10.0.

---
 srcpkgs/rustypaste/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustypaste/template b/srcpkgs/rustypaste/template
index 52eae3caaf96..f04fb2e37d6a 100644
--- a/srcpkgs/rustypaste/template
+++ b/srcpkgs/rustypaste/template
@@ -1,6 +1,6 @@
 # Template file for 'rustypaste'
 pkgname=rustypaste
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=cargo
 make_check_args="-- --test-threads 1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste/archive/refs/tags/v${version}.tar.gz"
-checksum=16197a881ae0f1fd32d90956b656d82429a1bb111c918837487eef943a14fd76
+checksum=54e4235716ccece450b51ffbd7a42a21b730650d3b481901e95d91477819806b
 conf_files="/etc/rustypaste/config.toml"
 
 system_accounts="_rustypaste"

From d381947f038acdbd782902e0a01c7d859d37f2e1 Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Wed, 31 May 2023 09:56:55 +0200
Subject: [PATCH 0215/1854] rustypaste-cli: update to 0.4.0.

---
 srcpkgs/rustypaste-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rustypaste-cli/template b/srcpkgs/rustypaste-cli/template
index 1b1f53295fbd..663a222a059f 100644
--- a/srcpkgs/rustypaste-cli/template
+++ b/srcpkgs/rustypaste-cli/template
@@ -1,6 +1,6 @@
-# Template file for 'rustypaste-cli' 
+# Template file for 'rustypaste-cli'
 pkgname=rustypaste-cli
-version=0.3.0
+version=0.4.0
 revision=1
 build_style=cargo
 short_desc="CLI tool for rustypaste"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste-cli"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste-cli/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=691fd3ddcf2c7c9c17728a304bd4299a35812940902b8b31059902abb49b037e
+checksum=c534d047202dcae17255a816882ac6358f82735270843f0b7ae525cc15fc2e91
 
 post_install() {
 	vlicense LICENSE

From 7998277296dee3a30355ecd6c1feff9765ccf8f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:25 -0400
Subject: [PATCH 0216/1854] chezmoi: update to 2.34.0.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index b7dca806e5f2..0204f59e0984 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.33.6
+version=2.34.0
 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=49f624ff55e1fb7165e9bca98aead8d6c49c6ff73926973c6ba6347f0ee17eba
+checksum=66a65bb283ba8259d0ca0205b3c3457da220c55d486da10b42f31fe5e478f5e8
 
 pre_build() {
 	local _date

From b99273bbf3567204ae3a2f8d7b6fd64e52bebaf9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:30 -0400
Subject: [PATCH 0217/1854] noto-fonts-ttf: update to 23.6.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 8763c4cc9440..554f1c2ceac1 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.5.1
+version=23.6.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=393e20547ea09d7c47053e86bcd4c16d753283244a96c09a7dcd79eea27aa3fa
+checksum=4a52070a67ce1f9c74eb74645bfa769d5df43bf1268123e733a5ac56cb36c476
 font_dirs="/usr/share/fonts/noto"
 
 do_install() {

From 5635a1f4d068b485206ba14ce8302a2021152dd5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:32 -0400
Subject: [PATCH 0218/1854] pyright: update to 1.1.311.

---
 srcpkgs/pyright/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index 42e65a683994..1ccc8edff5c9 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.309
+version=1.1.311
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=6af39e64928459992a4789bb3994b0a8144617fd32221c201c6157f3ccb76613
+checksum=33c2aa5d47d05d24fa741c068d7e87cdc17aa4d7c72b2e255dc38aa4b5c54752
 
 do_configure() {
 	cd "$wrksrc"

From fb9a0b89e30c8a2da20ec1d029f5187b79b11677 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:33 -0400
Subject: [PATCH 0219/1854] python3-pytest-xdist: update to 3.3.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 3128717d293a..b327702316a3 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.1
+version=3.3.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=1849bd98d8b242b948e472db7478e090bf3361912a8fed87992ed94085f54727
+checksum=d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93
 # tests only work in tox
 make_check=no
 

From 9a3c680fc853ed103990f4ea48e15e87e33a0951 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:34 -0400
Subject: [PATCH 0220/1854] soju: update to 0.6.2.

---
 srcpkgs/soju/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 70c4d46bedcb..6d7c82e58ccf 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,6 +1,6 @@
 # Template file for 'soju'
 pkgname=soju
-version=0.6.1
+version=0.6.2
 revision=1
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
@@ -14,7 +14,7 @@ license="AGPL-3.0-or-later"
 homepage="https://soju.im"
 changelog="https://git.sr.ht/~emersion/soju/refs"
 distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=336ec8bb2482ec811261bb6c19bd71613fa20e65bb98aedfbceb16969bb7038b
+checksum=b8a8f5af08670497d233137086e273a26c388f5e313c9e9e613ef6caaa3e928a
 conf_files="/etc/soju/config"
 system_accounts="_soju"
 make_dirs="/var/db/soju 0750 _soju _soju

From 2b0a7e961177e20fa2b138086eb7c00f586dfec8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 4 Jun 2023 20:55:35 -0400
Subject: [PATCH 0221/1854] webhook: update to 2.8.1.

---
 srcpkgs/webhook/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 602c73878774..8dd10051f2fa 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
-version=2.8.0
-revision=2
+version=2.8.1
+revision=1
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
@@ -9,7 +9,7 @@ maintainer="Abigail G <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/adnanh/webhook"
 distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz"
-checksum=c521558083f96bcefef16575a6f3f98ac79c0160fd0073be5e76d6645e068398
+checksum=a1e3eb2231e5631ebb374b76a79c3bac9cbdc7010974395e2d5e4e2e62ffd187
 conf_files="/etc/webhook/hooks.json /etc/sv/webhook/conf"
 system_accounts="_webhook"
 system_groups="_webhook"

From a0e8ce91fe51052d5af3cd11d93ae97ff08e430d Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sun, 4 Jun 2023 13:47:04 -0500
Subject: [PATCH 0222/1854] mat2: install man page

---
 srcpkgs/mat2/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template
index 64fc4b5f2169..c06ed1f67211 100644
--- a/srcpkgs/mat2/template
+++ b/srcpkgs/mat2/template
@@ -1,7 +1,7 @@
 # Template file for 'mat2'
 pkgname=mat2
 version=0.13.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="bubblewrap python3-cairo python3-gobject python3-mutagen poppler-glib
@@ -14,3 +14,7 @@ changelog="https://0xacab.org/jvoisin/mat2/-/raw/master/CHANGELOG.md"
 distfiles="https://0xacab.org/jvoisin/mat2/-/archive/${version}/mat2-${version}.tar.gz"
 checksum=e1bb0161fa1c2f2adb1b933761f9569534309e90209568f96aca5fc8a74f511a
 make_check=no  # cannot bwrap in chroot
+
+post_install() {
+	vman doc/mat2.1
+}

From 54d8200bef11f972b76aaa0ce0d9cc8f90e0034a Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 4 Jun 2023 15:57:03 -0400
Subject: [PATCH 0223/1854] ircdog: update to 0.5.0.

---
 srcpkgs/ircdog/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index af6253c17a7a..4eac96514502 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,15 +1,16 @@
 # Template file for 'ircdog'
 pkgname=ircdog
-version=0.4.0
-revision=2
+version=0.5.0
+revision=1
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"
 maintainer="0x5c <dev@0x5c.io>"
 license="ISC"
 homepage="https://github.com/ergochat/ircdog"
+changelog="https://raw.githubusercontent.com/ergochat/ircdog/master/CHANGELOG.md"
 distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
-checksum=7078dad0844a7f7578a95a410ed88f1aafe34384ba7090f14a6021eb7029068b
+checksum=d999c8e25eca99e7464e97bb61bc213d66fbef3e925a099f90d4be8c6f021d24
 
 post_install() {
 	vlicense LICENSE

From da105e6532e507700006b1d92c3c5bf690365876 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 13 Feb 2023 10:24:30 +0100
Subject: [PATCH 0224/1854] New package: muon-0.2.0

---
 srcpkgs/muon/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/muon/template

diff --git a/srcpkgs/muon/template b/srcpkgs/muon/template
new file mode 100644
index 000000000000..310187b9aac5
--- /dev/null
+++ b/srcpkgs/muon/template
@@ -0,0 +1,23 @@
+# Template file for 'muon'
+pkgname=muon
+version=0.1.0
+revision=1
+build_style=meson
+build_helper=qemu
+configure_args="
+ -Dlibcurl=enabled
+ -Dlibarchive=enabled
+ -Dlibpkgconf=enabled
+ -Dsamurai=disabled
+ -Dbestline=enabled"
+hostmakedepends="pkg-config samurai cmake"
+makedepends="pkgconf-devel libcurl-devel libarchive-devel"
+depends="samurai"
+checkdepends="git"
+short_desc="Meson implementation in C"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only, Apache-2.0"
+homepage="https://muon.build"
+changelog="https://git.sr.ht/~lattis/muon/refs/$version"
+distfiles="https://git.sr.ht/~lattis/muon/archive/$version.tar.gz"
+checksum="9d3825c2d562f8f8ad96d1f02167e89c4e84973decf205d127efd9293d7da35b"

From 2b7b5fd1afc9117c41a38d362abe31d1d50769f3 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:36:49 +0200
Subject: [PATCH 0225/1854] yoshimi: update to 2.3.0.

---
 srcpkgs/yoshimi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 89b38332df69..0b72467a8d57 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=2.2.3
+version=2.3.0
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=9e4f4b8834bb6ebaa5f408fb275c66a680cfd7b5b8716c4b3a6dea06b2ac1ed0
+checksum=167c3f300a3513407f5ed61b1104a79552bfc574f4a6dbf5bb713f2456a834f9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From a21d7472146a702791a91b59d784f293d9550f38 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:38:58 +0200
Subject: [PATCH 0226/1854] terragrunt: update to 0.46.1.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index cc4ee5d45d03..fe7569f377f3 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.45.16
+version=0.46.1
 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=11c2fadf60545ec495a031ddc72e985af83aa5171f952ef0da451f37f5160435
+checksum=f3b99f6de74ce6d2af87a01cb0ca6ff8d6357e506fbc69252f821820d3c5c0bf
 
 post_install() {
 	vlicense LICENSE.txt

From 762338e51293420cf2d8764f10125972a30ace15 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:40:12 +0200
Subject: [PATCH 0227/1854] packer: update to 1.9.1.

---
 srcpkgs/packer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index c24377bf3a03..b9e862e13f30 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.8.7
+version=1.9.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=0b3a45a3ecb0b5e993a0a39ee4599d69b58c1419cebddbfc45c61eb15389ba98
+checksum=1f3ae38fe9313a072547d1ce5674d74438ad5d59b042a87428534ac39bfd47b7
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 75b68c3844653334a81b60b0dcf2e033906d5445 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:41:28 +0200
Subject: [PATCH 0228/1854] moby: update to 24.0.2.

---
 srcpkgs/moby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 83f23916624d..2878c75a8936 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,7 +1,7 @@
 # Template file for 'moby'
 # should be kept in sync with docker-cli
 pkgname=moby
-version=23.0.6
+version=24.0.2
 revision=1
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
@@ -18,7 +18,7 @@ homepage="https://www.docker.com"
 changelog="https://github.com/moby/moby/releases"
 distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
  https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-checksum="3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e
+checksum="f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0
  5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b"
 system_groups="docker"
 

From 5e1a87e2e4bd8c6daff23dc8a00d657df83aef2b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:42:06 +0200
Subject: [PATCH 0229/1854] docker-cli: update to 24.0.2.

---
 srcpkgs/docker-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index ae4587fa99c7..47f6cc65b10d 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 # should be kept in sync with moby
 pkgname=docker-cli
-version=24.0.1
+version=24.0.2
 revision=1
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.docker.com"
 distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=f5916273959fb2df56424bb2c26d8b6feb9a148dd15eb400aedd5d3753e06959
+checksum=632357aa58d7f5e16ce87dbd73641c5f65c25b6501e3917ac4f0ce553a01e0bc
 system_groups="docker"
 
 pre_build() {

From 67e283e55207950e6d1b5e79829ae880f31cc8c4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 5 Jun 2023 11:42:55 +0200
Subject: [PATCH 0230/1854] hugo: update to 0.112.7.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d9f4819d8c27..d80e676fd44d 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.112.3
+version=0.112.7
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=24720523cd4feb4a746fb1462c4ad0b1ecdd4c3fbe08469d4498ca0647b9e28f
+checksum=d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa
 
 post_install() {
 	vdoc README.md

From 48b593cc887d67e7b4220da067a5c32017a5043e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 0231/1854] occt: update to 7.7.1.

---
 common/shlibs                                 | 118 +++++++++---------
 .../occt/patches/cmake-build-type-none.patch  |  13 --
 srcpkgs/occt/patches/fix-install-dir.patch    |  26 +---
 srcpkgs/occt/patches/musl-fenv.patch          |  14 +--
 srcpkgs/occt/patches/musl-mallinfo.patch      |  26 ++--
 srcpkgs/occt/template                         |  16 ++-
 6 files changed, 101 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index 16eefd439b2b..042a1d23492e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
 libcapnp_c.so.0 c-capnproto-0.3_1
-libTKBin.so.7 occt-7.2.0p1_1
-libTKDraw.so.7 occt-7.2.0p1_1
-libTKSTEP209.so.7 occt-7.2.0p1_1
-libTKOpenGl.so.7 occt-7.2.0p1_1
-libTKBinTObj.so.7 occt-7.2.0p1_1
-libTKSTL.so.7 occt-7.2.0p1_1
-libTKViewerTest.so.7 occt-7.2.0p1_1
-libTKCAF.so.7 occt-7.2.0p1_1
-libTKService.so.7 occt-7.2.0p1_1
-libTKV3d.so.7 occt-7.2.0p1_1
-libTKXCAF.so.7 occt-7.2.0p1_1
-libTKMesh.so.7 occt-7.2.0p1_1
-libTKSTEP.so.7 occt-7.2.0p1_1
-libTKMath.so.7 occt-7.2.0p1_1
-libTKLCAF.so.7 occt-7.2.0p1_1
-libTKShHealing.so.7 occt-7.2.0p1_1
-libTKGeomAlgo.so.7 occt-7.2.0p1_1
-libTKTObjDRAW.so.7 occt-7.2.0p1_1
-libTKTObj.so.7 occt-7.2.0p1_1
-libTKStd.so.7 occt-7.2.0p1_1
-libTKSTEPBase.so.7 occt-7.2.0p1_1
-libTKIGES.so.7 occt-7.2.0p1_1
-libTKGeomBase.so.7 occt-7.2.0p1_1
-libTKFillet.so.7 occt-7.2.0p1_1
-libTKFeat.so.7 occt-7.2.0p1_1
-libTKG2d.so.7 occt-7.2.0p1_1
-libTKXSBase.so.7 occt-7.2.0p1_1
-libTKDCAF.so.7 occt-7.2.0p1_1
-libTKXml.so.7 occt-7.2.0p1_1
-libTKTopTest.so.7 occt-7.2.0p1_1
-libTKG3d.so.7 occt-7.2.0p1_1
-libTKBRep.so.7 occt-7.2.0p1_1
-libTKVRML.so.7 occt-7.2.0p1_1
-libTKCDF.so.7 occt-7.2.0p1_1
-libTKXSDRAW.so.7 occt-7.2.0p1_1
-libTKXMesh.so.7 occt-7.2.0p1_1
-libTKernel.so.7 occt-7.2.0p1_1
-libTKTopAlgo.so.7 occt-7.2.0p1_1
-libTKHLR.so.7 occt-7.2.0p1_1
-libTKBinXCAF.so.7 occt-7.2.0p1_1
-libTKVCAF.so.7 occt-7.2.0p1_1
-libTKBinL.so.7 occt-7.2.0p1_1
-libTKXmlXCAF.so.7 occt-7.2.0p1_1
-libTKXDEIGES.so.7 occt-7.2.0p1_1
-libTKBO.so.7 occt-7.2.0p1_1
-libTKStdL.so.7 occt-7.2.0p1_1
-libTKXDEDRAW.so.7 occt-7.2.0p1_1
-libTKXmlTObj.so.7 occt-7.2.0p1_1
-libTKPrim.so.7 occt-7.2.0p1_1
-libTKMeshVS.so.7 occt-7.2.0p1_1
-libTKSTEPAttr.so.7 occt-7.2.0p1_1
-libTKBool.so.7 occt-7.2.0p1_1
-libTKOffset.so.7 occt-7.2.0p1_1
-libTKXDESTEP.so.7 occt-7.2.0p1_1
-libTKQADraw.so.7 occt-7.2.0p1_1
-libTKXmlL.so.7 occt-7.2.0p1_1
-libTKRWMesh.so.7 occt-7.4.0_1
+libTKernel.so.7.7 occt-7.7.1_1
+libTKXmlXCAF.so.7.7 occt-7.7.1_1
+libTKXmlTObj.so.7.7 occt-7.7.1_1
+libTKXmlL.so.7.7 occt-7.7.1_1
+libTKXml.so.7.7 occt-7.7.1_1
+libTKXSDRAW.so.7.7 occt-7.7.1_1
+libTKXSBase.so.7.7 occt-7.7.1_1
+libTKXMesh.so.7.7 occt-7.7.1_1
+libTKXDESTEP.so.7.7 occt-7.7.1_1
+libTKXDEIGES.so.7.7 occt-7.7.1_1
+libTKXDEDRAW.so.7.7 occt-7.7.1_1
+libTKXDECascade.so.7.7 occt-7.7.1_1
+libTKXDE.so.7.7 occt-7.7.1_1
+libTKXCAF.so.7.7 occt-7.7.1_1
+libTKViewerTest.so.7.7 occt-7.7.1_1
+libTKVRML.so.7.7 occt-7.7.1_1
+libTKVCAF.so.7.7 occt-7.7.1_1
+libTKV3d.so.7.7 occt-7.7.1_1
+libTKTopTest.so.7.7 occt-7.7.1_1
+libTKTopAlgo.so.7.7 occt-7.7.1_1
+libTKTObjDRAW.so.7.7 occt-7.7.1_1
+libTKTObj.so.7.7 occt-7.7.1_1
+libTKStdL.so.7.7 occt-7.7.1_1
+libTKStd.so.7.7 occt-7.7.1_1
+libTKShHealing.so.7.7 occt-7.7.1_1
+libTKService.so.7.7 occt-7.7.1_1
+libTKSTL.so.7.7 occt-7.7.1_1
+libTKSTEPBase.so.7.7 occt-7.7.1_1
+libTKSTEPAttr.so.7.7 occt-7.7.1_1
+libTKSTEP209.so.7.7 occt-7.7.1_1
+libTKSTEP.so.7.7 occt-7.7.1_1
+libTKRWMesh.so.7.7 occt-7.7.1_1
+libTKQADraw.so.7.7 occt-7.7.1_1
+libTKPrim.so.7.7 occt-7.7.1_1
+libTKOpenGlTest.so.7.7 occt-7.7.1_1
+libTKOpenGl.so.7.7 occt-7.7.1_1
+libTKOffset.so.7.7 occt-7.7.1_1
+libTKMeshVS.so.7.7 occt-7.7.1_1
+libTKMesh.so.7.7 occt-7.7.1_1
+libTKMath.so.7.7 occt-7.7.1_1
+libTKLCAF.so.7.7 occt-7.7.1_1
+libTKIGES.so.7.7 occt-7.7.1_1
+libTKHLR.so.7.7 occt-7.7.1_1
+libTKGeomBase.so.7.7 occt-7.7.1_1
+libTKGeomAlgo.so.7.7 occt-7.7.1_1
+libTKG3d.so.7.7 occt-7.7.1_1
+libTKG2d.so.7.7 occt-7.7.1_1
+libTKFillet.so.7.7 occt-7.7.1_1
+libTKFeat.so.7.7 occt-7.7.1_1
+libTKExpress.so.7.7 occt-7.7.1_1
+libTKDraw.so.7.7 occt-7.7.1_1
+libTKDCAF.so.7.7 occt-7.7.1_1
+libTKCDF.so.7.7 occt-7.7.1_1
+libTKCAF.so.7.7 occt-7.7.1_1
+libTKBool.so.7.7 occt-7.7.1_1
+libTKBinXCAF.so.7.7 occt-7.7.1_1
+libTKBinTObj.so.7.7 occt-7.7.1_1
+libTKBinL.so.7.7 occt-7.7.1_1
+libTKBin.so.7.7 occt-7.7.1_1
+libTKBRep.so.7.7 occt-7.7.1_1
+libTKBO.so.7.7 occt-7.7.1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
- 
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
- 
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
- 
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch
index 68b3ee4ef4fe..931587bef990 100644
--- a/srcpkgs/occt/patches/fix-install-dir.patch
+++ b/srcpkgs/occt/patches/fix-install-dir.patch
@@ -1,26 +1,12 @@
-# fix cmake install dir references
-# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
-
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
+--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake	2023-05-31 20:05:47.619869450 +0200
++++ occt-7.7.1/adm/cmake/occt_macros.cmake	2023-05-31 20:07:25.611036417 +0200
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
  
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
 +  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
-<Paste>
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -5,18 +5,18 @@ is probably wrong, but I don't have a replacement for the
 non-posix functions fegetexcept(3) and feenableexcept(3).
 """
 
---- a/src/OSD/OSD_signal.cxx
-+++ b/src/OSD/OSD_signal.cxx
-@@ -703,7 +703,7 @@
+--- a/src/OSD/OSD_signal.cxx.orig	2022-07-22 10:53:38.000000000 +0200
++++ b/src/OSD/OSD_signal.cxx	2022-10-06 09:19:02.286414340 +0200
+@@ -761,7 +761,7 @@ typedef void (* SIG_PFV) (int);
  
  #include <signal.h>
  
--#if !defined(__ANDROID__) && !defined(__QNX__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) &&  defined(__GLIBC__)
    #include <sys/signal.h>
  #endif
  
-@@ -914,7 +914,7 @@
+@@ -977,7 +977,7 @@ static void SegvHandler(const int theSig
  //=======================================================================
  void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
  {
@@ -25,7 +25,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
    feclearexcept (FE_ALL_EXCEPT);
    if (theFloatingSignal)
    {
-@@ -947,7 +947,7 @@
+@@ -1010,7 +1010,7 @@ void OSD::SetFloatingSignal (Standard_Bo
  //=======================================================================
  Standard_Boolean OSD::ToCatchFloatingSignals()
  {
diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
index 4e5825bf1cb0..1ce5b16b793f 100644
--- a/srcpkgs/occt/patches/musl-mallinfo.patch
+++ b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -1,17 +1,21 @@
 In musl libc there is no struct mallinfo and no function mallinf()
 
---- a/src/OSD/OSD_MemInfo.cxx
-+++ b/src/OSD/OSD_MemInfo.cxx
-@@ -147,8 +147,12 @@
-   }
-   aFile.close();
+--- a/src/OSD/OSD_MemInfo.cxx.orig	2022-10-06 09:21:55.466236104 +0200
++++ b/src/OSD/OSD_MemInfo.cxx	2022-10-06 09:25:34.105323581 +0200
+@@ -188,12 +188,16 @@ void OSD_MemInfo::Update()
+     #endif
+   #endif
  
 +  #if defined(__GLIBC__)
-   struct mallinfo aMI = mallinfo();
-   myCounters[MemHeapUsage] = aMI.uordblks;
-+  #else /* XXX not yet coded */
-+  myCounters[MemHeapUsage] = 0;
+   #ifdef HAS_MALLINFO2
+     const struct mallinfo2 aMI = mallinfo2();
+   #else
+     const struct mallinfo aMI = mallinfo();
+   #endif
+     myCounters[MemHeapUsage] = aMI.uordblks;
++  #else
++    myCounters[MemHeapUsage] = 0;
 +  #endif
+   }
  
- #elif (defined(__APPLE__))
-   struct task_basic_info aTaskInfo;
+   if (!IsActive (MemVirtual)
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 5f9ef2d060e4..296a52de5a1b 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,8 +1,7 @@
 # Template file for 'occt'
 pkgname=occt
-reverts=7.5.0_1
-version=7.4.0p1
-revision=5
+version=7.7.1
+revision=1
 _gittag="V${version//./_}"
 build_style=cmake
 # XXX: re-enable -DUSE_TBB=ON if possible when updating
@@ -17,8 +16,17 @@ homepage="https://www.opencascade.com"
 # distfile: use git instead of official tarball, which requires registration
 # see https://www.opencascade.com/content/packaging-again-debian
 distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
+checksum=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
 conflicts="oce>=0"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+fi
+
+pre_build() {
+	cp build/OpenCASCADECompileDefinitionsAndFlags-release.cmake \
+		build/OpenCASCADECompileDefinitionsAndFlags-none.cmake
+}
 
 post_install() {
 	rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt

From 17c0c405e7037ff9ad2ae5f4fd03e702bf9595c8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Jun 2023 11:48:53 +0200
Subject: [PATCH 0232/1854] freecad: rebuild for occt-7.7.1_1

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e301f32d3540..a4a3f5f76b29 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=4
+revision=5
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From b1d29e961d2b4e4ffdaefce190271d5f2d21fc9b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 0233/1854] gmsh: rebuild for occt-7.7.1_1

---
 srcpkgs/gmsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index ca44c92cf8e1..c3727d90e4c9 100644
--- a/srcpkgs/gmsh/template
+++ b/srcpkgs/gmsh/template
@@ -1,7 +1,7 @@
 # Template file for 'gmsh'
 pkgname=gmsh
 version=4.8.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON
  -DENABLE_HXT=$(vopt_if hxt ON OFF)

From 5dd99faa187727d6b33fb28a92c6c502d1256efa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 0234/1854] horizon: rebuilt for occt-7.7.0_1

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From f2374232a132090ffe0e770860bc472479b061af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 0235/1854] kicad: rebuilt for occt-7.7.1_1

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 17e6745b109c..1c34c498afbd 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=7.0.1
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON

From eca13c946fac29f4b49eee5f6315d698abbd5ce6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:53 +0200
Subject: [PATCH 0236/1854] python3-occ: update to 7.7.0.

---
 srcpkgs/python3-occ/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 6e9967154c5c..1fd02e0b26a0 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
-version=7.4.1
-revision=4
+version=7.7.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
@@ -13,4 +13,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="http://pythonocc.org"
 distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz"
-checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667
+checksum=9b27003b87799badfae04f8cacd03b8faa1309600c9de8021434d7511e718f82

From f611068aedcc0cac20eb93f7d5188efcbbbed646 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 0237/1854] PrusaSlicer: update to 2.5.2.

---
 .../PrusaSlicer/patches/cereal-is-header-only.patch   |  2 +-
 .../PrusaSlicer/patches/cmake-relax-dependency.patch  | 11 +++++++++++
 srcpkgs/PrusaSlicer/template                          |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..24897e503efb 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,9 +20,9 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r)
+
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
 ===================================================================
 --- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..b0f1448779a0
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig	2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt	2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+ 
+ generate_export_header(OCCTWrapper)
+ 
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index e645926e76f7..47ec80940155 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=5
+version=2.5.2
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,13 +11,13 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel libopenexr-devel wxWidgets-gtk3-devel occt-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
 
 post_extract() {
 	# Mark tests that fail on certain targets

From 27cac929560f5bdd5614523d442e624994e0567e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:52:59 +0300
Subject: [PATCH 0238/1854] qt6-multimedia: don't move qmldir to -devel subpkg

This breaks "import QtMultimedia" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-multimedia/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
index c622b7c9e8fc..a6832fdd69bf 100644
--- a/srcpkgs/qt6-multimedia/template
+++ b/srcpkgs/qt6-multimedia/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-multimedia'
 pkgname=qt6-multimedia
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_FEATURE_gstreamer=ON"
 hostmakedepends="perl qt6-declarative-host-tools pkg-config qt6-shadertools"
@@ -43,7 +43,6 @@ qt6-multimedia-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.prl"

From 300c46f61308e6d997d0352331800599eb27ac87 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:54:42 +0300
Subject: [PATCH 0239/1854] qt6-remoteobjects: don't move qmldir to -devel
 subpkg

This breaks "import QtRemoteObjects" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-remoteobjects/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
index b37d82bed03d..8cdd45e4ea8a 100644
--- a/srcpkgs/qt6-remoteobjects/template
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-remoteobjects'
 pkgname=qt6-remoteobjects
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools pkg-config"
 makedepends="qt6-declarative-devel"
@@ -39,7 +39,6 @@ qt6-remoteobjects-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 	}

From 52b3a48a9cd107bd080aa14581f7be62ca773707 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:55:27 +0300
Subject: [PATCH 0240/1854] qt6-sensors: don't move qmldir to -devel subpkg

This breaks "import QtSensors" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-sensors/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
index 5e6a1e2a7776..8f6d6ece628d 100644
--- a/srcpkgs/qt6-sensors/template
+++ b/srcpkgs/qt6-sensors/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-sensors'
 pkgname=qt6-sensors
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools pkg-config"
 makedepends="qt6-declarative-devel qt6-svg-devel"
@@ -27,7 +27,6 @@ qt6-sensors-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtSensors/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 	}

From 815c0d5970d86b4b7def00e1e5783b1ca772d164 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 5 Jun 2023 16:56:01 +0300
Subject: [PATCH 0241/1854] qt6-webchannel: don't move qmldir to -devel subpkg

This breaks "import QtWebChannel" and prevents any QML from using it
without the -devel subpkg which makes no sense.
---
 srcpkgs/qt6-webchannel/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
index 9c3def385a7b..30484a12b4f1 100644
--- a/srcpkgs/qt6-webchannel/template
+++ b/srcpkgs/qt6-webchannel/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-webchannel'
 pkgname=qt6-webchannel
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl qt6-base qt6-declarative-host-tools"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
@@ -31,7 +31,6 @@ qt6-webchannel-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
-		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 		vmove usr/lib/qt6/modules

From 4c0766176e9cdd2a4ad334020e5e1783f1d98899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 5 Jun 2023 23:39:27 +0700
Subject: [PATCH 0242/1854] freecad: fix build for occt 7.7

---
 srcpkgs/freecad/patches/001-include.patch     | 112 ++++++++++++++++++
 .../patches/153-limits.h-for-musl.patch       |   4 +-
 .../154-revert-gui-tmp-redirect-stderr.patch  |   5 -
 ...d63c8c9b1280978be841d04e68a0a55cceb9.patch |   6 +-
 4 files changed, 116 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/freecad/patches/001-include.patch

diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/patches/001-include.patch
new file mode 100644
index 000000000000..28b5af54999b
--- /dev/null
+++ b/srcpkgs/freecad/patches/001-include.patch
@@ -0,0 +1,112 @@
+From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
+From: Uwe <donovaly@users.noreply.github.com>
+Date: Sun, 3 Jul 2022 22:51:16 +0200
+Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
+
+- also sort includes
+---
+ src/Mod/Part/App/OCCError.h             | 36 +++----------------------
+ src/Mod/Part/App/OffsetCurvePyImp.cpp   | 12 ++++-----
+ src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
+ 3 files changed, 12 insertions(+), 46 deletions(-)
+
+--- a/src/Mod/Part/App/OCCError.h
++++ b/src/Mod/Part/App/OCCError.h
+@@ -23,36 +23,8 @@
+ #ifndef _OCCError_h_
+ #define _OCCError_h_
+ 
+-# include <Standard_Version.hxx>
+ # include <Standard_Failure.hxx>
+-# include <Standard_AbortiveTransaction.hxx>
+-# include <Standard_ConstructionError.hxx>
+-# if OCC_VERSION_HEX >= 0x060500
+-# include <Standard_DefineException.hxx>
+-# endif
+-# include <Standard_DimensionError.hxx>
+-# include <Standard_DimensionMismatch.hxx>
+-# include <Standard_DivideByZero.hxx>
+-# include <Standard_DomainError.hxx>
+-# include <Standard_ImmutableObject.hxx>
+-# include <Standard_LicenseError.hxx>
+-# include <Standard_LicenseNotFound.hxx>
+-# include <Standard_MultiplyDefined.hxx>
+-# include <Standard_NegativeValue.hxx>
+-# include <Standard_NoMoreObject.hxx>
+-# include <Standard_NoSuchObject.hxx>
+-# include <Standard_NotImplemented.hxx>
+-# include <Standard_NullObject.hxx>
+-# include <Standard_NullValue.hxx>
+-# include <Standard_NumericError.hxx>
+-# include <Standard_OutOfMemory.hxx>
+-# include <Standard_OutOfRange.hxx>
+-# include <Standard_Overflow.hxx>
+-# include <Standard_ProgramError.hxx>
+-# include <Standard_RangeError.hxx>
+-# include <Standard_TooManyUsers.hxx>
+-# include <Standard_TypeMismatch.hxx>
+-# include <Standard_Underflow.hxx>
++# include <Standard_Version.hxx>
+ 
+ #include <Mod/Part/PartGlobal.h>
+ #include <Base/Console.h>
+@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
+ 
+ #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
+ #endif  // _OCCError_h_
+-
+--- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
++++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
+@@ -20,20 +20,20 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
+-
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <Geom_OffsetCurve.hxx>
+ #endif
+ 
+-#include "OCCError.h"
+-#include "Geometry.h"
++#include <Base/GeometryPyCXX.h>
++#include <Base/Vector3D.h>
++#include <Base/VectorPy.h>
++
+ #include "OffsetCurvePy.h"
+ #include "OffsetCurvePy.cpp"
++#include "Geometry.h"
++#include "OCCError.h"
+ 
+-#include <Base/GeometryPyCXX.h>
+-#include <Base/VectorPy.h>
+-#include <Base/Vector3D.h>
+ 
+ using namespace Part;
+ 
+--- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
++++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
+@@ -20,20 +20,16 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
+-
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <Geom_OffsetSurface.hxx>
+ # include <memory>
+ #endif
+ 
+-#include <Base/VectorPy.h>
+-#include <Base/Vector3D.h>
+-
+ #include "OCCError.h"
+-#include "Geometry.h"
+-#include <Mod/Part/App/OffsetSurfacePy.h>
+-#include <Mod/Part/App/OffsetSurfacePy.cpp>
++#include "OffsetSurfacePy.h"
++#include "OffsetSurfacePy.cpp"
++
+ 
+ using namespace Part;
+ 
diff --git a/srcpkgs/freecad/patches/153-limits.h-for-musl.patch b/srcpkgs/freecad/patches/153-limits.h-for-musl.patch
index 59b0ff178ef8..4c1b369680b8 100644
--- a/srcpkgs/freecad/patches/153-limits.h-for-musl.patch
+++ b/srcpkgs/freecad/patches/153-limits.h-for-musl.patch
@@ -1,6 +1,6 @@
---- a/src/FCConfig.h.ORIG
+--- a/src/FCConfig.h
 +++ b/src/FCConfig.h
-@@ -321,4 +321,10 @@
+@@ -321,4 +321,10 @@ typedef unsigned __int64    uint64_t;
  //#	define _PreComp_                  // use precompiled header
  #endif
  
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
index 287179a23c3c..d6a9adabdec8 100644
--- a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
+++ b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
@@ -12,8 +12,6 @@ Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
  src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
  1 file changed, 27 deletions(-)
 
-diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-index 7f0ddd75d..455ece0b3 100644
 --- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
 +++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
 @@ -21,42 +21,17 @@
@@ -68,6 +66,3 @@ index 7f0ddd75d..455ece0b3 100644
      Q_UNUSED(window)
      if (spnav_open() == -1) {
          Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
--- 
-2.37.1
-
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
index 44b8d977def0..d4acf370ca0a 100644
--- a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
@@ -8,11 +8,9 @@ Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
  src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/Mod/Draft/draftguitools/gui_snapper.py b/src/Mod/Draft/draftguitools/gui_snapper.py
-index de27eaa53482..ef9ba5284d3c 100644
 --- a/src/Mod/Draft/draftguitools/gui_snapper.py
 +++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1438,7 +1438,7 @@ def accept():
+@@ -1426,7 +1426,7 @@ class Snapper:
              Gui.Snapper.off()
              self.ui.offUi()
              if callback:
@@ -21,7 +19,7 @@ index de27eaa53482..ef9ba5284d3c 100644
                      obj = None
                      if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
                          obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1457,7 +1457,7 @@ def cancel():
+@@ -1445,7 +1445,7 @@ class Snapper:
              Gui.Snapper.off()
              self.ui.offUi()
              if callback:

From 891f81299bca8347b2c55a734963fa797a699a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 3 Jun 2023 15:50:15 -0300
Subject: [PATCH 0243/1854] python3-ipython: update to 8.14.0.

 - switch to pep517 build style
 - update depends and checkdepends
 - break unnecessary checkdepends cycle with ipython_ipykernel
 - fix a race (https://github.com/ipython/ipython/issues/12164)

Closes: #44268 [via git-merge-pr]
---
 .../python3-ipython/patches/fix-race.patch    | 28 +++++++++++++++++++
 srcpkgs/python3-ipython/template              | 17 +++++------
 2 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-ipython/patches/fix-race.patch

diff --git a/srcpkgs/python3-ipython/patches/fix-race.patch b/srcpkgs/python3-ipython/patches/fix-race.patch
new file mode 100644
index 000000000000..a6fdf5726815
--- /dev/null
+++ b/srcpkgs/python3-ipython/patches/fix-race.patch
@@ -0,0 +1,28 @@
+See: https://github.com/ipython/ipython/issues/12164
+
+diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
+index 59b5c2389..e83da39c6 100644
+--- a/IPython/utils/_process_posix.py
++++ b/IPython/utils/_process_posix.py
+@@ -136,6 +136,7 @@ def system(self, cmd):
+         # record how far we've printed, so that next time we only print *new*
+         # content from the buffer.
+         out_size = 0
++        child = None
+         try:
+             # Since we're not really searching the buffer for text patterns, we
+             # can set pexpect's search window to be tiny and it won't matter.
+@@ -158,6 +159,13 @@ def system(self, cmd):
+                 # Update the pointer to what we've already printed
+                 out_size = len(child.before)
+         except KeyboardInterrupt:
++
++            if child is None:
++                # the interrupt was received before pexpect.spawn()
++                # was done... recover as best as possible.
++                import signal
++                return -signal.SIGINT
++
+             # We need to send ^C to the process.  The ascii code for '^C' is 3
+             # (the character is known as ETX for 'End of Text', see
+             # curses.ascii.ETX).
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 14b1cc291123..910d51f0fb88 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,24 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.13.2
+version=8.14.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-jedi python3-decorator python3-pickleshare
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-jedi python3-decorator python3-pickleshare
  python3-traitlets python3-prompt_toolkit python3-Pygments python3-backcall
  python3-matplotlib-inline python3-pexpect python3-stack_data"
-checkdepends="python3-pytest $depends python3-matplotlib python3-Pillow
- python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+checkdepends="$depends python3-pytest-asyncio python3-testpath python3-curio
+ python3-jupyter_nbformat python3-matplotlib python3-numpy python3-pandas
+ python3-trio"
 short_desc="Enhanced interactive Python3 shell"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 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=7dff3fad32b97f6488e02f87b970f309d082f758d7b7fc252e3b19ee0e432dbb
+checksum=1d197b907b6ba441b692c48cf2a3a2de280dc0ac91a3405b39349a50272ca0a1
 conflicts="python-ipython<=5.8.0_2"
+make_check_pre="env PYTHONPATH=."
 
 post_install() {
 	# remove iptest

From b3b9c40fceee28d639191b92157a5c27e2b8d09b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 5 Jun 2023 13:40:15 -0400
Subject: [PATCH 0244/1854] python3-occ: remove obsolete patch

---
 srcpkgs/python3-occ/patches/python3.10.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/python3-occ/patches/python3.10.patch

diff --git a/srcpkgs/python3-occ/patches/python3.10.patch b/srcpkgs/python3-occ/patches/python3.10.patch
deleted file mode 100644
index e192608fd3b3..000000000000
--- a/srcpkgs/python3-occ/patches/python3.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Display/SimpleGui.py b/src/Display/SimpleGui.py
-index 42705a82..6a274c16 100644
---- a/src/Display/SimpleGui.py
-+++ b/src/Display/SimpleGui.py
-@@ -161,8 +161,8 @@ def init_display(backend_str: Optional[str]=None,
-             def centerOnScreen(self) -> None:
-                 '''Centers the window on the screen.'''
-                 resolution = QtWidgets.QApplication.desktop().screenGeometry()
--                x = (resolution.width() - self.frameSize().width()) / 2
--                y = (resolution.height() - self.frameSize().height()) / 2
-+                x = (resolution.width() - self.frameSize().width()) // 2
-+                y = (resolution.height() - self.frameSize().height()) // 2
-                 self.move(x, y)
- 
-             def add_menu(self, menu_name: str) -> None:

From a3b1db21163c09e5ef0068441b0feb450484e6b1 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Jun 2023 19:45:19 +0200
Subject: [PATCH 0245/1854] passt: update to 2023.06.03.429e1a7.

---
 srcpkgs/passt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passt/template b/srcpkgs/passt/template
index 3ab469513be4..aa1679b2467d 100644
--- a/srcpkgs/passt/template
+++ b/srcpkgs/passt/template
@@ -1,6 +1,6 @@
 # Template file for 'passt'
 pkgname=passt
-version=2023.05.09.96f8d55
+version=2023.06.03.429e1a7
 revision=1
 # upstream uses YYYY_MM_DD.COMMIT
 _version=${version/./_}
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2, BSD-3-Clause"
 homepage="https://passt.top"
 distfiles="https://passt.top/passt/snapshot/passt-${_version}.tar.xz"
-checksum=5f81185e8c94ff7eae925e2f0eae7f16cdd891e68f70b6e35e0a67fb4c41457d
+checksum=4bd17ce7bd1d6dda033e346a40c5dc60d39cc08a6e3341fef79888299c84c3b6
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 4c24123f1cb3860138b25a2f3657325b42f75d81 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Jun 2023 19:48:56 +0200
Subject: [PATCH 0246/1854] obs: update to 29.1.2.

---
 srcpkgs/obs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 7ee29ff3eac6..7b69c630d30d 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=29.1.1
+version=29.1.2
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 build_style=cmake
@@ -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=9a37148449d715b3c7cc3e622c291aba9fa45bd354a39453b3e922eb558cf21e
+checksum=215f1fa5772c5dd9f3d6e35b0cb573912b00320149666a77864f9d305525504b
 
 pre_configure() {
 	# it's not enough to use -DENABLE_BROWSER ...

From cf332cbef28f64783e78fb6c691b1c013fd6f54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Jun 2023 00:13:45 +0700
Subject: [PATCH 0247/1854] python3-occ: patch for occt 7.7.1

---
 srcpkgs/python3-occ/patches/occt-7.7.1.patch | 2561 ++++++++++++++++++
 srcpkgs/python3-occ/template                 |    2 +-
 2 files changed, 2562 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-occ/patches/occt-7.7.1.patch

diff --git a/srcpkgs/python3-occ/patches/occt-7.7.1.patch b/srcpkgs/python3-occ/patches/occt-7.7.1.patch
new file mode 100644
index 000000000000..70861a77853b
--- /dev/null
+++ b/srcpkgs/python3-occ/patches/occt-7.7.1.patch
@@ -0,0 +1,2561 @@
+From 6ba4509edb333494d35a40c01192ab5e236acdda Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Mon, 3 Apr 2023 14:01:20 +0200
+Subject: [PATCH 1/4] update swig files to occt-771
+
+---
+ src/SWIG_files/common/EnumTemplates.i      |   1 -
+ src/SWIG_files/headers/AIS_module.hxx      |   2 +
+ src/SWIG_files/headers/BRepFill_module.hxx |   1 +
+ src/SWIG_files/wrapper/AIS.i               | 127 ++++++++----
+ src/SWIG_files/wrapper/AIS.pyi             |  12 +-
+ src/SWIG_files/wrapper/BRepAlgo.i          |  26 +++
+ src/SWIG_files/wrapper/BRepAlgo.pyi        |   2 +
+ src/SWIG_files/wrapper/BRepBlend.i         |  44 +++--
+ src/SWIG_files/wrapper/BRepBlend.pyi       |  14 +-
+ src/SWIG_files/wrapper/BRepExtrema.i       | 218 +++++----------------
+ src/SWIG_files/wrapper/BRepExtrema.pyi     |  23 +--
+ src/SWIG_files/wrapper/BRepFill.i          |  48 +++++
+ src/SWIG_files/wrapper/BRepFill.pyi        |  19 ++
+ src/SWIG_files/wrapper/BRepOffset.i        |   3 +
+ src/SWIG_files/wrapper/BRepOffset.pyi      |   2 +
+ src/SWIG_files/wrapper/BRepOffsetAPI.i     |  11 ++
+ src/SWIG_files/wrapper/BRepOffsetAPI.pyi   |   1 +
+ src/SWIG_files/wrapper/BSplCLib.i          |  23 +++
+ src/SWIG_files/wrapper/BSplCLib.pyi        |   3 +
+ src/SWIG_files/wrapper/ChFiDS.i            |  14 ++
+ src/SWIG_files/wrapper/ChFiDS.pyi          |   3 +
+ src/SWIG_files/wrapper/GeomInt.i           |  23 +++
+ src/SWIG_files/wrapper/GeomInt.pyi         |   5 +
+ src/SWIG_files/wrapper/STEPCAFControl.i    | 140 ++++++-------
+ src/SWIG_files/wrapper/STEPCAFControl.pyi  |  32 +--
+ src/SWIG_files/wrapper/STEPConstruct.i     |  26 +++
+ src/SWIG_files/wrapper/STEPConstruct.pyi   |   2 +
+ src/SWIG_files/wrapper/ShapeUpgrade.i      |   1 +
+ src/SWIG_files/wrapper/StdPrs.i            |  12 +-
+ src/SWIG_files/wrapper/StdPrs.pyi          |   4 +-
+ src/SWIG_files/wrapper/StepToGeom.i        |  16 --
+ src/SWIG_files/wrapper/XCAFDoc.i           |  78 +++++---
+ src/SWIG_files/wrapper/XCAFDoc.pyi         |  56 ++++--
+ src/SWIG_files/wrapper/XCAFPrs.i           |  10 +-
+ 34 files changed, 592 insertions(+), 410 deletions(-)
+
+diff --git a/src/SWIG_files/common/EnumTemplates.i b/src/SWIG_files/common/EnumTemplates.i
+index b66537d8..69af927f 100644
+--- a/src/SWIG_files/common/EnumTemplates.i
++++ b/src/SWIG_files/common/EnumTemplates.i
+@@ -15,7 +15,6 @@ ENUM_OUTPUT_TYPEMAPS(BRepOffset_Status);
+ ENUM_OUTPUT_TYPEMAPS(Graphic3d_DisplayPriority);
+ ENUM_OUTPUT_TYPEMAPS(Graphic3d_NameOfMaterial);
+ ENUM_OUTPUT_TYPEMAPS(GeomAbs_Shape);
+-ENUM_OUTPUT_TYPEMAPS(ProxPnt_Status);
+ ENUM_OUTPUT_TYPEMAPS(Aspect_TypeOfLine);
+ ENUM_OUTPUT_TYPEMAPS(PrsDim_KindOfSurface);
+ ENUM_OUTPUT_TYPEMAPS(DsgPrs_ArrowSide);
+diff --git a/src/SWIG_files/headers/AIS_module.hxx b/src/SWIG_files/headers/AIS_module.hxx
+index ee7050ea..97fb3b69 100644
+--- a/src/SWIG_files/headers/AIS_module.hxx
++++ b/src/SWIG_files/headers/AIS_module.hxx
+@@ -22,12 +22,14 @@ along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
+ #include<AIS.hxx>
+ #include<AIS_AngleDimension.hxx>
+ #include<AIS_Animation.hxx>
++#include<AIS_AnimationAxisRotation.hxx>
+ #include<AIS_AnimationCamera.hxx>
+ #include<AIS_AnimationObject.hxx>
+ #include<AIS_AnimationTimer.hxx>
+ #include<AIS_AttributeFilter.hxx>
+ #include<AIS_Axis.hxx>
+ #include<AIS_BadEdgeFilter.hxx>
++#include<AIS_BaseAnimationObject.hxx>
+ #include<AIS_C0RegularityFilter.hxx>
+ #include<AIS_CameraFrustum.hxx>
+ #include<AIS_Chamf2dDimension.hxx>
+diff --git a/src/SWIG_files/headers/BRepFill_module.hxx b/src/SWIG_files/headers/BRepFill_module.hxx
+index 73975e24..ef638100 100644
+--- a/src/SWIG_files/headers/BRepFill_module.hxx
++++ b/src/SWIG_files/headers/BRepFill_module.hxx
+@@ -67,6 +67,7 @@ along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
+ #include<BRepFill_SequenceOfSection.hxx>
+ #include<BRepFill_ShapeLaw.hxx>
+ #include<BRepFill_Sweep.hxx>
++#include<BRepFill_ThruSectionErrorStatus.hxx>
+ #include<BRepFill_TransitionStyle.hxx>
+ #include<BRepFill_TrimEdgeTool.hxx>
+ #include<BRepFill_TrimShellCorner.hxx>
+diff --git a/src/SWIG_files/wrapper/AIS.i b/src/SWIG_files/wrapper/AIS.i
+index bf1f6b10..8f58d69a 100644
+--- a/src/SWIG_files/wrapper/AIS.i
++++ b/src/SWIG_files/wrapper/AIS.i
+@@ -577,8 +577,8 @@ AIS_TOPL_YZPlane = AIS_TypeOfPlane.AIS_TOPL_YZPlane
+ %wrap_handle(AIS_TrihedronOwner)
+ %wrap_handle(AIS_TypeFilter)
+ %wrap_handle(AIS_AnimationCamera)
+-%wrap_handle(AIS_AnimationObject)
+ %wrap_handle(AIS_Axis)
++%wrap_handle(AIS_BaseAnimationObject)
+ %wrap_handle(AIS_Circle)
+ %wrap_handle(AIS_ColorScale)
+ %wrap_handle(AIS_ConnectedInteractive)
+@@ -595,6 +595,8 @@ AIS_TOPL_YZPlane = AIS_TypeOfPlane.AIS_TOPL_YZPlane
+ %wrap_handle(AIS_TextLabel)
+ %wrap_handle(AIS_Triangulation)
+ %wrap_handle(AIS_Trihedron)
++%wrap_handle(AIS_AnimationAxisRotation)
++%wrap_handle(AIS_AnimationObject)
+ %wrap_handle(AIS_ColoredShape)
+ %wrap_handle(AIS_TexturedShape)
+ /* end handles declaration */
+@@ -8532,41 +8534,6 @@ opencascade::handle<V3d_View>
+ 	}
+ };
+ 
+-/****************************
+-* class AIS_AnimationObject *
+-****************************/
+-class AIS_AnimationObject : public AIS_Animation {
+-	public:
+-		/****************** AIS_AnimationObject ******************/
+-		/**** md5 signature: c16e60828b420c37f86bd653dd4d9c04 ****/
+-		%feature("compactdefaultargs") AIS_AnimationObject;
+-		%feature("autodoc", "Constructor with initialization. note that start/end transformations specify exactly local transformation of the object, not the transformation to be applied to existing local transformation. @param theanimationname animation identifier @param thecontext interactive context where object have been displayed @param theobject object to apply local transformation @param thetrsfstart local transformation at the start of animation (e.g. theobject->localtransformation()) @param thetrsfend local transformation at the end of animation.
+-
+-Parameters
+-----------
+-theAnimationName: TCollection_AsciiString
+-theContext: AIS_InteractiveContext
+-theObject: AIS_InteractiveObject
+-theTrsfStart: gp_Trsf
+-theTrsfEnd: gp_Trsf
+-
+-Returns
+--------
+-None
+-") AIS_AnimationObject;
+-		 AIS_AnimationObject(const TCollection_AsciiString & theAnimationName, const opencascade::handle<AIS_InteractiveContext> & theContext, const opencascade::handle<AIS_InteractiveObject> & theObject, const gp_Trsf & theTrsfStart, const gp_Trsf & theTrsfEnd);
+-
+-};
+-
+-
+-%make_alias(AIS_AnimationObject)
+-
+-%extend AIS_AnimationObject {
+-	%pythoncode {
+-	__repr__ = _dumps_object
+-	}
+-};
+-
+ /*****************
+ * class AIS_Axis *
+ *****************/
+@@ -8855,6 +8822,23 @@ None
+ 	}
+ };
+ 
++/********************************
++* class AIS_BaseAnimationObject *
++********************************/
++%nodefaultctor AIS_BaseAnimationObject;
++class AIS_BaseAnimationObject : public AIS_Animation {
++	public:
++};
++
++
++%make_alias(AIS_BaseAnimationObject)
++
++%extend AIS_BaseAnimationObject {
++	%pythoncode {
++	__repr__ = _dumps_object
++	}
++};
++
+ /**************************
+ * class AIS_CameraFrustum *
+ **************************/
+@@ -16143,6 +16127,77 @@ Standard_ShortReal
+ 	}
+ };
+ 
++/**********************************
++* class AIS_AnimationAxisRotation *
++**********************************/
++class AIS_AnimationAxisRotation : public AIS_BaseAnimationObject {
++	public:
++		/****************** AIS_AnimationAxisRotation ******************/
++		/**** md5 signature: 819427e2c422233cc067da4633992952 ****/
++		%feature("compactdefaultargs") AIS_AnimationAxisRotation;
++		%feature("autodoc", "Constructor with initialization. @param[in] theanimationname animation identifier @param[in] thecontext interactive context where object have been displayed @param[in] theobject object to apply rotation @param[in] theaxis rotation axis @param[in] theanglestart rotation angle at the start of animation @param[in] theangleend rotation angle at the end of animation.
++
++Parameters
++----------
++theAnimationName: str
++theContext: AIS_InteractiveContext
++theObject: AIS_InteractiveObject
++theAxis: gp_Ax1
++theAngleStart: float
++theAngleEnd: float
++
++Returns
++-------
++None
++") AIS_AnimationAxisRotation;
++		 AIS_AnimationAxisRotation(TCollection_AsciiString theAnimationName, const opencascade::handle<AIS_InteractiveContext> & theContext, const opencascade::handle<AIS_InteractiveObject> & theObject, const gp_Ax1 & theAxis, const Standard_Real theAngleStart, const Standard_Real theAngleEnd);
++
++};
++
++
++%make_alias(AIS_AnimationAxisRotation)
++
++%extend AIS_AnimationAxisRotation {
++	%pythoncode {
++	__repr__ = _dumps_object
++	}
++};
++
++/****************************
++* class AIS_AnimationObject *
++****************************/
++class AIS_AnimationObject : public AIS_BaseAnimationObject {
++	public:
++		/****************** AIS_AnimationObject ******************/
++		/**** md5 signature: c16e60828b420c37f86bd653dd4d9c04 ****/
++		%feature("compactdefaultargs") AIS_AnimationObject;
++		%feature("autodoc", "Constructor with initialization. note that start/end transformations specify exactly local transformation of the object, not the transformation to be applied to existing local transformation. @param[in] theanimationname animation identifier @param[in] thecontext interactive context where object have been displayed @param[in] theobject object to apply local transformation @param[in] thetrsfstart local transformation at the start of animation (e.g. theobject->localtransformation()) @param[in] thetrsfend local transformation at the end of animation.
++
++Parameters
++----------
++theAnimationName: str
++theContext: AIS_InteractiveContext
++theObject: AIS_InteractiveObject
++theTrsfStart: gp_Trsf
++theTrsfEnd: gp_Trsf
++
++Returns
++-------
++None
++") AIS_AnimationObject;
++		 AIS_AnimationObject(TCollection_AsciiString theAnimationName, const opencascade::handle<AIS_InteractiveContext> & theContext, const opencascade::handle<AIS_InteractiveObject> & theObject, const gp_Trsf & theTrsfStart, const gp_Trsf & theTrsfEnd);
++
++};
++
++
++%make_alias(AIS_AnimationObject)
++
++%extend AIS_AnimationObject {
++	%pythoncode {
++	__repr__ = _dumps_object
++	}
++};
++
+ /*************************
+ * class AIS_ColoredShape *
+ *************************/
+diff --git a/src/SWIG_files/wrapper/AIS.pyi b/src/SWIG_files/wrapper/AIS.pyi
+index a75ef4ba..da4a3977 100644
+--- a/src/SWIG_files/wrapper/AIS.pyi
++++ b/src/SWIG_files/wrapper/AIS.pyi
+@@ -1021,9 +1021,6 @@ class AIS_AnimationCamera(AIS_Animation):
+     def SetView(self, theView: V3d_View) -> None: ...
+     def View(self) -> V3d_View: ...
+ 
+-class AIS_AnimationObject(AIS_Animation):
+-    def __init__(self, theAnimationName: TCollection_AsciiString, theContext: AIS_InteractiveContext, theObject: AIS_InteractiveObject, theTrsfStart: gp_Trsf, theTrsfEnd: gp_Trsf) -> None: ...
+-
+ class AIS_Axis(AIS_InteractiveObject):
+     @overload
+     def __init__(self, aComponent: Geom_Line) -> None: ...
+@@ -1050,6 +1047,9 @@ class AIS_Axis(AIS_InteractiveObject):
+     def UnsetColor(self) -> None: ...
+     def UnsetWidth(self) -> None: ...
+ 
++class AIS_BaseAnimationObject(AIS_Animation):
++    pass
++
+ class AIS_CameraFrustum(AIS_InteractiveObject):
+     def __init__(self) -> None: ...
+     def AcceptDisplayMode(self, theMode: int) -> bool: ...
+@@ -1652,6 +1652,12 @@ class AIS_XRTrackedDevice(AIS_InteractiveObject):
+     def SetUnitFactor(self, theFactor: float) -> None: ...
+     def UnitFactor(self) -> float: ...
+ 
++class AIS_AnimationAxisRotation(AIS_BaseAnimationObject):
++    def __init__(self, theAnimationName: str, theContext: AIS_InteractiveContext, theObject: AIS_InteractiveObject, theAxis: gp_Ax1, theAngleStart: float, theAngleEnd: float) -> None: ...
++
++class AIS_AnimationObject(AIS_BaseAnimationObject):
++    def __init__(self, theAnimationName: str, theContext: AIS_InteractiveContext, theObject: AIS_InteractiveObject, theTrsfStart: gp_Trsf, theTrsfEnd: gp_Trsf) -> None: ...
++
+ class AIS_ColoredShape(AIS_Shape):
+     @overload
+     def __init__(self, theShape: TopoDS_Shape) -> None: ...
+diff --git a/src/SWIG_files/wrapper/BRepAlgo.i b/src/SWIG_files/wrapper/BRepAlgo.i
+index 3860648e..bd9e2f38 100644
+--- a/src/SWIG_files/wrapper/BRepAlgo.i
++++ b/src/SWIG_files/wrapper/BRepAlgo.i
+@@ -921,6 +921,17 @@ None
+ ") CutEdge;
+ 		void CutEdge(const TopoDS_Edge & E, const TopTools_ListOfShape & VonE, TopTools_ListOfShape & NE);
+ 
++		/****************** GetTolConf ******************/
++		/**** md5 signature: 7e9f7b87eb3b20edee9e3a86157928cd ****/
++		%feature("compactdefaultargs") GetTolConf;
++		%feature("autodoc", "Get maximal tolerance used for comparing distaces between vertices. .
++
++Returns
++-------
++float
++") GetTolConf;
++		Standard_Real GetTolConf();
++
+ 		/****************** GetVerticesForSubstitute ******************/
+ 		/**** md5 signature: 3b0ea732ecf076dde3f931f0997c07aa ****/
+ 		%feature("compactdefaultargs") GetVerticesForSubstitute;
+@@ -1014,6 +1025,21 @@ None
+ ") SetImageVV;
+ 		void SetImageVV(const BRepAlgo_Image & theImageVV);
+ 
++		/****************** SetTolConf ******************/
++		/**** md5 signature: 1c312d5c00a3d856c91eb31857ae32c6 ****/
++		%feature("compactdefaultargs") SetTolConf;
++		%feature("autodoc", "Set maximal tolerance used for comparing distaces between vertices. .
++
++Parameters
++----------
++theTolConf: float
++
++Returns
++-------
++None
++") SetTolConf;
++		void SetTolConf(const Standard_Real theTolConf);
++
+ 		/****************** UpdateVEmap ******************/
+ 		/**** md5 signature: 491681c63af221fbd7247e01d389bbc0 ****/
+ 		%feature("compactdefaultargs") UpdateVEmap;
+diff --git a/src/SWIG_files/wrapper/BRepAlgo.pyi b/src/SWIG_files/wrapper/BRepAlgo.pyi
+index 5ee7ab94..20ecddc9 100644
+--- a/src/SWIG_files/wrapper/BRepAlgo.pyi
++++ b/src/SWIG_files/wrapper/BRepAlgo.pyi
+@@ -86,6 +86,7 @@ class BRepAlgo_Loop:
+     def AddConstEdges(self, LE: TopTools_ListOfShape) -> None: ...
+     def AddEdge(self, E: TopoDS_Edge, LV: TopTools_ListOfShape) -> None: ...
+     def CutEdge(self, E: TopoDS_Edge, VonE: TopTools_ListOfShape, NE: TopTools_ListOfShape) -> None: ...
++    def GetTolConf(self) -> float: ...
+     def GetVerticesForSubstitute(self, VerVerMap: TopTools_DataMapOfShapeShape) -> None: ...
+     def Init(self, F: TopoDS_Face) -> None: ...
+     def NewEdges(self, E: TopoDS_Edge) -> TopTools_ListOfShape: ...
+@@ -93,6 +94,7 @@ class BRepAlgo_Loop:
+     def NewWires(self) -> TopTools_ListOfShape: ...
+     def Perform(self) -> None: ...
+     def SetImageVV(self, theImageVV: BRepAlgo_Image) -> None: ...
++    def SetTolConf(self, theTolConf: float) -> None: ...
+     def UpdateVEmap(self, theVEmap: TopTools_IndexedDataMapOfShapeListOfShape) -> None: ...
+     def VerticesForSubstitute(self, VerVerMap: TopTools_DataMapOfShapeShape) -> None: ...
+     def WiresToFaces(self) -> None: ...
+diff --git a/src/SWIG_files/wrapper/BRepBlend.i b/src/SWIG_files/wrapper/BRepBlend.i
+index 509a2525..b8131099 100644
+--- a/src/SWIG_files/wrapper/BRepBlend.i
++++ b/src/SWIG_files/wrapper/BRepBlend.i
+@@ -3508,7 +3508,7 @@ opencascade::handle<BRepBlend_Line>
+ 		const opencascade::handle<BRepBlend_Line> & Line();
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: e410fc1bc97982de557150e942b13c80 ****/
++		/**** md5 signature: 5c6445d58f45808f7c3defd1db894a35 ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -3522,9 +3522,9 @@ FinvP2: Blend_CurvPointFuncInv
+ Pdep: float
+ Pmax: float
+ MaxStep: float
++Tol3d: float
+ TolGuide: float
+ Soldep: math_Vector
+-Tolesp: float
+ Fleche: float
+ Appro: bool,optional
+ 	default value is Standard_False
+@@ -3533,10 +3533,10 @@ Returns
+ -------
+ None
+ ") Perform;
+-		void Perform(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
++		void Perform(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: 78e8905aafd910d0fa3a7b23c096467b ****/
++		/**** md5 signature: 452fb9b79df54fb801f2f70d066f611b ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -3550,7 +3550,7 @@ FinvP2: Blend_CurvPointFuncInv
+ Pdep: float
+ Pmax: float
+ Soldep: math_Vector
+-Tolesp: float
++Tol3d: float
+ TolGuide: float
+ RecRst1: bool
+ RecP1: bool
+@@ -3562,7 +3562,7 @@ Returns
+ -------
+ Psol: float
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real &OutValue, math_Vector & ParSol);
++		Standard_Boolean PerformFirstSection(Blend_RstRstFunction & Func, Blend_SurfCurvFuncInv & Finv1, Blend_CurvPointFuncInv & FinvP1, Blend_SurfCurvFuncInv & Finv2, Blend_CurvPointFuncInv & FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real &OutValue, math_Vector & ParSol);
+ 
+ };
+ 
+@@ -5559,7 +5559,7 @@ opencascade::handle<BRepBlend_Line>
+ 		const opencascade::handle<BRepBlend_Line> & Line();
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: 3ebeca31e507208cd42bab74df3ed6e3 ****/
++		/**** md5 signature: 86cf3650fa597d7655c244c1866126f2 ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5572,9 +5572,10 @@ FinvC: Blend_SurfCurvFuncInv
+ Pdep: float
+ Pmax: float
+ MaxStep: float
++Tol3d: float
++Tol2d: float
+ TolGuide: float
+ Soldep: math_Vector
+-Tolesp: float
+ Fleche: float
+ Appro: bool,optional
+ 	default value is Standard_False
+@@ -5583,10 +5584,10 @@ Returns
+ -------
+ None
+ ") Perform;
+-		void Perform(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
++		void Perform(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: 691664aa4fe132192d2ccf25ba05720a ****/
++		/**** md5 signature: 429fbdc03f84a4a14fbebef94ad27ee5 ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5599,7 +5600,8 @@ FinvC: Blend_SurfCurvFuncInv
+ Pdep: float
+ Pmax: float
+ Soldep: math_Vector
+-Tolesp: float
++Tol3d: float
++Tol2d: float
+ TolGuide: float
+ RecRst: bool
+ RecP: bool
+@@ -5610,7 +5612,7 @@ Returns
+ -------
+ Psol: float
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real &OutValue, math_Vector & ParSol);
++		Standard_Boolean PerformFirstSection(Blend_SurfRstFunction & Func, Blend_FuncInv & Finv, Blend_SurfPointFuncInv & FinvP, Blend_SurfCurvFuncInv & FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & Soldep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real &OutValue, math_Vector & ParSol);
+ 
+ };
+ 
+@@ -5795,7 +5797,7 @@ opencascade::handle<BRepBlend_Line>
+ 		const opencascade::handle<BRepBlend_Line> & Line();
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: ef3b3700f467db4ea875b65f539d9955 ****/
++		/**** md5 signature: 6d94e3dcc7c71857d2c24ced3358703f ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5806,9 +5808,9 @@ FInv: Blend_FuncInv
+ Pdep: float
+ Pmax: float
+ MaxStep: float
++Tol3d: float
+ TolGuide: float
+ Soldep: math_Vector
+-Tolesp: float
+ Fleche: float
+ Appro: bool,optional
+ 	default value is Standard_False
+@@ -5817,10 +5819,10 @@ Returns
+ -------
+ None
+ ") Perform;
+-		void Perform(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
++		void Perform(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector & Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: a2bca51a10d7f020b86504fe9860626e ****/
++		/**** md5 signature: 92db8d0914da0712dd54b302697b3aa3 ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5829,7 +5831,7 @@ Parameters
+ F: Blend_Function
+ Pdep: float
+ ParDep: math_Vector
+-Tolesp: float
++Tol3d: float
+ TolGuide: float
+ Pos1: TopAbs_State
+ Pos2: TopAbs_State
+@@ -5838,10 +5840,10 @@ Returns
+ -------
+ bool
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_Function & F, const Standard_Real Pdep, math_Vector & ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, TopAbs_State & Pos1, TopAbs_State & Pos2);
++		Standard_Boolean PerformFirstSection(Blend_Function & F, const Standard_Real Pdep, math_Vector & ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, TopAbs_State & Pos1, TopAbs_State & Pos2);
+ 
+ 		/****************** PerformFirstSection ******************/
+-		/**** md5 signature: 39c72a7c59d31a28e720252eee26feee ****/
++		/**** md5 signature: 7464aaa5cedcb060541546a3a1ff5540 ****/
+ 		%feature("compactdefaultargs") PerformFirstSection;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -5852,7 +5854,7 @@ FInv: Blend_FuncInv
+ Pdep: float
+ Pmax: float
+ ParDep: math_Vector
+-Tolesp: float
++Tol3d: float
+ TolGuide: float
+ RecOnS1: bool
+ RecOnS2: bool
+@@ -5862,7 +5864,7 @@ Returns
+ -------
+ Psol: float
+ ") PerformFirstSection;
+-		Standard_Boolean PerformFirstSection(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real &OutValue, math_Vector & ParSol);
++		Standard_Boolean PerformFirstSection(Blend_Function & F, Blend_FuncInv & FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector & ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real &OutValue, math_Vector & ParSol);
+ 
+ 		/****************** SetDomainsToRecadre ******************/
+ 		/**** md5 signature: 10664ebffbd6ed784502d7d4acfa5a93 ****/
+diff --git a/src/SWIG_files/wrapper/BRepBlend.pyi b/src/SWIG_files/wrapper/BRepBlend.pyi
+index 03deabc7..cbe9c845 100644
+--- a/src/SWIG_files/wrapper/BRepBlend.pyi
++++ b/src/SWIG_files/wrapper/BRepBlend.pyi
+@@ -346,8 +346,8 @@ class BRepBlend_RstRstLineBuilder:
+     def Decroch2Start(self) -> bool: ...
+     def IsDone(self) -> bool: ...
+     def Line(self) -> BRepBlend_Line: ...
+-    def Perform(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, MaxStep: float, TolGuide: float, Soldep: math_Vector, Tolesp: float, Fleche: float, Appro: Optional[bool] = False) -> None: ...
+-    def PerformFirstSection(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tolesp: float, TolGuide: float, RecRst1: bool, RecP1: bool, RecRst2: bool, RecP2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
++    def Perform(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, MaxStep: float, Tol3d: float, TolGuide: float, Soldep: math_Vector, Fleche: float, Appro: Optional[bool] = False) -> None: ...
++    def PerformFirstSection(self, Func: Blend_RstRstFunction, Finv1: Blend_SurfCurvFuncInv, FinvP1: Blend_CurvPointFuncInv, Finv2: Blend_SurfCurvFuncInv, FinvP2: Blend_CurvPointFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tol3d: float, TolGuide: float, RecRst1: bool, RecP1: bool, RecRst2: bool, RecP2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
+ 
+ class BRepBlend_SurfCurvConstRadInv(Blend_SurfCurvFuncInv):
+     def __init__(self, S: Adaptor3d_Surface, C: Adaptor3d_Curve, Cg: Adaptor3d_Curve) -> None: ...
+@@ -519,8 +519,8 @@ class BRepBlend_SurfRstLineBuilder:
+     def DecrochStart(self) -> bool: ...
+     def IsDone(self) -> bool: ...
+     def Line(self) -> BRepBlend_Line: ...
+-    def Perform(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, MaxStep: float, TolGuide: float, Soldep: math_Vector, Tolesp: float, Fleche: float, Appro: Optional[bool] = False) -> None: ...
+-    def PerformFirstSection(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tolesp: float, TolGuide: float, RecRst: bool, RecP: bool, RecS: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
++    def Perform(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, MaxStep: float, Tol3d: float, Tol2d: float, TolGuide: float, Soldep: math_Vector, Fleche: float, Appro: Optional[bool] = False) -> None: ...
++    def PerformFirstSection(self, Func: Blend_SurfRstFunction, Finv: Blend_FuncInv, FinvP: Blend_SurfPointFuncInv, FinvC: Blend_SurfCurvFuncInv, Pdep: float, Pmax: float, Soldep: math_Vector, Tol3d: float, Tol2d: float, TolGuide: float, RecRst: bool, RecP: bool, RecS: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
+ 
+ class BRepBlend_Walking:
+     def __init__(self, Surf1: Adaptor3d_Surface, Surf2: Adaptor3d_Surface, Domain1: Adaptor3d_TopolTool, Domain2: Adaptor3d_TopolTool, HGuide: ChFiDS_ElSpine) -> None: ...
+@@ -536,11 +536,11 @@ class BRepBlend_Walking:
+     def Continu(self, F: Blend_Function, FInv: Blend_FuncInv, P: float, OnS1: bool) -> bool: ...
+     def IsDone(self) -> bool: ...
+     def Line(self) -> BRepBlend_Line: ...
+-    def Perform(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, MaxStep: float, TolGuide: float, Soldep: math_Vector, Tolesp: float, Fleche: float, Appro: Optional[bool] = False) -> None: ...
++    def Perform(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, MaxStep: float, Tol3d: float, TolGuide: float, Soldep: math_Vector, Fleche: float, Appro: Optional[bool] = False) -> None: ...
+     @overload
+-    def PerformFirstSection(self, F: Blend_Function, Pdep: float, ParDep: math_Vector, Tolesp: float, TolGuide: float, Pos1: TopAbs_State, Pos2: TopAbs_State) -> bool: ...
++    def PerformFirstSection(self, F: Blend_Function, Pdep: float, ParDep: math_Vector, Tol3d: float, TolGuide: float, Pos1: TopAbs_State, Pos2: TopAbs_State) -> bool: ...
+     @overload
+-    def PerformFirstSection(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, ParDep: math_Vector, Tolesp: float, TolGuide: float, RecOnS1: bool, RecOnS2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
++    def PerformFirstSection(self, F: Blend_Function, FInv: Blend_FuncInv, Pdep: float, Pmax: float, ParDep: math_Vector, Tol3d: float, TolGuide: float, RecOnS1: bool, RecOnS2: bool, ParSol: math_Vector) -> Tuple[bool, float]: ...
+     def SetDomainsToRecadre(self, RecDomain1: Adaptor3d_TopolTool, RecDomain2: Adaptor3d_TopolTool) -> None: ...
+     def TwistOnS1(self) -> bool: ...
+     def TwistOnS2(self) -> bool: ...
+diff --git a/src/SWIG_files/wrapper/BRepExtrema.i b/src/SWIG_files/wrapper/BRepExtrema.i
+index bc15b17e..18a48b42 100644
+--- a/src/SWIG_files/wrapper/BRepExtrema.i
++++ b/src/SWIG_files/wrapper/BRepExtrema.i
+@@ -48,6 +48,7 @@ https://www.opencascade.com/doc/occt-7.6.0/refman/html/package_brepextrema.html"
+ #include<gp_module.hxx>
+ #include<Bnd_module.hxx>
+ #include<BVH_module.hxx>
++#include<Poly_module.hxx>
+ #include<GeomAdaptor_module.hxx>
+ #include<Geom_module.hxx>
+ #include<Geom2d_module.hxx>
+@@ -55,6 +56,7 @@ https://www.opencascade.com/doc/occt-7.6.0/refman/html/package_brepextrema.html"
+ #include<Adaptor2d_module.hxx>
+ #include<TopLoc_module.hxx>
+ #include<Message_module.hxx>
++#include<TShort_module.hxx>
+ #include<TColgp_module.hxx>
+ #include<TColStd_module.hxx>
+ #include<TCollection_module.hxx>
+@@ -68,6 +70,7 @@ https://www.opencascade.com/doc/occt-7.6.0/refman/html/package_brepextrema.html"
+ %import gp.i
+ %import Bnd.i
+ %import BVH.i
++%import Poly.i
+ 
+ %pythoncode {
+ from enum import IntEnum
+@@ -1645,7 +1648,7 @@ None
+ 		 BRepExtrema_ProximityDistTool();
+ 
+ 		/****************** BRepExtrema_ProximityDistTool ******************/
+-		/**** md5 signature: b9731e05e5136c7110e50a313b036c02 ****/
++		/**** md5 signature: b080844c8fa666dae8c0e8db8d27e87e ****/
+ 		%feature("compactdefaultargs") BRepExtrema_ProximityDistTool;
+ 		%feature("autodoc", "Creates new tool for the given element sets.
+ 
+@@ -1653,6 +1656,8 @@ Parameters
+ ----------
+ theSet1: BRepExtrema_TriangleSet
+ theNbSamples1: int
++theAddVertices1: BVH_Array3d
++theAddStatus1: NCollection_Vector<ProxPnt_Status>
+ theSet2: BRepExtrema_TriangleSet
+ theShapeList1: BRepExtrema_ShapeList
+ theShapeList2: BRepExtrema_ShapeList
+@@ -1661,7 +1666,7 @@ Returns
+ -------
+ None
+ ") BRepExtrema_ProximityDistTool;
+-		 BRepExtrema_ProximityDistTool(const opencascade::handle<BRepExtrema_TriangleSet> & theSet1, const Standard_Integer theNbSamples1, const opencascade::handle<BRepExtrema_TriangleSet> & theSet2, const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
++		 BRepExtrema_ProximityDistTool(const opencascade::handle<BRepExtrema_TriangleSet> & theSet1, const Standard_Integer theNbSamples1, const BVH_Array3d & theAddVertices1, const NCollection_Vector<ProxPnt_Status> & theAddStatus1, const opencascade::handle<BRepExtrema_TriangleSet> & theSet2, const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
+ 
+ 		/****************** Accept ******************/
+ 		/**** md5 signature: 47868288da8d60ae3574004f3eef6f3b ****/
+@@ -1679,6 +1684,40 @@ bool
+ ") Accept;
+ 		virtual Standard_Boolean Accept(const Standard_Integer theSgmIdx, const Standard_Real &);
+ 
++		/****************** IsEdgeOnBorder ******************/
++		/**** md5 signature: 7f2df1d45fe4dd10cb81da19c83428fd ****/
++		%feature("compactdefaultargs") IsEdgeOnBorder;
++		%feature("autodoc", "Returns true if the edge is on the boarder.
++
++Parameters
++----------
++theTrgIdx: int
++theFirstEdgeNodeIdx: int
++theSecondEdgeNodeIdx: int
++theTr: Handle ( Poly_Triangulation )
++
++Returns
++-------
++bool
++") IsEdgeOnBorder;
++		static Standard_Boolean IsEdgeOnBorder(const Standard_Integer theTrgIdx, const Standard_Integer theFirstEdgeNodeIdx, const Standard_Integer theSecondEdgeNodeIdx, const Handle ( Poly_Triangulation ) & theTr);
++
++		/****************** IsNodeOnBorder ******************/
++		/**** md5 signature: 6a6c9031bf497d7acf6e95de1f2784f6 ****/
++		%feature("compactdefaultargs") IsNodeOnBorder;
++		%feature("autodoc", "Returns true if the node is on the boarder.
++
++Parameters
++----------
++theNodeIdx: int
++theTr: Handle ( Poly_Triangulation )
++
++Returns
++-------
++bool
++") IsNodeOnBorder;
++		static Standard_Boolean IsNodeOnBorder(const Standard_Integer theNodeIdx, const Handle ( Poly_Triangulation ) & theTr);
++
+ 		/****************** LoadShapeLists ******************/
+ 		/**** md5 signature: 2ec9bfacd5c06102fdebe80e35402ca0 ****/
+ 		%feature("compactdefaultargs") LoadShapeLists;
+@@ -1787,178 +1826,10 @@ theMetric: float
+ %extend BRepExtrema_ProximityDistTool {
+ 	%pythoncode {
+ 	__repr__ = _dumps_object
+-	}
+-};
+-
+-/***************************************
+-* class BRepExtrema_ProximityValueTool *
+-***************************************/
+-class BRepExtrema_ProximityValueTool {
+-	public:
+-typedef typename BRepExtrema_ProximityDistTool ::ProxPnt_Status ProxPnt_Status;
+-		/****************** BRepExtrema_ProximityValueTool ******************/
+-		/**** md5 signature: f01190ce189b90d5b9278fbee66731a1 ****/
+-		%feature("compactdefaultargs") BRepExtrema_ProximityValueTool;
+-		%feature("autodoc", "Creates new unitialized proximity tool.
+-
+-Returns
+--------
+-None
+-") BRepExtrema_ProximityValueTool;
+-		 BRepExtrema_ProximityValueTool();
+-
+-		/****************** BRepExtrema_ProximityValueTool ******************/
+-		/**** md5 signature: 457895b0f954d4aa93c3b2011e47f0e1 ****/
+-		%feature("compactdefaultargs") BRepExtrema_ProximityValueTool;
+-		%feature("autodoc", "Creates new proximity tool for the given element sets.
+-
+-Parameters
+-----------
+-theSet1: BRepExtrema_TriangleSet
+-theSet2: BRepExtrema_TriangleSet
+-theShapeList1: BRepExtrema_ShapeList
+-theShapeList2: BRepExtrema_ShapeList
+-
+-Returns
+--------
+-None
+-") BRepExtrema_ProximityValueTool;
+-		 BRepExtrema_ProximityValueTool(const opencascade::handle<BRepExtrema_TriangleSet> & theSet1, const opencascade::handle<BRepExtrema_TriangleSet> & theSet2, const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
+-
+-		/****************** Distance ******************/
+-		/**** md5 signature: d47317206a0fb34e540004324dbfafd8 ****/
+-		%feature("compactdefaultargs") Distance;
+-		%feature("autodoc", "Returns the computed distance.
+-
+-Returns
+--------
+-float
+-") Distance;
+-		Standard_Real Distance();
+-
+-		/****************** IsDone ******************/
+-		/**** md5 signature: e385477ab1bec806154173d4a550fd68 ****/
+-		%feature("compactdefaultargs") IsDone;
+-		%feature("autodoc", "Is proximity test completed?.
+-
+-Returns
+--------
+-bool
+-") IsDone;
+-		Standard_Boolean IsDone();
+-
+-		/****************** LoadShapeLists ******************/
+-		/**** md5 signature: 2ec9bfacd5c06102fdebe80e35402ca0 ****/
+-		%feature("compactdefaultargs") LoadShapeLists;
+-		%feature("autodoc", "Loads the given list of subshapes into the proximity tool.
+-
+-Parameters
+-----------
+-theShapeList1: BRepExtrema_ShapeList
+-theShapeList2: BRepExtrema_ShapeList
+-
+-Returns
+--------
+-None
+-") LoadShapeLists;
+-		void LoadShapeLists(const BRepExtrema_ShapeList & theShapeList1, const BRepExtrema_ShapeList & theShapeList2);
+-
+-		/****************** LoadTriangleSets ******************/
+-		/**** md5 signature: 3a94a7860b973acbc6838bfe75b5b812 ****/
+-		%feature("compactdefaultargs") LoadTriangleSets;
+-		%feature("autodoc", "Loads the given element sets into the proximity tool.
+-
+-Parameters
+-----------
+-theSet1: Handle ( BRepExtrema_TriangleSet )
+-theSet2: Handle ( BRepExtrema_TriangleSet )
+-
+-Returns
+--------
+-None
+-") LoadTriangleSets;
+-		void LoadTriangleSets(const Handle ( BRepExtrema_TriangleSet ) & theSet1, const Handle ( BRepExtrema_TriangleSet ) & theSet2);
+-
+-		/****************** MarkDirty ******************/
+-		/**** md5 signature: bd3f3e7de1b3b6a0c1da3082319fae2e ****/
+-		%feature("compactdefaultargs") MarkDirty;
+-		%feature("autodoc", "Marks test results as outdated.
+-
+-Returns
+--------
+-None
+-") MarkDirty;
+-		void MarkDirty();
+-
+-		/****************** Perform ******************/
+-		/**** md5 signature: c2c8700606b770cff797eb33824bf0aa ****/
+-		%feature("compactdefaultargs") Perform;
+-		%feature("autodoc", "Performs the computation of the proximity value.
+-
+-Parameters
+-----------
+-
+-Returns
+--------
+-theTolerance: float
+-") Perform;
+-		void Perform(Standard_Real &OutValue);
+-
+-		/****************** ProximityPoints ******************/
+-		/**** md5 signature: 4ddc607867ad4f349b192d8bb4196f92 ****/
+-		%feature("compactdefaultargs") ProximityPoints;
+-		%feature("autodoc", "Returns points on triangles sets, which provide the proximity distance.
+-
+-Parameters
+-----------
+-thePoint1: gp_Pnt
+-thePoint2: gp_Pnt
+ 
+-Returns
+--------
+-None
+-") ProximityPoints;
+-		void ProximityPoints(gp_Pnt & thePoint1, gp_Pnt & thePoint2);
+-
+-		/****************** ProximityPointsStatus ******************/
+-		/**** md5 signature: cbb67aeda5a68bd79cbb58089638d3f8 ****/
+-		%feature("compactdefaultargs") ProximityPointsStatus;
+-		%feature("autodoc", "Returns status of points on triangles sets, which provide the proximity distance.
+-
+-Parameters
+-----------
+-
+-Returns
+--------
+-thePointStatus1: ProxPnt_Status
+-thePointStatus2: ProxPnt_Status
+-") ProximityPointsStatus;
+-		void ProximityPointsStatus(ProxPnt_Status &OutValue, ProxPnt_Status &OutValue);
+-
+-		/****************** SetNbSamplePoints ******************/
+-		/**** md5 signature: 200898431f5ab55f6d0477df1f50c3b9 ****/
+-		%feature("compactdefaultargs") SetNbSamplePoints;
+-		%feature("autodoc", "Sets number of sample points used for proximity calculation for each shape. if number is less or equal zero, all triangulation nodes are used.
+-
+-Parameters
+-----------
+-theSamples1: int,optional
+-	default value is 0
+-theSamples2: int,optional
+-	default value is 0
+-
+-Returns
+--------
+-None
+-") SetNbSamplePoints;
+-		void SetNbSamplePoints(const Standard_Integer theSamples1 = 0, const Standard_Integer theSamples2 = 0);
+-
+-};
+-
+-
+-%extend BRepExtrema_ProximityValueTool {
+-	%pythoncode {
+-	__repr__ = _dumps_object
++	@methodnotwrapped
++	def LoadAdditionalPointsFirstSet(self):
++		pass
+ 	}
+ };
+ 
+@@ -1967,7 +1838,6 @@ None
+ ***********************************/
+ class BRepExtrema_ShapeProximity {
+ 	public:
+-typedef typename BRepExtrema_ProximityValueTool ::ProxPnt_Status ProxPnt_Status;
+ 		/****************** BRepExtrema_ShapeProximity ******************/
+ 		/**** md5 signature: 73b29b290349b3955b499c712de97888 ****/
+ 		%feature("compactdefaultargs") BRepExtrema_ShapeProximity;
+diff --git a/src/SWIG_files/wrapper/BRepExtrema.pyi b/src/SWIG_files/wrapper/BRepExtrema.pyi
+index 0738ed63..749fc5ef 100644
+--- a/src/SWIG_files/wrapper/BRepExtrema.pyi
++++ b/src/SWIG_files/wrapper/BRepExtrema.pyi
+@@ -9,6 +9,7 @@ from OCC.Core.Message import *
+ from OCC.Core.gp import *
+ from OCC.Core.Bnd import *
+ from OCC.Core.BVH import *
++from OCC.Core.Poly import *
+ 
+ #the following typedef cannot be wrapped as is
+ BRepExtrema_ShapeList = NewType('BRepExtrema_ShapeList', Any)
+@@ -163,8 +164,10 @@ class BRepExtrema_Poly:
+ class BRepExtrema_ProximityDistTool():
+     @overload
+     def __init__(self) -> None: ...
+-    @overload
+-    def __init__(self, theSet1: BRepExtrema_TriangleSet, theNbSamples1: int, theSet2: BRepExtrema_TriangleSet, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
++    @staticmethod
++    def IsEdgeOnBorder(theTrgIdx: int, theFirstEdgeNodeIdx: int, theSecondEdgeNodeIdx: int, theTr: Poly_Triangulation) -> bool: ...
++    @staticmethod
++    def IsNodeOnBorder(theNodeIdx: int, theTr: Poly_Triangulation) -> bool: ...
+     def LoadShapeLists(self, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
+     def LoadTriangleSets(self, theSet1: BRepExtrema_TriangleSet, theSet2: BRepExtrema_TriangleSet) -> None: ...
+     def Perform(self) -> None: ...
+@@ -172,20 +175,6 @@ class BRepExtrema_ProximityDistTool():
+     def ProximityPoints(self, thePoint1: BVH_Vec3d, thePoint2: BVH_Vec3d) -> None: ...
+     def RejectNode(self, theCornerMin: BVH_Vec3d, theCornerMax: BVH_Vec3d) -> Tuple[bool, float]: ...
+ 
+-class BRepExtrema_ProximityValueTool:
+-    @overload
+-    def __init__(self) -> None: ...
+-    @overload
+-    def __init__(self, theSet1: BRepExtrema_TriangleSet, theSet2: BRepExtrema_TriangleSet, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
+-    def Distance(self) -> float: ...
+-    def IsDone(self) -> bool: ...
+-    def LoadShapeLists(self, theShapeList1: BRepExtrema_ShapeList, theShapeList2: BRepExtrema_ShapeList) -> None: ...
+-    def LoadTriangleSets(self, theSet1: BRepExtrema_TriangleSet, theSet2: BRepExtrema_TriangleSet) -> None: ...
+-    def MarkDirty(self) -> None: ...
+-    def Perform(self) -> float: ...
+-    def ProximityPoints(self, thePoint1: gp_Pnt, thePoint2: gp_Pnt) -> None: ...
+-    def SetNbSamplePoints(self, theSamples1: Optional[int] = 0, theSamples2: Optional[int] = 0) -> None: ...
+-
+ class BRepExtrema_ShapeProximity:
+     @overload
+     def __init__(self, theTolerance: Optional[float] = precision_Infinite()) -> None: ...
+@@ -271,3 +260,5 @@ class BRepExtrema_OverlapTool: ...
+ # hsequence classes
+ 
+ BRepExtrema_Poly_Distance = BRepExtrema_Poly.Distance
++BRepExtrema_ProximityDistTool_IsEdgeOnBorder = BRepExtrema_ProximityDistTool.IsEdgeOnBorder
++BRepExtrema_ProximityDistTool_IsNodeOnBorder = BRepExtrema_ProximityDistTool.IsNodeOnBorder
+diff --git a/src/SWIG_files/wrapper/BRepFill.i b/src/SWIG_files/wrapper/BRepFill.i
+index 1b12746f..0281ab54 100644
+--- a/src/SWIG_files/wrapper/BRepFill.i
++++ b/src/SWIG_files/wrapper/BRepFill.i
+@@ -105,6 +105,16 @@ from OCC.Core.Exception import *
+ };
+ 
+ /* public enums */
++enum BRepFill_ThruSectionErrorStatus {
++	BRepFill_ThruSectionErrorStatus_Done = 0,
++	BRepFill_ThruSectionErrorStatus_NotDone = 1,
++	BRepFill_ThruSectionErrorStatus_NotSameTopology = 2,
++	BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = 3,
++	BRepFill_ThruSectionErrorStatus_WrongUsage = 4,
++	BRepFill_ThruSectionErrorStatus_Null3DCurve = 5,
++	BRepFill_ThruSectionErrorStatus_Failed = 6,
++};
++
+ enum BRepFill_TypeOfContact {
+ 	BRepFill_NoContact = 0,
+ 	BRepFill_Contact = 1,
+@@ -122,6 +132,22 @@ enum BRepFill_TransitionStyle {
+ /* python proxy classes for enums */
+ %pythoncode {
+ 
++class BRepFill_ThruSectionErrorStatus(IntEnum):
++	BRepFill_ThruSectionErrorStatus_Done = 0
++	BRepFill_ThruSectionErrorStatus_NotDone = 1
++	BRepFill_ThruSectionErrorStatus_NotSameTopology = 2
++	BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = 3
++	BRepFill_ThruSectionErrorStatus_WrongUsage = 4
++	BRepFill_ThruSectionErrorStatus_Null3DCurve = 5
++	BRepFill_ThruSectionErrorStatus_Failed = 6
++BRepFill_ThruSectionErrorStatus_Done = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Done
++BRepFill_ThruSectionErrorStatus_NotDone = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotDone
++BRepFill_ThruSectionErrorStatus_NotSameTopology = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotSameTopology
++BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_ProfilesInconsistent
++BRepFill_ThruSectionErrorStatus_WrongUsage = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_WrongUsage
++BRepFill_ThruSectionErrorStatus_Null3DCurve = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Null3DCurve
++BRepFill_ThruSectionErrorStatus_Failed = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Failed
++
+ class BRepFill_TypeOfContact(IntEnum):
+ 	BRepFill_NoContact = 0
+ 	BRepFill_Contact = 1
+@@ -575,6 +601,17 @@ TopTools_ListOfShape
+ ") GeneratedShapes;
+ 		const TopTools_ListOfShape & GeneratedShapes(const TopoDS_Edge & SubSection);
+ 
++		/****************** GetStatus ******************/
++		/**** md5 signature: d01d66bd030c1232d59d2b7253fc3b10 ****/
++		%feature("compactdefaultargs") GetStatus;
++		%feature("autodoc", "No available documentation.
++
++Returns
++-------
++BRepFill_ThruSectionErrorStatus
++") GetStatus;
++		BRepFill_ThruSectionErrorStatus GetStatus();
++
+ 		/****************** Init ******************/
+ 		/**** md5 signature: 217046dd3125fb37abc6e15803e209f1 ****/
+ 		%feature("compactdefaultargs") Init;
+@@ -1816,6 +1853,17 @@ TopTools_ListOfShape
+ ") GeneratedShapes;
+ 		const TopTools_ListOfShape & GeneratedShapes(const TopoDS_Shape & SSection);
+ 
++		/****************** GetStatus ******************/
++		/**** md5 signature: d01d66bd030c1232d59d2b7253fc3b10 ****/
++		%feature("compactdefaultargs") GetStatus;
++		%feature("autodoc", "Returns status of the operation.
++
++Returns
++-------
++BRepFill_ThruSectionErrorStatus
++") GetStatus;
++		BRepFill_ThruSectionErrorStatus GetStatus();
++
+ 		/****************** IsMutableInput ******************/
+ 		/**** md5 signature: 2df16e5a957577cfce65832aa2d90512 ****/
+ 		%feature("compactdefaultargs") IsMutableInput;
+diff --git a/src/SWIG_files/wrapper/BRepFill.pyi b/src/SWIG_files/wrapper/BRepFill.pyi
+index b73b54f3..412b53b2 100644
+--- a/src/SWIG_files/wrapper/BRepFill.pyi
++++ b/src/SWIG_files/wrapper/BRepFill.pyi
+@@ -83,6 +83,23 @@ class BRepFill_SequenceOfSection:
+     def Value(self, theIndex: int) -> BRepFill_Section: ...
+     def SetValue(self, theIndex: int, theValue: BRepFill_Section) -> None: ...
+ 
++class BRepFill_ThruSectionErrorStatus(IntEnum):
++    BRepFill_ThruSectionErrorStatus_Done: int = ...
++    BRepFill_ThruSectionErrorStatus_NotDone: int = ...
++    BRepFill_ThruSectionErrorStatus_NotSameTopology: int = ...
++    BRepFill_ThruSectionErrorStatus_ProfilesInconsistent: int = ...
++    BRepFill_ThruSectionErrorStatus_WrongUsage: int = ...
++    BRepFill_ThruSectionErrorStatus_Null3DCurve: int = ...
++    BRepFill_ThruSectionErrorStatus_Failed: int = ...
++
++BRepFill_ThruSectionErrorStatus_Done = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Done
++BRepFill_ThruSectionErrorStatus_NotDone = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotDone
++BRepFill_ThruSectionErrorStatus_NotSameTopology = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_NotSameTopology
++BRepFill_ThruSectionErrorStatus_ProfilesInconsistent = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_ProfilesInconsistent
++BRepFill_ThruSectionErrorStatus_WrongUsage = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_WrongUsage
++BRepFill_ThruSectionErrorStatus_Null3DCurve = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Null3DCurve
++BRepFill_ThruSectionErrorStatus_Failed = BRepFill_ThruSectionErrorStatus.BRepFill_ThruSectionErrorStatus_Failed
++
+ class BRepFill_TypeOfContact(IntEnum):
+     BRepFill_NoContact: int = ...
+     BRepFill_Contact: int = ...
+@@ -139,6 +156,7 @@ class BRepFill_CompatibleWires:
+     def __init__(self, Sections: TopTools_SequenceOfShape) -> None: ...
+     def Generated(self) -> TopTools_DataMapOfShapeListOfShape: ...
+     def GeneratedShapes(self, SubSection: TopoDS_Edge) -> TopTools_ListOfShape: ...
++    def GetStatus(self) -> BRepFill_ThruSectionErrorStatus: ...
+     def Init(self, Sections: TopTools_SequenceOfShape) -> None: ...
+     def IsDegeneratedFirstSection(self) -> bool: ...
+     def IsDegeneratedLastSection(self) -> bool: ...
+@@ -255,6 +273,7 @@ class BRepFill_Generator:
+     def AddWire(self, Wire: TopoDS_Wire) -> None: ...
+     def Generated(self) -> TopTools_DataMapOfShapeListOfShape: ...
+     def GeneratedShapes(self, SSection: TopoDS_Shape) -> TopTools_ListOfShape: ...
++    def GetStatus(self) -> BRepFill_ThruSectionErrorStatus: ...
+     def IsMutableInput(self) -> bool: ...
+     def Perform(self) -> None: ...
+     def ResultShape(self, theShape: TopoDS_Shape) -> TopoDS_Shape: ...
+diff --git a/src/SWIG_files/wrapper/BRepOffset.i b/src/SWIG_files/wrapper/BRepOffset.i
+index d6800998..05add5f2 100644
+--- a/src/SWIG_files/wrapper/BRepOffset.i
++++ b/src/SWIG_files/wrapper/BRepOffset.i
+@@ -131,6 +131,7 @@ enum BRepOffset_Error {
+ 	BRepOffset_CannotFuseVertices = 7,
+ 	BRepOffset_CannotExtentEdge = 8,
+ 	BRepOffset_UserBreak = 9,
++	BRepOffset_MixedConnectivity = 10,
+ };
+ 
+ enum BRepOffsetSimple_Status {
+@@ -171,6 +172,7 @@ class BRepOffset_Error(IntEnum):
+ 	BRepOffset_CannotFuseVertices = 7
+ 	BRepOffset_CannotExtentEdge = 8
+ 	BRepOffset_UserBreak = 9
++	BRepOffset_MixedConnectivity = 10
+ BRepOffset_NoError = BRepOffset_Error.BRepOffset_NoError
+ BRepOffset_UnknownError = BRepOffset_Error.BRepOffset_UnknownError
+ BRepOffset_BadNormalsOnGeometry = BRepOffset_Error.BRepOffset_BadNormalsOnGeometry
+@@ -181,6 +183,7 @@ BRepOffset_CannotTrimEdges = BRepOffset_Error.BRepOffset_CannotTrimEdges
+ BRepOffset_CannotFuseVertices = BRepOffset_Error.BRepOffset_CannotFuseVertices
+ BRepOffset_CannotExtentEdge = BRepOffset_Error.BRepOffset_CannotExtentEdge
+ BRepOffset_UserBreak = BRepOffset_Error.BRepOffset_UserBreak
++BRepOffset_MixedConnectivity = BRepOffset_Error.BRepOffset_MixedConnectivity
+ 
+ class BRepOffsetSimple_Status(IntEnum):
+ 	BRepOffsetSimple_OK = 0
+diff --git a/src/SWIG_files/wrapper/BRepOffset.pyi b/src/SWIG_files/wrapper/BRepOffset.pyi
+index 89a5e3e1..fd6f7478 100644
+--- a/src/SWIG_files/wrapper/BRepOffset.pyi
++++ b/src/SWIG_files/wrapper/BRepOffset.pyi
+@@ -43,6 +43,7 @@ class BRepOffset_Error(IntEnum):
+     BRepOffset_CannotFuseVertices: int = ...
+     BRepOffset_CannotExtentEdge: int = ...
+     BRepOffset_UserBreak: int = ...
++    BRepOffset_MixedConnectivity: int = ...
+ 
+ BRepOffset_NoError = BRepOffset_Error.BRepOffset_NoError
+ BRepOffset_UnknownError = BRepOffset_Error.BRepOffset_UnknownError
+@@ -54,6 +55,7 @@ BRepOffset_CannotTrimEdges = BRepOffset_Error.BRepOffset_CannotTrimEdges
+ BRepOffset_CannotFuseVertices = BRepOffset_Error.BRepOffset_CannotFuseVertices
+ BRepOffset_CannotExtentEdge = BRepOffset_Error.BRepOffset_CannotExtentEdge
+ BRepOffset_UserBreak = BRepOffset_Error.BRepOffset_UserBreak
++BRepOffset_MixedConnectivity = BRepOffset_Error.BRepOffset_MixedConnectivity
+ 
+ class BRepOffsetSimple_Status(IntEnum):
+     BRepOffsetSimple_OK: int = ...
+diff --git a/src/SWIG_files/wrapper/BRepOffsetAPI.i b/src/SWIG_files/wrapper/BRepOffsetAPI.i
+index 1f9ad1dd..df26f708 100644
+--- a/src/SWIG_files/wrapper/BRepOffsetAPI.i
++++ b/src/SWIG_files/wrapper/BRepOffsetAPI.i
+@@ -2558,6 +2558,17 @@ TopoDS_Shape
+ ") GeneratedFace;
+ 		TopoDS_Shape GeneratedFace(const TopoDS_Shape & Edge);
+ 
++		/****************** GetStatus ******************/
++		/**** md5 signature: d01d66bd030c1232d59d2b7253fc3b10 ****/
++		%feature("compactdefaultargs") GetStatus;
++		%feature("autodoc", "Returns the status of thrusection operation.
++
++Returns
++-------
++BRepFill_ThruSectionErrorStatus
++") GetStatus;
++		BRepFill_ThruSectionErrorStatus GetStatus();
++
+ 		/****************** Init ******************/
+ 		/**** md5 signature: 82b061dc05f66b08422610d2d7504487 ****/
+ 		%feature("compactdefaultargs") Init;
+diff --git a/src/SWIG_files/wrapper/BRepOffsetAPI.pyi b/src/SWIG_files/wrapper/BRepOffsetAPI.pyi
+index 042de45f..815ee7e1 100644
+--- a/src/SWIG_files/wrapper/BRepOffsetAPI.pyi
++++ b/src/SWIG_files/wrapper/BRepOffsetAPI.pyi
+@@ -260,6 +260,7 @@ class BRepOffsetAPI_ThruSections(BRepBuilderAPI_MakeShape):
+     def FirstShape(self) -> TopoDS_Shape: ...
+     def Generated(self, S: TopoDS_Shape) -> TopTools_ListOfShape: ...
+     def GeneratedFace(self, Edge: TopoDS_Shape) -> TopoDS_Shape: ...
++    def GetStatus(self) -> BRepFill_ThruSectionErrorStatus: ...
+     def Init(self, isSolid: Optional[bool] = False, ruled: Optional[bool] = False, pres3d: Optional[float] = 1.0e-06) -> None: ...
+     def IsMutableInput(self) -> bool: ...
+     def LastShape(self) -> TopoDS_Shape: ...
+diff --git a/src/SWIG_files/wrapper/BSplCLib.i b/src/SWIG_files/wrapper/BSplCLib.i
+index f0b6635f..80aa4d80 100644
+--- a/src/SWIG_files/wrapper/BSplCLib.i
++++ b/src/SWIG_files/wrapper/BSplCLib.i
+@@ -2001,6 +2001,29 @@ InversionProblem: int
+ ") Interpolate;
+ 		static void Interpolate(const Standard_Integer Degree, const TColStd_Array1OfReal & FlatKnots, const TColStd_Array1OfReal & Parameters, const TColStd_Array1OfInteger & ContactOrderArray, const Standard_Integer ArrayDimension, Standard_Real &OutValue, Standard_Real &OutValue, Standard_Integer &OutValue);
+ 
++		/****************** Intervals ******************/
++		/**** md5 signature: 6005dd7b642eb153ae7f9293cf41ffb5 ****/
++		%feature("compactdefaultargs") Intervals;
++		%feature("autodoc", "Splits the given range to bspline intervals of given continuity @param[in] theknots the knots of bspline @param[in] themults the knots' multiplicities @param[in] thedegree the degree of bspline @param[in] isperiodic the periodicity of bspline @param[in] thecontinuity the target interval's continuity @param[in] thefirst the begin of the target range @param[in] thelast the end of the target range @param[in] thetolerance the tolerance @param[in,out] theintervals the array to store intervals if isn't nullptr returns the number of intervals.
++
++Parameters
++----------
++theKnots: TColStd_Array1OfReal
++theMults: TColStd_Array1OfInteger
++theDegree: int
++isPeriodic: bool
++theContinuity: int
++theFirst: float
++theLast: float
++theTolerance: float
++theIntervals: TColStd_Array1OfReal *
++
++Returns
++-------
++int
++") Intervals;
++		static Standard_Integer Intervals(const TColStd_Array1OfReal & theKnots, const TColStd_Array1OfInteger & theMults, Standard_Integer theDegree, Standard_Boolean isPeriodic, Standard_Integer theContinuity, Standard_Real theFirst, Standard_Real theLast, Standard_Real theTolerance, TColStd_Array1OfReal * theIntervals);
++
+ 		/****************** IsRational ******************/
+ 		/**** md5 signature: 5ee1bb4d64e0a78acc3cb994f1afcefa ****/
+ 		%feature("compactdefaultargs") IsRational;
+diff --git a/src/SWIG_files/wrapper/BSplCLib.pyi b/src/SWIG_files/wrapper/BSplCLib.pyi
+index b8ac4682..671f76a0 100644
+--- a/src/SWIG_files/wrapper/BSplCLib.pyi
++++ b/src/SWIG_files/wrapper/BSplCLib.pyi
+@@ -278,6 +278,8 @@ class bsplclib:
+     @staticmethod
+     def Interpolate(Degree: int, FlatKnots: TColStd_Array1OfReal, Parameters: TColStd_Array1OfReal, ContactOrderArray: TColStd_Array1OfInteger, ArrayDimension: int) -> Tuple[float, float, int]: ...
+     @staticmethod
++    def Intervals(theKnots: TColStd_Array1OfReal, theMults: TColStd_Array1OfInteger, theDegree: int, isPeriodic: bool, theContinuity: int, theFirst: float, theLast: float, theTolerance: float, theIntervals: TColStd_Array1OfReal) -> int: ...
++    @staticmethod
+     def IsRational(Weights: TColStd_Array1OfReal, I1: int, I2: int, Epsilon: Optional[float] = 0.0) -> bool: ...
+     @staticmethod
+     def KnotAnalysis(Degree: int, Periodic: bool, CKnots: TColStd_Array1OfReal, CMults: TColStd_Array1OfInteger, KnotForm: GeomAbs_BSplKnotDistribution) -> int: ...
+@@ -566,6 +568,7 @@ bsplclib_Interpolate = bsplclib.Interpolate
+ bsplclib_Interpolate = bsplclib.Interpolate
+ bsplclib_Interpolate = bsplclib.Interpolate
+ bsplclib_Interpolate = bsplclib.Interpolate
++bsplclib_Intervals = bsplclib.Intervals
+ bsplclib_IsRational = bsplclib.IsRational
+ bsplclib_KnotAnalysis = bsplclib.KnotAnalysis
+ bsplclib_KnotForm = bsplclib.KnotForm
+diff --git a/src/SWIG_files/wrapper/ChFiDS.i b/src/SWIG_files/wrapper/ChFiDS.i
+index d60e552a..b8096939 100644
+--- a/src/SWIG_files/wrapper/ChFiDS.i
++++ b/src/SWIG_files/wrapper/ChFiDS.i
+@@ -121,6 +121,7 @@ enum ChFiDS_TypeOfConcavity {
+ 	ChFiDS_Tangential = 2,
+ 	ChFiDS_FreeBound = 3,
+ 	ChFiDS_Other = 4,
++	ChFiDS_Mixed = 5,
+ };
+ 
+ /* end public enums declaration */
+@@ -178,11 +179,13 @@ class ChFiDS_TypeOfConcavity(IntEnum):
+ 	ChFiDS_Tangential = 2
+ 	ChFiDS_FreeBound = 3
+ 	ChFiDS_Other = 4
++	ChFiDS_Mixed = 5
+ ChFiDS_Concave = ChFiDS_TypeOfConcavity.ChFiDS_Concave
+ ChFiDS_Convex = ChFiDS_TypeOfConcavity.ChFiDS_Convex
+ ChFiDS_Tangential = ChFiDS_TypeOfConcavity.ChFiDS_Tangential
+ ChFiDS_FreeBound = ChFiDS_TypeOfConcavity.ChFiDS_FreeBound
+ ChFiDS_Other = ChFiDS_TypeOfConcavity.ChFiDS_Other
++ChFiDS_Mixed = ChFiDS_TypeOfConcavity.ChFiDS_Mixed
+ };
+ /* end python proxy for enums */
+ 
+@@ -2029,6 +2032,17 @@ TopoDS_Vertex
+ ") FirstVertex;
+ 		TopoDS_Vertex FirstVertex();
+ 
++		/****************** GetTolesp ******************/
++		/**** md5 signature: 217c13748b3cb2bf2cc59e96cafe8207 ****/
++		%feature("compactdefaultargs") GetTolesp;
++		%feature("autodoc", "Return tolesp parameter.
++
++Returns
++-------
++float
++") GetTolesp;
++		Standard_Real GetTolesp();
++
+ 		/****************** GetType ******************/
+ 		/**** md5 signature: 6d4e6ae7972633971ba343e8afc91aa1 ****/
+ 		%feature("compactdefaultargs") GetType;
+diff --git a/src/SWIG_files/wrapper/ChFiDS.pyi b/src/SWIG_files/wrapper/ChFiDS.pyi
+index 6543ea1a..d1884594 100644
+--- a/src/SWIG_files/wrapper/ChFiDS.pyi
++++ b/src/SWIG_files/wrapper/ChFiDS.pyi
+@@ -192,12 +192,14 @@ class ChFiDS_TypeOfConcavity(IntEnum):
+     ChFiDS_Tangential: int = ...
+     ChFiDS_FreeBound: int = ...
+     ChFiDS_Other: int = ...
++    ChFiDS_Mixed: int = ...
+ 
+ ChFiDS_Concave = ChFiDS_TypeOfConcavity.ChFiDS_Concave
+ ChFiDS_Convex = ChFiDS_TypeOfConcavity.ChFiDS_Convex
+ ChFiDS_Tangential = ChFiDS_TypeOfConcavity.ChFiDS_Tangential
+ ChFiDS_FreeBound = ChFiDS_TypeOfConcavity.ChFiDS_FreeBound
+ ChFiDS_Other = ChFiDS_TypeOfConcavity.ChFiDS_Other
++ChFiDS_Mixed = ChFiDS_TypeOfConcavity.ChFiDS_Mixed
+ 
+ class ChFiDS_CircSection:
+     def __init__(self) -> None: ...
+@@ -351,6 +353,7 @@ class ChFiDS_Spine(Standard_Transient):
+     def FirstParameter(self, IndexSpine: int) -> float: ...
+     def FirstStatus(self) -> ChFiDS_State: ...
+     def FirstVertex(self) -> TopoDS_Vertex: ...
++    def GetTolesp(self) -> float: ...
+     def GetType(self) -> GeomAbs_CurveType: ...
+     def GetTypeOfConcavity(self) -> ChFiDS_TypeOfConcavity: ...
+     def HasFirstTgt(self) -> bool: ...
+diff --git a/src/SWIG_files/wrapper/GeomInt.i b/src/SWIG_files/wrapper/GeomInt.i
+index a01b7841..9d84060c 100644
+--- a/src/SWIG_files/wrapper/GeomInt.i
++++ b/src/SWIG_files/wrapper/GeomInt.i
+@@ -936,6 +936,29 @@ opencascade::handle<Geom_Curve>
+ ") Boundary;
+ 		const opencascade::handle<Geom_Curve> & Boundary(const Standard_Integer Index);
+ 
++		/****************** BuildPCurves ******************/
++		/**** md5 signature: 6965f43fd020f13216b45cd065743faa ****/
++		%feature("compactdefaultargs") BuildPCurves;
++		%feature("autodoc", "Creates 2d-curve on given surface from given 3d-curve.
++
++Parameters
++----------
++theFirst: float
++theLast: float
++theUmin: float
++theUmax: float
++theVmin: float
++theVmax: float
++theSurface: Geom_Surface
++theCurve: Geom_Curve
++theCurve2d: Geom2d_Curve
++
++Returns
++-------
++theTol: float
++") BuildPCurves;
++		static void BuildPCurves(const Standard_Real theFirst, const Standard_Real theLast, const Standard_Real theUmin, const Standard_Real theUmax, const Standard_Real theVmin, const Standard_Real theVmax, Standard_Real &OutValue, const opencascade::handle<Geom_Surface> & theSurface, const opencascade::handle<Geom_Curve> & theCurve, opencascade::handle<Geom2d_Curve> & theCurve2d);
++
+ 		/****************** BuildPCurves ******************/
+ 		/**** md5 signature: 2c2bdb53423075c70323712785098b12 ****/
+ 		%feature("compactdefaultargs") BuildPCurves;
+diff --git a/src/SWIG_files/wrapper/GeomInt.pyi b/src/SWIG_files/wrapper/GeomInt.pyi
+index eae46ba0..c6076fec 100644
+--- a/src/SWIG_files/wrapper/GeomInt.pyi
++++ b/src/SWIG_files/wrapper/GeomInt.pyi
+@@ -110,6 +110,10 @@ class GeomInt_IntSS:
+     @overload
+     def __init__(self, S1: Geom_Surface, S2: Geom_Surface, Tol: float, Approx: Optional[bool] = True, ApproxS1: Optional[bool] = False, ApproxS2: Optional[bool] = False) -> None: ...
+     def Boundary(self, Index: int) -> Geom_Curve: ...
++    @overload
++    @staticmethod
++    def BuildPCurves(theFirst: float, theLast: float, theUmin: float, theUmax: float, theVmin: float, theVmax: float, theSurface: Geom_Surface, theCurve: Geom_Curve, theCurve2d: Geom2d_Curve) -> float: ...
++    @overload
+     @staticmethod
+     def BuildPCurves(f: float, l: float, S: Geom_Surface, C: Geom_Curve, C2d: Geom2d_Curve) -> float: ...
+     def HasLineOnS1(self, Index: int) -> bool: ...
+@@ -525,6 +529,7 @@ class GeomInt_WLApprox: ...
+ 
+ geomint_AdjustPeriodic = geomint.AdjustPeriodic
+ GeomInt_IntSS_BuildPCurves = GeomInt_IntSS.BuildPCurves
++GeomInt_IntSS_BuildPCurves = GeomInt_IntSS.BuildPCurves
+ GeomInt_IntSS_MakeBSpline = GeomInt_IntSS.MakeBSpline
+ GeomInt_IntSS_MakeBSpline2d = GeomInt_IntSS.MakeBSpline2d
+ GeomInt_IntSS_TreatRLine = GeomInt_IntSS.TreatRLine
+diff --git a/src/SWIG_files/wrapper/STEPCAFControl.i b/src/SWIG_files/wrapper/STEPCAFControl.i
+index 3ddc1ba8..9372c840 100644
+--- a/src/SWIG_files/wrapper/STEPCAFControl.i
++++ b/src/SWIG_files/wrapper/STEPCAFControl.i
+@@ -1849,24 +1849,24 @@ None
+ 		 STEPCAFControl_Writer();
+ 
+ 		/****************** STEPCAFControl_Writer ******************/
+-		/**** md5 signature: 70a513d4d628947fa1e98ed8e35359d9 ****/
++		/**** md5 signature: dedf68dbebf4d519616966632e9764a8 ****/
+ 		%feature("compactdefaultargs") STEPCAFControl_Writer;
+ 		%feature("autodoc", "Creates a reader tool and attaches it to an already existing session clears the session if it was not yet set for step clears the internal data structures.
+ 
+ Parameters
+ ----------
+-WS: XSControl_WorkSession
+-scratch: bool,optional
++theWS: XSControl_WorkSession
++theScratch: bool,optional
+ 	default value is Standard_True
+ 
+ Returns
+ -------
+ None
+ ") STEPCAFControl_Writer;
+-		 STEPCAFControl_Writer(const opencascade::handle<XSControl_WorkSession> & WS, const Standard_Boolean scratch = Standard_True);
++		 STEPCAFControl_Writer(const opencascade::handle<XSControl_WorkSession> & theWS, const Standard_Boolean theScratch = Standard_True);
+ 
+ 		/****************** ChangeWriter ******************/
+-		/**** md5 signature: 9719ebc8336482d007d450c0e3b00713 ****/
++		/**** md5 signature: acee09144e4dec42ed602fde52975129 ****/
+ 		%feature("compactdefaultargs") ChangeWriter;
+ 		%feature("autodoc", "Returns basic reader for root file.
+ 
+@@ -1877,39 +1877,39 @@ STEPControl_Writer
+ 		STEPControl_Writer & ChangeWriter();
+ 
+ 		/****************** ExternFile ******************/
+-		/**** md5 signature: 4f90b7104efa0649e14f70ad09ab8e61 ****/
++		/**** md5 signature: 0769b22e71152aabd75dace01164fc2b ****/
+ 		%feature("compactdefaultargs") ExternFile;
+ 		%feature("autodoc", "Returns data on external file by its original label returns false if no external file with given name is read.
+ 
+ Parameters
+ ----------
+-L: TDF_Label
+-ef: STEPCAFControl_ExternFile
++theLabel: TDF_Label
++theExtFile: STEPCAFControl_ExternFile
+ 
+ Returns
+ -------
+ bool
+ ") ExternFile;
+-		Standard_Boolean ExternFile(const TDF_Label & L, opencascade::handle<STEPCAFControl_ExternFile> & ef);
++		Standard_Boolean ExternFile(const TDF_Label & theLabel, opencascade::handle<STEPCAFControl_ExternFile> & theExtFile);
+ 
+ 		/****************** ExternFile ******************/
+-		/**** md5 signature: ad0d6b0b3be01575d180dd24c55cd264 ****/
++		/**** md5 signature: f77e0b8157371b505bc136b8bd33443e ****/
+ 		%feature("compactdefaultargs") ExternFile;
+ 		%feature("autodoc", "Returns data on external file by its name returns false if no external file with given name is read.
+ 
+ Parameters
+ ----------
+-name: char *
+-ef: STEPCAFControl_ExternFile
++theName: str
++theExtFile: STEPCAFControl_ExternFile
+ 
+ Returns
+ -------
+ bool
+ ") ExternFile;
+-		Standard_Boolean ExternFile(const char * name, opencascade::handle<STEPCAFControl_ExternFile> & ef);
++		Standard_Boolean ExternFile(Standard_CString theName, opencascade::handle<STEPCAFControl_ExternFile> & theExtFile);
+ 
+ 		/****************** ExternFiles ******************/
+-		/**** md5 signature: 1154c88bc3253c7291077317c11363ab ****/
++		/**** md5 signature: 08a0b41df731275c7119f8910e47970c ****/
+ 		%feature("compactdefaultargs") ExternFiles;
+ 		%feature("autodoc", "Returns data on external files returns null handle if no external files are read.
+ 
+@@ -1920,7 +1920,7 @@ NCollection_DataMap<TCollection_AsciiString, opencascade::handle<STEPCAFControl_
+ 		const NCollection_DataMap<TCollection_AsciiString, opencascade::handle<STEPCAFControl_ExternFile>> & ExternFiles();
+ 
+ 		/****************** GetColorMode ******************/
+-		/**** md5 signature: 010da6a8a0e8a61fdb607fd6faba2b56 ****/
++		/**** md5 signature: cddb885e605f1794a5a6486023f65736 ****/
+ 		%feature("compactdefaultargs") GetColorMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1931,7 +1931,7 @@ bool
+ 		Standard_Boolean GetColorMode();
+ 
+ 		/****************** GetDimTolMode ******************/
+-		/**** md5 signature: 2eed8e0bb30a6f85d0c500a8d4b9e16c ****/
++		/**** md5 signature: 5f3c2fc2e581a2ea711f9607cd0a817a ****/
+ 		%feature("compactdefaultargs") GetDimTolMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1942,7 +1942,7 @@ bool
+ 		Standard_Boolean GetDimTolMode();
+ 
+ 		/****************** GetLayerMode ******************/
+-		/**** md5 signature: d677385c303e067613f92bc738509727 ****/
++		/**** md5 signature: b6b1458608d2429d13e63a07c0b392d8 ****/
+ 		%feature("compactdefaultargs") GetLayerMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1953,7 +1953,7 @@ bool
+ 		Standard_Boolean GetLayerMode();
+ 
+ 		/****************** GetMaterialMode ******************/
+-		/**** md5 signature: cda125e3ff8f835393b9894e3f229aea ****/
++		/**** md5 signature: 2057a4ef866086868ba91cb34e6ad09a ****/
+ 		%feature("compactdefaultargs") GetMaterialMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1964,7 +1964,7 @@ bool
+ 		Standard_Boolean GetMaterialMode();
+ 
+ 		/****************** GetNameMode ******************/
+-		/**** md5 signature: 2dd32a893d6f5f4666ac3752ace2d12f ****/
++		/**** md5 signature: 1097f532a68b4625a0108cddc8366238 ****/
+ 		%feature("compactdefaultargs") GetNameMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1975,7 +1975,7 @@ bool
+ 		Standard_Boolean GetNameMode();
+ 
+ 		/****************** GetPropsMode ******************/
+-		/**** md5 signature: 3b2f4c2b61084d1e067d83421e0ea81d ****/
++		/**** md5 signature: 99cee0ed60040ac88dbf6e950f82a10e ****/
+ 		%feature("compactdefaultargs") GetPropsMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1986,7 +1986,7 @@ bool
+ 		Standard_Boolean GetPropsMode();
+ 
+ 		/****************** GetSHUOMode ******************/
+-		/**** md5 signature: 74c5f048b04741ef5abfe259b5c453cd ****/
++		/**** md5 signature: 4e3a3a7f89647ad6b4f35f24a42234d6 ****/
+ 		%feature("compactdefaultargs") GetSHUOMode;
+ 		%feature("autodoc", "No available documentation.
+ 
+@@ -1997,31 +1997,31 @@ bool
+ 		Standard_Boolean GetSHUOMode();
+ 
+ 		/****************** Init ******************/
+-		/**** md5 signature: 13544ae418c98602c6eaed6faea8f526 ****/
++		/**** md5 signature: e7d3f870615865a6686f75c3aa077ff3 ****/
+ 		%feature("compactdefaultargs") Init;
+ 		%feature("autodoc", "Clears the internal data structures and attaches to a new session clears the session if it was not yet set for step.
+ 
+ Parameters
+ ----------
+-WS: XSControl_WorkSession
+-scratch: bool,optional
++theWS: XSControl_WorkSession
++theScratch: bool,optional
+ 	default value is Standard_True
+ 
+ Returns
+ -------
+ None
+ ") Init;
+-		void Init(const opencascade::handle<XSControl_WorkSession> & WS, const Standard_Boolean scratch = Standard_True);
++		void Init(const opencascade::handle<XSControl_WorkSession> & theWS, const Standard_Boolean theScratch = Standard_True);
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: 82a9ff51a493dfcaea368ecaef792fdb ****/
++		/**** md5 signature: 624f8c3670df66af47c4a9af2967eb2a ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "No available documentation.
+ 
+ Parameters
+ ----------
+-doc: TDocStd_Document
+-filename: TCollection_AsciiString
++theDoc: TDocStd_Document
++theFileName: str
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+ 
+@@ -2029,17 +2029,17 @@ Returns
+ -------
+ bool
+ ") Perform;
+-		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & doc, const TCollection_AsciiString & filename, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & theDoc, TCollection_AsciiString theFileName, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Perform ******************/
+-		/**** md5 signature: 1ef00b1bd520cd3b05cc4f00e91c494d ****/
++		/**** md5 signature: 90b76d8d692f1926baa1d9dd3db9018b ****/
+ 		%feature("compactdefaultargs") Perform;
+ 		%feature("autodoc", "Transfers a document and writes it to a step file returns true if translation is ok.
+ 
+ Parameters
+ ----------
+-doc: TDocStd_Document
+-filename: char *
++theDoc: TDocStd_Document
++theFileName: str
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+ 
+@@ -2047,124 +2047,124 @@ Returns
+ -------
+ bool
+ ") Perform;
+-		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & doc, const char * filename, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Perform(const opencascade::handle<TDocStd_Document> & theDoc, Standard_CString theFileName, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** SetColorMode ******************/
+-		/**** md5 signature: e8d41838c31a9460a1c83d84b1f572a1 ****/
++		/**** md5 signature: f341158b4cc5262e2e5cb7b941cc9031 ****/
+ 		%feature("compactdefaultargs") SetColorMode;
+ 		%feature("autodoc", "Set colormode for indicate write colors or not.
+ 
+ Parameters
+ ----------
+-colormode: bool
++theColorMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetColorMode;
+-		void SetColorMode(const Standard_Boolean colormode);
++		void SetColorMode(const Standard_Boolean theColorMode);
+ 
+ 		/****************** SetDimTolMode ******************/
+-		/**** md5 signature: 18d408609aea9a67d1d1e15d923773db ****/
++		/**** md5 signature: 08cd53498196841f3c3a5c0e281a464f ****/
+ 		%feature("compactdefaultargs") SetDimTolMode;
+ 		%feature("autodoc", "Set dimtolmode for indicate write d&gts or not.
+ 
+ Parameters
+ ----------
+-dimtolmode: bool
++theDimTolMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetDimTolMode;
+-		void SetDimTolMode(const Standard_Boolean dimtolmode);
++		void SetDimTolMode(const Standard_Boolean theDimTolMode);
+ 
+ 		/****************** SetLayerMode ******************/
+-		/**** md5 signature: 3ec21c8de4b114a83bb0b34cb3b98662 ****/
++		/**** md5 signature: d164352478699d01fe5d59c680c2a74d ****/
+ 		%feature("compactdefaultargs") SetLayerMode;
+ 		%feature("autodoc", "Set layermode for indicate write layers or not.
+ 
+ Parameters
+ ----------
+-layermode: bool
++theLayerMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetLayerMode;
+-		void SetLayerMode(const Standard_Boolean layermode);
++		void SetLayerMode(const Standard_Boolean theLayerMode);
+ 
+ 		/****************** SetMaterialMode ******************/
+-		/**** md5 signature: ef4abdfa06b076742a69b17150f91d88 ****/
++		/**** md5 signature: 932571d6d0df2e34fd2487f6025f4956 ****/
+ 		%feature("compactdefaultargs") SetMaterialMode;
+ 		%feature("autodoc", "Set dimtolmode for indicate write d&gts or not.
+ 
+ Parameters
+ ----------
+-matmode: bool
++theMaterialMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetMaterialMode;
+-		void SetMaterialMode(const Standard_Boolean matmode);
++		void SetMaterialMode(const Standard_Boolean theMaterialMode);
+ 
+ 		/****************** SetNameMode ******************/
+-		/**** md5 signature: 43ccb5d3fb024d8191f251ee74d0f6ba ****/
++		/**** md5 signature: a24984c6ce274882f02601c13cf73b9a ****/
+ 		%feature("compactdefaultargs") SetNameMode;
+ 		%feature("autodoc", "Set namemode for indicate write name or not.
+ 
+ Parameters
+ ----------
+-namemode: bool
++theNameMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetNameMode;
+-		void SetNameMode(const Standard_Boolean namemode);
++		void SetNameMode(const Standard_Boolean theNameMode);
+ 
+ 		/****************** SetPropsMode ******************/
+-		/**** md5 signature: 97f3b34eb7a1e38c6cf17d5c26f938a6 ****/
++		/**** md5 signature: fbb288fb7a76bf6b9cd3acd70d056a7f ****/
+ 		%feature("compactdefaultargs") SetPropsMode;
+ 		%feature("autodoc", "Propsmode for indicate write validation properties or not.
+ 
+ Parameters
+ ----------
+-propsmode: bool
++thePropsMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetPropsMode;
+-		void SetPropsMode(const Standard_Boolean propsmode);
++		void SetPropsMode(const Standard_Boolean thePropsMode);
+ 
+ 		/****************** SetSHUOMode ******************/
+-		/**** md5 signature: ad06ed8b923731ee7b75bf3d7074f299 ****/
++		/**** md5 signature: 39955bf97fe8d6a6d6b3b211a859f216 ****/
+ 		%feature("compactdefaultargs") SetSHUOMode;
+ 		%feature("autodoc", "Set shuo mode for indicate write shuo or not.
+ 
+ Parameters
+ ----------
+-shuomode: bool
++theSHUOMode: bool
+ 
+ Returns
+ -------
+ None
+ ") SetSHUOMode;
+-		void SetSHUOMode(const Standard_Boolean shuomode);
++		void SetSHUOMode(const Standard_Boolean theSHUOMode);
+ 
+ 		/****************** Transfer ******************/
+-		/**** md5 signature: 2616e7e1bc1f8548fb5e464651c0f720 ****/
++		/**** md5 signature: dd7ebbdc1c22d7845ad531885273adee ****/
+ 		%feature("compactdefaultargs") Transfer;
+ 		%feature("autodoc", "Transfers a document (or single label) to a step model the mode of translation of shape is asis if multi is not null pointer, it switches to multifile mode (with external refs), and string pointed by <multi> gives prefix for names of extern files (can be empty string) returns true if translation is ok.
+ 
+ Parameters
+ ----------
+-doc: TDocStd_Document
+-mode: STEPControl_StepModelType,optional
++theDoc: TDocStd_Document
++theMode: STEPControl_StepModelType,optional
+ 	default value is STEPControl_AsIs
+-multi: char *,optional
++theIsMulti: str,optional
+ 	default value is 0
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+@@ -2173,19 +2173,19 @@ Returns
+ -------
+ bool
+ ") Transfer;
+-		Standard_Boolean Transfer(const opencascade::handle<TDocStd_Document> & doc, const STEPControl_StepModelType mode = STEPControl_AsIs, const char * multi = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Transfer(const opencascade::handle<TDocStd_Document> & theDoc, const STEPControl_StepModelType theMode = STEPControl_AsIs, Standard_CString theIsMulti = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Transfer ******************/
+-		/**** md5 signature: 3230c3763f234bd8211762a290f20e3d ****/
++		/**** md5 signature: 40f710aeab310ab1eff9bbdbe733b162 ****/
+ 		%feature("compactdefaultargs") Transfer;
+ 		%feature("autodoc", "Method to transfer part of the document specified by label.
+ 
+ Parameters
+ ----------
+-L: TDF_Label
+-mode: STEPControl_StepModelType,optional
++theLabel: TDF_Label
++theMode: STEPControl_StepModelType,optional
+ 	default value is STEPControl_AsIs
+-multi: char *,optional
++theIsMulti: str,optional
+ 	default value is 0
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+@@ -2194,19 +2194,19 @@ Returns
+ -------
+ bool
+ ") Transfer;
+-		Standard_Boolean Transfer(const TDF_Label & L, const STEPControl_StepModelType mode = STEPControl_AsIs, const char * multi = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Transfer(const TDF_Label & theLabel, const STEPControl_StepModelType theMode = STEPControl_AsIs, Standard_CString theIsMulti = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Transfer ******************/
+-		/**** md5 signature: 7533cb05eb0d45c4c5142f45de14069a ****/
++		/**** md5 signature: 4e3f0900d966cc07a5e2191b2b4ba7a6 ****/
+ 		%feature("compactdefaultargs") Transfer;
+ 		%feature("autodoc", "Mehod to writing sequence of root assemblies or part of the file specified by use by one label .
+ 
+ Parameters
+ ----------
+-L: TDF_LabelSequence
+-mode: STEPControl_StepModelType,optional
++theLabelSeq: TDF_LabelSequence
++theMode: STEPControl_StepModelType,optional
+ 	default value is STEPControl_AsIs
+-multi: char *,optional
++theIsMulti: str,optional
+ 	default value is 0
+ theProgress: Message_ProgressRange,optional
+ 	default value is Message_ProgressRange()
+@@ -2215,7 +2215,7 @@ Returns
+ -------
+ bool
+ ") Transfer;
+-		Standard_Boolean Transfer(const TDF_LabelSequence & L, const STEPControl_StepModelType mode = STEPControl_AsIs, const char * multi = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
++		Standard_Boolean Transfer(const TDF_LabelSequence & theLabelSeq, const STEPControl_StepModelType theMode = STEPControl_AsIs, Standard_CString theIsMulti = 0, const Message_ProgressRange & theProgress = Message_ProgressRange());
+ 
+ 		/****************** Write ******************/
+ 		/**** md5 signature: 14544d6ececf228a5871ef6afa0279ae ****/
+@@ -2248,7 +2248,7 @@ IFSelect_ReturnStatus
+ 		IFSelect_ReturnStatus WriteStream(std::ostream & theStream);
+ 
+ 		/****************** Writer ******************/
+-		/**** md5 signature: 70b6d632350a5ba6ff972c4b437432a0 ****/
++		/**** md5 signature: 056d4f3221d283b7d58d92ddd5c40dd7 ****/
+ 		%feature("compactdefaultargs") Writer;
+ 		%feature("autodoc", "Returns basic reader as const.
+ 
+diff --git a/src/SWIG_files/wrapper/STEPCAFControl.pyi b/src/SWIG_files/wrapper/STEPCAFControl.pyi
+index 896eedcf..9160ffa9 100644
+--- a/src/SWIG_files/wrapper/STEPCAFControl.pyi
++++ b/src/SWIG_files/wrapper/STEPCAFControl.pyi
+@@ -175,12 +175,12 @@ class STEPCAFControl_Writer:
+     @overload
+     def __init__(self) -> None: ...
+     @overload
+-    def __init__(self, WS: XSControl_WorkSession, scratch: Optional[bool] = True) -> None: ...
++    def __init__(self, theWS: XSControl_WorkSession, theScratch: Optional[bool] = True) -> None: ...
+     def ChangeWriter(self) -> STEPControl_Writer: ...
+     @overload
+-    def ExternFile(self, L: TDF_Label, ef: STEPCAFControl_ExternFile) -> bool: ...
++    def ExternFile(self, theLabel: TDF_Label, theExtFile: STEPCAFControl_ExternFile) -> bool: ...
+     @overload
+-    def ExternFile(self, name: str, ef: STEPCAFControl_ExternFile) -> bool: ...
++    def ExternFile(self, theName: str, theExtFile: STEPCAFControl_ExternFile) -> bool: ...
+     def ExternFiles(self) -> False: ...
+     def GetColorMode(self) -> bool: ...
+     def GetDimTolMode(self) -> bool: ...
+@@ -189,24 +189,24 @@ class STEPCAFControl_Writer:
+     def GetNameMode(self) -> bool: ...
+     def GetPropsMode(self) -> bool: ...
+     def GetSHUOMode(self) -> bool: ...
+-    def Init(self, WS: XSControl_WorkSession, scratch: Optional[bool] = True) -> None: ...
++    def Init(self, theWS: XSControl_WorkSession, theScratch: Optional[bool] = True) -> None: ...
+     @overload
+-    def Perform(self, doc: TDocStd_Document, filename: TCollection_AsciiString, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Perform(self, theDoc: TDocStd_Document, theFileName: str, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     @overload
+-    def Perform(self, doc: TDocStd_Document, filename: str, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+-    def SetColorMode(self, colormode: bool) -> None: ...
+-    def SetDimTolMode(self, dimtolmode: bool) -> None: ...
+-    def SetLayerMode(self, layermode: bool) -> None: ...
+-    def SetMaterialMode(self, matmode: bool) -> None: ...
+-    def SetNameMode(self, namemode: bool) -> None: ...
+-    def SetPropsMode(self, propsmode: bool) -> None: ...
+-    def SetSHUOMode(self, shuomode: bool) -> None: ...
++    def Perform(self, theDoc: TDocStd_Document, theFileName: str, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def SetColorMode(self, theColorMode: bool) -> None: ...
++    def SetDimTolMode(self, theDimTolMode: bool) -> None: ...
++    def SetLayerMode(self, theLayerMode: bool) -> None: ...
++    def SetMaterialMode(self, theMaterialMode: bool) -> None: ...
++    def SetNameMode(self, theNameMode: bool) -> None: ...
++    def SetPropsMode(self, thePropsMode: bool) -> None: ...
++    def SetSHUOMode(self, theSHUOMode: bool) -> None: ...
+     @overload
+-    def Transfer(self, doc: TDocStd_Document, mode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, multi: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Transfer(self, theDoc: TDocStd_Document, theMode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, theIsMulti: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     @overload
+-    def Transfer(self, L: TDF_Label, mode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, multi: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Transfer(self, theLabel: TDF_Label, theMode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, theIsMulti: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     @overload
+-    def Transfer(self, L: TDF_LabelSequence, mode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, multi: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
++    def Transfer(self, theLabelSeq: TDF_LabelSequence, theMode: Optional[STEPControl_StepModelType] = STEPControl_AsIs, theIsMulti: Optional[str] = 0, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+     def Write(self, theFileName: str) -> IFSelect_ReturnStatus: ...
+     def Writer(self) -> STEPControl_Writer: ...
+ 
+diff --git a/src/SWIG_files/wrapper/STEPConstruct.i b/src/SWIG_files/wrapper/STEPConstruct.i
+index f1221c33..d9eaffc8 100644
+--- a/src/SWIG_files/wrapper/STEPConstruct.i
++++ b/src/SWIG_files/wrapper/STEPConstruct.i
+@@ -2598,6 +2598,17 @@ opencascade::handle<StepVisual_PresentationStyleAssignment>
+ ") MakeColorPSA;
+ 		opencascade::handle<StepVisual_PresentationStyleAssignment> MakeColorPSA(const opencascade::handle<StepRepr_RepresentationItem> & item, const opencascade::handle<StepVisual_Colour> & SurfCol, const opencascade::handle<StepVisual_Colour> & CurveCol, const opencascade::handle<StepVisual_Colour> & RenderCol, const Standard_Real RenderTransp, const Standard_Boolean isForNAUO = Standard_False);
+ 
++		/****************** NbRootStyles ******************/
++		/**** md5 signature: 4bb6a5a6f49e5abb7085f5ef57337a5a ****/
++		%feature("compactdefaultargs") NbRootStyles;
++		%feature("autodoc", "Returns number of override styles.
++
++Returns
++-------
++int
++") NbRootStyles;
++		Standard_Integer NbRootStyles();
++
+ 		/****************** NbStyles ******************/
+ 		/**** md5 signature: 9f5fbd515247307ce70e63c6f585ddb7 ****/
+ 		%feature("compactdefaultargs") NbStyles;
+@@ -2609,6 +2620,21 @@ int
+ ") NbStyles;
+ 		Standard_Integer NbStyles();
+ 
++		/****************** RootStyle ******************/
++		/**** md5 signature: 97e67ad6592e4e36a6444e18652921fc ****/
++		%feature("compactdefaultargs") RootStyle;
++		%feature("autodoc", "Returns override style with given index.
++
++Parameters
++----------
++i: int
++
++Returns
++-------
++opencascade::handle<StepVisual_StyledItem>
++") RootStyle;
++		opencascade::handle<StepVisual_StyledItem> RootStyle(const Standard_Integer i);
++
+ 		/****************** Style ******************/
+ 		/**** md5 signature: e152f39ac13e328dca6d350a6f881da8 ****/
+ 		%feature("compactdefaultargs") Style;
+diff --git a/src/SWIG_files/wrapper/STEPConstruct.pyi b/src/SWIG_files/wrapper/STEPConstruct.pyi
+index ca04fc33..0f3aa64d 100644
+--- a/src/SWIG_files/wrapper/STEPConstruct.pyi
++++ b/src/SWIG_files/wrapper/STEPConstruct.pyi
+@@ -253,7 +253,9 @@ class STEPConstruct_Styles(STEPConstruct_Tool):
+     def LoadInvisStyles(self, InvSyles: TColStd_HSequenceOfTransient) -> bool: ...
+     def LoadStyles(self) -> bool: ...
+     def MakeColorPSA(self, item: StepRepr_RepresentationItem, SurfCol: StepVisual_Colour, CurveCol: StepVisual_Colour, RenderCol: StepVisual_Colour, RenderTransp: float, isForNAUO: Optional[bool] = False) -> StepVisual_PresentationStyleAssignment: ...
++    def NbRootStyles(self) -> int: ...
+     def NbStyles(self) -> int: ...
++    def RootStyle(self, i: int) -> StepVisual_StyledItem: ...
+     def Style(self, i: int) -> StepVisual_StyledItem: ...
+ 
+ class STEPConstruct_ValidationProps(STEPConstruct_Tool):
+diff --git a/src/SWIG_files/wrapper/ShapeUpgrade.i b/src/SWIG_files/wrapper/ShapeUpgrade.i
+index 1fd11ef9..b3c16c8c 100644
+--- a/src/SWIG_files/wrapper/ShapeUpgrade.i
++++ b/src/SWIG_files/wrapper/ShapeUpgrade.i
+@@ -1064,6 +1064,7 @@ None
+ class ShapeUpgrade_UnifySameDomain : public Standard_Transient {
+ 	public:
+ typedef NCollection_DataMap<TopoDS_Shape , opencascade ::handle<Geom_Plane>, TopTools_ShapeMapHasher> DataMapOfFacePlane;
++typedef NCollection_DataMap<TopoDS_Shape , TopTools_MapOfShape , TopTools_ShapeMapHasher> DataMapOfShapeMapOfShape;
+ 		/****************** ShapeUpgrade_UnifySameDomain ******************/
+ 		/**** md5 signature: 81e68dd91fd764ff95aa62b12dc88ed6 ****/
+ 		%feature("compactdefaultargs") ShapeUpgrade_UnifySameDomain;
+diff --git a/src/SWIG_files/wrapper/StdPrs.i b/src/SWIG_files/wrapper/StdPrs.i
+index 0d01b154..bcdbf6c2 100644
+--- a/src/SWIG_files/wrapper/StdPrs.i
++++ b/src/SWIG_files/wrapper/StdPrs.i
+@@ -1220,7 +1220,7 @@ int
+ class StdPrs_ShadedShape : public Prs3d_Root {
+ 	public:
+ 		/****************** Add ******************/
+-		/**** md5 signature: 4361c97ebfd2d178620c977d5eabb386 ****/
++		/**** md5 signature: eb25cffb7e72ca49100cdcc43a05ee8c ****/
+ 		%feature("compactdefaultargs") Add;
+ 		%feature("autodoc", "Shades <theshape>. @param thevolumetype defines the way how to interpret input shapes - as closed volumes (to activate back-face culling and capping plane algorithms), as open volumes (shells or solids with holes) or to perform autodetection (would split input shape into two groups).
+ 
+@@ -1231,15 +1231,17 @@ theShape: TopoDS_Shape
+ theDrawer: Prs3d_Drawer
+ theVolume: StdPrs_Volume,optional
+ 	default value is StdPrs_Volume_Autodetection
++theGroup: Graphic3d_Group,optional
++	default value is NULL
+ 
+ Returns
+ -------
+ None
+ ") Add;
+-		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection);
++		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection, const opencascade::handle<Graphic3d_Group> & theGroup = NULL);
+ 
+ 		/****************** Add ******************/
+-		/**** md5 signature: c21dc028b4eb82bb3707a6e95d6e5c3b ****/
++		/**** md5 signature: c2784d9b78f332340fcb1d6c9293a2a1 ****/
+ 		%feature("compactdefaultargs") Add;
+ 		%feature("autodoc", "Shades <theshape> with texture coordinates. @param thevolumetype defines the way how to interpret input shapes - as closed volumes (to activate back-face culling and capping plane algorithms), as open volumes (shells or solids with holes) or to perform autodetection (would split input shape into two groups).
+ 
+@@ -1254,12 +1256,14 @@ theUVRepeat: gp_Pnt2d
+ theUVScale: gp_Pnt2d
+ theVolume: StdPrs_Volume,optional
+ 	default value is StdPrs_Volume_Autodetection
++theGroup: Graphic3d_Group,optional
++	default value is NULL
+ 
+ Returns
+ -------
+ None
+ ") Add;
+-		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const Standard_Boolean theHasTexels, const gp_Pnt2d & theUVOrigin, const gp_Pnt2d & theUVRepeat, const gp_Pnt2d & theUVScale, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection);
++		static void Add(const opencascade::handle<Prs3d_Presentation> & thePresentation, const TopoDS_Shape & theShape, const opencascade::handle<Prs3d_Drawer> & theDrawer, const Standard_Boolean theHasTexels, const gp_Pnt2d & theUVOrigin, const gp_Pnt2d & theUVRepeat, const gp_Pnt2d & theUVScale, const StdPrs_Volume theVolume = StdPrs_Volume_Autodetection, const opencascade::handle<Graphic3d_Group> & theGroup = NULL);
+ 
+ 		/****************** AddWireframeForFacesWithoutTriangles ******************/
+ 		/**** md5 signature: 2399101e036cd3b0540bfa37732d6fc1 ****/
+diff --git a/src/SWIG_files/wrapper/StdPrs.pyi b/src/SWIG_files/wrapper/StdPrs.pyi
+index 3a01af7b..4df76eb5 100644
+--- a/src/SWIG_files/wrapper/StdPrs.pyi
++++ b/src/SWIG_files/wrapper/StdPrs.pyi
+@@ -156,10 +156,10 @@ class StdPrs_PoleCurve(Prs3d_Root):
+ class StdPrs_ShadedShape(Prs3d_Root):
+     @overload
+     @staticmethod
+-    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection) -> None: ...
++    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection, theGroup: Optional[Graphic3d_Group] = None) -> None: ...
+     @overload
+     @staticmethod
+-    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theHasTexels: bool, theUVOrigin: gp_Pnt2d, theUVRepeat: gp_Pnt2d, theUVScale: gp_Pnt2d, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection) -> None: ...
++    def Add(thePresentation: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer, theHasTexels: bool, theUVOrigin: gp_Pnt2d, theUVRepeat: gp_Pnt2d, theUVScale: gp_Pnt2d, theVolume: Optional[StdPrs_Volume] = StdPrs_Volume_Autodetection, theGroup: Optional[Graphic3d_Group] = None) -> None: ...
+     @staticmethod
+     def AddWireframeForFacesWithoutTriangles(thePrs: Prs3d_Presentation, theShape: TopoDS_Shape, theDrawer: Prs3d_Drawer) -> None: ...
+     @staticmethod
+diff --git a/src/SWIG_files/wrapper/StepToGeom.i b/src/SWIG_files/wrapper/StepToGeom.i
+index a91cc710..f4ab236f 100644
+--- a/src/SWIG_files/wrapper/StepToGeom.i
++++ b/src/SWIG_files/wrapper/StepToGeom.i
+@@ -808,22 +808,6 @@ opencascade::handle<Geom2d_VectorWithMagnitude>
+ ") MakeVectorWithMagnitude2d;
+ 		static opencascade::handle<Geom2d_VectorWithMagnitude> MakeVectorWithMagnitude2d(const opencascade::handle<StepGeom_Vector> & SV);
+ 
+-		/****************** MakeYprRotation ******************/
+-		/**** md5 signature: de9dc847a92c9949d29654e63b9eb686 ****/
+-		%feature("compactdefaultargs") MakeYprRotation;
+-		%feature("autodoc", "No available documentation.
+-
+-Parameters
+-----------
+-SR: StepKinematics_SpatialRotation
+-theCntxt: StepRepr_GlobalUnitAssignedContext
+-
+-Returns
+--------
+-opencascade::handle<TColStd_HArray1OfReal>
+-") MakeYprRotation;
+-		static opencascade::handle<TColStd_HArray1OfReal> MakeYprRotation(const StepKinematics_SpatialRotation & SR, const opencascade::handle<StepRepr_GlobalUnitAssignedContext> & theCntxt);
+-
+ };
+ 
+ 
+diff --git a/src/SWIG_files/wrapper/XCAFDoc.i b/src/SWIG_files/wrapper/XCAFDoc.i
+index 791919dd..e5c716a9 100644
+--- a/src/SWIG_files/wrapper/XCAFDoc.i
++++ b/src/SWIG_files/wrapper/XCAFDoc.i
+@@ -2317,7 +2317,7 @@ TDF_Label
+ 		TDF_Label FindColor(const Quantity_ColorRGBA & col);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: be86e43f2f2ac06163dce467a9739527 ****/
++		/**** md5 signature: 7092ec33c89b067e1ceab0d67b5ed02d ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color defined by label lab returns false if the label is not in colortable or does not define a color.
+ 
+@@ -2330,10 +2330,10 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & lab, Quantity_Color & col);
++		static Standard_Boolean GetColor(const TDF_Label & lab, Quantity_Color & col);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: a7a6506d3132240934c87e97ec6b28ed ****/
++		/**** md5 signature: 7252a98dd463a84602d0b7516d6cfc04 ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color defined by label lab returns false if the label is not in colortable or does not define a color.
+ 
+@@ -2346,7 +2346,7 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & lab, Quantity_ColorRGBA & col);
++		static Standard_Boolean GetColor(const TDF_Label & lab, Quantity_ColorRGBA & col);
+ 
+ 		/****************** GetColor ******************/
+ 		/**** md5 signature: 869ec12dba73e125e4d66d2a85d2d496 ****/
+@@ -2366,7 +2366,7 @@ bool
+ 		static Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, TDF_Label & colorL);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: 5801253cfaf9cc63278aa2d80d15b2c3 ****/
++		/**** md5 signature: 9f42bc515522bf5857381b8ed56f5af6 ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color assigned to <l> as <type> returns false if no such color is assigned.
+ 
+@@ -2380,10 +2380,10 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_Color & color);
++		static Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_Color & color);
+ 
+ 		/****************** GetColor ******************/
+-		/**** md5 signature: f56e146c8c1c603ab9bcf2d6c801e3b4 ****/
++		/**** md5 signature: 175af0eadf13dd6e8e7059280dcebe1e ****/
+ 		%feature("compactdefaultargs") GetColor;
+ 		%feature("autodoc", "Returns color assigned to <l> as <type> returns false if no such color is assigned.
+ 
+@@ -2397,7 +2397,7 @@ Returns
+ -------
+ bool
+ ") GetColor;
+-		Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_ColorRGBA & color);
++		static Standard_Boolean GetColor(const TDF_Label & L, const XCAFDoc_ColorType type, Quantity_ColorRGBA & color);
+ 
+ 		/****************** GetColor ******************/
+ 		/**** md5 signature: 6e439ce30113cabaadf18ee4ce1d0971 ****/
+@@ -2599,7 +2599,7 @@ bool
+ 		Standard_Boolean IsSet(const TopoDS_Shape & S, const XCAFDoc_ColorType type);
+ 
+ 		/****************** IsVisible ******************/
+-		/**** md5 signature: e84f73aaf1ac293dea741c71b9f10a4b ****/
++		/**** md5 signature: bcc14ce19df050eb884b5911b48c4b59 ****/
+ 		%feature("compactdefaultargs") IsVisible;
+ 		%feature("autodoc", "Return true if object on this label is visible, false if invisible.
+ 
+@@ -2611,7 +2611,7 @@ Returns
+ -------
+ bool
+ ") IsVisible;
+-		Standard_Boolean IsVisible(const TDF_Label & L);
++		static Standard_Boolean IsVisible(const TDF_Label & L);
+ 
+ 		/****************** RemoveColor ******************/
+ 		/**** md5 signature: 3e1749f5696dd21fe53c3eb3d8e77952 ****/
+@@ -3477,7 +3477,7 @@ None
+ 		void GetDatumLabels(TDF_LabelSequence & Labels);
+ 
+ 		/****************** GetDatumOfTolerLabels ******************/
+-		/**** md5 signature: ed65059da2973245ec5c0f5e0dfd7526 ****/
++		/**** md5 signature: 581e63a0a9642866e1575d216f9b4d3d ****/
+ 		%feature("compactdefaultargs") GetDatumOfTolerLabels;
+ 		%feature("autodoc", "Returns all datum labels defined for thedimtoll label.
+ 
+@@ -3490,10 +3490,10 @@ Returns
+ -------
+ bool
+ ") GetDatumOfTolerLabels;
+-		Standard_Boolean GetDatumOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
++		static Standard_Boolean GetDatumOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
+ 
+ 		/****************** GetDatumWithObjectOfTolerLabels ******************/
+-		/**** md5 signature: da94437dec84c797c8bab6e76d5e373f ****/
++		/**** md5 signature: d5f3a53d01bb6038ce1c82b7e4989ce4 ****/
+ 		%feature("compactdefaultargs") GetDatumWithObjectOfTolerLabels;
+ 		%feature("autodoc", "Returns all datum labels with xcafdimtolobjects_datumobject defined for label thedimtoll.
+ 
+@@ -3506,7 +3506,7 @@ Returns
+ -------
+ bool
+ ") GetDatumWithObjectOfTolerLabels;
+-		Standard_Boolean GetDatumWithObjectOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
++		static Standard_Boolean GetDatumWithObjectOfTolerLabels(const TDF_Label & theDimTolL, TDF_LabelSequence & theDatums);
+ 
+ 		/****************** GetDimTol ******************/
+ 		/**** md5 signature: 5f2928d077835acfc683c0b7e312ac72 ****/
+@@ -3646,7 +3646,7 @@ bool
+ 		Standard_Boolean GetRefGeomToleranceLabels(const TDF_Label & theShapeL, TDF_LabelSequence & theDimTols);
+ 
+ 		/****************** GetRefShapeLabel ******************/
+-		/**** md5 signature: e25d6989472f0a0e102c1daa5f739a29 ****/
++		/**** md5 signature: b09dac51ded70edf3dd23cc545931b1a ****/
+ 		%feature("compactdefaultargs") GetRefShapeLabel;
+ 		%feature("autodoc", "Gets all shape labels referred by thel label of the gd&t table. returns false if there are no shape labels added to the sequences.
+ 
+@@ -3660,7 +3660,7 @@ Returns
+ -------
+ bool
+ ") GetRefShapeLabel;
+-		Standard_Boolean GetRefShapeLabel(const TDF_Label & theL, TDF_LabelSequence & theShapeLFirst, TDF_LabelSequence & theShapeLSecond);
++		static Standard_Boolean GetRefShapeLabel(const TDF_Label & theL, TDF_LabelSequence & theShapeLFirst, TDF_LabelSequence & theShapeLSecond);
+ 
+ 		/****************** GetTolerOfDatumLabels ******************/
+ 		/**** md5 signature: b4d4047d58bcf3d1d31d5586d788da7e ****/
+@@ -5490,20 +5490,20 @@ opencascade::handle<TColStd_HSequenceOfExtendedString>
+ 		opencascade::handle<TColStd_HSequenceOfExtendedString> GetLayers(const TopoDS_Shape & Sh);
+ 
+ 		/****************** GetShapesOfLayer ******************/
+-		/**** md5 signature: 8b01d3b5f0a0832996031f609b876e7c ****/
++		/**** md5 signature: 2bcd2de1711ebf8ae0d1ddf5d01dce52 ****/
+ 		%feature("compactdefaultargs") GetShapesOfLayer;
+ 		%feature("autodoc", "Return sequanese of shape labels that assigned with layers to <shlabels>.
+ 
+ Parameters
+ ----------
+-layerL: TDF_Label
+-ShLabels: TDF_LabelSequence
++theLayerL: TDF_Label
++theShLabels: TDF_LabelSequence
+ 
+ Returns
+ -------
+ None
+ ") GetShapesOfLayer;
+-		void GetShapesOfLayer(const TDF_Label & layerL, TDF_LabelSequence & ShLabels);
++		static void GetShapesOfLayer(const TDF_Label & theLayerL, TDF_LabelSequence & theShLabels);
+ 
+ 		/****************** ID ******************/
+ 		/**** md5 signature: 4697ce8a095fa6dcef0217708d19718f ****/
+@@ -6456,7 +6456,7 @@ Standard_GUID
+ 		static const Standard_GUID & GetID();
+ 
+ 		/****************** GetMaterial ******************/
+-		/**** md5 signature: 806c54e68af730f31f3353b2ba682bd0 ****/
++		/**** md5 signature: cf930e538eb371f96b92c4f439c49612 ****/
+ 		%feature("compactdefaultargs") GetMaterial;
+ 		%feature("autodoc", "Returns material assigned to <matl> returns false if no such material is assigned.
+ 
+@@ -6472,7 +6472,7 @@ Returns
+ -------
+ aDensity: float
+ ") GetMaterial;
+-		Standard_Boolean GetMaterial(const TDF_Label & MatL, opencascade::handle<TCollection_HAsciiString> & aName, opencascade::handle<TCollection_HAsciiString> & aDescription, Standard_Real &OutValue, opencascade::handle<TCollection_HAsciiString> & aDensName, opencascade::handle<TCollection_HAsciiString> & aDensValType);
++		static Standard_Boolean GetMaterial(const TDF_Label & MatL, opencascade::handle<TCollection_HAsciiString> &OutValue, opencascade::handle<TCollection_HAsciiString> &OutValue, Standard_Real &OutValue, opencascade::handle<TCollection_HAsciiString> &OutValue, opencascade::handle<TCollection_HAsciiString> &OutValue);
+ 
+ 		/****************** GetMaterialLabels ******************/
+ 		/**** md5 signature: cd3883adc849957e7e10d763ad936071 ****/
+@@ -8152,6 +8152,32 @@ opencascade::handle<TDataStd_NamedData>
+ ") GetNamedProperties;
+ 		opencascade::handle<TDataStd_NamedData> GetNamedProperties(const TopoDS_Shape & theShape, const Standard_Boolean theToCreate = Standard_False);
+ 
++		/****************** GetOneShape ******************/
++		/**** md5 signature: 3215690f7fd49b341401d78832c630e0 ****/
++		%feature("compactdefaultargs") GetOneShape;
++		%feature("autodoc", "Gets shape from a sequence of shape's labels @param[in] thelabels a sequence of labels to get shapes from returns original shape in case of one label and a compound of shapes in case of more.
++
++Parameters
++----------
++theLabels: TDF_LabelSequence
++
++Returns
++-------
++TopoDS_Shape
++") GetOneShape;
++		static TopoDS_Shape GetOneShape(const TDF_LabelSequence & theLabels);
++
++		/****************** GetOneShape ******************/
++		/**** md5 signature: 5c1df85e1e2a72b0b93fde509f26a709 ****/
++		%feature("compactdefaultargs") GetOneShape;
++		%feature("autodoc", "Gets shape from a sequence of all top-level shapes which are free returns original shape in case of one label and a compound of shapes in case of more.
++
++Returns
++-------
++TopoDS_Shape
++") GetOneShape;
++		TopoDS_Shape GetOneShape();
++
+ 		/****************** GetReferredShape ******************/
+ 		/**** md5 signature: 63acc4d5460c835c166b1fc0b2913030 ****/
+ 		%feature("compactdefaultargs") GetReferredShape;
+@@ -9844,7 +9870,7 @@ Standard_GUID
+ 		static const Standard_GUID & GetID();
+ 
+ 		/****************** GetMaterial ******************/
+-		/**** md5 signature: 83194336f7abcf51085de62960d38361 ****/
++		/**** md5 signature: 694e93123423187642f68fe8d4e64f2a ****/
+ 		%feature("compactdefaultargs") GetMaterial;
+ 		%feature("autodoc", "Returns material defined by specified label, or null if the label is not in material table.
+ 
+@@ -9856,7 +9882,7 @@ Returns
+ -------
+ opencascade::handle<XCAFDoc_VisMaterial>
+ ") GetMaterial;
+-		opencascade::handle<XCAFDoc_VisMaterial> GetMaterial(const TDF_Label & theMatLabel);
++		static opencascade::handle<XCAFDoc_VisMaterial> GetMaterial(const TDF_Label & theMatLabel);
+ 
+ 		/****************** GetMaterials ******************/
+ 		/**** md5 signature: a96d68af36051bd063fefc1e10aabb79 ****/
+@@ -9890,7 +9916,7 @@ bool
+ 		static Standard_Boolean GetShapeMaterial(const TDF_Label & theShapeLabel, TDF_Label & theMaterialLabel);
+ 
+ 		/****************** GetShapeMaterial ******************/
+-		/**** md5 signature: 86335bfdea98c720bcf3af0fe4fb0fe0 ****/
++		/**** md5 signature: 04847c1ad68cdd465933ffa2a713f244 ****/
+ 		%feature("compactdefaultargs") GetShapeMaterial;
+ 		%feature("autodoc", "Returns material assigned to the shape label.
+ 
+@@ -9902,7 +9928,7 @@ Returns
+ -------
+ opencascade::handle<XCAFDoc_VisMaterial>
+ ") GetShapeMaterial;
+-		opencascade::handle<XCAFDoc_VisMaterial> GetShapeMaterial(const TDF_Label & theShapeLabel);
++		static opencascade::handle<XCAFDoc_VisMaterial> GetShapeMaterial(const TDF_Label & theShapeLabel);
+ 
+ 		/****************** GetShapeMaterial ******************/
+ 		/**** md5 signature: b4d2560c50c52f8b49c713aa67731929 ****/
+diff --git a/src/SWIG_files/wrapper/XCAFDoc.pyi b/src/SWIG_files/wrapper/XCAFDoc.pyi
+index b3036a2f..9fed3910 100644
+--- a/src/SWIG_files/wrapper/XCAFDoc.pyi
++++ b/src/SWIG_files/wrapper/XCAFDoc.pyi
+@@ -299,16 +299,20 @@ class XCAFDoc_ColorTool(TDataStd_GenericEmpty):
+     @overload
+     def FindColor(self, col: Quantity_ColorRGBA) -> TDF_Label: ...
+     @overload
+-    def GetColor(self, lab: TDF_Label, col: Quantity_Color) -> bool: ...
++    @staticmethod
++    def GetColor(lab: TDF_Label, col: Quantity_Color) -> bool: ...
+     @overload
+-    def GetColor(self, lab: TDF_Label, col: Quantity_ColorRGBA) -> bool: ...
++    @staticmethod
++    def GetColor(lab: TDF_Label, col: Quantity_ColorRGBA) -> bool: ...
+     @overload
+     @staticmethod
+     def GetColor(L: TDF_Label, type: XCAFDoc_ColorType, colorL: TDF_Label) -> bool: ...
+     @overload
+-    def GetColor(self, L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_Color) -> bool: ...
++    @staticmethod
++    def GetColor(L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_Color) -> bool: ...
+     @overload
+-    def GetColor(self, L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_ColorRGBA) -> bool: ...
++    @staticmethod
++    def GetColor(L: TDF_Label, type: XCAFDoc_ColorType, color: Quantity_ColorRGBA) -> bool: ...
+     @overload
+     def GetColor(self, S: TopoDS_Shape, type: XCAFDoc_ColorType, colorL: TDF_Label) -> bool: ...
+     @overload
+@@ -330,7 +334,8 @@ class XCAFDoc_ColorTool(TDataStd_GenericEmpty):
+     def IsSet(self, L: TDF_Label, type: XCAFDoc_ColorType) -> bool: ...
+     @overload
+     def IsSet(self, S: TopoDS_Shape, type: XCAFDoc_ColorType) -> bool: ...
+-    def IsVisible(self, L: TDF_Label) -> bool: ...
++    @staticmethod
++    def IsVisible(L: TDF_Label) -> bool: ...
+     def RemoveColor(self, lab: TDF_Label) -> None: ...
+     def ReverseChainsOfTreeNodes(self) -> bool: ...
+     @staticmethod
+@@ -418,9 +423,11 @@ class XCAFDoc_DimTolTool(TDataStd_GenericEmpty):
+     def FindDimTol(self, theKind: int, theVal: TColStd_HArray1OfReal, theName: TCollection_HAsciiString, theDescription: TCollection_HAsciiString) -> TDF_Label: ...
+     def GetDatum(self, theDatumL: TDF_Label, theName: TCollection_HAsciiString, theDescription: TCollection_HAsciiString, theIdentification: TCollection_HAsciiString) -> bool: ...
+     def GetDatumLabels(self, Labels: TDF_LabelSequence) -> None: ...
+-    def GetDatumOfTolerLabels(self, theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
+-    def GetDatumWithObjectOfTolerLabels(self, theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
+-    def GetDimTol(self, theDimTolL: TDF_Label, theVal: TColStd_HArray1OfReal, theName: TCollection_HAsciiString, theDescription: TCollection_HAsciiString) -> Tuple[bool, int]: ...
++    @staticmethod
++    def GetDatumOfTolerLabels(theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
++    @staticmethod
++    def GetDatumWithObjectOfTolerLabels(theDimTolL: TDF_Label, theDatums: TDF_LabelSequence) -> bool: ...
++    def GetDimTol(self, theDimTolL: TDF_Label, theVal: TColStd_HArray1OfReal) -> Tuple[bool, int, str, str]: ...
+     def GetDimTolLabels(self, Labels: TDF_LabelSequence) -> None: ...
+     def GetDimensionLabels(self, theLabels: TDF_LabelSequence) -> None: ...
+     def GetGeomToleranceLabels(self, theLabels: TDF_LabelSequence) -> None: ...
+@@ -429,7 +436,8 @@ class XCAFDoc_DimTolTool(TDataStd_GenericEmpty):
+     def GetRefDatumLabel(self, theShapeL: TDF_Label, theDatum: TDF_LabelSequence) -> bool: ...
+     def GetRefDimensionLabels(self, theShapeL: TDF_Label, theDimensions: TDF_LabelSequence) -> bool: ...
+     def GetRefGeomToleranceLabels(self, theShapeL: TDF_Label, theDimTols: TDF_LabelSequence) -> bool: ...
+-    def GetRefShapeLabel(self, theL: TDF_Label, theShapeLFirst: TDF_LabelSequence, theShapeLSecond: TDF_LabelSequence) -> bool: ...
++    @staticmethod
++    def GetRefShapeLabel(theL: TDF_Label, theShapeLFirst: TDF_LabelSequence, theShapeLSecond: TDF_LabelSequence) -> bool: ...
+     def GetTolerOfDatumLabels(self, theDatumL: TDF_Label, theTols: TDF_LabelSequence) -> bool: ...
+     def ID(self) -> Standard_GUID: ...
+     def IsDatum(self, lab: TDF_Label) -> bool: ...
+@@ -629,7 +637,8 @@ class XCAFDoc_LayerTool(TDataStd_GenericEmpty):
+     def GetLayers(self, Sh: TopoDS_Shape, aLayerLS: TDF_LabelSequence) -> bool: ...
+     @overload
+     def GetLayers(self, Sh: TopoDS_Shape) -> TColStd_HSequenceOfExtendedString: ...
+-    def GetShapesOfLayer(self, layerL: TDF_Label, ShLabels: TDF_LabelSequence) -> None: ...
++    @staticmethod
++    def GetShapesOfLayer(theLayerL: TDF_Label, theShLabels: TDF_LabelSequence) -> None: ...
+     def ID(self) -> Standard_GUID: ...
+     def IsLayer(self, lab: TDF_Label) -> bool: ...
+     @overload
+@@ -731,7 +740,8 @@ class XCAFDoc_MaterialTool(TDataStd_GenericEmpty):
+     def GetDensityForShape(ShapeL: TDF_Label) -> float: ...
+     @staticmethod
+     def GetID() -> Standard_GUID: ...
+-    def GetMaterial(self, MatL: TDF_Label, aName: TCollection_HAsciiString, aDescription: TCollection_HAsciiString, aDensName: TCollection_HAsciiString, aDensValType: TCollection_HAsciiString) -> Tuple[bool, float]: ...
++    @staticmethod
++    def GetMaterial(MatL: TDF_Label) -> Tuple[bool, str, str, float, str, str]: ...
+     def GetMaterialLabels(self, Labels: TDF_LabelSequence) -> None: ...
+     def ID(self) -> Standard_GUID: ...
+     def IsMaterial(self, lab: TDF_Label) -> bool: ...
+@@ -899,6 +909,11 @@ class XCAFDoc_ShapeTool(TDataStd_GenericEmpty):
+     def GetNamedProperties(self, theLabel: TDF_Label, theToCreate: Optional[bool] = False) -> TDataStd_NamedData: ...
+     @overload
+     def GetNamedProperties(self, theShape: TopoDS_Shape, theToCreate: Optional[bool] = False) -> TDataStd_NamedData: ...
++    @overload
++    @staticmethod
++    def GetOneShape(theLabels: TDF_LabelSequence) -> TopoDS_Shape: ...
++    @overload
++    def GetOneShape(self) -> TopoDS_Shape: ...
+     @staticmethod
+     def GetReferredShape(L: TDF_Label, Label: TDF_Label) -> bool: ...
+     @staticmethod
+@@ -1058,13 +1073,15 @@ class XCAFDoc_VisMaterialTool(TDF_Attribute):
+     def BaseLabel(self) -> TDF_Label: ...
+     @staticmethod
+     def GetID() -> Standard_GUID: ...
+-    def GetMaterial(self, theMatLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
++    @staticmethod
++    def GetMaterial(theMatLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
+     def GetMaterials(self, Labels: TDF_LabelSequence) -> None: ...
+     @overload
+     @staticmethod
+     def GetShapeMaterial(theShapeLabel: TDF_Label, theMaterialLabel: TDF_Label) -> bool: ...
+     @overload
+-    def GetShapeMaterial(self, theShapeLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
++    @staticmethod
++    def GetShapeMaterial(theShapeLabel: TDF_Label) -> XCAFDoc_VisMaterial: ...
+     @overload
+     def GetShapeMaterial(self, theShape: TopoDS_Shape, theMaterialLabel: TDF_Label) -> bool: ...
+     @overload
+@@ -1209,7 +1226,12 @@ XCAFDoc_Color_Set = XCAFDoc_Color.Set
+ XCAFDoc_Color_Set = XCAFDoc_Color.Set
+ XCAFDoc_ColorTool_AutoNaming = XCAFDoc_ColorTool.AutoNaming
+ XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
++XCAFDoc_ColorTool_GetColor = XCAFDoc_ColorTool.GetColor
+ XCAFDoc_ColorTool_GetID = XCAFDoc_ColorTool.GetID
++XCAFDoc_ColorTool_IsVisible = XCAFDoc_ColorTool.IsVisible
+ XCAFDoc_ColorTool_Set = XCAFDoc_ColorTool.Set
+ XCAFDoc_ColorTool_SetAutoNaming = XCAFDoc_ColorTool.SetAutoNaming
+ XCAFDoc_Datum_GetID = XCAFDoc_Datum.GetID
+@@ -1217,7 +1239,10 @@ XCAFDoc_Datum_Set = XCAFDoc_Datum.Set
+ XCAFDoc_Datum_Set = XCAFDoc_Datum.Set
+ XCAFDoc_DimTol_GetID = XCAFDoc_DimTol.GetID
+ XCAFDoc_DimTol_Set = XCAFDoc_DimTol.Set
++XCAFDoc_DimTolTool_GetDatumOfTolerLabels = XCAFDoc_DimTolTool.GetDatumOfTolerLabels
++XCAFDoc_DimTolTool_GetDatumWithObjectOfTolerLabels = XCAFDoc_DimTolTool.GetDatumWithObjectOfTolerLabels
+ XCAFDoc_DimTolTool_GetID = XCAFDoc_DimTolTool.GetID
++XCAFDoc_DimTolTool_GetRefShapeLabel = XCAFDoc_DimTolTool.GetRefShapeLabel
+ XCAFDoc_DimTolTool_Set = XCAFDoc_DimTolTool.Set
+ XCAFDoc_Dimension_GetID = XCAFDoc_Dimension.GetID
+ XCAFDoc_Dimension_Set = XCAFDoc_Dimension.Set
+@@ -1268,6 +1293,7 @@ XCAFDoc_GraphNode_GetDefaultGraphID = XCAFDoc_GraphNode.GetDefaultGraphID
+ XCAFDoc_GraphNode_Set = XCAFDoc_GraphNode.Set
+ XCAFDoc_GraphNode_Set = XCAFDoc_GraphNode.Set
+ XCAFDoc_LayerTool_GetID = XCAFDoc_LayerTool.GetID
++XCAFDoc_LayerTool_GetShapesOfLayer = XCAFDoc_LayerTool.GetShapesOfLayer
+ XCAFDoc_LayerTool_Set = XCAFDoc_LayerTool.Set
+ XCAFDoc_LengthUnit_GetID = XCAFDoc_LengthUnit.GetID
+ XCAFDoc_LengthUnit_Set = XCAFDoc_LengthUnit.Set
+@@ -1279,6 +1305,7 @@ XCAFDoc_Material_GetID = XCAFDoc_Material.GetID
+ XCAFDoc_Material_Set = XCAFDoc_Material.Set
+ XCAFDoc_MaterialTool_GetDensityForShape = XCAFDoc_MaterialTool.GetDensityForShape
+ XCAFDoc_MaterialTool_GetID = XCAFDoc_MaterialTool.GetID
++XCAFDoc_MaterialTool_GetMaterial = XCAFDoc_MaterialTool.GetMaterial
+ XCAFDoc_MaterialTool_Set = XCAFDoc_MaterialTool.Set
+ XCAFDoc_Note_Get = XCAFDoc_Note.Get
+ XCAFDoc_Note_IsMine = XCAFDoc_Note.IsMine
+@@ -1294,6 +1321,7 @@ XCAFDoc_ShapeTool_GetComponents = XCAFDoc_ShapeTool.GetComponents
+ XCAFDoc_ShapeTool_GetExternRefs = XCAFDoc_ShapeTool.GetExternRefs
+ XCAFDoc_ShapeTool_GetID = XCAFDoc_ShapeTool.GetID
+ XCAFDoc_ShapeTool_GetLocation = XCAFDoc_ShapeTool.GetLocation
++XCAFDoc_ShapeTool_GetOneShape = XCAFDoc_ShapeTool.GetOneShape
+ XCAFDoc_ShapeTool_GetReferredShape = XCAFDoc_ShapeTool.GetReferredShape
+ XCAFDoc_ShapeTool_GetSHUO = XCAFDoc_ShapeTool.GetSHUO
+ XCAFDoc_ShapeTool_GetSHUONextUsage = XCAFDoc_ShapeTool.GetSHUONextUsage
+@@ -1320,6 +1348,8 @@ XCAFDoc_ViewTool_GetID = XCAFDoc_ViewTool.GetID
+ XCAFDoc_ViewTool_Set = XCAFDoc_ViewTool.Set
+ XCAFDoc_VisMaterial_GetID = XCAFDoc_VisMaterial.GetID
+ XCAFDoc_VisMaterialTool_GetID = XCAFDoc_VisMaterialTool.GetID
++XCAFDoc_VisMaterialTool_GetMaterial = XCAFDoc_VisMaterialTool.GetMaterial
++XCAFDoc_VisMaterialTool_GetShapeMaterial = XCAFDoc_VisMaterialTool.GetShapeMaterial
+ XCAFDoc_VisMaterialTool_GetShapeMaterial = XCAFDoc_VisMaterialTool.GetShapeMaterial
+ XCAFDoc_VisMaterialTool_Set = XCAFDoc_VisMaterialTool.Set
+ XCAFDoc_Volume_Get = XCAFDoc_Volume.Get
+diff --git a/src/SWIG_files/wrapper/XCAFPrs.i b/src/SWIG_files/wrapper/XCAFPrs.i
+index 51f661e0..efa0d4b0 100644
+--- a/src/SWIG_files/wrapper/XCAFPrs.i
++++ b/src/SWIG_files/wrapper/XCAFPrs.i
+@@ -1019,7 +1019,7 @@ None
+ class XCAFPrs_Texture : public Graphic3d_Texture2D {
+ 	public:
+ 		/****************** XCAFPrs_Texture ******************/
+-		/**** md5 signature: f9dbe9d0fe880b67c047fad8716af896 ****/
++		/**** md5 signature: 000bd876aad38ca74535015d5e9463d7 ****/
+ 		%feature("compactdefaultargs") XCAFPrs_Texture;
+ 		%feature("autodoc", "Constructor.
+ 
+@@ -1032,7 +1032,7 @@ Returns
+ -------
+ None
+ ") XCAFPrs_Texture;
+-		 XCAFPrs_Texture(const Image_Texture & theImageSource, const Graphic3d_TextureUnit theUnit);
++		 XCAFPrs_Texture(const opencascade::handle<Image_Texture> & theImageSource, const Graphic3d_TextureUnit theUnit);
+ 
+ 		/****************** GetCompressedImage ******************/
+ 		/**** md5 signature: bad0c95151f5a884e9dbc72217977538 ****/
+@@ -1065,15 +1065,15 @@ opencascade::handle<Image_PixMap>
+ 		virtual opencascade::handle<Image_PixMap> GetImage(const opencascade::handle<Image_SupportedFormats> & theSupported);
+ 
+ 		/****************** GetImageSource ******************/
+-		/**** md5 signature: 1fa59174d8d0d408df072137f5b3fe0e ****/
++		/**** md5 signature: c24f99a1f3e5bf7521b240aa232d6d28 ****/
+ 		%feature("compactdefaultargs") GetImageSource;
+ 		%feature("autodoc", "Return image source.
+ 
+ Returns
+ -------
+-Image_Texture
++opencascade::handle<Image_Texture>
+ ") GetImageSource;
+-		const Image_Texture & GetImageSource();
++		const opencascade::handle<Image_Texture> & GetImageSource();
+ 
+ };
+ 
+
+From 44af64d633d315e52e3f18247ff8e26d0619effb Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Tue, 4 Apr 2023 03:57:57 +0200
+Subject: [PATCH 2/4] bump occt version to 7.7.1
+
+---
+ CMakeLists.txt          | 6 +++---
+ ci/conda/meta.yaml      | 6 +++---
+ src/PkgBase/__init__.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14a60d09..8cef86b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,8 +21,8 @@ project(PYTHONOCC)
+ 
+ # set pythonOCC version
+ set(PYTHONOCC_VERSION_MAJOR 7)
+-set(PYTHONOCC_VERSION_MINOR 6)
+-set(PYTHONOCC_VERSION_PATCH 3)
++set(PYTHONOCC_VERSION_MINOR 7)
++set(PYTHONOCC_VERSION_PATCH 1)
+ 
+ #  Empty for official releases, set to -dev, -rc1, etc for development releases
+ set(PYTHONOCC_VERSION_DEVEL )
+@@ -147,7 +147,7 @@ if(DEFINED OCE_INCLUDE_PATH)
+ # if OCE_INCLUDE_PATH is not passed at command line,
+ # find OCE automatically
+ else(OCE_INCLUDE_PATH)
+-  find_package(OpenCASCADE 7.7.0 REQUIRED)
++  find_package(OpenCASCADE 7.7.1 REQUIRED)
+   if(OpenCASCADE_FOUND)
+     message(STATUS "OpenCASCADE version found: " ${OpenCASCADE_MAJOR_VERSION} "." ${OpenCASCADE_MINOR_VERSION} "." ${OpenCASCADE_MAINTENANCE_VERSION})
+     message(STATUS "OpenCASCADE include directory: " ${OpenCASCADE_INCLUDE_DIR})
+diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
+index 33d91edc..8ca381de 100644
+--- a/ci/conda/meta.yaml
++++ b/ci/conda/meta.yaml
+@@ -1,4 +1,4 @@
+-{% set version = "7.7.0" %}
++{% set version = "7.7.1" %}
+ 
+ package:
+   name: pythonocc-core
+@@ -26,11 +26,11 @@ requirements:
+ 
+   host:
+     - python {{ python }}
+-    - occt ==7.7.0
++    - occt ==7.7.1
+     - numpy >=1.17
+ 
+   run:
+-    - occt ==7.7.0
++    - occt ==7.7.1
+     - six
+     - numpy >=1.17
+ 
+diff --git a/src/PkgBase/__init__.py b/src/PkgBase/__init__.py
+index 898fb48e..e90690b0 100644
+--- a/src/PkgBase/__init__.py
++++ b/src/PkgBase/__init__.py
+@@ -1,6 +1,6 @@
+ PYTHONOCC_VERSION_MAJOR = 7
+ PYTHONOCC_VERSION_MINOR = 7
+-PYTHONOCC_VERSION_PATCH = 0
++PYTHONOCC_VERSION_PATCH = 1
+ 
+ #  Empty for official releases, set to -dev, -rc1, etc for development releases
+ PYTHONOCC_VERSION_DEVEL = ''
+
+From 6ec7cc9095631de070573fc26164578f2e2c87bf Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Thu, 13 Apr 2023 16:40:05 +0200
+Subject: [PATCH 3/4] remove xvfb tests from conda build
+
+---
+ ci/conda/run_test.sh | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/ci/conda/run_test.sh b/ci/conda/run_test.sh
+index 8d0acf0a..6610b84e 100644
+--- a/ci/conda/run_test.sh
++++ b/ci/conda/run_test.sh
+@@ -2,10 +2,3 @@
+ cd ../work/test
+ python run_tests.py
+ mypy test_mypy_classic_occ_bottle.py
+-
+-if [ $(uname) == Linux ]; then
+-    # start xvfb
+-    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_pyqt5_unittest.py
+-    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_pyside2_unittest.py
+-    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_wx_unittest.py
+-fi
+
+From bcd7a2c2e0b12801416db9c0d73f2c01992e8ab5 Mon Sep 17 00:00:00 2001
+From: tpaviot <tpaviot@gmail.com>
+Date: Thu, 13 Apr 2023 17:08:51 +0200
+Subject: [PATCH 4/4] Fix DataEchange load colrs
+
+---
+ src/Extend/DataExchange.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/Extend/DataExchange.py b/src/Extend/DataExchange.py
+index 20f0c9b8..6545d83a 100644
+--- a/src/Extend/DataExchange.py
++++ b/src/Extend/DataExchange.py
+@@ -41,6 +41,7 @@ from OCC.Core.TDocStd import TDocStd_Document
+ from OCC.Core.XCAFDoc import (
+     XCAFDoc_DocumentTool_ShapeTool,
+     XCAFDoc_DocumentTool_ColorTool,
++    XCAFDoc_ColorTool,
+ )
+ from OCC.Core.STEPCAFControl import STEPCAFControl_Reader
+ from OCC.Core.TDF import TDF_LabelSequence, TDF_Label
+@@ -62,6 +63,7 @@ try:
+ except ImportError:
+     HAVE_SVGWRITE = False
+ 
++
+ ##########################
+ # Step import and export #
+ ##########################
+@@ -280,11 +282,10 @@ def read_step_file_with_names_colors(filename):
+ 
+             if not color_set:
+                 if (
+-                    color_tool.GetColor(lab, 0, c)
+-                    or color_tool.GetColor(lab, 1, c)
+-                    or color_tool.GetColor(lab, 2, c)
++                    XCAFDoc_ColorTool.GetColor(lab, 0, c)
++                    or XCAFDoc_ColorTool.GetColor(lab, 1, c)
++                    or XCAFDoc_ColorTool.GetColor(lab, 2, c)
+                 ):
+-
+                     color_tool.SetInstanceColor(shape, 0, c)
+                     color_tool.SetInstanceColor(shape, 1, c)
+                     color_tool.SetInstanceColor(shape, 2, c)
+@@ -330,9 +331,9 @@ def read_step_file_with_names_colors(filename):
+ 
+                 if not color_set:
+                     if (
+-                        color_tool.GetColor(lab_subs, 0, c)
+-                        or color_tool.GetColor(lab_subs, 1, c)
+-                        or color_tool.GetColor(lab_subs, 2, c)
++                        XCAFDoc_ColorTool.GetColor(lab_subs, 0, c)
++                        or XCAFDoc_ColorTool.GetColor(lab_subs, 1, c)
++                        or XCAFDoc_ColorTool.GetColor(lab_subs, 2, c)
+                     ):
+                         color_tool.SetInstanceColor(shape, 0, c)
+                         color_tool.SetInstanceColor(shape, 1, c)
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 1fd02e0b26a0..947435fe886e 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -6,7 +6,7 @@ archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
 hostmakedepends="python3 swig"
-makedepends="python3-devel occt-devel freetype-devel swig"
+makedepends="python3-devel occt-devel freetype-devel swig rapidjson"
 depends="python3 occt freetype"
 short_desc="Industrial strength 3D CAD Python3 package"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"

From 7407ea966eb1e233c1c1d28b5b5833fc2bd10e25 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 16 Feb 2023 19:39:39 +0530
Subject: [PATCH 0248/1854] python3-colorama: update to 0.4.6.

---
 srcpkgs/python3-colorama/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
index 36a3dda2081c..ec542c2b3b4a 100644
--- a/srcpkgs/python3-colorama/template
+++ b/srcpkgs/python3-colorama/template
@@ -1,18 +1,20 @@
 # Template file for 'python3-colorama'
 pkgname=python3-colorama
-version=0.4.5
-revision=2
-build_style=python3-module
-hostmakedepends="unzip python3-setuptools"
+version=0.4.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Cross-platform colored terminal text (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/tartley/colorama"
 changelog="https://github.com/tartley/colorama/raw/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
-checksum=e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4
+checksum=08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44
 
 post_install() {
 	vlicense LICENSE.txt
+	rm -r ${DESTDIR}/${py3_sitelib}/colorama/tests
 }

From 207e369dc5bc90a53eb4609abf772ef448ad9e0a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 00:43:08 +0530
Subject: [PATCH 0249/1854] common/build-style/python3-pep517.sh: extract
 wheels in hidden dirs

This prevents pytest from collecting tests multiple times when
they are bundled in the wheel itself alongside the source tree.

Closes: #43946 [via git-merge-pr]
---
 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 ffe52fccf3db..2d5ff7caf34e 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -19,7 +19,7 @@ do_check() {
 		testjobs="-n $XBPS_MAKEJOBS"
 	fi
 
-	local testdir="${wrksrc}/tmp/$(date +%s)"
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
 	python3 -m installer --destdir "${testdir}" \
 		${make_install_args} ${make_install_target:-dist/*.whl}
 

From 6be67280cf8403c3a3af965a616c14675393f7c4 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 5 Jun 2023 16:38:07 +0300
Subject: [PATCH 0250/1854] spotify: update to 1.2.11.

---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 8eaa25125af7..4dc3395617cd 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.2.9
+version=1.2.11
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
-distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.743.g85d9593d_amd64.deb"
-checksum=44eebb4c1a80fae48b532f6dd915ec2990489d0b6b77bf4ee800abf9ee772c81
+distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.916.geb595a67_amd64.deb"
+checksum=472bf841451c219320f1ca038915f52bd4afdf7a1c979571d6ed541ca5e26d51
 repository=nonfree
 restricted=yes
 nostrip=yes

From cedba2c82ec719b0821d3211165ed6de45f9b644 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Mon, 5 Jun 2023 08:12:45 -0400
Subject: [PATCH 0251/1854] font-iosevka: update to 24.1.1.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 55aba82b0fe2..c464f5a8d207 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=24.1.0
+version=24.1.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
 changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
 distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="52207eccbf8dc8cad208f55efb6ba692361ef6de12faa0716b36a2a123db5522
- 01cdb5c52ada9275e8a30878ef1b709283694a23b877e2f2519fe1940c6b2136"
+checksum="f452e564737131c4425c6784024d9b9fb83d24a4775ca7fb1f03e21a466137f5
+ e33e7785e34892506e60def6d6e2b38b2bb87edd9fdeaedc53913e6d0fb66ea0"
 
 font_dirs="/usr/share/fonts/TTF"
 

From cb20a44a0f41ce3762df7d2df7c8eb9cd5ed878e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 5 Jun 2023 11:56:36 +0200
Subject: [PATCH 0252/1854] linux6.3: update to 6.3.6

---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 35b5178363f6..135f88fab13f 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.5
+version=6.3.6
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- bf66d350e6a4727b8ddbd3a14ddc9033c4b80ffb6d4688269917e1a1a5e4578a"
+ 0bceca759d8c1531197b369668a8aa800b3733fcbe87cc0ecf8f014389c16fd8"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1f8ce0ed1c1fb75e950ef8d88a174618fe2d312c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 5 Jun 2023 21:50:52 +0200
Subject: [PATCH 0253/1854] lazygit: update to 0.38.2.

---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 77ca7aaf2703..aee7817a109b 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.38.1
+version=0.38.2
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ 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=144f55267df7d51be9ae1dc3313707a7f6bcdf0c42eb330667c1fd661dec01b8
+checksum=2e727db952022c0518443d18c9b8a97a882970b93c5ab198ff33bb8ed2166c2f
 
 post_install() {
 	vlicense LICENSE

From 6facc326a8390788d1eff0f15371b130ace7f403 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 1 Jun 2023 13:55:30 +0530
Subject: [PATCH 0254/1854] tree: update to 2.1.1.

Adopt.
---
 srcpkgs/tree/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index b74113a90c14..3f819f254a8c 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -1,15 +1,15 @@
 # Template file for 'tree'
 pkgname=tree
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=gnu-makefile
 short_desc="Recursive directory listing program"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-2.0-or-later"
 homepage="https://mama.indstate.edu/users/ice/tree"
 changelog="https://mama.indstate.edu/users/ice/tree/changes.html"
 distfiles="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${version}/unix-tree-${version}.tar.gz"
-checksum=e9f829a03996451bcf90fae4fdee4285bece6dc1a89de92a3f8e6cad29e03c71
+checksum=bcd2a0327ad40592a9c43e09a4d2ef834e6f17aa9a59012a5fb1007950b5eced
 
 do_install() {
 	make MANDIR=${DESTDIR}/usr/share/man DESTDIR=${DESTDIR}/usr/bin install

From 6b0efae720b1c5a07895b614eda2fb7da2e359bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Jun 2023 23:07:55 -0400
Subject: [PATCH 0255/1854] vivaldi: update to 6.0.2979.25.

---
 srcpkgs/vivaldi/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 2156fa12d550..12b5400171bf 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
 # Permission to redistribute is granted.
 # see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.0.2979.22
+version=6.0.2979.25
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ 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=b8dda705696e965c693993f63f3542c0a70d98ef579834b75a214e729d1d3aa8
+	checksum=9b737b76f3ad4676b71582d97643e301f19117828027c5e50e5a469d3a00c156
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=c7bc016ddec176eae758615e1c3e6461be6dd3fcc611741a5306c79cd03888c1
+	checksum=b918fd16b71943de7f2775ce9bf8ad4637e35a41a05f1a3aade1d5eb2667c012
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=948fed1e8f50a0f94e91985fb86e99b3557d9e0dfb55afa9dc6e840d8a071ba8
+	checksum=e0dfd628ca39962f3772687548d181a0fe5e3be823f8935368514983060b101a
 	;;
 *)
 	broken="No distfiles available for this target"

From 2903b2ea6b290064f31a573f8a9433dbad133ea0 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 28 May 2023 17:48:18 +0300
Subject: [PATCH 0256/1854] gc: Update to 8.2.4

---
 srcpkgs/gc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index a62033103920..61935cc0b664 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -1,6 +1,6 @@
 # Template file for 'gc'
 pkgname=gc
-version=8.2.2
+version=8.2.4
 revision=1
 build_style=gnu-configure
 # libatomic_ops is replaced by C11 atomic
@@ -11,7 +11,7 @@ maintainer="Ivan Maidanski <ivmai@mail.ru>"
 license="MIT"
 homepage="https://www.hboehm.info/gc/"
 distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
-checksum=f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0
+checksum=3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/include/gc/

From 78d2d0ce4c689b9ddedf6f82cc83427b60401fd6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 00:55:54 +0200
Subject: [PATCH 0257/1854] firefox: update to 114.0.

---
 ...the-vendored-glean_parser-for-all-of.patch | 39 ----------
 .../firefox/patches/avoid-redefinition.patch  | 15 ----
 srcpkgs/firefox/patches/skia-sucks1.patch     | 77 -------------------
 srcpkgs/firefox/patches/skia-sucks2.patch     | 44 -----------
 srcpkgs/firefox/patches/skia-sucks3.patch     | 32 --------
 srcpkgs/firefox/template                      |  7 +-
 6 files changed, 4 insertions(+), 210 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
 delete mode 100644 srcpkgs/firefox/patches/avoid-redefinition.patch
 delete mode 100644 srcpkgs/firefox/patches/skia-sucks1.patch
 delete mode 100644 srcpkgs/firefox/patches/skia-sucks2.patch
 delete mode 100644 srcpkgs/firefox/patches/skia-sucks3.patch

diff --git a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
deleted file mode 100644
index 3a7118ec69ca..000000000000
--- a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ahochheiden <ahochheiden@mozilla.com>
-Date: Sat, 6 May 2023 21:07:09 +0000
-Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of
- `mach` r=firefox-build-system-reviewers,glandium
-
-Differential Revision: https://phabricator.services.mozilla.com/D177340
----
- python/sites/build.txt       | 1 -
- python/sites/mach.txt        | 1 +
- python/sites/python-test.txt | 1 -
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/python/sites/build.txt b/python/sites/build.txt
-index b43f7680d200..4e6f6c51d9ad 100644
---- a/python/sites/build.txt
-+++ b/python/sites/build.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pth:third_party/python/vsdownload
-diff --git a/python/sites/mach.txt b/python/sites/mach.txt
-index b9fafd0b9c59..a18691184312 100644
---- a/python/sites/mach.txt
-+++ b/python/sites/mach.txt
-@@ -78,6 +78,7 @@ vendored:third_party/python/esprima
- vendored:third_party/python/fluent.migrate
- vendored:third_party/python/fluent.syntax
- vendored:third_party/python/giturlparse
-+vendored:third_party/python/glean_parser
- vendored:third_party/python/gyp/pylib
- vendored:third_party/python/idna
- vendored:third_party/python/importlib_metadata
-diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt
-index 48cdcd2b8f48..74889365a22b 100644
---- a/python/sites/python-test.txt
-+++ b/python/sites/python-test.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pypi:pytest==7.0.1
diff --git a/srcpkgs/firefox/patches/avoid-redefinition.patch b/srcpkgs/firefox/patches/avoid-redefinition.patch
deleted file mode 100644
index 867d37c62a90..000000000000
--- a/srcpkgs/firefox/patches/avoid-redefinition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Rasmus Thomsen <oss@cogitri.dev>
-Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
-(linux/if.h), leading to redefinitions. We need to include net/if.h before
-linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
-Upstream: No
---- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:32.359751046 +0200
-+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
-@@ -31,6 +31,7 @@
- */
- 
- #if defined(LINUX)
-+#include <net/if.h>
- #include "addrs-netlink.h"
- #include <csi_platform.h>
- #include <assert.h>
diff --git a/srcpkgs/firefox/patches/skia-sucks1.patch b/srcpkgs/firefox/patches/skia-sucks1.patch
deleted file mode 100644
index cd9eecccf610..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
-https://bugzilla.mozilla.org/attachment.cgi?id=9028600
-
---- a/gfx/skia/skia/third_party/skcms/skcms.cc
-+++ b/gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -30,6 +30,8 @@
-         #include <avx512fintrin.h>
-         #include <avx512dqintrin.h>
-     #endif
-+#elif defined(__BIG_ENDIAN__)
-+    #define SKCMS_PORTABLE
- #endif
- 
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
- static uint16_t read_big_u16(const uint8_t* ptr) {
-     uint16_t be;
-     memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
--    return _byteswap_ushort(be);
-+#if defined(__BIG_ENDIAN__)
-+    return be;
- #else
-+    #if defined(_MSC_VER)
-+    return _byteswap_ushort(be);
-+    #else
-     return __builtin_bswap16(be);
-+    #endif
- #endif
- }
- 
- static uint32_t read_big_u32(const uint8_t* ptr) {
-     uint32_t be;
-     memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
--    return _byteswap_ulong(be);
-+#if defined(__BIG_ENDIAN__)
-+    return be;
- #else
-+    #if defined(_MSC_VER)
-+    return _byteswap_ulong(be);
-+    #else
-     return __builtin_bswap32(be);
-+    #endif
- #endif
- }
- 
---- a/gfx/2d/DrawTargetSkia.cpp
-+++ b/gfx/2d/DrawTargetSkia.cpp
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
-   return surfaceBounds.Intersect(bounds);
- }
- 
--static const int kARGBAlphaOffset =
--    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;
- 
- static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
-                              const int32_t aStride, SurfaceFormat aFormat) {
---- a/gfx/2d/Types.h
-+++ b/gfx/2d/Types.h
-@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
-   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
-   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
--  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
--  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
--#else
--#  error "bad endianness"
--#endif
- 
-   // The following values are OS and endian-independent synonyms.
-   //
diff --git a/srcpkgs/firefox/patches/skia-sucks2.patch b/srcpkgs/firefox/patches/skia-sucks2.patch
deleted file mode 100644
index 1a498f8711dd..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# Parent  aecb4600e5da17443b224c79eee178c1d8e155e3
-For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
-right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
-
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- a/gfx/skia/skia/include/private/SkNx.h	Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
-     AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
-     AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
- 
-+    // On Big endian the commented out variant doesn't work,
-+    // and honestly, I have no idea why it exists in the first place.
-+    // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+    // which gets a 64-bit integer, and FromBits returns 32-bit,
-+    // cutting off the wrong half again.
-+    // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+    // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+    AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
-     AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
-     AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
-     AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
- 
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
-             //   ~~~>
-             // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
-             // c = 0*aa + d(1-1*aa) =      d(1-aa)
-+
-+            // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+            return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
-             return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
-                  + d.approxMulDiv255(aa.inv());
-         };
-         while (h --> 0) {
diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch
deleted file mode 100644
index 4bf77e684405..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
-
-# HG changeset patch
-# Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
-                     On big endian this is broken and instead of fading out, the 
-                     tab gets white and the font transparent, leading to an unreadable
-                     tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
-          to byte-swap the correct buffer, but I could not find it.
-          So the next best thing is to deactivate the fading-effect. Now all tab-titles
-          are readable, albeit not as pretty to look at as they could be. 
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- a/gfx/2d/DrawTargetSkia.cpp	Tue Oct 22 12:27:22 2019 +0200
-+++ b/gfx/2d/DrawTargetSkia.cpp	Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
-       SkCanvas::kPreserveLCDText_SaveLayerFlag |
-           (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
- 
-+#if MOZ_BIG_ENDIAN()
-+  // Pushing a layer where an aMask is defined produces wrong output.
-+  // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+  // Therefore I deactivate those layers in the meantime.
-+  // The result is: Tab-titles that are longer than the available space should be faded out.
-+  //                The fading doesn't work, so we deactivate the fading-effect here.
-+  if (!aMask)
-+#endif
-   mCanvas->saveLayer(saveRec);
- 
-   SetPermitSubpixelAA(aOpaque);
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 85a14d933c65..3bf78b037413 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,16 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=113.0
+version=114.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
-distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627
+# distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz"
+distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"
+checksum=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6
 
 lib32disabled=yes
 

From bfa7d334aa8087d6c82554b980c69105c4f987ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 15:36:35 +0200
Subject: [PATCH 0258/1854] firefox-i18n: update to 114.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9c721ea35982..7c94212c279a 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=113.0
+version=114.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d36df7a481a96ab6ac74ba4cc33e0ee72e91caa2bfe55b97a17d9794d2a3c4e8
- 21d502f5e1d25ee0ea4b3709afc7e9575f629cd15737e21aed19c1f148fd57d1
- ee8d0193cfd2ed426044352d957026e91f31d6c1de680080e6d27ae08cf70ec1
- dca830694cccbecd46e74950d14fa46c3f43614551fb7f75e3b537275a9d50fa
- 2b84cea51df01c5959d1b1012f3ac2e411b9da26b2264b18b59553a814f3ef8e
- 4fe334dce9241ad92b93e09c66124d42841a1e724e359cbb0c50e6000f2f9fc5
- 8b895a7879c8bb652ff56e390e0da4889a4774f30f1976f11b13afe8e7a72994
- 6a6a2cc943c146a98180ed5e862a2c279a08702f89d4074beec01a64f55b98a1
- 06144c4d43188e20d3325c2799a61b87808b587dc0136ac817d890a0cd91bf25
- 0f3d153bde7f1a6afb2a598fe98e95c41f5d14f78191db7b353220557e40e5d5
- a3ff7e5536d4ff85b06ca4f8ffacee45cf1ba73c0662593a14bac544139cc3f9
- 85be7ecde1bfeea1f1f477f2b808de51c74f01d2228966f31e60abe06279049e
- 156747a491aaf8744bd37a085a5b3959d1c00a4edac14ed859690cf980aae709
- bd31e4c6331cc249f114eb9ef7a454d99482fb05c0f0f0e8d4507948d7c113b5
- 0373f78a7bbe79d849c11bec495893c5e99f40c20d3b674acb9704126cd49741
- f6c3f8edc69a07692a8fba5ad37a04e46f246bb9e2f085da5a97caa024d19828
- ca9c9f07abd3feec4dc6cd375f3a2c8841ee19bd69585c6d70ad950c18879adc
- 3626081b50619d66cb88e14eaf71caa97a2b48d79f69cac3a5bb919633f87d04
- b0a4b03cb247c8f0c87c9dee819cc47ff6ced32cb3c89773233a08963975ea36
- 6ae2fdf3c67a676112befb69b0c66709f2acadfeb1d7696315e331cd61dc96bf
- 998bd6ee63d6388c0631524992d7c4d050f8f005d37b0c593e531bfaf6a4a2d1
- 3729bcd73ccc966f0d73f7e32aadb2bfbb9559466c69550602bedad2a78bf500
- 06acc903cfbb6b7f683ae738b733972e451ab6a14b28f7975c2884ae59701ec4
- b1938f51754971be1fa5fcccccdfcba6fa63a845746e47f666efd050042141c1
- 57400cd4597926629ab8f22e5f4722e0234f5727441906708786bbe6843fbf22
- fd42ffc5e14bd3526d8fea876a1e18df379e5f75c1f10368641dee1d6eebbb23
- cc351cb54675a908b20226b13354e189b6a3fc38a5c039116b1f2258af0f479f
- df0794bb5b2e78aec73ecdc779458e9a86f756b5e2f37acec6e227543dc1b3d0
- c750bac67017e0784cf58fb06e92e2bc52688a16a3773825a1a6e0df84ef233a
- a4a11e68fcd10aadd62b0cb10533ffd43a1c98a3e1db535e119cac0df5613f3a
- d489aeb8ca63f97778fa309d43529838349918414188dce598d29b20c59da533
- 438efaaae1867ab1b37fe23283c2bfe666d73288c76f482f339bcdf27a4eb7dd
- d52e1c96fa56d3bd8f152bb4b2e9c9a9e2edc2c4fad81869b1962b06ebb4c283
- 9f442e9e8c819791cb78fe655c53129b9a5d0b8090079ab74b45b7f7d1515a5b
- 8a17ed68d41be60e18ecbe2becff41912305e7fb86384b7d1fc89dd767fa21d5
- 891591bcde2190b87be25d5d57777608b8f8cea06d58c8a60d09d18809b42856
- 9e57d9348c392adfbb14debfc3aa474116007241109ca421a369ef5865cca480
- ea9bf771e9e792a2a1723093c3f3d522681f638c5dc30c0dae6dde0a68648961
- bf9e2e72dfcdb609064a0c0f503001f270257045b3f0b455470bccfbab0476b9
- 0f4f2eea09738aea94c0afec45f0bec34dbae9c4bd922634c82735d3a703f292
- bc228183f6e3c563ade71fd4c64784aa0c0a0e5e108ac04c055e9bcd9836bb86
- 95c0605bffcef0d327830fa14aea895d54b4c18cc38122e49ce115c9a7afb47f
- ee2753898e65d344ad7bc9642ec0a2e05a7880ebee03112c1190cd001c15b4b9
- 9a14eae682acd9044b4227adf33ec1d2e0e4ecad75791fecfd355871d27eb047
- 60db4ea466aa513ca24c4051f0c048bd09e6feb0935b7789cbe4331ad4888cdc
- 9f75ea79337d72287bf6738fb62f6f5abb0bd67e306c331ae1feb412ec160482
- 8a8e4d03059b5bd2ed73870e89f31b20b6ef4d644487d2e048eb422f59a3649b
- 26e0a1db066ec73688d607243f90c98b77806cd67bee504345f6de1e24915f4c
- 7c274bc5c13c6e0b7b2e6674f1e2af791b81eceb0bd722ef5a80e921a97bd903
- a34e84cd85b434885ba7b7b5824b293d8a8a9f23cceb23f79a802236eb6dde1e
- 9aaf343698c7666394b393154ffcf248d87d226fe577e5563afd2de602249c2f
- fef917c385f92ac3dc95aff1d2e9f78eb7afe9d74895c87a7051d770ac887987
- 11729bfef6adcea46e77b1c96dc2b40d3989ffa36ba65f3782f9453f5533b2ae
- 177164301e02565efb226aa525e5b5b2bfd7cd904f5456e15350284f31f3f223
- 45310e7db684e38f404fc4b805e39bbe7a5bae4028beab38311e6aaf2a31fe2b
- 5a25567e3c83bc7a57d16df9f5f669fb1b4e90f5bf1c483280cac6a00e86537c
- ce1295de439ca8476195ac7c4041608669705943c60e883f678a20f0cb7f58e6
- 075b9a3867ddee26ad61441939b4d431329b9605bb86125b29e719e81a0a2c68
- aabf6cef613b20f1fdecd91fcc347275a7c1bc0ef1d18e55e5a245bf6735818e
- 4afde707b110688d130a865969a5ebd78cc7876f74ac151624705fd9f3a8e275
- 3f11b5ea15424f75544378a913eff10f2f9802610541aa24dca72ee2503ef35d
- d0cb5f452064685162686ba49a7b4f5ec6998c726d415c72f178b2db4ef523e3
- 917fe99ea4ce119c418d52d071e6662c8cb9c6190939111142a1daabc4091fd0
- 8eafb1a687d8b8072c6caec83f9ca80d03699f0a182629c2087fe77c2f354fd2
- dcd54b26247e4563d675c612ca7c471fd2588fe9beda9c077695a2f5a673cdde
- 93e71b7dd69dec0d992829ecd7362369a8a2c6070900d93879693d4ea5a1ef32
- 5ba8d4c71ff5b915e20d9d5eab5f57d2daf971cf1b3f0b12dc2fd25755bf6303
- 6b6a82733fec2611d62fafc00dd3de8bc7f7018a8ea9c1f1f7f8d11b599e2a23
- a7cb00209f94b3cb18db773f6d7ab568c416c3604b2d109135b9521f89e2371c
- 0f14e9cee9d13549d418bde6fb20c2827297e673bea582ac1cf085b8d763861e
- 897f391a66e95dc41f52c480a162239f76bac3cf7209152e7e610a19facee29f
- 6a5fdeefc438825d60ad5f8ff14615de43c4a332f01c275e9c2a4a66dd5a4fdb
- e1ea24d2cfa6fc4b490ac81755920b9b8f6f481666d56a66be6fde2539b2080d
- fcf415b511a74d57b1cfa92a22eabd5e3bc30f42642c754e07c429b8caffc714
- 38021f594397a1078fb5be7d584a15dae70f9663681f6f33ef9d14f2a3b91d93
- 32d56004e40dc59240060f0eb84bb761a67f4545d73856775eac41c79c25fdec
- 0bac15f959317aab370995793e585b331b181536b5b40cfcf59100b81a086f38
- 54ec4111d38fd2c4ce4dbfbb86a4517466102d1fd871f6f4f73e4f8cf59a998e
- 353fb938fd4641fd65b10cf54d9f40f703cec74a3d5316126478903eec3f9435
- c43a49feff2ffe483599e286631a2f3bbad61fe90182b8d0acd5468115590971
- f9ebe4290302e434ac774cf21bd5397d438c9e6478b778bd2b2c2bd5f95c3399
- 19a21659c6fb216e5d594ca35f62453de7ceaf88408a52444b40f8dc23d64f17
- 1294a7fdf7e36a3abb2b89222e97d4aaa6dcc2b36bff5319843a64122c692160
- d9f184a76008b8d2be832086b1f53baea3eff988993fd683c5cb2bcd1d240f4f
- c38edc9bfb0ac02bf4972811f50baa3cb237c1e7d626237b8c7c08d520e1246d
- afce22b71757920587de3ff5a5c12fe3dd7b53daf9110ffde6c09c69545edd0e
- fb754a736658035849341f2d01d1f48bb06b09c7f1ee9e6749e0580c7c9cb903
- 30c5079f9c514b7b9e8bc44fd67bd44e4a5b42457c9c76a2ca606a8bf5d62bde
- abf2d8a5d2c8736ffbede3844101a3bd9ea977a0dbca091c2b87871e3bbe96c3
- 7fd38252dd62fe45a732dd322e920ab90533d533f947322db80c48773262a827
- 01db872a78484ee2ed53060810ab46927572d4af92c727b0e03e5337ad2a6fa5
- 944cd12f408e49e0fd4bb79205f9ce9ee007b64d923a3c1d83c1e0cc7f494621
- 6bf5b9d2f30ded74ebdf32933148fe7a478cffff9353379b72f0482ea0991f10
- 1da211f718c88aa8252be97c7a5703d54e9c65599a24121d80853174e9e7dd60
- f2fdd09021e69566d750e34404866235f0f395ead48b36db35738192de557ad0
- da39e10a5598ab69b756872efcaad594fe52dda0e533e7a0d56ad1cdc8859a43"
+checksum="c0f9a6c3d766c08f3676602696d8798b679ec1388cd5392a1b8668ffee145ffa
+ 26e309adb10d6ee133a5e1d47d969b04da06a9aaafb915080ab6d039bd7c9995
+ 5275570c342f09f90a735bb264810c7f4ae1fbc8e18d9a4944a95569682daf62
+ 4f6b16a79b454c72f8fdc0e4800e7a085c392a3204cf2173fb85853568820fe9
+ 34423da9b8cf41b280a3c6dc998da72004bc2ea0245dcb59af6cbe26a6683b68
+ e37ca54dbd3506ca177e812305c5ba870584131a16958b8c46c7f2159172982d
+ 0db3c23472f6b45d158b9de5220040821e89be207767910121040e9cba949f92
+ 38e9cccd6791e769fd9016c2e0a3d5aafb6a2090c1c60326f03907aac0991325
+ f3bec565c0c4c1bd7b659e4c4922d2d33ed5ebc1dd81e9d7b5a23c510da325a0
+ 045ff5e6a99bacdeb1421061fb01a1fc71a76e12c9205cdd1fc58391cd89a613
+ 7aa85724f5b31d31c3108700bf0d2efca74105c5e0df72c6a79b1913f5058152
+ 6a1fd174df2343abe8a74f219c32cbf457f3914c0dd3c96949d947dedafec8b1
+ 559b6c47830caaae13ea507cec2268e4469ee1b90504cdfa1252e5d6295d9a7c
+ ff96e801074a1343ea9a122d3078250a961eb7da29ecac542a0c84186a17f010
+ d0f973e086135861ce2e5e26e1e56bf9b21503d06fb732c8b918f426d55348f6
+ aee67eb0b05c7c06b23aca4af3e473ddc75c9570a3d866675bb30c0fa409f2c0
+ 20e9c7514e8e4a135c36cfd32177fbb000072e2fe3b7a38ea3e08ec2064d9633
+ 6adfd2d6f9667472b0665f0370c2eb582355ca370ea046028741b91c16aa76b2
+ c2a9d90d8a46a3f0070c031c48dcc09fcb33b8d571881578ae541984f0f98ff5
+ 797686f4f8ad9279e8b080ba39cf52f049235ff4ce6e61ca0fe65f9d479a2d45
+ 9ea3dc01ba7d9389d4514626f5cb1597063f7e68401ea13522a74ac777cde4cb
+ 3e02c13156f87af7a25e826f8f72487004c3b64675be73e53eaa55f45a4b0147
+ a2561641f64b428f34ec4d5215b97a6ae945df31b347c282e4f33a1fe82c5bc1
+ 93a4955b0952613b931c2574fa9c6ed251a08df32f46304b3ead002bbe701ec9
+ f1bab7c5b208ebb5ac87a5006a236fe09727be260bdd3b0f7b520a0ed91366d8
+ c7ff4fee557227e6dbf87a1bd12205217710e41028066b0da3ed46adc3df2944
+ 7f6f51cc45674f07f905107d2b6ea1770c39ccf1b8a5782e6bab964fcccc39a2
+ a28453e1d0727297918fb3a83bd68090598c5ddd0386e5cbd21b5ead68cd8d2e
+ 5b88a842efc8b8adccf314734e56ef5570e8823614f03b1023e7f3ba6ae904bf
+ 0f607d174af36790046d1ce2219dd341e557af524f22d8afa504538e047d9081
+ 85a57d3d4746f6e43c3f24ca9d7c2d873ba48166772c0a127485381b4017d9d2
+ ed68f1678df1cedc204c2ebc6363f5ccc82562f684f45455169ffce3a94860ab
+ da0e4e3abc51b101e84450ef84f77b3709ef21d7db3f401f4449fab69966ff62
+ b474686d3b54e00ef1c3606dc432c64a4f3b1f56321cc1b28cd0737e7e313ab8
+ c2c27f1b46fdf4288fd04ff8554443542ce6821cdb7c13e3ddc7bf51c4b62c0a
+ 342230adbb31f5e07b5a89ded0bd860fe76a1cb638953383de5c690fead75050
+ 48d5d27014991eebd2f3cd86ddce13807753fba0c67af32f4665db3685b45ee0
+ e9a5d2be6f3e69570abefcf58390ffecf911efcbb096601f6ea326797d9950e3
+ 0185575560595cd58b8526ba5450c395b0c513e360b523e57be37c3d0af05744
+ e5abcec84157c0085f99b2f4d0cce258d3dd496a8edb7fa208937da8fa7436a3
+ 4d3f1274da892de438c0d0e1003dd06509a7c21b60e7df3f91cbec463021a9db
+ 61356d776b6341a0802ad6974bfd133db0b93b5430eb55d21167049a8626b603
+ 8968f1a77e30680209df33cc6282797ef0e24164ca65141e232d8bc3fbff8123
+ cc4769a1372fe19d1d64afb2660d71eb012f518a731fe2a3b1fc4d38cab285f0
+ b3cfcc9e008fd1800d6688d5180e9fbcbb0336e16e444f81715ffca4d1ddc96f
+ 96592a74d16993e03fd202be691f2e3bc9ac6e2d9fa50a6de0670f46e71b203b
+ 1644d3bfd7e4c2b537a7a52b25b7f9cd808ddbaf86e026be91536c62252cd792
+ 63e53aee3ca63d086778c3b66d2e0530c23e901dc4e2a437e8bdba7bcb6ee720
+ 49e78397cd9d8ec6ce22f6503f89132009ecf028719f5b5ddd1164922184ffa5
+ 12ec633c84011216239334c2f08eaa7ec4e4fa4f9c4d9277d6275a84f6df467f
+ 825410ee4860f3466803725a7a604530b5641779f819f48e3fd47b5831a47659
+ cab3fdae9481f6b8d4f81b91377771022de050a5da63d970b0b35c9a4c8c82f1
+ aa56bd371cf1096c65e2c76073d25d69ecc8018be8487e14cac370bd9f5d45b1
+ 0a18c294ef2a89150acc6521898bed8276806ca607bbb87c6e01c30cc3f6f697
+ fc5e0b80bb4dda023a18d46f3f686981a13bfb364d6d29e4e46cf1f58381daf2
+ 6f15404bca77866c663e8ba1c727ff40007700ca0d36f0e5559e417e654d3b64
+ f0b77a56215baf8546b06a69e7211319af04e3baeb5c06a0fe0519787d949d8c
+ 0a8c4f3c3f541cf4be8ac72c5d8e9cc85852568ece273f4173c71eb637d406e7
+ 23a448de4027b9b2b7d3ad46d3a53411289a2d9b8fdfcbf2b9d9094d0269ff34
+ 3890f6fcc967db23914ee090edd31ca03622e359d7ca7fe5ebb92a203d63f17e
+ f14464fee583c0afe7022db7e6d5dd607782a5f04c9e0caef7dfab6ab135f609
+ 82baa25118153388a0ab7b9c2ec4d89ad52c1acd380141e0bb301bb698371563
+ 39da2bd341d58d4686b2609772d2e40c04183a4046ef4de5bf02821cd550d864
+ ca2e41b6c29c062f40cbf8b5ebb9badfde0457350169b6ae201f607f3dc25813
+ 752168e60f96d2b01275afc1ffcf7b8ad9f3383a05d6f99c76d7f8b2052189e9
+ 37cac85f7af9cb2edc726cb8336dead32ed2f10ab6e72547c799e0dae455148a
+ da58c2ba13252a42551629e66771e8254fdc4e80fff7e7fab40baeec8adc201c
+ 050b33dba495f812910ee3a53affd7eae61ce2456b148a33e1883e06c6beb73e
+ 16d619c02edb3179a30f7af5aea14d0c01266d46f0663b76fbcf71de29b27af8
+ 1eadb108e6271cd74ef0a3328dd277cb92765ff0b8d72d922a979d0ed9710944
+ ac5352956096a0eb869759cbbc0e04acc95a3be677b5ef56f2b237ae74567632
+ cc2035801a929b67b97d5185480757eb51fd8063e360a7bd0d2cecea6edda2e4
+ 62d73008f29ffc7078d1e2bddb36f360044f28a3bab820832b6ea82b07582048
+ 129981bf7628f49fba9522636211405b66fb14159f76c557b93d6d810c672cc2
+ ba6a082b4c41594d1fa671269357f7f814c169f0c62e343164ea86957cb0c748
+ 33de6d30b7a9337b299d083bf5ede792f785c17e4bf3a9c85dcecd7abb0ea4ef
+ b8d14e07fdbd034d4241de6a77c6bfed38b54726ec770ea25442a947fd9a821f
+ 86436adc98e9f449ca2dcdf076042987400d62f8acf9458abf7cd98c327751e8
+ ba69da64c6ab3d416759818e420259023a4d64434b27cb604d6491737e7e4a33
+ ff239bdcb54a03dad3210b9457231e56a38e306220ec981c1f29307d73620fa4
+ 3ebb85c2974c9d69f4e9c816f338da304a58469034997f83f0cd9056c4acb6d3
+ 5315ff187fe3fddfc39000a7164ff3b42938059978eb322ba222a43d2a1145d1
+ 0f768dd1b87e34b347e32d5f06691b68d7747654faf2586a673154d777a2765f
+ 802537e360788ec58d697c17cd0333e8fcfc92ce3161d19cedc2a4841825d0ca
+ 6722b217cd12f3a6502f14865fbf02bae8dceeb98f7a593840a88d57829cbbed
+ a0d85d09f3bda6a1416240a252ec4cfc916cf37b98c72185a6b97e3b7b50251d
+ 0a48ee5ae79e98d8b07adfef4eaacf93b19011ec3a667bfca3fc0098e348ab8c
+ 4b559d090fe138fabc031b27b1cf5a0d67c0a036f646fa4430fe8c4c9f6b0e37
+ 3c9b56539542ace8a6481400800367a07e980ebaad213caba3e5fe2da15bef9b
+ 0b27ce7aa8ff4b09d5f42c1525d89505d2b159c7d9051b3e1dcb60ed67a0be5c
+ b9fcbc9063278b77c652ed738913c1d9506306796af41c42fbe5ff2bae721fe1
+ 625c2e19caa24046e624383501a395bdbbbf39594e742cc40e31d85cdc3eadce
+ 5b397388706d49d413b745ca17f0776f8db6c81b3b6001d0490b3f1163d50ff3
+ 03bb0e45f2038e8dd5d57ad131c163ddcd135cbf1b42371670bef4fa2fdf8da3
+ 8b11f723ba5a973cf3639fa03e860e29f7427c8d8e68d278d5770ec83a6fb903
+ 6ded563d8f5ae096ed6f3c58dd19277333dae81fda96832a50a5040ef79ca35b"

From 0e2b892efb13dee02decbcc971fa6ec4e4809b21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:06:35 -0400
Subject: [PATCH 0259/1854] New package: python3-lazy_loader-0.2

---
 srcpkgs/python3-lazy_loader/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-lazy_loader/template

diff --git a/srcpkgs/python3-lazy_loader/template b/srcpkgs/python3-lazy_loader/template
new file mode 100644
index 000000000000..492c98124834
--- /dev/null
+++ b/srcpkgs/python3-lazy_loader/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-lazy_loader'
+pkgname=python3-lazy_loader
+version=0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="Populate Python namespace without incurring immediate import costs"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/scientific-python/lazy_loader"
+changelog="https://raw.githubusercontent.com/scientific-python/lazy_loader/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/l/lazy_loader/lazy_loader-${version}.tar.gz"
+checksum=0edc7a5175c400acb108f283749951fefdadedeb00adcec6e88b974a9254f18a
+
+post_install() {
+	vlicense LICENSE.md
+}

From a41ca937b2bbc28476f4c82aecaa7f5895c96096 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:06:36 -0400
Subject: [PATCH 0260/1854] New package: python3-pyproject-metadata-0.7.1

---
 srcpkgs/python3-pyproject-metadata/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pyproject-metadata/template

diff --git a/srcpkgs/python3-pyproject-metadata/template b/srcpkgs/python3-pyproject-metadata/template
new file mode 100644
index 000000000000..fcf5c5d22593
--- /dev/null
+++ b/srcpkgs/python3-pyproject-metadata/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproject-metadata'
+pkgname=python3-pyproject-metadata
+version=0.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core python3-wheel"
+depends="python3-packaging"
+short_desc="PEP 621 metadata parsing"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://pep621.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/FFY00/python-pyproject-metadata/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyproject-metadata/pyproject-metadata-${version}.tar.gz"
+checksum=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67
+make_check=no # tarball includes no tests
+
+post_install() {
+	vlicense LICENSE
+}

From f810686900e1a4a9b424df3b29472f99981c5c1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:48:57 -0400
Subject: [PATCH 0261/1854] New package: python3-meson-python-0.13.1

---
 srcpkgs/python3-meson-python/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-meson-python/template

diff --git a/srcpkgs/python3-meson-python/template b/srcpkgs/python3-meson-python/template
new file mode 100644
index 000000000000..57f3b808c83e
--- /dev/null
+++ b/srcpkgs/python3-meson-python/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-meson-python'
+pkgname=python3-meson-python
+version=0.13.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="meson python3-pyproject-metadata"
+depends="meson python3-pyproject-metadata patchelf"
+short_desc="Meson PEP 517 Python build backend"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://meson-python.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/mesonbuild/meson-python/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/m/meson_python/meson_python-${version}.tar.gz"
+checksum=63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618
+# tests require custom-built executables, need reconciliation with xbps-src env
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 4720168046ff237342cd320646f887a54a5c3a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:09:26 -0400
Subject: [PATCH 0262/1854] python3-scikit-image: update to 0.21.0.

---
 .../patches/meson-cross.patch                 | 93 +++++++++++++++++++
 .../patches/numpy-version.patch               | 14 +++
 srcpkgs/python3-scikit-image/template         | 59 +++++++++---
 3 files changed, 151 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/python3-scikit-image/patches/meson-cross.patch
 create mode 100644 srcpkgs/python3-scikit-image/patches/numpy-version.patch

diff --git a/srcpkgs/python3-scikit-image/patches/meson-cross.patch b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
new file mode 100644
index 000000000000..8807a612f665
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
@@ -0,0 +1,93 @@
+From 8789a3365282a4f5604e090a10c960e710d240b9 Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh@sideband.org>
+Date: Tue, 6 Jun 2023 10:05:25 -0400
+Subject: [PATCH] meson: allow proper selection of NumPy, Pythran in cross
+ builds
+
+---
+ skimage/meson.build | 62 +++++++++++++++++++++++++++------------------
+ 1 file changed, 38 insertions(+), 24 deletions(-)
+
+diff --git a/skimage/meson.build b/skimage/meson.build
+index 28c831312..c168389d7 100644
+--- a/skimage/meson.build
++++ b/skimage/meson.build
+@@ -29,37 +29,51 @@ if is_windows
+   endif
+ endif
+ 
+-# NumPy include directory - needed in all submodules
+-incdir_numpy = run_command(py3,
+-  [
+-    '-c',
+-    'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
+-  ],
+-  check: true
+-).stdout().strip()
++# Both NumPy and Pythran require header files that may differ between the build
++# system and the host system in a cross-compilation environment. To accommodate
++# these cases, we can query user-defined properties that can be specified in
++# the 'properties' section of a Meson cross file:
++#
++#   [properties]
++#   numpy-include-dir = '/path/to/numpy/includes'
++#   pythran-include-dir = '/path/to/pythran/includes'
++#
++# In the absence of explicitly configured paths, just run the build Python and
++# try to query the Python packages for their paths directly.
++
++# NumPy include directory
++incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
++if incdir_numpy == 'not-given'
++  # If not specified, try to query NumPy from the build python
++  incdir_numpy = run_command(py3,
++    [
++      '-c',
++      'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
++    ],
++    check: true
++  ).stdout().strip()
++endif
+ 
+ inc_np = include_directories(incdir_numpy)
+ 
+ cc = meson.get_compiler('c')
+ 
+-# Pythran include directory and build flags
+-use_pythran = run_command(py3,
+-  [
+-    '-c',
+-    'import os; print(os.environ.get("SCIPY_USE_PYTHRAN", 1))'
+-  ],
+-  check: true
+-).stdout().strip() == '1'
+-
+-incdir_pythran = run_command(py3,
+-  [
+-    '-c',
+-    'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
+-  ],
+-  check: true
+-).stdout().strip()
++# Pythran include directory
++incdir_pythran = meson.get_external_property('pythran-include-dir', 'not-given')
++if incdir_pythran == 'not-given'
++  # If not specified, try to query Pythran from the build python
++  incdir_pythran = run_command(py3,
++    [
++      '-c',
++      'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
++    ],
++    check: true
++  ).stdout().strip()
++endif
++
+ inc_pythran = include_directories(incdir_pythran)
+ 
++# Pythran build flags
+ cpp_args_pythran = [
+   '-DENABLE_PYTHON_MODULE',
+   '-D__PYTHRAN__=3',
+-- 
+2.41.0
+
diff --git a/srcpkgs/python3-scikit-image/patches/numpy-version.patch b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
new file mode 100644
index 000000000000..9d3a96588edd
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
@@ -0,0 +1,14 @@
+There doesn't seem to be a valid reason for this restriction, and it doesn't
+impede building anyway.
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -145,7 +145,7 @@
+     "numpy==1.21.1; python_version=='3.8' and platform_python_implementation != 'PyPy'",
+     "numpy==1.21.1; python_version=='3.9' and platform_python_implementation != 'PyPy'",
+     "numpy==1.21.6; python_version=='3.10' and platform_system != 'Windows' and platform_python_implementation != 'PyPy'",
+-    "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
++    "numpy>=1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
+     "numpy; python_version>='3.12'",
+     "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'",
+ ]
diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index c3b403fdef61..e800ed4f00f6 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,28 +1,57 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
-version=0.19.3
-revision=2
-_pkgname="${pkgname#python3-}"
-build_style=python3-module
-build_helper="numpy"
-hostmakedepends="python3-Cython python3-wheel python3-numpy
- python3-packaging python3-setuptools pythran"
-makedepends="python3-devel"
-depends="python3-scipy python3-numpy python3-imageio python3-matplotlib
- python3-networkx python3-tifffile python3-pywt python3-packaging"
+version=0.21.0
+revision=1
+build_style=meson
+build_helper="python3"
+hostmakedepends="python3-build python3-installer python3-meson-python
+ python3-wheel python3-setuptools python3-packaging python3-Cython pythran
+ python3-lazy_loader python3-numpy pkg-config"
+makedepends="python3-devel python3-numpy pythran"
+depends="python3-numpy python3-scipy python3-networkx python3-Pillow
+ python3-imageio python3-tifffile python3-pywt python3-packaging
+ python3-lazy_loader"
 short_desc="Image processing in Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://scikit-image.org/"
-distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=4eb877c98d1395769daef5bc2ba8a7efd3f736c87086aecb3775a9174593398b
+distfiles="https://github.com/scikit-image/scikit-image/archive/v${version}.tar.gz"
+checksum=53a82a9dbd3ed608d2ad3876269a271a7e922b12e228388eac996b508aadd652
 # Tests require data files and unpackaged dependencies
 make_check=no
 
-pre_build() {
-	make_build_args+=" ${makejobs}"
+if [ "${CROSS_BUILD}" ]; then
+	configure_args="--cross-file=python.cross"
+fi
+
+pre_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		# Meson can't tolerate $CC with arguments as set by build helper
+		CC="${XBPS_CROSS_TRIPLET}-gcc"
+		# CXX needs to know where to find Python headers
+		CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+}
+
+post_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}"
+		cat > python.cross <<-EOF
+		[properties]
+		numpy-include-dir = '${_xpy}/numpy/core/include'
+		pythran-include-dir = '${_xpy}/pythran'
+		EOF
+	fi
+}
+
+do_build() {
+	# Use the build directory already configured by xbps-src for meson
+	python3 -m build --no-isolation --wheel \
+		-Cbuilddir="./build" -Ccompile-args="${makejobs}" .
 }
 
-post_install() {
+do_install() {
+	python3 -m installer --destdir "${DESTDIR}" \
+		--no-compile-bytecode dist/*.whl
 	vlicense LICENSE.txt
 }

From 18e3c78c76fcf21e606386359487ac23af54c202 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:12:58 -0400
Subject: [PATCH 0263/1854] python3-MarkupSafe: update to 2.1.3.

---
 srcpkgs/python3-MarkupSafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index e164956b0e2c..ce9f7dc13108 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MarkupSafe'
 pkgname=python3-MarkupSafe
-version=2.1.2
+version=2.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/markupsafe/"
 distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d
+checksum=af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad
 
 post_install() {
 	vlicense LICENSE.rst

From 56279c566f4518d78648326ab5f88d0ef3f1c254 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:14:59 -0400
Subject: [PATCH 0264/1854] python3-cryptography_vectors: update to 41.0.1.

---
 srcpkgs/python3-cryptography_vectors/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 8a900ad9d118..122780dbe152 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=41.0.0
+version=41.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=7c77787f6f1e3065aed0af9b0113d3736f2d0a80e0ed1ddbd296cf5ac638df00
+checksum=23b08c39777ec7b2774a11f945d1746301b1e88ecff2e5326d7f50ea0f42d580
 
 post_install() {
 	vlicense LICENSE

From aed81f9ff4fb6c3f070115dc7803e80a0b98e2c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:16:54 -0400
Subject: [PATCH 0265/1854] python3-cryptography: update to 41.0.1.

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index f5a45e5277a5..ed5d26a87413 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=41.0.0
+version=41.0.1
 revision=1
 build_style=python3-module
 build_helper="rust"
@@ -17,7 +17,7 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78
+checksum=d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From c68436bdbe3d333094e1f28a5a394d463fcffb8c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:17:42 -0400
Subject: [PATCH 0266/1854] python3-imageio: update to 2.31.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index ad3e419c67fd..859954e3973c 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.30.0
+version=2.31.0
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=15e8ae8a63575040253a772cb476b7ce4e4d762200fb6086e08802784c7d394b
+checksum=2833a9e648a7d95d3dbbe74d3488283de59722463c67fa4d0481185f7de29ed6
 
 post_install() {
 	vlicense LICENSE

From 2d1277388ffb05c067037c03c6fac3054e4c1c54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:30:28 -0400
Subject: [PATCH 0267/1854] python3-cvxopt: fix dist-info versioning

---
 srcpkgs/python3-cvxopt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 92e33c022bae..7e85f1c5628b 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-cvxopt'
 pkgname=python3-cvxopt
 version=1.3.1
-revision=1
+revision=2
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel SuiteSparse-devel gsl-devel glpk-devel fftw-devel
  $(vopt_if openblas 'openblas-devel' 'lapack-devel')"
 depends="python3"

From 7c8ef2964e164e9d2150ddd92bbcd8666a68fe05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:23:31 +0200
Subject: [PATCH 0268/1854] xrdb: update to 1.2.2.

---
 srcpkgs/xrdb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index e786702c8d80..bc72395160e7 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -1,6 +1,6 @@
 # Template file for 'xrdb'
 pkgname=xrdb
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-cpp=/usr/bin/cpp,/usr/bin/clang-cpp,/usr/bin/mcpp"
@@ -11,8 +11,8 @@ short_desc="X server resource database utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4
 
 post_install() {
 	vlicense COPYING

From bcaa3be73c09b508361bfd11247b06cdc43300ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Jun 2023 17:38:11 +0200
Subject: [PATCH 0269/1854] reptyr: update to 0.10.0.

---
 srcpkgs/reptyr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/reptyr/template b/srcpkgs/reptyr/template
index b1cad3c1d477..5190ebf8b816 100644
--- a/srcpkgs/reptyr/template
+++ b/srcpkgs/reptyr/template
@@ -1,6 +1,6 @@
 # Template file for 'reptyr'
 pkgname=reptyr
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-makefile
 make_install_args="BASHCOMPDIR=/usr/share/bash-completion/completions"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/nelhage/reptyr"
 distfiles="https://github.com/nelhage/reptyr/archive/${pkgname}-${version}.tar.gz"
-checksum=b442fbb80a1003b1985974c6fc9eeb8124a43a9bf014ae6af8cde0ca5e587731
+checksum=c6ffbc34a511ac00d072219bda30699e51f2f4eb483cbae9e32e981d49e8b380
 
 post_install() {
 	vlicense COPYING LICENSE

From 2d9db361f1c3e76dd32cbf75d2426e24b376fa9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:06:49 +0200
Subject: [PATCH 0270/1854] xorgproto: update to 2023.1.

---
 srcpkgs/xorgproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 342be095872f..02905d7aabb0 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
-version=2022.2
+version=2023.1
 revision=1
 build_style=meson
 configure_args="-Dlegacy=true"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.xz"
-checksum=5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e
+checksum=6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13
 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
  dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
  printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0

From d6767366ec488a7cd7349f15d392b1080773fc8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:07:25 +0200
Subject: [PATCH 0271/1854] ugrep: update to 3.12.1.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index eb60f284250b..df9ae32837ff 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.12.0
+version=3.12.1
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=f69330b74a2d2e46c878c19da3453e97d92ae960d0e1a92a853481cb889fca3e
+checksum=a442ac9c0961746374d0627e6ec52d5c6250541640aeb9a698eb40382d0ec44c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 759b9580df8708890a1cf2211c6b7a7ebc10e6c7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 22:57:19 +0200
Subject: [PATCH 0272/1854] syncthing: update to 1.23.5.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 58a95827922d..1c704f3d6eed 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.23.4
+version=1.23.5
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=4b68cee85b63fbb197a4e5401b3983a2a2358e1098ff91755f47925a1ee17f58
+checksum=d87f02b3e970c0f08c59166851b40ee5c647efcb2d70b5f0410416987cd42294
 
 pre_build() {
 	GOARCH= go generate \

From b57ad4746ac1d2d2acd7c8b60d8ce1af38719a8a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:28:53 +0200
Subject: [PATCH 0273/1854] terragrunt: update to 0.46.2.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fe7569f377f3..fc654aa02f70 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.46.1
+version=0.46.2
 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=f3b99f6de74ce6d2af87a01cb0ca6ff8d6357e506fbc69252f821820d3c5c0bf
+checksum=0d8bb4e98276e68c76d770e662bb434fb5c89f8fc06c3c00e14e717417123ec5
 
 post_install() {
 	vlicense LICENSE.txt

From 5629c64d75cf3e6e3a2c0d4b524ef2f6680fb689 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:29:51 +0200
Subject: [PATCH 0274/1854] hugo: update to 0.113.0.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d80e676fd44d..d5c4cfeca19a 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.112.7
+version=0.113.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa
+checksum=0bea01f37d7d04e6262844ff3070b76e5fb9f5fe2330a1367bd1c35c77098161
 
 post_install() {
 	vdoc README.md

From 63262845c903e985f42a6b7f70dee7ad56cb03c7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:02 +0200
Subject: [PATCH 0275/1854] drumkv1: update to 0.9.31.

---
 srcpkgs/drumkv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index dee163016be3..90373aa8ef95 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
 # Template file for 'drumkv1'
 pkgname=drumkv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://drumkv1.sourceforge.io/"
 changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=75b0c50705fe2a81d578e739700bbbabcdb359d153f76b9475016c8572d64ec1
+checksum=d42b09322a4135964afdd5246a8d6863d8aa20886b47ba8b58f345d23aa68033

From c875fe4dec3ad2c45c99ff5958e5d63347bcd691 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:05 +0200
Subject: [PATCH 0276/1854] padthv1: update to 0.9.31.

---
 srcpkgs/padthv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 33a217131082..2c4b5a50bff7 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'padthv1'
 pkgname=padthv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://padthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/padthv1/padthv1-${version}.tar.gz"
-checksum=704b94d41d5daca3dbd9eaca93b8228e8f6e447a8c86f1f695fd92f16e7e6add
+checksum=305f45be4c923bcfa671463b01ef212d8fde4ae37ea687581a8046187b9315c7

From eb6537c428ef526f0e8dd023dab64f99b8f02a2f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 0277/1854] samplv1: update to 0.9.31.

---
 srcpkgs/samplv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index d4d17baa57c3..0d299884926b 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
 # Template file for 'samplv1'
 pkgname=samplv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://samplv1.sourceforge.io/"
 changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/samplv1/samplv1-${version}.tar.gz"
-checksum=f32fcccfa0395757b66351816e841e2b5c0459ce9161aba36d23ff9db58955a5
+checksum=9d4eb430709e5ed53d28c8dd9c01f07fc042be569b72a248bd766d2256a50bcb

From 6cff128c63b8c008e4ab66eb72574e1f5ed01c5b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 0278/1854] synthv1: update to 0.9.31.

---
 srcpkgs/synthv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index 7d20b505baea..126cd0600682 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'synthv1'
 pkgname=synthv1
-version=0.9.30
+version=0.9.31
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://synthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/synthv1/synthv1-${version}.tar.gz"
-checksum=235cf1035f91a24743d01fcd1efa5274db94f2395734f33519ca672ac64af4d5
+checksum=9304a03adcfc51d4c83e6acdbbd4ef8e4418c996a1e23f8c5f9eabd62d8fce1b

From f44f95551eab7f8b0db7d484d9d0812809dc44c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:05:38 -0400
Subject: [PATCH 0279/1854] python3-meson-python: fix update-check

---
 srcpkgs/python3-meson-python/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/python3-meson-python/update

diff --git a/srcpkgs/python3-meson-python/update b/srcpkgs/python3-meson-python/update
new file mode 100644
index 000000000000..60b9eebd42f4
--- /dev/null
+++ b/srcpkgs/python3-meson-python/update
@@ -0,0 +1 @@
+pattern="meson_python-\K[0-9.]+(?=.tar)"

From 906c9a192f3b98fe67a8b8713892bda3adaf8c26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:09:23 -0400
Subject: [PATCH 0280/1854] cpp-utilities: update to 5.23.0.

---
 .../patches/fix-32bit-sendfile.patch          | 26 -------------------
 srcpkgs/cpp-utilities/template                |  4 +--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch

diff --git a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch b/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
deleted file mode 100644
index 0c8cc562f866..000000000000
--- a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 92757f253113515e96bb4ddbb4627b314ada6b58 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Thu, 6 Apr 2023 11:33:41 -0400
-Subject: [PATCH] Fix use of `sendfile()` on 32-bit systems
-
----
- io/copy.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/io/copy.h b/io/copy.h
-index 4abbe8d..0635a8e 100644
---- a/io/copy.h
-+++ b/io/copy.h
-@@ -155,7 +155,8 @@ void CopyHelper<bufferSize>::callbackCopy(NativeFileStream &input, NativeFileStr
-         output.flush();
-         const auto totalBytes = static_cast<std::streamoff>(count);
-         while (count) {
--            const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, std::min(count, bufferSize));
-+            const auto bytesToCopy = static_cast<std::size_t>(std::min(count, static_cast<std::uint64_t>(bufferSize)));
-+            const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, bytesToCopy);
-             if (bytesCopied < 0) {
-                 throw std::ios_base::failure(argsToString("sendfile64() failed: ", std::strerror(errno)));
-             }
--- 
-2.40.0
-
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d4d2d10eb9a8..4e164a09fac5 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.22.0
+version=5.23.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/cpp-utilities/archive/v${version}.tar.gz"
-checksum=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
+checksum=2a0564afb3c5c2f9119ef4ea434001d4ee67a88a99484c412253b3f9ae4147bc
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 1e12f44c310bf9df644d617fcf4b219fd7f8ef23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:10:23 -0400
Subject: [PATCH 0281/1854] qtutilities: update to 6.12.1.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 027d35c37179..06cc1b888bd8 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.12.0
+version=6.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=d3b8bc68c82d195cfeb4aa8d599c020774322aea7faebf5243e139088d89a82c
+checksum=83a68a39a2edbd1ba3ec2e50b9b4c84ed5a54c30fb3cb1bc3088e8d0290989c2
 
 pre_check() {
 	ninja -C build tests

From 1a563143f4d473e7e65d6dce25a482fd4bd0567a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:15:08 -0400
Subject: [PATCH 0282/1854] tagparser: update to 12.0.0.

---
 common/shlibs              | 2 +-
 srcpkgs/tagparser/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 042a1d23492e..e34e372b84f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3925,7 +3925,7 @@ libslirp.so.0 libslirp-4.2.0_1
 libqpdf.so.29 libqpdf-11.0.0_1
 libstk-4.6.1.so libstk-4.6.1_1
 libc++utilities.so.5 cpp-utilities-5.2.0_1
-libtagparser.so.11 tagparser-11.0.0_1
+libtagparser.so.12 tagparser-12.0.0_1
 libqtutilities.so.6 qtutilities-6.0.4_1
 libkdsoap.so.2 KDSoap-2.0.0_1
 libkdsoap-server.so.2 KDSoap-2.0.0_1
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index c0ce54c985f9..5577aaa67c0a 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=11.6.0
+version=12.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=298ff927e14860e97e5b75057ff50fe64e0e0521ca7253e8624be6db6ac77261
+checksum=94ded89093beb67d95816c4ba700cb50f64b4f4fdc7748ccfbb61946246b635e
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 9fd8863392f5af36cfa03b587d359df50c0e298b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:16:28 -0400
Subject: [PATCH 0283/1854] tageditor: update to 3.8.0.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 8b18b4f825bb..26b4421b4396 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.7.9
+version=3.8.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz"
-checksum=987101e9a259db79b28b872c778e9818f12618ce5a12ab7558b6262c7621b217
+checksum=9ab25924be61b1ddd12510c2fa90a9fd9ebae1b634764e50415f47c1e0be28ab
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From c39c2ae36afba95fd875fe03a859d18377731efa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:58:26 +0200
Subject: [PATCH 0284/1854] knot: update to 3.2.7.

---
 srcpkgs/knot/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 8a220c62d1d3..bfb53410c2e2 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,7 +1,7 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.2.6
-revision=2
+version=3.2.7
+revision=1
 build_style=gnu-configure
 configure_args="
  --disable-silent-rules
@@ -12,7 +12,8 @@ configure_args="
 conf_files="/etc/knot/knot.conf"
 hostmakedepends="automake pkg-config protobuf-c"
 makedepends="gnutls-devel lmdb-devel libedit-devel liburcu-devel
- protobuf-c-devel fstrm-devel libmaxminddb-devel"
+ protobuf-c-devel fstrm-devel libmaxminddb-devel libcap-ng-devel
+ nghttp2-devel"
 checkdepends="softhsm"
 short_desc="High-performance authoritative-only DNS server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -20,7 +21,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=ac124fb17dbc4ac5310a30a396245a6ba304b3c89abed0f8a47d727462c8da4d
+checksum=d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 1b184a4f65c6ddc6df9c61fe2710817eed8fad6a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 13:34:57 +0200
Subject: [PATCH 0285/1854] chromium: update to 114.0.5735.106.

---
 ...g-for-std-strlen-in-web_view_impl.cc.patch | 29 -------
 ...typename-s-that-are-required-in-C-17.patch | 45 +++++++++++
 ...karound_clang_bug-structured_binding.patch | 32 --------
 ...karound_clang_bug-structured_binding.patch | 81 +++++++++++++++++++
 .../patches/cursed^Uscoped_file.patch         | 18 -----
 srcpkgs/chromium/template                     | 20 ++---
 6 files changed, 133 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
 create mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
 delete mode 100644 srcpkgs/chromium/patches/cursed^Uscoped_file.patch

diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index 6648fab5719d..000000000000
--- a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
---
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
- 
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 000000000000..35b7152cbbdb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+     RemoteSavedCallbacks<T...>& saved_callbacks,
+     const RemoteId& remote_id,
+-    std::remove_reference<T>::type... result) {
++    typename std::remove_reference<T>::type... result) {
+   auto found_callbacks_map = saved_callbacks.find(remote_id);
+   if (found_callbacks_map == saved_callbacks.end())
+     return;  // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+   template <class... T>
+   void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+                          const RemoteId& remote_id,
+-                         std::remove_reference<T>::type... result);
++                         typename std::remove_reference<T>::type... result);
+ 
+   // Test support for client ID management.
+   static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
deleted file mode 100644
index c3e87c9f589a..000000000000
--- a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
-workaround llvm15 compiler bug
-diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me	2023-05-03 16:30:34.244612573 +0200
-+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc	2023-05-03 16:37:36.732278590 +0200
-@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
-                                 row_auto_repetitions);
- 
-   bool has_nested_subgrid = false;
--  auto& [grid_items, layout_data, subtree_size] =
--      sizing_tree->CreateSizingData();
-+
-+  auto& workaround_clang_bug = sizing_tree->CreateSizingData();
-+  auto& grid_items = workaround_clang_bug.grid_items;
-+  auto& layout_data = workaround_clang_bug.layout_data;
-+  auto& subtree_size = workaround_clang_bug.subtree_size;
- 
-   if (!must_ignore_children) {
-     // Construct grid items that are not subgridded.
-@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
-     NGGridSizingTree* sizing_tree) const {
-   DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
- 
--  auto& [grid_items, layout_data, subtree_size] =
--      sizing_tree->At(current_grid_index);
-+  auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
-+  auto& grid_items = workaround_clang_bug.grid_items;
-+  auto& layout_data = workaround_clang_bug.layout_data;
-+  auto& subtree_size = workaround_clang_bug.subtree_size;
- 
-   auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
-     InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..af8e737059c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding	2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc	2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+                               : BuildGridSizingTree(&oof_children);
+ 
+   LayoutUnit intrinsic_block_size;
+-  auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++  auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& tree_size = t_s;
+ 
+   if (IsBreakInside(BreakToken())) {
+     // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+                                 row_auto_repetitions);
+ 
+   bool has_nested_subgrid = false;
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_tree->CreateSizingData(opt_subgrid_data);
++  auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   if (!must_ignore_children) {
+     // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+   NGGridSizingTree sizing_tree;
+ 
+   if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+-    auto& [grid_items, layout_data, subtree_size] =
+-        sizing_tree.CreateSizingData();
++    auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++    auto& grid_items = g_i;
++    auto& layout_data = l_d;
++    auto& subtree_size = s_s;
+ 
+     const auto& node = Node();
+     grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+     const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+   DCHECK(sizing_subtree);
+ 
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_subtree.SubtreeRootData();
++  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+     InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+     bool* opt_needs_additional_pass) const {
+   DCHECK(sizing_subtree);
+ 
+-  auto& [grid_items, layout_data, subtree_size] =
+-      sizing_subtree.SubtreeRootData();
++  auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++  auto& grid_items = g_i;
++  auto& layout_data = l_d;
++  auto& subtree_size = s_s;
+ 
+   const bool is_for_columns = track_direction == kForColumns;
+   const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me	2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc	2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+   // Reject all outstanding promises.
+   DCHECK(thread_checker_.CalledOnValidThread());
+-  for (auto& [promise_id, promise] : promises_) {
++  for (auto& [p_i, p_e] : promises_) {
++    auto& promise_id = p_i;
++    auto& promise = p_e;
+     TRACE_EVENT_NESTABLE_ASYNC_END1(
+         "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+         "status", "cleared");
diff --git a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
deleted file mode 100644
index 2e5433f7abce..000000000000
--- a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/base/files/scoped_file_linux.cc.orig
-+++ b/base/files/scoped_file_linux.cc
-@@ -77,15 +77,3 @@
- }
- 
- }  // namespace base
--
--extern "C" {
--
--int __close(int);
--
--__attribute__((visibility("default"), noinline)) int close(int fd) {
--  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
--    CrashOnFdOwnershipViolation();
--  return __close(fd);
--}
--
--}  // extern "C"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index cafc2fe324c6..b4a39dfd3815 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,12 +1,11 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=113.0.5672.92
+version=114.0.5735.106
 revision=1
 archs="i686* x86_64* aarch64* armv7l*"
 hostmakedepends="
  $(vopt_if clang "clang lld llvm15")
- $(vopt_if js_optimize openjdk)
  bison git gperf hwids ninja nodejs perl pkg-config python3
  libatomic-devel libepoxy-devel libevent-devel libglib-devel"
 makedepends="
@@ -17,8 +16,8 @@ makedepends="
  libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
  libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
  libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
- pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel libffi-devel
+ pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
  $(vopt_if pipewire pipewire-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if sndio sndio-devel)"
@@ -28,15 +27,14 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
+checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
 
 lib32disabled=yes
 
-build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
+build_options="clang debug vaapi pulseaudio sndio pipewire"
 build_options_default="clang vaapi pulseaudio pipewire"
 desc_option_clang="Use clang to build"
 desc_option_debug="Build with debug symbols"
-desc_option_js_optimize="Optimize the JS used for Chromium's UI"
 desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
 
 if [ "$XBPS_LIBC" = musl ]; then
@@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
 	 libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
 	 libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
 	 $(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
-	 libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
-	 mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
+	 libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
+	 mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
 	 libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
 fi
 
@@ -158,7 +156,6 @@ do_configure() {
 		libxml
 		libxslt
 		opus
-		re2
 		snappy
 	"
 
@@ -219,9 +216,6 @@ do_configure() {
 		# deprecated
 		'use_gnome_keyring=false'
 
-		# https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
-		"enable_js_type_check=$(vopt_if js_optimize true false)"
-
 		"use_pulseaudio=$(vopt_if pulseaudio true false)"
 		"link_pulseaudio=$(vopt_if pulseaudio true false)"
 

From f3c3796aa3068ef75ce7b8873a654fe8116cf322 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 7 Jun 2023 20:18:21 +0200
Subject: [PATCH 0286/1854] linux5.4: update to 5.4.245.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index e1e9d22352c9..a48fbde924c7 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.244
+version=5.4.245
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- c1055b17cae94cefd31aac8da0cd4099f607c38765c8b1e590a760c0370ab7cc"
+ 8e0a8911bccb734a55b319687ee7050259b1c9d64324ef04448d9bea7c8a02be"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From 5a5a9ad62f1022346ac93b53a3a18da1fe1ca136 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 16:42:41 -0400
Subject: [PATCH 0287/1854] mongo-c-driver: update to 1.23.5.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 1e7a908c7fe7..1785e796bd79 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.23.4
+version=1.23.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=209406c91fcf7c63aa633179a0a6b1b36ba237fb77e0470fd81f7299a408e334
+checksum=260dc2207881ccbe7b79b1fa6b3ba84ab9be94eb93d4beefbbe8a6cb562947ed
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From abbd96dcaa01d71868ea6a6d3d1d6859473789e2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 16:45:47 -0400
Subject: [PATCH 0288/1854] python3-google-i18n-address: update to 3.0.0.

---
 srcpkgs/python3-google-i18n-address/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-google-i18n-address/template b/srcpkgs/python3-google-i18n-address/template
index 1161c2bb4ca1..81c5425c20e2 100644
--- a/srcpkgs/python3-google-i18n-address/template
+++ b/srcpkgs/python3-google-i18n-address/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-google-i18n-address'
 pkgname=python3-google-i18n-address
-version=2.5.2
+version=3.0.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target="tests/"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-poetry-core hatchling"
 depends="python3-requests"
 checkdepends="python3-pytest-cov python3-pytest-cov $depends"
 short_desc="Address validation helpers for Google's i18n address database"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mirumee/google-i18n-address"
 distfiles="https://github.com/mirumee/google-i18n-address/archive/refs/tags/${version}.tar.gz"
-checksum=5ec8e92d71ffe4d889c439f7f55f698553b6d731cc5177276045a5bb436a6029
+checksum=387b4683936bbc19d1cf9a1dbf8f08610742f5ad3db72b681240b2e43a120c05

From be8f2ad426ee5ceca04f563ded6f809ea38f20a2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 16:47:28 -0400
Subject: [PATCH 0289/1854] xml2rfc: update to 3.17.3.

---
 srcpkgs/xml2rfc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 1058373efeee..8d5be28f449a 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
 # Template file for 'xml2rfc'
 pkgname=xml2rfc
-version=3.17.2
+version=3.17.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ietf-tools.github.io/xml2rfc/"
 distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=168183289de769bf53adb80f02986f73bb4e6934fa73a85c89a82be7a2b6f01d
+checksum=535b7f701a5d87be8fb8ecdefcef486b11fa454bf0be236c6378c20ca57f28c5
 make_check=no # too many dependencies
 
 post_install() {

From 503d0d9b9c8485b40c9285fe5b3c54e37a3bd120 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Jun 2023 18:06:06 -0400
Subject: [PATCH 0290/1854] QMPlay2: update to 23.06.04.

---
 srcpkgs/QMPlay2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index ad73cbb01bae..17879a25093d 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=23.02.05
+version=23.06.04
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=b5347b6840e6f60496f7ca043d423ec52afc7a8b34274379a50c7e7bcd75414c
+checksum=9173b9b8ae26b9e97092239f40451172e9fe8d5d7ac1cbf0aa88ab8a73db7d1a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 1662ca771a879e3b473489d68d19c7ea722b9988 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 21:53:29 -0400
Subject: [PATCH 0291/1854] python3: update to 3.11.4.

---
 srcpkgs/python3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 04ef3591be55..ef07cb7d2f39 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,8 +3,8 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.11.3
-revision=2
+version=3.11.4
+revision=1
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6
  --enable-loadable-sqlite-extensions --with-computed-gotos
@@ -25,7 +25,7 @@ distfiles="
  https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz
  ${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz
 "
-checksum="8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
+checksum="2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
  ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
 skip_extraction="${_bluez}.tar.xz"
 

From 9cb508675413dd3a285a3d2a9cab259dbfc515f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 21:58:11 -0400
Subject: [PATCH 0292/1854] python3-tkinter: update to 3.11.4.

---
 srcpkgs/python3-tkinter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index ec080a818e69..fc16bfdf9dce 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.11.3
+version=3.11.4
 revision=1
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6
@@ -28,7 +28,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
+checksum=2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From 3716482e42063f9e45037cc7eeb48448dcb29414 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 8 May 2023 20:24:34 +0300
Subject: [PATCH 0293/1854] coredns: update to 1.10.1.

---
 srcpkgs/coredns/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index 812ffae342f5..decf19f647e8 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,20 +1,22 @@
 # Template file for 'coredns'
 pkgname=coredns
-version=1.8.6
-revision=3
+version=1.10.1
+revision=1
 build_style=go
 go_import_path=github.com/coredns/coredns
-hostmakedepends="git make mmark"
+hostmakedepends="mmark"
 short_desc="CoreDNS is a DNS server that chains plugins"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"
 homepage="https://coredns.io"
+changelog="https://github.com/coredns/coredns/releases"
 distfiles="https://github.com/coredns/coredns/archive/v${version}.tar.gz"
-checksum=cbe3764afe2148b8047ea7e5cbba5108c298dee3a9a0391028e2980e35beaa2b
+checksum=f47186452e5f2925e2c71135669afd9e03b9b55831417d33d612ef2fa69924a7
 make_dirs="/etc/coredns 0750 root root"
 
-_git_commit=f59c03d09c3a3a12f571ad1087b979325f3dae30
-go_ldflags+="-X github.com/coredns/coredns/coremain.GitCommit=${_git_commit}"
+# Update this on each version bump.
+_git_commit=055b2c31a9cf28321734e5f71613ea080d216cd3
+go_ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${_git_commit}"
 
 post_build() {
 	make -f Makefile.doc MMARK="$(command -v mmark) -man" man/coredns.1 man/corefile.5 plugins

From 4c5aac7ad7850609f08eab8ea28316ebd2e54ec1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 8 Jun 2023 21:42:29 +0100
Subject: [PATCH 0294/1854] librepcb: add missing qt5-plugin-sqlite dependency.

Fixes #44294.
---
 srcpkgs/librepcb/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index 670b1bf77a18..d51ca101381c 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -1,11 +1,12 @@
 # Template file for 'librepcb'
 pkgname=librepcb
 version=0.1.5
-revision=1
+revision=2
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-svg-devel zlib-devel"
+depends="qt5-plugin-sqlite"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5f5fcdef08a447c04519c7365adc1b53a49e88aa Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Wed, 7 Jun 2023 11:22:34 +0200
Subject: [PATCH 0295/1854] element-desktop: update to 1.11.32.

---
 srcpkgs/element-desktop/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 11ecbd72a16e..4c805a19f318 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.11.31
-revision=3
+version=1.11.32
+revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
 hostmakedepends="git yarn nodejs rust cargo python3 curl
@@ -17,8 +17,8 @@ homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
 distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
-checksum="5152bcdab011deb7e5d7c713edd268bf4266dedde87ff735ad146e9eb12e205b
- 6597d59f12a0f878fa363d6253a506583f686284d81a50baceb2965a4e0cce18"
+checksum="be4cc53354741690361aa5c933828a6f16a9826546650f03202005d449afc1d2
+ 5aa9c183a8e23e0114d51339519be1a14081c76531a4828057fec1a7f171f2b2"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From c3fb9dbea5e40231bffec3f7c3b14884c2095d17 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 8 Jun 2023 00:23:53 +0530
Subject: [PATCH 0296/1854] osv-scanner: update to 1.3.4.

---
 srcpkgs/osv-scanner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index 9ef331e35c51..ff02f965d680 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,6 +1,6 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=go
 go_import_path="github.com/google/osv-scanner"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://google.github.io/osv-scanner/"
 changelog="https://raw.githubusercontent.com/google/osv-scanner/main/CHANGELOG.md"
 distfiles="https://github.com/google/osv-scanner/archive/refs/tags/v${version}.tar.gz"
-checksum=cc058ea2a51435c0289ca026219439f643e8ef984fe60e87628cdfe519973d46
+checksum=19229149eca937a4da60ca29416fe1ea6997655fd10e273b833082ef5977a3de
 
 do_check() {
 	go test ./...

From 04c790a91b235b1291eaa444d50df7ab1c13a993 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 8 Jun 2023 13:45:31 +0200
Subject: [PATCH 0297/1854] qtractor: update to 0.9.34

---
 srcpkgs/qtractor/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index ce3471a68476..ea744367cef3 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,9 +1,9 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.33
+version=0.9.34
 revision=1
 _clap_tag=1.1.8
-_vst3sdk_tag=3.7.7_build_19
+_vst3sdk_tag=3.7.8_build_34
 create_wrksrc=yes
 build_wrksrc="qtractor"
 build_style=cmake
@@ -24,12 +24,12 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta
  https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz"
-checksum="25c526941d4c90a00df1ce0f61fba478278b707b94c25640b0d392e2ef76028d
+checksum="6f10c6bfe2328068ecdd60f4e49463bd82aaa5c19d118dc43df6a0a051287deb
  6f281ef55c4cf6129cf5b1746f373a4ba3e4078c1f406202d2e34ddeae86e37a
- 3dd04a170659cfdfc4bdf5fc83e91577b66d1a72042b74b35bc225393511c938
- 3eee23a453b76ba5d6c609891f4557d6b4d8988d0c2a157171b4fc817ecb8d17
- b092b521a278fe385a7e0b206c5dd9e0198a3e49e9db0083c14c182a1c04556c
- 5bcae9462cc86100f41ae9a3ed62bd0be0b40b9bda246ed11d5caa168d39452f"
+ a27e6acc86f2761e554e2f2f8256b248345b145de02771e2f6c6fe6b24c187d8
+ bd4e24f143d739d5e9e69398ed07c9961eb561cefad69486eb3453fb31bca58b
+ 7509e85caf02d6567384adb84ee7b05bdea5283f52cb232e504ac44091aeb42d
+ 0392a24cc3665365d3a1f448e8f1c79d5375645acf88be73598cae673afcc1fc"
 
 post_extract() {
 	cd $wrksrc

From 0666c545852d8f5ecea6e2091fc6d745ea9d0751 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 8 Jun 2023 09:18:54 -0400
Subject: [PATCH 0298/1854] texlab: update to 5.7.0

---
 srcpkgs/texlab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 4281e3813302..b1b9b7988e02 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
 # Template file for 'texlab'
 pkgname=texlab
-version=5.6.0
+version=5.7.0
 revision=1
 build_style=cargo
 make_install_args="--path crates/texlab"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
 changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
 distfiles="https://github.com/latex-lsp/texlab/archive/refs/tags/v${version}.tar.gz"
-checksum=16d7bf4c4e3a25cf1a9cd2ccfea2315c7c03cd3705de50f179133a25b1f0ae30
+checksum=0af42d00da72114704a234f26ca4ec603e067ecdd03a1f0b7002445bfc906f4b
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="smartstring fails to compile"

From d08784639d334f83762c484a56225ee207c9ac26 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 8 Jun 2023 15:44:43 +0200
Subject: [PATCH 0299/1854] golangci-lint: update to 1.53.2.

---
 srcpkgs/golangci-lint/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 767f29fbb95e..7b2aa25aa7a9 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,7 +1,7 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.51.2
-revision=2
+version=1.53.2
+revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=7e5bc05ad3739cec5a8b4e947a02d540c657a06039175c8822e1000f6bf606bd
+checksum=fc3e94b5574cdbe0faf37c8cbc1764c4ed07852a9e9dc146216ee69a20b3f97c
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From e06503e4a494d60d05f30cc64cb8872f9cad8dbf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 6 Jun 2023 13:42:57 +0200
Subject: [PATCH 0300/1854] Clipboard: update to 0.8.0

---
 srcpkgs/Clipboard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Clipboard/template b/srcpkgs/Clipboard/template
index 7d5f0477cd3e..bcb06d1b87f4 100644
--- a/srcpkgs/Clipboard/template
+++ b/srcpkgs/Clipboard/template
@@ -1,6 +1,6 @@
 # Template file for 'Clipboard'
 pkgname=Clipboard
-version=0.7.1
+version=0.8.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Slackadays/Clipboard"
 changelog="https://github.com/Slackadays/Clipboard/releases"
 distfiles="https://github.com/Slackadays/Clipboard/archive/refs/tags/${version}.tar.gz"
-checksum=ade73db60fdbdff8c68a4dc97f854aae502304e8294d57a7b32f6b01d48f8eef
+checksum=d3fa16ee7fab364f9755d2a5991aaf06f7b6d703df7994486e7c424bfe1d97d2
 
 if [ "${XBPS_TARGET_NO_ATOMIC8}" ]; then
 	makedepends+=" libatomic-devel"

From a13dba41b897282c81c5dc9d249a0e477aa173f8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 6 Jun 2023 13:56:00 +0100
Subject: [PATCH 0301/1854] elfutils: update to 0.189.

---
 srcpkgs/elfutils/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index eda621c1511d..810b4f41ab3d 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,10 +1,10 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.187
+version=0.189
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config m4"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
@@ -13,8 +13,9 @@ short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
+changelog="https://sourceware.org/git/?p=elfutils.git;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://sourceware.org/pub/elfutils/${version}/${pkgname}-${version}.tar.bz2"
-checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
+checksum=39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 CFLAGS="-Wno-error=deprecated-declarations" # curl 7.55+
@@ -55,8 +56,8 @@ debuginfod_package() {
 	short_desc+=" - debuginfod programs"
 	pkg_install() {
 		vmove "usr/bin/debuginfod*"
-		vmove "usr/share/man/man1/debuginfod-find.1"
-		vmove "usr/share/man/man8/debuginfod.8"
+		vmove usr/share/man/man1/debuginfod-find.1
+		vmove usr/share/man/man8/debuginfod.8
 	}
 }
 

From b804184eb31d78a7020b2eda58f3583c2c2a0ace Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 6 Jun 2023 13:24:32 -0400
Subject: [PATCH 0302/1854] starship: update to 1.15.0

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 132254c4d5e0..92b620107a6e 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,6 +1,6 @@
 # Template file for 'starship'
 pkgname=starship
-version=1.14.2
+version=1.15.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://starship.rs"
 changelog="https://raw.githubusercontent.com/starship/starship/master/CHANGELOG.md"
 distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz"
-checksum=6c9bee757955644453deab3564a10c0696606bb1c197ad631ff6ebbf8892b7a7
+checksum=e525476cf93d3a06332abf9e02415d4789fac6f28e4b7d98db7d83da08231828
 
 do_check() {
 	mkdir -p fake-home

From 6c1f48729fa3eb874c73276151108168911bc85d Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Tue, 6 Jun 2023 20:24:30 -0500
Subject: [PATCH 0303/1854] Signal-Desktop: update to 6.20.1.

---
 srcpkgs/Signal-Desktop/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index fec02583a29a..7eca75b4f1f5 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,38 +1,34 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.20.0
+version=6.20.1
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
 # https://git.alpinelinux.org/aports/tree/testing/signal-desktop
 # ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
 archs="x86_64"
-hostmakedepends="git git-lfs nodeenv python3 tar"
+hostmakedepends="git git-lfs nodejs python3 tar"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
 maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=fc92011c51da6792215eb92d48afc17f1967caeade1307daaa13884244d7a3b0
+checksum=3c664dbb5c1670554859fa55fd765ac35632f573fd5b7bea63876cdf41b6b7d6
 nostrip_files="signal-desktop"
 
 post_extract() {
 	# git-lfs hook needs to be installed for one of the dependencies
 	git lfs install
 
-	# use nodeenv since we have that in the repos already
-	nodeenv --node='18.14.0' signal-node
-	. ./signal-node/bin/activate
+	vsed 's/"node": "/&>=/' -i package.json
 
 	npm install -g yarn
-
 	# Dependencies have to be installed before applying patch
 	yarn install --ignore-engines --frozen-lockfile
 }
 
 do_build() {
-	. ./signal-node/bin/activate
 	yarn generate
 	yarn build-release
 }

From d0a62aa3ec87ce8a4b77b403d1d909c2973fceff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 8 Jun 2023 02:18:17 -0700
Subject: [PATCH 0304/1854] power-profiles-daemon: update to 0.13.

---
 srcpkgs/power-profiles-daemon/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/power-profiles-daemon/template b/srcpkgs/power-profiles-daemon/template
index 30ffad79543c..b42312b54c27 100644
--- a/srcpkgs/power-profiles-daemon/template
+++ b/srcpkgs/power-profiles-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'power-profiles-daemon'
 pkgname=power-profiles-daemon
-version=0.12
-revision=2
+version=0.13
+revision=1
 build_style=meson
 configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/"
 hostmakedepends="pkg-config glib-devel"
@@ -12,8 +12,9 @@ short_desc="Makes power profiles handling available over D-Bus"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/power-profiles-daemon"
+changelog="https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/raw/main/NEWS"
 distfiles="https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/${version}/power-profiles-daemon-${version}.tar.gz"
-checksum=4c01dc51cd734403af868cff2d13923c83076c477d7f02c601f3a5127dd82a18
+checksum=74aac43eb43ebe5a3255a00eb48d781a5acfba32e96ab85737e22205e045e581
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"

From 18844c5d6195c00d90f269ed4a7d18b6772e8bf7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 6 Jun 2023 07:29:46 +0200
Subject: [PATCH 0305/1854] fselect: fix for rust 1.70

---
 srcpkgs/fselect/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 436f6f97023d..9a9fe4371235 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,7 +1,7 @@
 # Template file for 'fselect'
 pkgname=fselect
 version=0.8.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libzstd-devel"
@@ -23,6 +23,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	XBPS_CROSS_RUSTFLAGS+=" -latomic"
 fi
 
+post_patch() {
+	cargo update --package mp4parse@0.12.0 --precise 0.12.1
+}
+
 post_install() {
 	vlicense LICENSE-MIT
 	vman docs/fselect.1

From 67a52d09ad6e261a659347192f36ff6e119f8f73 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 5 Jun 2023 21:54:15 -0400
Subject: [PATCH 0306/1854] nerd-fonts: update to 3.0.2

---
 srcpkgs/nerd-fonts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template
index d4cbc69b5984..f4409116aa62 100644
--- a/srcpkgs/nerd-fonts/template
+++ b/srcpkgs/nerd-fonts/template
@@ -1,6 +1,6 @@
 # Template file for 'nerd-fonts'
 pkgname=nerd-fonts
-version=3.0.1
+version=3.0.2
 revision=1
 depends="nerd-fonts-ttf nerd-fonts-otf"
 short_desc="Iconic font aggregator, collection and patcher"
@@ -9,7 +9,7 @@ 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=c4b62dd2287ace2eeff2911186021a26fe8a9531edfaa5d4622eb794bb323d89
+checksum=3b18b305451b0b22cb6484197f8029efe54e5c459e8ed3adbb0fb1697c0c13a6
 
 do_install() {
 	vmkdir usr/share/fonts/NerdFonts/otf

From 94fefdd261e37a849edc47b9bc7635938d67863b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:57:49 +0100
Subject: [PATCH 0307/1854] bindfs: update to 1.17.3.

---
 srcpkgs/bindfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 4a8d39ed3472..1ae65af58a61 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bindfs'
 pkgname=bindfs
-version=1.17.2
+version=1.17.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,6 +11,6 @@ license="GPL-2.0-or-later"
 homepage="https://bindfs.org"
 changelog="https://bindfs.org/docs/ChangeLog.utf8.txt"
 distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=5f2c50a70b8d58c025b81fbf364fad432d154936630ce0023cc88baa8d5ca1d0
+checksum=c16876091572c23242c16e87c5be7e3512f443aae637328d8c011c071e9302eb
 #cannot mount
 make_check=no

From 418f69b9bc0ca290675e0362349646fe0f99ebb9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 5 Jun 2023 01:10:44 +0530
Subject: [PATCH 0308/1854] puzzles: update to 20230606.4227ac1.

---
 srcpkgs/puzzles/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 260344e0cc6c..831ef3f7b33e 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,6 +1,6 @@
 # Template file for 'puzzles'
 pkgname=puzzles
-version=20230505.63346a8
+version=20230606.4227ac1
 revision=1
 build_style=cmake
 configure_args="-DNAME_PREFIX=puzzles-"
@@ -10,8 +10,8 @@ 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=63346a8ceac9ac1061e59af2a99ab1a44c851392;sf=tgz>${pkgname}-${version#*.}.tgz"
-checksum=77a7a06fa21a987cbc1475bc689b0374633a3fdbe6f76a66832b448697de5d40
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=4227ac1fd5dc25c247e7526526079b85e1890766;sf=tgz>${pkgname}-${version#*.}.tgz"
+checksum=9613c6091e04eef3f47d596ac78ad465cf8656c5502e376059419bcbe87da5b1
 
 post_install() {
 	vlicense LICENCE LICENSE

From b8cfadbb3c50b62b6de93333d8c9832f9e5f8563 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 4 Jun 2023 16:41:16 +0900
Subject: [PATCH 0309/1854] keyd: update to 2.4.3.

---
 srcpkgs/keyd/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/keyd/template b/srcpkgs/keyd/template
index ac149364173e..69618a8f3169 100644
--- a/srcpkgs/keyd/template
+++ b/srcpkgs/keyd/template
@@ -1,6 +1,6 @@
 # Template file for 'keyd'
 pkgname=keyd
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,11 +10,10 @@ license="MIT"
 homepage="https://github.com/rvaiya/keyd"
 changelog="https://raw.githubusercontent.com/rvaiya/keyd/master/docs/CHANGELOG.md"
 distfiles="https://github.com/rvaiya/keyd/archive/refs/tags/v${version}.tar.gz"
-checksum=877e1a39efaa062c996856d632d6aeedd409422be6c5bdb2064a9b707293c280
+checksum=d4075f673879f4950c1c0d43985797603200e993596a5d7fcec1597c2350c380
 system_groups="keyd"
 
 post_install() {
 	vsv keyd
 	vlicense LICENSE
-	vinstall keyd.quirks 644 usr/share/libinput 30-keyd.quirks
 }

From 2ed5e04350d0637cc210d9afa656ac19febb939b Mon Sep 17 00:00:00 2001
From: Mojamuto <carlosme@protonmail.ch>
Date: Sun, 4 Jun 2023 13:56:40 +0200
Subject: [PATCH 0310/1854] xfce4-battery-plugin: update to 1.1.5

---
 srcpkgs/xfce4-battery-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..3fe17fcdbbae 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
-version=1.1.4
+version=1.1.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
+checksum=752233bfb320ee1e26104a656cbb868299f562733063e2b9a18f0966585ce213

From f1e239d95ae19574efbbb4ea4b8533ae35defa22 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 4 Jun 2023 16:52:22 +0200
Subject: [PATCH 0311/1854] gopls: update to 0.12.2.

---
 srcpkgs/gopls/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 16491e5febc4..c786fc23aeb6 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,16 +1,16 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.11.0
-revision=2
+version=0.12.2
+revision=1
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls
 short_desc="Official language server for the Go language"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
-license="MIT"
+license="BSD-3-Clause"
 homepage="https://github.com/golang/tools/tree/master/gopls"
 distfiles="https://github.com/golang/tools/archive/refs/tags/gopls/v${version}.tar.gz"
-checksum=b5dd0040bcc75b4760eb543826b6503a163c835c90f50843e626a112ca083931
+checksum=f185a44f46fe39688493008d47debfe63ea7cd26464f522df292c62539b8ca8d
 
 post_install() {
 	vlicense ../LICENSE

From 020165766c325abe7a79a7a973992f87d2da31ed Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 4 Jun 2023 21:12:02 +0200
Subject: [PATCH 0312/1854] nmap: update to 7.94

---
 srcpkgs/nmap/patches/openssl.patch | 314 -----------------------------
 srcpkgs/nmap/template              |   9 +-
 2 files changed, 5 insertions(+), 318 deletions(-)
 delete mode 100644 srcpkgs/nmap/patches/openssl.patch

diff --git a/srcpkgs/nmap/patches/openssl.patch b/srcpkgs/nmap/patches/openssl.patch
deleted file mode 100644
index 0d6e80105153..000000000000
--- a/srcpkgs/nmap/patches/openssl.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From d6bea8dcdee36a3902cece14097993350306f1b6 Mon Sep 17 00:00:00 2001
-From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Tue, 6 Sep 2022 22:39:34 +0000
-Subject: [PATCH] Build based on OpenSSL version, not API level. Fixes #2516
-
----
- ncat/http_digest.c        |  2 +-
- ncat/ncat_connect.c       |  4 ++--
- ncat/ncat_ssl.c           |  6 +++---
- ncat/ncat_ssl.h           | 12 ------------
- ncat/test/test-wildcard.c |  4 ++--
- nse_openssl.cc            | 28 +++++++---------------------
- nse_ssl_cert.cc           | 24 ++++++------------------
- nsock/src/nsock_ssl.c     |  4 ++--
- nsock/src/nsock_ssl.h     | 15 +--------------
- 9 files changed, 24 insertions(+), 75 deletions(-)
-
-diff --git a/ncat/http_digest.c b/ncat/http_digest.c
-index b5f80a920a..e6ff99175c 100644
---- a/ncat/http_digest.c
-+++ b/ncat/http_digest.c
-@@ -133,7 +133,7 @@ int http_digest_init_secret(void)
-     return 0;
- }
- 
--#if OPENSSL_API_LEVEL < 10100
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define EVP_MD_CTX_new EVP_MD_CTX_create
- #define EVP_MD_CTX_free EVP_MD_CTX_destroy
- #endif
-diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
-index 0e4b50761c..3dd3291fc9 100644
---- a/ncat/ncat_connect.c
-+++ b/ncat/ncat_connect.c
-@@ -82,8 +82,8 @@
- #include <openssl/err.h>
- 
- /* Deprecated in OpenSSL 3.0 */
--#if OPENSSL_API_LEVEL >= 30000
--#define SSL_get_peer_certificate SSL_get1_peer_certificate
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# define SSL_get_peer_certificate SSL_get1_peer_certificate
- #endif
- #endif
- 
-diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c
-index 9226b48116..3818bfecc5 100644
---- a/ncat/ncat_ssl.c
-+++ b/ncat/ncat_ssl.c
-@@ -80,7 +80,7 @@
- #define FUNC_ASN1_STRING_data ASN1_STRING_data
- #endif
- 
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
-@@ -117,7 +117,7 @@ SSL_CTX *setup_ssl_listen(void)
-     OpenSSL_add_all_algorithms();
-     ERR_load_crypto_strings();
-     SSL_load_error_strings();
--#elif OPENSSL_API_LEVEL >= 30000
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-   if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
-   {
-     loguser("OpenSSL legacy provider failed to load.\n");
-@@ -477,7 +477,7 @@ static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
-     const char *commonName = "localhost";
-     char dNSName[128];
-     int rc;
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     int ret = 0;
-     RSA *rsa = NULL;
-     BIGNUM *bne = NULL;
-diff --git a/ncat/ncat_ssl.h b/ncat/ncat_ssl.h
-index fca0b17716..458736e271 100644
---- a/ncat/ncat_ssl.h
-+++ b/ncat/ncat_ssl.h
-@@ -67,18 +67,6 @@
- #include <openssl/ssl.h>
- #include <openssl/err.h>
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
- #define NCAT_CA_CERTS_FILE "ca-bundle.crt"
- 
- enum {
-diff --git a/ncat/test/test-wildcard.c b/ncat/test/test-wildcard.c
-index 428ece71c7..fe55e1997e 100644
---- a/ncat/test/test-wildcard.c
-+++ b/ncat/test/test-wildcard.c
-@@ -20,7 +20,7 @@ are rejected. The SSL transactions happen over OpenSSL BIO pairs.
- 
- #include "ncat_core.h"
- #include "ncat_ssl.h"
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
- #include <openssl/bn.h>
- #endif
- 
-@@ -294,7 +294,7 @@ static int set_dNSNames(X509 *cert, const struct lstr dNSNames[])
- static int gen_cert(X509 **cert, EVP_PKEY **key,
-     const struct lstr commonNames[], const struct lstr dNSNames[])
- {
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     int rc, ret=0;
-     RSA *rsa = NULL;
-     BIGNUM *bne = NULL;
-diff --git a/nse_openssl.cc b/nse_openssl.cc
-index 3ee5d73d3f..0f5b450e0c 100644
---- a/nse_openssl.cc
-+++ b/nse_openssl.cc
-@@ -20,6 +20,9 @@
- #define FUNC_EVP_CIPHER_CTX_init EVP_CIPHER_CTX_reset
- #define FUNC_EVP_CIPHER_CTX_cleanup EVP_CIPHER_CTX_reset
- #define PASS_EVP_CTX(ctx) (ctx)
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# include <openssl/provider.h>
-+#endif
- #else
- #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_init
- #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_cleanup
-@@ -37,23 +40,6 @@ extern NmapOps o;
- 
- #include "nse_openssl.h"
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--
--#if OPENSSL_API_LEVEL >= 30000
--#include <openssl/provider.h>
--#endif
--
- #define NSE_SSL_LUA_ERR(_L) \
-     luaL_error(_L, "OpenSSL error: %s", ERR_error_string(ERR_get_error(), NULL))
- 
-@@ -184,7 +170,7 @@ static int l_bignum_is_prime( lua_State *L ) /** bignum_is_prime( BIGNUM p ) */
-   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
-   BN_CTX * ctx = BN_CTX_new();
-   int is_prime =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
- #else
-     BN_check_prime( p->bn, ctx, NULL );
-@@ -199,7 +185,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
-   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
-   BN_CTX * ctx = BN_CTX_new();
-   int is_prime =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
- #else
-     BN_check_prime( p->bn, ctx, NULL );
-@@ -210,7 +196,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
-     BN_sub_word( n, (BN_ULONG)1 );
-     BN_div_word( n, (BN_ULONG)2 );
-     is_safe =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       BN_is_prime_ex( n, BN_prime_checks, ctx, NULL );
- #else
-       BN_check_prime( n, ctx, NULL );
-@@ -582,7 +568,7 @@ LUALIB_API int luaopen_openssl(lua_State *L) {
- #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-   OpenSSL_add_all_algorithms();
-   ERR_load_crypto_strings();
--#elif OPENSSL_API_LEVEL >= 30000
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-   if (NULL == OSSL_PROVIDER_load(NULL, "legacy") && o.debugging > 1)
-   {
-     // Legacy provider may not be available.
-diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
-index 5ae623a475..bc35019a1a 100644
---- a/nse_ssl_cert.cc
-+++ b/nse_ssl_cert.cc
-@@ -89,19 +89,7 @@
- #define X509_get0_notAfter X509_get_notAfter
- #endif
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/core_names.h>
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
-@@ -459,7 +447,7 @@ static const char *pkey_type_to_string(int type)
- }
- 
- int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-   char tmp[64] = {0};
-   size_t len = 0;
-   /* This structure (ecdhparams.curve_params) comes from tls.lua */
-@@ -634,7 +622,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-   else
- #endif
-   if (pkey_type == EVP_PKEY_RSA) {
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     RSA *rsa = EVP_PKEY_get1_RSA(pubkey);
-     if (rsa) {
- #endif
-@@ -643,7 +631,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       luaL_getmetatable( L, "BIGNUM" );
-       lua_setmetatable( L, -2 );
- #if HAVE_OPAQUE_STRUCTS
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       const BIGNUM *n = NULL, *e = NULL;
-       data->should_free = false;
-       RSA_get0_key(rsa, &n, &e, NULL);
-@@ -663,7 +651,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       luaL_getmetatable( L, "BIGNUM" );
-       lua_setmetatable( L, -2 );
- #if HAVE_OPAQUE_STRUCTS
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       data->should_free = false;
- #else
-       data->should_free = true;
-@@ -673,7 +661,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       data->bn = rsa->n;
- #endif
-       lua_setfield(L, -2, "modulus");
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       RSA_free(rsa);
-     }
- #endif
-diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c
-index 1ef7d521f0..23db5513ea 100644
---- a/nsock/src/nsock_ssl.c
-+++ b/nsock/src/nsock_ssl.c
-@@ -64,7 +64,7 @@
- #include "netutils.h"
- 
- #if HAVE_OPENSSL
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
- #endif
- 
-@@ -120,7 +120,7 @@ static SSL_CTX *ssl_init_helper(const SSL_METHOD *method) {
-     SSL_library_init();
- #else
-     OPENSSL_atexit(nsock_ssl_atexit);
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-     if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
-     {
-       nsock_log_error("OpenSSL legacy provider failed to load.\n");
-diff --git a/nsock/src/nsock_ssl.h b/nsock/src/nsock_ssl.h
-index bb99b1b5e1..1af473d629 100644
---- a/nsock/src/nsock_ssl.h
-+++ b/nsock/src/nsock_ssl.h
-@@ -69,20 +69,7 @@
- #include <openssl/err.h>
- #include <openssl/rand.h>
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
- #endif
-
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 8636e26d247d..761485cdba06 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -1,20 +1,21 @@
 # Template file for 'nmap'
 pkgname=nmap
-version=7.93
+version=7.94
 revision=1
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
-hostmakedepends="python"
+hostmakedepends="python3"
 makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <mail@piraty.dev>"
 license="custom:nmap"
 homepage="https://nmap.org"
+changelog="https://raw.githubusercontent.com/nmap/nmap/master/CHANGELOG"
 distfiles="https://nmap.org/dist/nmap-${version}.tar.bz2"
-checksum=55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651
+checksum=d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc
 repository=nonfree
-python_version=2
+python_version=3
 
 build_options="lua"
 build_options_default="lua"

From c78bb87813bef3cd9bf550659f2be42b310c8455 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 4 Jun 2023 21:51:48 +0200
Subject: [PATCH 0313/1854] lagrange: update to 1.16.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 569c997fb20a..e674d266750f 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.16.2
+version=1.16.3
 revision=1
 build_style=cmake
 configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=90e3c6cec54ecd0b0afce3952494c46bc6846850da622f66a6394b62b5866c86
+checksum=e82d00a616735d1c2a0a4a165ed63894f6563b9478971c76ef31033599eab0ce
 
 post_install() {
 	vlicense LICENSE.md

From 92380cd5bce5349b1cab9c5d2fd0fc69769a3fe8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 4 Jun 2023 22:04:41 +0200
Subject: [PATCH 0314/1854] vala-language-server: update to 0.48.7

---
 .../patches/glib-2.74-regex.patch             | 46 -------------------
 srcpkgs/vala-language-server/template         |  4 +-
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/vala-language-server/patches/glib-2.74-regex.patch

diff --git a/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch b/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch
deleted file mode 100644
index 53511585ca5b..000000000000
--- a/srcpkgs/vala-language-server/patches/glib-2.74-regex.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b6193265d68b90755d57938c2ba1895841cf4b36 Mon Sep 17 00:00:00 2001
-From: Princeton Ferro <princetonferro@gmail.com>
-Date: Sat, 24 Sep 2022 18:07:27 -0400
-Subject: [PATCH] fix regex for links in comments (#268)
-
-Closes #263
----
- src/documentation/doccomment.vala       | 2 +-
- src/documentation/girdocumentation.vala | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/documentation/doccomment.vala b/src/documentation/doccomment.vala
-index 53bc2520..613cccaf 100644
---- a/src/documentation/doccomment.vala
-+++ b/src/documentation/doccomment.vala
-@@ -129,7 +129,7 @@ class Vls.DocComment {
-         body = /{{{(\w+)?(.*?)}}}/s.replace (body, body.length, 0, "```\\1\\2```");
-         
-         // images and links
--        body = /(\[\[|{{)([~:\/\\\w-.]+)(\|(.*?))?(\]\]|}})/
-+        body = /(\[\[|{{)([~:\/\\\w\-.]+)(\|(.*?))?(\]\]|}})/
-             .replace_eval (body, body.length, 0, 0, (match_info, result) => {
-                 string type = match_info.fetch (1) ?? "";
-                 string href = match_info.fetch (2) ?? "";
-diff --git a/src/documentation/girdocumentation.vala b/src/documentation/girdocumentation.vala
-index 93e0aaeb..36e8b7d7 100644
---- a/src/documentation/girdocumentation.vala
-+++ b/src/documentation/girdocumentation.vala
-@@ -356,7 +356,7 @@ class Vls.GirDocumentation {
-         if (gtkdoc_dir != null) {
-             // substitute image URLs
-             // substitute relative paths in GIR comments for absolute paths to GTK-Doc resources
--            comment_data = /!\[(.*?)\]\(([~:\/\\\w-.]+)\)/
-+            comment_data = /!\[(.*?)\]\(([~:\/\\\w\-.]+)\)/
-                 .replace_eval (comment_data, comment_data.length, 0, 0, (match_info, result) => {
-                     string link_label = match_info.fetch (1) ?? "";
-                     string link_href = match_info.fetch (2) ?? "";
-@@ -386,7 +386,7 @@ class Vls.GirDocumentation {
-             });
- 
-         // now, substitute references to sections
--        comment_data = /\[(.*?)\]\[([\w-\s]+)\]/
-+        comment_data = /\[(.*?)\]\[([\w\-\s]+)\]/
-             .replace_eval (comment_data, comment_data.length, 0, 0, (match_info, result) => {
-                 string link_label = match_info.fetch (1) ?? "";
-                 string section = match_info.fetch (2) ?? "";
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index aa5eeec286cb..2b79b3652de6 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.5
+version=0.48.7
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=c2ace01705c21ee79db281e61035dba00c4d9780e3227921ec7167ba49eb42b7
+checksum=6e848334accd27566843d56db15bedcf7529dc68e416d23d3b4e9fc522019c68

From 60a2ccdd666d4abe8ed9792014ce056141500ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 4 Jun 2023 22:07:41 +0200
Subject: [PATCH 0315/1854] arti: update to 1.1.5.

---
 srcpkgs/arti/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index 4ee222463631..d6be792e376c 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
 # Template file for 'arti'
 pkgname=arti
-version=1.1.4
+version=1.1.5
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0, MIT"
 homepage="https://gitlab.torproject.org/tpo/core/arti"
 changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
 distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=8e354b9014010d9dec3f209092cdff0c13d7ae9ed937f7326de8134079c7f011
+checksum=1ac43aa8ae742d516724bd1f7b412a5a979b5007b88f9eed2d8ab06e92bb28f4
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	case "$XBPS_TARGET_MACHINE" in

From 5b8c8a90ef80c3ce106452b8af8231c7c7005c63 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 5 Jun 2023 02:25:09 +0200
Subject: [PATCH 0316/1854] yad: update to 13.0

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 25b187b8d41f..7563d196ee60 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=12.3
+version=13.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=794442b03cc22c64020f44511eb97400bae2dcb82883185399f6c6be6219c009
+checksum=194198c4a58e20ceffd9a3206633c3726d962d7d4219edb77aeb748897403e34
 
 pre_configure() {
 	autoreconf -ivf

From 5e4f6df4919b403e658fc70f0ee8dd5302496da0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 4 Jun 2023 22:05:09 -0400
Subject: [PATCH 0317/1854] hyperfine: update to 1.17.0

---
 srcpkgs/hyperfine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template
index c21501c586a2..fa1bdf406d35 100644
--- a/srcpkgs/hyperfine/template
+++ b/srcpkgs/hyperfine/template
@@ -1,6 +1,6 @@
 # Template file for 'hyperfine'
 pkgname=hyperfine
-version=1.16.1
+version=1.17.0
 revision=1
 build_style=cargo
 short_desc="Command-line benchmarking tool"
@@ -9,7 +9,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/sharkdp/hyperfine"
 changelog="https://raw.githubusercontent.com/sharkdp/hyperfine/master/CHANGELOG.md"
 distfiles="https://github.com/sharkdp/hyperfine/archive/refs/tags/v${version}.tar.gz"
-checksum=ffb3298945cbe2c068ca1a074946d55b9add83c9df720eda2ed7f3d94d7e65d2
+checksum=3dcd86c12e96ab5808d5c9f3cec0fcc04192a87833ff009063c4a491d5487b58
 
 export SHELL_COMPLETIONS_DIR=${XBPS_BUILDDIR}/${pkgname}-${version}
 

From 02695ef183d3855fc1fce48226e33aa1e9394e80 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 5 Jun 2023 15:36:55 +0200
Subject: [PATCH 0318/1854] open-vm-tools: update to 12.2.0

---
 ...-test-for-feature-instead-of-platfor.patch | 28 ++++++++-----------
 srcpkgs/open-vm-tools/template                |  6 ++--
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
index f6c0c084d541..4dea9a6b4173 100644
--- a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
+++ b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
@@ -22,18 +22,11 @@ The features we test for are:
 
 This is needed for musl libc.
 
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- open-vm-tools/configure.ac               |  4 ++++
- open-vm-tools/lib/misc/idLinux.c         | 30 +++++++++++-------------
- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 11 +++++----
- 3 files changed, 24 insertions(+), 21 deletions(-)
-
 diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 9aa95abb..941195c1 100644
+index 5f9a193..a846dff 100644
 --- a/open-vm-tools/configure.ac
 +++ b/open-vm-tools/configure.ac
-@@ -879,6 +879,7 @@ AC_CHECK_FUNCS(
+@@ -1179,6 +1179,7 @@ AC_CHECK_FUNCS(
  
  AC_CHECK_FUNCS([ecvt])
  AC_CHECK_FUNCS([fcvt])
@@ -41,7 +34,7 @@ index 9aa95abb..941195c1 100644
  
  AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
  
-@@ -1088,9 +1089,12 @@ fi
+@@ -1388,9 +1389,12 @@ fi
  ###
  
  AC_CHECK_HEADERS([crypt.h])
@@ -55,7 +48,7 @@ index 9aa95abb..941195c1 100644
  AC_CHECK_HEADERS([sys/inttypes.h])
  AC_CHECK_HEADERS([sys/io.h])
 diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c
-index 1bb86f48..2116f2aa 100644
+index 3d7d1e3..0e12ac5 100644
 --- a/open-vm-tools/lib/misc/idLinux.c
 +++ b/open-vm-tools/lib/misc/idLinux.c
 @@ -27,12 +27,9 @@
@@ -72,7 +65,7 @@ index 1bb86f48..2116f2aa 100644
  #ifdef __APPLE__
  #include <sys/socket.h>
  #include <TargetConditionals.h>
-@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid)  // IN:
+@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid)  // IN:
  static Bool
  IdIsSetUGid(void)
  {
@@ -106,10 +99,11 @@ index 1bb86f48..2116f2aa 100644
 +#elif HAVE___SECURE_GETENV
     static const char envName[] = "VMW_SETUGID_TEST";
  
-    if (setenv(envName, "1", TRUE) == -1) {
-       return TRUE; /* Conservative */
+    /*
+@@ -1062,7 +1058,9 @@ IdIsSetUGid(void)
+       return secure_getenv(envName) == NULL;
     }
-    return __secure_getenv(envName) == NULL;
+    return TRUE;
 -#endif
 +#else
 +   /* Android does not have a secure_getenv, so be conservative. */
@@ -118,7 +112,7 @@ index 1bb86f48..2116f2aa 100644
  }
  #endif
 diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
-index 3363f3ac..b343196b 100644
+index de57a4a..7a132ee 100644
 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
 +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
 @@ -35,9 +35,13 @@
@@ -136,7 +130,7 @@ index 3363f3ac..b343196b 100644
  # include <net/if.h>
  #endif
  #ifndef NO_DNET
-@@ -494,10 +498,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
+@@ -499,10 +503,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
   *
   ******************************************************************************
   */
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 6e4e19bfdd5e..67ee6db8275d 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=12.1.5
+version=12.2.0
 revision=1
 archs="x86_64* i686* aarch64*"
 build_wrksrc="open-vm-tools"
@@ -17,8 +17,8 @@ maintainer="Piraty <mail@piraty.dev>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/ReleaseNotes.md"
-distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=678d08b46fba15f2b4c39245b5bc4deec30284d6f13ee279c233bc3d3627ec8a
+distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz"
+checksum=5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
 
 build_options="pam x11"
 build_options_default="pam x11"

From 5a007a3941e64fdf0b6bab3df089fef6b9691660 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 4 Jun 2023 13:46:04 +0530
Subject: [PATCH 0319/1854] himalaya: update to 0.8.0.

---
 srcpkgs/himalaya/template | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index 4bafe8d2f2c5..a115d4e5562c 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,19 +1,34 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.7.3
+version=0.8.0
 revision=1
 build_style=cargo
+build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel"
+makedepends="sqlite-devel libzstd-devel"
 short_desc="CLI email client"
 maintainer="Gadzhi Kharkharov <me@kkga.me>"
 license="MIT"
 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=5bfadca9d6141834c3a97d53a43bdd317e59ee4f893bcc00e6fcbf9fc0f5b55a
+checksum=c9bf62c802b05d3c98e105513042eafbbcbed4c5ed61aec7addae185accc5b40
 
 post_install() {
 	vlicense LICENSE
 	vdoc README.md
+
+	local himalaya="${DESTDIR}/usr/bin/himalaya"
+	vtargetrun ${himalaya} man .
+	for page in himalaya*.1; do
+		vman ${page}
+	done
+
+	for shell in bash fish zsh; do
+		vtargetrun ${himalaya} completion ${shell} > himalaya.${shell}
+		vcompletion himalaya.${shell} ${shell}
+	done
+
+	vsconf config.sample.toml config.toml
+	vinstall assets/himalaya.desktop 644 usr/share/applications
 }

From 68db9cf99778faca06cf09059f9b9fb9314b3bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:43:28 +0100
Subject: [PATCH 0320/1854] ImageMagick: update to 7.1.1.11.

---
 srcpkgs/ImageMagick/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cc78d87b0326..dbfcc264cae7 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-version=7.1.1.10
+# Revbump php*-imagick with ImageMagick updates.
+version=7.1.1.11
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -19,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=5008d827a78b56d436f532e6b6f7b6d4a69aa59342ce3dae00383f4686718c89
+checksum=98bb2783da7d5b06e7543529bd07b50d034fba611ff15e8817a0f4f73957d934
 
 subpackages="libmagick libmagick-devel"
 

From 29d9b8be60996364e04d42f59da677f7d392e8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:48:23 +0100
Subject: [PATCH 0321/1854] php8.0-imagick: revbump for ImageMagick 7.1.1.11.

---
 srcpkgs/php8.0-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
index fe31cb060f30..ae1823ab75d2 100644
--- a/srcpkgs/php8.0-imagick/template
+++ b/srcpkgs/php8.0-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0-imagick'
 pkgname=php8.0-imagick
 version=3.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.0"

From 88acdafe9e631b86aab065f2367c707d28e8d5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:48:23 +0100
Subject: [PATCH 0322/1854] php8.1-imagick: revbump for ImageMagick 7.1.1.11.

---
 srcpkgs/php8.1-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index 9c949a40d8c6..dbf7cae1d74a 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1-imagick'
 pkgname=php8.1-imagick
 version=3.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.1"

From b930111aa92b8bb7732bc2ecf5da5e6c8a7343ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 5 Jun 2023 23:48:23 +0100
Subject: [PATCH 0323/1854] php8.2-imagick: revbump for ImageMagick 7.1.1.11.

---
 srcpkgs/php8.2-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2-imagick/template b/srcpkgs/php8.2-imagick/template
index 59d405b7ee0e..09b11989c52a 100644
--- a/srcpkgs/php8.2-imagick/template
+++ b/srcpkgs/php8.2-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2-imagick'
 pkgname=php8.2-imagick
 version=3.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.2"

From 1b233409205aba40b8de7633f554f83f7b3e7d47 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 6 Jun 2023 16:47:01 +0200
Subject: [PATCH 0324/1854] dbeaver: update to 23.1.0.

---
 srcpkgs/dbeaver/files/dbeaver.desktop | 3 +--
 srcpkgs/dbeaver/template              | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dbeaver/files/dbeaver.desktop b/srcpkgs/dbeaver/files/dbeaver.desktop
index 1eb3eba5b99d..ecb376d39cbb 100644
--- a/srcpkgs/dbeaver/files/dbeaver.desktop
+++ b/srcpkgs/dbeaver/files/dbeaver.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
 Name=DBeaver
 Comment=SQL Integrated Development Environment
-Icon=dbeaver
+Icon=/usr/lib/dbeaver/icon.xpm
 Exec=dbeaver
 Terminal=false
 Type=Application
 Categories=Development
-
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d207598988d8..de239d96902c 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=23.0.5
+version=23.1.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://dbeaver.io"
 changelog="https://dbeaver.io/news/"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=55261bcdf16635347a42f8f8059df4368c88da79bbf4e458f0f648a8ab03e7e1
+checksum=85df98086b9984c4379382077f90bee60231fd04e1ccde120e9422e29a462218
 nopie=true
 
 do_build() {

From 3b126f47f28872699b047b68c38d70b9bae72ce3 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 1 Jun 2023 13:46:26 +0200
Subject: [PATCH 0325/1854] dooble: update to 2023.05.31.

---
 srcpkgs/dooble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dooble/template b/srcpkgs/dooble/template
index ac1d6dcb0f17..002507fbdcef 100644
--- a/srcpkgs/dooble/template
+++ b/srcpkgs/dooble/template
@@ -1,6 +1,6 @@
 # Template file for 'dooble'
 pkgname=dooble
-version=2023.04.20
+version=2023.05.31
 revision=1
 build_style=qmake
 configure_args="dooble.pro"
@@ -12,7 +12,7 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://textbrowser.github.io/dooble/"
 distfiles="https://github.com/textbrowser/dooble/archive/refs/tags/${version}.tar.gz"
-checksum=5425a5ad6753c08df061a8b78fa4aba035a915327d7b967eab3f0a6479eb869c
+checksum=ca2ad5dde9b695acb0b3553ce351fb6f155e9fb412dcb870adba8e12051a09e5
 
 do_install() {
 	vbin Dooble dooble

From e7dd1b3e0f4655a26b7aa249336ba92282ae9e53 Mon Sep 17 00:00:00 2001
From: JailBird <jailbird@fdf.net>
Date: Fri, 2 Jun 2023 15:51:03 -0500
Subject: [PATCH 0326/1854] dnsdist: update to 1.8.0

---
 srcpkgs/dnsdist/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index 0e2138b9d7bc..9b3991a2d546 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsdist'
 pkgname=dnsdist
-version=1.7.2
-revision=3
+version=1.8.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
  --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
@@ -19,7 +19,7 @@ license="GPL-2.0-only"
 homepage="https://dnsdist.org/"
 changelog="https://dnsdist.org/changelog.html"
 distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=524bd2bb05aa2e05982a971ae8510f2812303ab4486a3861b62212d06b1127cd
+checksum=1c0d375c25453d349b88e03ff589aa2603ca8692fc98364c068ead372804704f
 
 system_accounts="_dnsdist"
 
@@ -33,6 +33,6 @@ pre_configure() {
 }
 
 post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vinstall dnsdist.conf-dist 644 etc/dnsdist dnsdist.conf
 	vsv dnsdist
 }

From 324af758b13bd9f35218c3feb87f779426ce3b15 Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Fri, 2 Jun 2023 22:29:57 -0400
Subject: [PATCH 0327/1854] ntfs2btrfs: update to 20230501

---
 ...Use-GNUInstallDirs-to-determine-sbin.patch | 23 -------------------
 srcpkgs/ntfs2btrfs/template                   |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch

diff --git a/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch b/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
deleted file mode 100644
index 4f3412240f52..000000000000
--- a/srcpkgs/ntfs2btrfs/patches/0001-Use-GNUInstallDirs-to-determine-sbin.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f97247434ecda2cd2c451da5c73c3af98dfaea35 Mon Sep 17 00:00:00 2001
-From: Mark Harmstone <mark@harmstone.com>
-Date: Thu, 7 Oct 2021 17:59:35 +0100
-Subject: [PATCH] CMakeLists.txt: use GNUInstallDirs to determine sbin location
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cfaa571..17ded78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,5 +89,5 @@ else()
-     target_compile_options(ntfs2btrfs PRIVATE -Wall -Wextra -Wno-address-of-packed-member -Wconversion -Wno-unknown-pragmas -Werror=pointer-arith)
- endif()
- 
--install(TARGETS ntfs2btrfs DESTINATION sbin)
-+install(TARGETS ntfs2btrfs DESTINATION ${CMAKE_INSTALL_SBINDIR})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ntfs2btrfs.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
--- 
-2.33.0
-
diff --git a/srcpkgs/ntfs2btrfs/template b/srcpkgs/ntfs2btrfs/template
index c87a81de187d..d8a5903a4e98 100644
--- a/srcpkgs/ntfs2btrfs/template
+++ b/srcpkgs/ntfs2btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'ntfs2btrfs'
 pkgname=ntfs2btrfs
-version=20210923
+version=20230501
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_SBINDIR=bin"
@@ -11,4 +11,4 @@ maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-only"
 homepage="https://github.com/maharmstone/ntfs2btrfs"
 distfiles="https://github.com/maharmstone/ntfs2btrfs/archive/${version}.tar.gz"
-checksum=e07cc1cad634d59e58111bf993683f02a7504913fac1ef8dd33fd06ebf9140c1
+checksum=15924a22e9d80e4ca28bf5524708dd8f69d840df1e781a659ce953fee7d90730

From 542c90f58165394dc2dbfed3083f25db65b254bc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 3 Jun 2023 18:11:15 +0100
Subject: [PATCH 0328/1854] dav1d: update to 1.2.1.

---
 srcpkgs/dav1d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index 93a5a75f8238..ff2b78b4333b 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -1,6 +1,6 @@
 # Template file for 'dav1d'
 pkgname=dav1d
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=meson
 configure_args="-Denable_asm=true -Denable_tools=true -Dfuzzing_engine=none
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 changelog="https://code.videolan.org/videolan/dav1d/raw/master/NEWS"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive/${version}/dav1d-${version}.tar.bz2"
-checksum=05cedc43127e00a86c68b8a49a5f68e2dc22b9baa10b1e12a5e3bc5b37876a6b
+checksum=a4003623cdc0109dec3aac8435520aa3fb12c4d69454fa227f2658cdb6dab5fa
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Denable_tests=true"

From c71fcb2eb8e2e033abe206dc66a80354ad5fe3b1 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Tue, 30 May 2023 08:57:22 +0200
Subject: [PATCH 0329/1854] cpuid: update to 20230505.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 0fd421467072..849aec8d173d 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20230406
+version=20230505
 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=f4045de535f30e34e8c012b054ce66f40ac399144d6e3c3896bd80c0deeef1b0
+checksum=55d30400cd6bab9acf3597edfc9a527a258e3a7b5c40ccc9b8b32b10d3e29b30
 
 conflicts="msr-tools"

From 2642c0e4a85ef0e637819bce46e68ee12a6314bc Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 3 Jun 2023 20:20:17 +0200
Subject: [PATCH 0330/1854] pgmetrics: update to 1.15.0.

---
 srcpkgs/pgmetrics/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index ed30907d502b..de82b6132519 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,7 +1,7 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
-version=1.14.1
-revision=2
+version=1.15.0
+revision=1
 build_style=go
 go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://pgmetrics.io"
 distfiles="https://github.com/rapidloop/pgmetrics/archive/refs/tags/v${version}.tar.gz"
-checksum=cb93d65215e47fd7d15b9fe236dee53f29d72870d57e9262a37487dd516e8dda
+checksum=2975c4c5fbc8ebffeeb4afa0fd783bef60b3034c8d882d7e6d630ed5af803018
 
 post_install() {
 	vdoc README.md

From c6c17fd8e09195624c5b8411333a1ea51735752d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 3 Jun 2023 20:43:28 -0400
Subject: [PATCH 0331/1854] just: update to 1.14.0

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index f9861bccb69f..8f93ff95355e 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.13.0
+version=1.14.0
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz"
-checksum=ead24ef982253fa4bdd0af27b0867f74c8d9528817be8dd8b14b182369a432c7
+checksum=021d4dee59ddfd86ab87b9c9423b9a8126932c844da9765a35eb1ccb8f6cf4ce
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From cc31ad9815c8b21ac44bfe41d63dd0178f9a77dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 30 May 2023 20:11:12 +0200
Subject: [PATCH 0332/1854] libssh2: update to 1.11.0

---
 srcpkgs/libssh2/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index 456e4cc4547b..4b999a7fc1ee 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,16 +1,16 @@
 # Template file for 'libssh2'
 pkgname=libssh2
-version=1.10.0
+version=1.11.0
 revision=1
-build_style=gnu-configure
-configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
+build_style=cmake
+configure_args="-DENABLE_ZLIB_COMPRESSION=ON -DRUN_DOCKER_TESTS=OFF"
 makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.libssh2.org/"
 distfiles="http://www.libssh2.org/download/${pkgname}-${version}.tar.gz"
-checksum=2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51
+checksum=3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
 
 post_install() {
 	vlicense COPYING LICENSE
@@ -21,9 +21,11 @@ libssh2-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/doc
+		vmove usr/share/man
 	}
 }

From ad25019983e9eda899acf02d318a3697b1f78007 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 29 May 2023 11:22:11 +0530
Subject: [PATCH 0333/1854] font-spleen: update to 2.0.0.

---
 srcpkgs/font-spleen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template
index 33eda7716544..d84121bb2803 100644
--- a/srcpkgs/font-spleen/template
+++ b/srcpkgs/font-spleen/template
@@ -1,6 +1,6 @@
 # Template file for 'font-spleen'
 pkgname=font-spleen
-version=1.9.3
+version=2.0.0
 revision=1
 build_style=gnu-makefile
 make_cmd=bmake
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/fcambus/spleen"
 changelog="https://raw.githubusercontent.com/fcambus/spleen/master/ChangeLog"
 distfiles="https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"
-checksum=b7ad1edb02a5ddad117ca94f026eb8450b51504d2e81bc3a03875e12d4e76b25
+checksum=778778b35dd48701b803db247a6ac8759154ce5fc3abd5cc0b6db98a44ba5a0c
 font_dirs="/usr/share/fonts/X11/spleen"
 
 do_configure() {

From ba6e4f52bb8a52e52a59255e094ab245c4a18a29 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 May 2023 14:48:45 -0400
Subject: [PATCH 0334/1854] azote: update to 1.12.0

---
 srcpkgs/azote/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 8d4ab840fe91..319a5f5b3ad8 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,6 +1,6 @@
 # Template file for 'azote'
 pkgname=azote
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Piotr Miller <nwg.piotr@gmail.com>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/azote"
 distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/v${version}.tar.gz"
-checksum=82cacfabecd0ad2265495d07cce80cb9d01c2191104250adce67012bddd79fd1
+checksum=f36962755f266ab3adf21fe997ad0df7ff4c372b6d9e7437d6c815e75ad479dc
 make_check=no # no tests provided
 
 post_install() {

From 140f532ff1c746dec2b971599bdeaab487d94a88 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 16 May 2023 15:52:27 -0700
Subject: [PATCH 0335/1854] root: update to 6.28.04

---
 srcpkgs/root/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 0cbe92f79ecd..13a46d1a759e 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,6 +1,6 @@
 # Template file for 'root'
 pkgname=root
-version=6.28.02
+version=6.28.04
 revision=1
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
@@ -27,7 +27,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://root.cern"
 distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
-checksum=6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa
+checksum=70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965
 build_options="fortran"
 build_options_default="fortran"
 python_version=3

From 714721cd19d9c5e8377d3375d98dfbb88042e7f4 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Tue, 7 Mar 2023 13:22:56 -0300
Subject: [PATCH 0336/1854] nextcloud-client: update to 3.8.2, adopt

Also:
- Remove patch to disable update check, use BUILD_UPDATER=NO flag
  instead [1]

[1] https://github.com/nextcloud/desktop/pull/1847
---
 ...heck-for-updates-disabled-as-default.patch | 24 -------------------
 srcpkgs/nextcloud-client/template             |  8 +++----
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch

diff --git a/srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch b/srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch
deleted file mode 100644
index dec501c628f2..000000000000
--- a/srcpkgs/nextcloud-client/patches/check-for-updates-disabled-as-default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Set check for updates option as false by default
-
---- a/src/gui/generalsettings.ui
-+++ b/src/gui/generalsettings.ui
-@@ -114,7 +114,7 @@
-            <string>&amp;Automatically check for Updates</string>
-           </property>
-           <property name="checked">
--           <bool>true</bool>
-+           <bool>false</bool>
-           </property>
-          </widget>
-         </item>
---- a/src/libsync/configfile.cpp
-+++ b/src/libsync/configfile.cpp
-@@ -631,7 +631,7 @@ bool ConfigFile::autoUpdateCheck(const QString &connection) const
-     if (connection.isEmpty())
-         con = defaultConnection();
- 
--    QVariant fallback = getValue(QLatin1String(autoUpdateCheckC), con, true);
-+    QVariant fallback = getValue(QLatin1String(autoUpdateCheckC), con, false);
-     fallback = getValue(QLatin1String(autoUpdateCheckC), QString(), fallback);
- 
-     QVariant value = getPolicySetting(QLatin1String(autoUpdateCheckC), fallback);
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 27502262b8fa..8d667180293f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,9 +1,9 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.8.1
+version=3.8.2
 revision=1
 build_style=cmake
-configure_args="-Wno-dev"
+configure_args="-DBUILD_UPDATER=NO -Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
@@ -14,12 +14,12 @@ depends="qt5-graphicaleffects"
 checkdepends="cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
 short_desc="NextCloud Desktop client"
-maintainer="yopito <pierre.bourgin@free.fr>"
+maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
 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=f919a09c261039ddb8fcb6c10f10b1c6a8a31f64bf9b8b14ff46b5d02e428afc
+checksum=6186aaa70b82b06b4531cff2e55e0dd38a0d817de7ef039a81293d82cb05e8c0
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 

From e48635a4f44f6cad50ca9c910770e90c6453ea8b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 10:43:50 +0200
Subject: [PATCH 0337/1854] hyperrogue: update to 12.1q

---
 srcpkgs/hyperrogue/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index 9cd93f66f554..ac59d59696b7 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,6 +1,6 @@
 # Template file for 'hyperrogue'
 pkgname=hyperrogue
-version=12.1o
+version=12.1q
 revision=1
 build_style=gnu-makefile
 makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, CC-BY-SA-4.0, CC-BY-SA-3.0, CC-BY-3.0, Public Domain"
 homepage="https://www.roguetemple.com/z/hyper/"
 changelog="https://raw.githubusercontent.com/zenorogue/hyperrogue/master/changelog.txt"
 distfiles="https://github.com/zenorogue/hyperrogue/archive/refs/tags/v${version}.tar.gz"
-checksum=cd351935d79be5c2e952a48cfad165635573d4aec0f695f8d6b563fb9938c4e9
+checksum=65689881423762cadf6d6b2e22a1ade62a3f6911fdf6d268d84111e1e0f3b6f0
 nocross="Generates code from build output that must run on host"
 
 # SDL_gfx-devel headers require that SDL.h be under the header search paths,

From ea34f674a2d383bb8d5fa80428bfd7dcd3be3d45 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 May 2023 10:15:20 -0400
Subject: [PATCH 0338/1854] fragments: update to 2.1.1

---
 srcpkgs/fragments/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index 135e4905b99f..7de6c8b6b2b2 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,7 +1,7 @@
 # Template file for 'fragments'
 pkgname=fragments
-version=2.1
-revision=2
+version=2.1.1
+revision=1
 build_style=meson
 build_helper="rust"
 hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
@@ -14,7 +14,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Fragments"
 distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
+checksum=5d573b99565d730101d41541731efe70df5bd72bab27de9f3da17b847e3684a8
 
 post_patch() {
 	if [ "$CROSS_BUILD" ]; then

From 21e8c7b1f3856537f80ac8515a3105063195c574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 31 May 2023 19:40:31 +0200
Subject: [PATCH 0339/1854] tml: update to 0.6.1.

---
 srcpkgs/tml/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index e7b794000e57..55da9c4b2b73 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
-version=0.6.0
-revision=3
+version=0.6.1
+revision=1
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/liamg/tml"
 distfiles="https://github.com/liamg/tml/archive/v${version}.tar.gz"
-checksum=80c5113447ee0f4aea0339184e6f393b135c62c985c788baf7e0fa4b9f7c2c48
+checksum=f9ee764c08481deca00a292ecec19c0987b68254cfc1a0f7f8b63528bfafee67
 
 post_install() {
 	vlicense LICENSE

From 196442710dd61401dabf3ce8b058b63d78e1b97b Mon Sep 17 00:00:00 2001
From: Jason Elswick <jason@jasondavid.tv>
Date: Wed, 31 May 2023 16:17:18 -0500
Subject: [PATCH 0340/1854] python3-dnsrecon: update to 1.1.4

---
 srcpkgs/python3-dnsrecon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-dnsrecon/template b/srcpkgs/python3-dnsrecon/template
index 32979df704f7..ed46e10d17cd 100644
--- a/srcpkgs/python3-dnsrecon/template
+++ b/srcpkgs/python3-dnsrecon/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-dnsrecon'
 pkgname=python3-dnsrecon
-version=1.1.3
-revision=2
+version=1.1.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-netaddr python3-dnspython python3-lxml python3-flake8 python3-setuptools"
 checkdepends="${depends} python3-pytest"
 short_desc="DNS enumeration script"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Jason Elswick <jason@jasondavid.tv>"
 license="GPL-2.0-only"
 homepage="https://github.com/darkoperator/dnsrecon"
 distfiles="https://github.com/darkoperator/dnsrecon/archive/refs/tags/${version}.tar.gz"
-checksum=076aa0745ab956b278f535f17fd002bd8be838e00fd18a639c30e9cd37ec9eb0
+checksum=ef3a7969b2cf25d1a65a62043a8dbede73103920e2c17c72e8c1aa7c1cc467b2

From 5a7399de6d0a218d2c3edc08e9d253143b783e00 Mon Sep 17 00:00:00 2001
From: Imran Khan <imran@khan.ovh>
Date: Thu, 1 Jun 2023 21:11:13 +0600
Subject: [PATCH 0341/1854] pgbouncer: update to 1.19.1.

---
 srcpkgs/pgbouncer/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index fb60ee74f89e..f681521fcd3a 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,22 +1,22 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.17.0
+version=1.19.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"
-checkdepends="which postgresql14 postgresql14-client"
+checkdepends="python3-pytest-xdist python3-pytest-asyncio python3-filelock python3-psycopg postgresql15 postgresql15-client"
 short_desc="Lightweight connection pooler for PostgreSQL"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="ISC"
 homepage="https://pgbouncer.github.io/"
 changelog="https://raw.githubusercontent.com/pgbouncer/pgbouncer/master/NEWS.md"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=657309b7bc5c7a85cbf70a9a441b535f7824123081eabb7ba86d00349a256e23
+checksum=58c3eff9bb72c18133b28e1f034fd59356ea76281c65e127432ca101c208a394
 make_check=ci-skip # Postgres server can't be run as root
 
 pre_check() {
-	. /etc/profile.d/postgresql14.sh
+	. /etc/profile.d/postgresql15.sh
 }
 
 post_install() {

From 17da0732ec641686481a30bf642823764371aed0 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Thu, 1 Jun 2023 13:44:02 -0400
Subject: [PATCH 0342/1854] mako: update to 1.8.0

---
 srcpkgs/mako/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template
index aad55bad6e21..2780bb58a057 100644
--- a/srcpkgs/mako/template
+++ b/srcpkgs/mako/template
@@ -1,6 +1,6 @@
 # Template file for 'mako'
 pkgname=mako
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=meson
 configure_args="-Dicons=enabled -Dman-pages=enabled -Dzsh-completions=true
@@ -13,7 +13,7 @@ maintainer="Emerson Ferreira <me@skrps.me>"
 license="MIT"
 homepage="https://wayland.emersion.fr/mako/"
 distfiles="https://github.com/emersion/mako/archive/v${version}.tar.gz"
-checksum=4312ff6bc61708115b43b967a42813374de7a2022f10c84e20127606416c3c12
+checksum=f149f3dd2a083504a50307554c0a729ac56888c8ebb0704a78b7261be26166de
 
 post_install() {
 	vlicense LICENSE

From f013c9a306822fedf7a32d6ebbefa7e7a0e2c8d3 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Thu, 8 Jun 2023 18:50:59 -0500
Subject: [PATCH 0343/1854] Signal-Desktop: update to 6.20.2.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 7eca75b4f1f5..88a862a26a14 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.20.1
+version=6.20.2
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=3c664dbb5c1670554859fa55fd765ac35632f573fd5b7bea63876cdf41b6b7d6
+checksum=8cca38e0ce70bec39a9d3f4c1d51bfec95a1455187c5ec1001ce98ec55f9c3e5
 nostrip_files="signal-desktop"
 
 post_extract() {

From c85fc5a14b58c1ea7ef0d40a12af22b6df33cee0 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 21:58:25 +0200
Subject: [PATCH 0344/1854] alfred: update to 2023.1.

---
 srcpkgs/alfred/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alfred/template b/srcpkgs/alfred/template
index 6ad228a0008b..111904c8daf4 100644
--- a/srcpkgs/alfred/template
+++ b/srcpkgs/alfred/template
@@ -1,6 +1,6 @@
 # Template file for 'alfred'
 pkgname=alfred
-version=2021.1
+version=2023.1
 revision=1
 build_style=gnu-makefile
 make_build_args="CONFIG_ALFRED_GPSD=n"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://www.open-mesh.org/projects/alfred/wiki"
 distfiles="https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${version}.tar.gz"
-checksum=94e2cf4dad885f9059fc8b8694a71eca51c9e184683bb99a79e3de8cb7485e88
+checksum=438048248f373757d3a8bde7cbc6db6685f4d0105d130da2f5a54f29090c6974
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libnl3"
 

From 53d36e8d65ea2c00ac0ed053ca4eef49801e7172 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:06:12 +0200
Subject: [PATCH 0345/1854] gopass: update to 1.15.5.

---
 srcpkgs/gopass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 320ff8ca0e14..66b113ae5a7b 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.15.2
-revision=2
+version=1.15.5
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.gopass.pw/"
 changelog="https://raw.githubusercontent.com/gopasspw/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz"
-checksum=c4eb5b8c28b0cb339581e1ef9f19612f6d523d7fa8a24554365ee72dc331d8d9
+checksum=d37e23081abd53c6441a28f1faecc5bbdc760e921ea26fb092745a695e79f60f
 
 post_install() {
 	vlicense LICENSE

From 575351e61b46ccd8c791e7a1a3b4bff896934106 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:38:24 +0200
Subject: [PATCH 0346/1854] iperf3: update to 3.13.

---
 srcpkgs/iperf3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 6ca59cb0ae4c..a8e54cccc2be 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf3'
 pkgname=iperf3
-version=3.11
+version=3.13
 revision=1
 build_style=gnu-configure
 make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS="
@@ -10,7 +10,7 @@ license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md"
 distfiles="https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"
-checksum=de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f
+checksum=bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865
 
 post_install() {
 	vlicense LICENSE

From e95be0604416f3014718997c365ab7566316a6bb Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 29 May 2023 22:03:09 +0100
Subject: [PATCH 0347/1854] enchant2: update to 2.5.0.

---
 srcpkgs/enchant2/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 1f028cba007b..c3d41d86fda6 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.3.3
-revision=2
+version=2.5.0
+revision=1
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
 # might be a bug in their build system that only this directory and/or file aren't
@@ -12,7 +12,7 @@ make_build_args="pkgdatadir=/usr/share/enchant-2"
 make_install_args="$make_build_args"
 # tests need --enable-relocatable
 configure_args="--enable-relocatable"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config groff"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
  libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
@@ -22,7 +22,7 @@ license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 changelog="https://raw.githubusercontent.com/AbiWord/enchant/master/NEWS"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=3da12103f11cf49c3cf2fd2ce3017575c5321a489e5b9bfa81dd91ec413f3891
+checksum=149e224cdd2ca825d874639578b6246e07f37d5b8f3970658a377a1ef46f2e15
 make_check=no # tests broken
 
 enchant2-devel_package() {

From eca981e8fa4888c375e405db3e24b99d8efaa01f Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Mon, 29 May 2023 18:31:51 -0400
Subject: [PATCH 0348/1854] Waybar: update to 0.9.18

---
 srcpkgs/Waybar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 4a6d1d595037..3da1c780f280 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.17
+version=0.9.18
 revision=1
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
@@ -28,7 +28,7 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz"
-checksum="da6f448be343a593ee092486fb4744502aa1e6ad85f4eccc3670d0b84a2a4266"
+checksum=44927f71834196276cfcbf5607339f59b511edf0ecc496c09d4f5f115108df3e
 
 build_options="libnl pulseaudio dbusmenugtk mpd sndio pipewire"
 build_options_default="libnl pulseaudio dbusmenugtk mpd sndio pipewire"

From a6cb00d437912e61647a3bae768dfb11baa6a7c2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 30 May 2023 11:28:32 +0200
Subject: [PATCH 0349/1854] intellij-idea-community-edition: update to 2023.1.2

---
 srcpkgs/intellij-idea-community-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index c681412597c5..63390bf45691 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2023.1
+version=2023.1.2
 revision=1
 archs="x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"
-checksum=e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa
+checksum=f222f0282bebe2e8c3fef6a27b160c760c118e45a0cdb7c9053d645a8e00844a
 repository=nonfree
 nopie=yes
 python_version=3

From 43cce44220b5892bafeaa164e5f4ba01ec0cfe13 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 30 May 2023 11:34:12 +0200
Subject: [PATCH 0350/1854] pnpm: update to 8.6.0

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index a6551bc553a0..5e3f10c0aa8b 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=7.30.5
+version=8.6.0
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=c8d730294f671574458704cd56e81dc0eb8d345a444e4c7a728d8d2cdc4f5045
+checksum=1e9c17c34c2eebaba02e78b619e296db08d302c296e58c2f51b0cd4e3e5bcda2
 python_version=3
 
 do_install() {

From b6f4f9f2d057314a81b5261d81026c09e2a558bb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 30 May 2023 10:28:13 -0400
Subject: [PATCH 0351/1854] mdBook: update to 0.4.30

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 0f14fdda92c3..cfcdbc4cb545 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.29
+version=0.4.30
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz"
-checksum=13e2ff0b9193aa257e6629554bc7dcdb83ee9654235dcd351b254aecd7d7b04f
+checksum=9df217a6a4c22d4b0fef0d13e04b1a9ae896a0c1084af36b93d032c9fa2c4148
 
 post_install() {
 	vlicense LICENSE

From 775edc04857dd7d88a2864e9938ea79e1a4fe67e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 18:48:26 -0300
Subject: [PATCH 0352/1854] python3-coverage: update to 7.2.7.

---
 .../patches/no-versioned-coverage.patch       | 16 --------
 srcpkgs/python3-coverage/template             | 41 ++++++++++++++-----
 2 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python3-coverage/patches/no-versioned-coverage.patch

diff --git a/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
deleted file mode 100644
index fefbfc0af761..000000000000
--- a/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -86,12 +86,9 @@ setup_args = dict(
-     },
- 
-     entry_points={
--        # Install a script as "coverage", and as "coverage[23]", and as
--        # "coverage-2.7" (or whatever).
-+        # Install a script as "coverage"
-         'console_scripts': [
-             'coverage = coverage.cmdline:main',
--            'coverage%d = coverage.cmdline:main' % sys.version_info[:1],
--            'coverage-%d.%d = coverage.cmdline:main' % sys.version_info[:2],
-         ],
-     },
- 
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
index 223f93ac4447..514705a375cd 100644
--- a/srcpkgs/python3-coverage/template
+++ b/srcpkgs/python3-coverage/template
@@ -1,17 +1,36 @@
 # Template file for 'python3-coverage'
 pkgname=python3-coverage
-version=5.0.3
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=7.2.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 makedepends="python3-devel"
-depends="python3-setuptools"
-checkdepends="python3-pytest-xdist python3-flaky python3-unittest-mixins"
-short_desc="Code coverage testing for Python3"
+checkdepends="$depends python3-pytest-xdist python3-flaky python3-hypothesis"
+short_desc="Code coverage tool for Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
+homepage="https://github.com/nedbat/coveragepy"
+changelog="https://raw.githubusercontent.com/nedbat/coveragepy/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-# coverage executable needs to run for many tests
-make_check=no
+checksum=924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59
+
+pre_check() {
+	# required setup, see tox.ini
+	python igor.py zip_mods
+}
+
+do_check() {
+	# Running via PYTHONPATH breaks a few tests so we use a venv
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
+	python3 -m venv --system-site-packages --without-pip "${testdir}"
+
+	local testpy="${testdir}/bin/python3"
+	"${testpy}" -m installer dist/*.whl
+	PATH="${testdir}/bin:${PATH}" "${testpy}" -m pytest -n ${XBPS_MAKEJOBS}
+}
+
+post_install() {
+	# remove versioned scripts (keep only /usr/bin/coverage)
+	rm ${DESTDIR}/usr/bin/coverage3
+	rm ${DESTDIR}/usr/bin/coverage-${py3_ver}
+}

From b603663e5081dac7e555912512a51bee9f9d0568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 23:53:02 -0300
Subject: [PATCH 0353/1854] python3-flaky: update to 3.7.0.

---
 srcpkgs/python3-flaky/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template
index 8f80d84d295b..5d1bbe305358 100644
--- a/srcpkgs/python3-flaky/template
+++ b/srcpkgs/python3-flaky/template
@@ -1,13 +1,15 @@
 # Template file for 'python3-flaky'
 pkgname=python3-flaky
-version=3.6.1
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=3.7.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
-short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python3)"
+short_desc="Plugin for nose or pytest that automatically reruns flaky tests"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/box/flaky"
+changelog="https://raw.githubusercontent.com/box/flaky/master/HISTORY.rst"
 distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
-checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698
+checksum=3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d
+make_check=no  # Tests are broken

From 3a8a29204fa7d849bdc133de1f436ce0ffe3c70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 5 Jun 2023 01:58:55 -0300
Subject: [PATCH 0354/1854] python3-hypothesis: update to 6.76.0.

---
 srcpkgs/python3-hypothesis/template | 47 +++++++++++++++--------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 30def188b53f..67321c20e2d2 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,32 +1,35 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.75.0
+version=6.76.0
 revision=1
 build_wrksrc=hypothesis-python
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+# disable tests requiring unpackaged dependencies or installed entrypoints
+make_check_args="
+ --ignore=tests/codemods/test_codemods.py
+ --ignore=tests/codemods/test_codemod_cli.py
+ --ignore=tests/dpcontracts/test_contracts.py
+ --ignore=tests/lark/test_grammar.py
+ --ignore=tests/patching/test_patching.py
+ --ignore=tests/redis/test_redis_exampledatabase.py
+ -k not(test_registered_from_entrypoint)
+"
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-attrs python3-sortedcontainers"
-checkdepends="python3-pytest-xdist black python3-typing_extensions
- python3-pytz python3-numpy python3-pexpect python3-dateutil $depends"
-short_desc="Python3 library for property based testing"
+checkdepends="python3-pytest-xdist black python3-typing_extensions python3-pytz
+ python3-numpy python3-pexpect python3-dateutil python3-pandas $depends"
+short_desc="Python library for property-based testing"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MPL-2.0"
 homepage="https://hypothesis.works/"
-changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
+changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=b5aae201b1758beb00c6d8eea3d860a461fe9f628c14d01f7a90a978b23e9178
+checksum=4564bbd860413af105dcdee6d5a9f8a1d08274f940266dfd2b45492d61f8b847
 
-do_check() {
-	# Manually run the tests that tox considers part of the "full" suite,
-	# less any related to packages not provided by Void.
-	#
-	# The tests in ghostwriter/test_ghostwriter_cli require a "hypothesis"
-	# entrypoint script, which does not exist until install time.
-	#
-	# The test_subTest_no_self function tries to run a separate
-	# interpreter, which will not see the local PYTHONPATH here.
-	PYTHONPATH=src python3 -m pytest -n $XBPS_MAKEJOBS \
-		-k 'not test_settings_alone and not test_subTest_no_self' \
-		--ignore=tests/ghostwriter/test_ghostwriter_cli.py \
-		tests/{cover,datetime,typing_extensions,ghostwriter}
-}
+if [ "$XBPS_CHECK_PKGS" != full ]; then
+	# Skip "full" tests unless explicitly requested"
+	make_check_target="
+	 tests/cover tests/pytest tests/datetime
+	 tests/typing_extensions tests/ghostwriter
+	"
+fi

From 8902a7940d9c38dce9b3c7f8aad23c150473f452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 23:36:00 -0300
Subject: [PATCH 0355/1854] python3-mock: update to 5.0.2.

---
 srcpkgs/python3-mock/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/python3-mock/template b/srcpkgs/python3-mock/template
index b237c4789a27..314da43a1740 100644
--- a/srcpkgs/python3-mock/template
+++ b/srcpkgs/python3-mock/template
@@ -1,23 +1,18 @@
 # Template file for 'python3-mock'
 pkgname=python3-mock
-version=4.0.3
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=5.0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 checkdepends="python3-pytest"
-short_desc="Python3 mock library"
+short_desc="Python mock library"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://mock.readthedocs.org/en/latest/"
-changelog="https://mock.readthedocs.io/en/latest/changelog.html"
+changelog="https://raw.githubusercontent.com/testing-cabal/mock/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc
-
-do_check() {
-	# The skipped test checks internal Python unittest behavior and fails
-	python3 -m pytest -k "not test_bool_not_called"
-}
+checksum=06f18d7d65b44428202b145a9a36e99c2ee00d1eb992df0caf881d4664377891
 
 post_install() {
 	vlicense LICENSE.txt

From 52d5ace41ef7cb289f75fb626c3ea1be74e2183a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 19:06:45 -0300
Subject: [PATCH 0356/1854] New package: python3-process-tests-2.1.2

---
 srcpkgs/python3-process-tests/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-process-tests/template

diff --git a/srcpkgs/python3-process-tests/template b/srcpkgs/python3-process-tests/template
new file mode 100644
index 000000000000..3f129be9880b
--- /dev/null
+++ b/srcpkgs/python3-process-tests/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-process-tests'
+pkgname=python3-process-tests
+version=2.1.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Tools for testing processes"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/ionelmc/python-process-tests"
+changelog="https://raw.githubusercontent.com/ionelmc/python-process-tests/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/process-tests/process-tests-${version}.tar.gz"
+checksum=a3747ad947bdfc93e5c986bdb17a6d718f3f26e8577a0807a00962f29e26deba
+make_check=no  # no tests available
+
+post_install() {
+	vlicense LICENSE
+}

From 4e6d24162776163723d0126e52f924a39531d612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 4 Jun 2023 17:08:42 -0300
Subject: [PATCH 0357/1854] python3-pytest-asyncio: update to 0.21.0.

---
 srcpkgs/python3-pytest-asyncio/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 4e747d5c5b41..ec0fdcb061f3 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,22 +1,23 @@
 # Template file for 'python3-pytest-asyncio'
 pkgname=python3-pytest-asyncio
-version=0.20.3
+version=0.21.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-pytest"
-checkdepends="$depends python3-hypothesis"
-short_desc="Pytest support for asyncio"
+checkdepends="$depends python3-flaky python3-hypothesis python3-pytest-trio"
+short_desc="Pytest plugin for asyncio"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pytest-dev/pytest-asyncio"
+changelog="https://raw.githubusercontent.com/pytest-dev/pytest-asyncio/master/docs/source/reference/changelog.rst"
 distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36
+checksum=2b38a496aef56f56b0e87557ec313e11e1ab9276fc3863f6a7be0f1d0e415e1b
 
-do_check() {
-	local skiptests="test_auto_mode_cmdline or \
-		test_strict_mode_ignores_trio_fixtures or \
-		test_unused_port_fixture or test_unused_port_factory_fixture"
-
-	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k "not (${skiptests})"
-}
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+	# these tests fail on CI (bind to a tcp address)
+	make_check_args="
+	 --deselect=tests/test_simple.py::test_unused_port_fixture
+	 --deselect=tests/test_simple.py::test_unused_port_factory_fixture
+	 "
+fi

From 771fc86cfc573dfb457ed818aae347eae5de195d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 20:58:14 -0300
Subject: [PATCH 0358/1854] New package: python3-pytest-console-scripts-1.4.1

---
 .../python3-pytest-console-scripts/template   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-console-scripts/template

diff --git a/srcpkgs/python3-pytest-console-scripts/template b/srcpkgs/python3-pytest-console-scripts/template
new file mode 100644
index 000000000000..2c6281267898
--- /dev/null
+++ b/srcpkgs/python3-pytest-console-scripts/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-console-scripts'
+pkgname=python3-pytest-console-scripts
+version=1.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-pytest"
+checkdepends="$depends"
+short_desc="Pytest plugin for testing console scripts"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/kvas-it/pytest-console-scripts"
+changelog="https://raw.githubusercontent.com/kvas-it/pytest-console-scripts/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/p/pytest-console-scripts/pytest-console-scripts-${version}.tar.gz"
+checksum=5a826ed84cc0afa202eb9e44381d7d762f7bdda8e0c23f9f79a7f1f44cf4a895
+
+post_install() {
+	vlicense LICENSE
+}

From f9bc8667785a2965a99e8186207e953a73796cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 22:46:04 -0300
Subject: [PATCH 0359/1854] python3-pytest-cov: update to 4.1.0.

---
 srcpkgs/python3-pytest-cov/template | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index 47dc36d44017..edc00f201af7 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,20 +1,32 @@
 # Template file for 'python3-pytest-cov'
 pkgname=python3-pytest-cov
-version=3.0.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=4.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-pytest python3-coverage"
-checkdepends="$depends python3-toml python3-py python3-pluggy python3-packaging
- python3-more-itertools python3-attrs python3-six python3-parsing"
+checkdepends="$depends python3-fields python3-process-tests
+ python3-pytest-xdist python3-virtualenv"
 short_desc="Pytest plugin for measuring coverage"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://pytest-cov.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470
-make_check=no # requires unpackaged xdist, fields, process_tests
+checksum=3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6
+
+do_check() {
+	# Running via PYTHONPATH breaks a few tests so we use a venv
+	local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
+	python3 -m venv --system-site-packages --without-pip "${testdir}"
+
+	local testpy="${testdir}/bin/python3"
+	"${testpy}" -m installer dist/*.whl
+	# coverage needs to be installed inside venv
+	# see: https://github.com/pytest-dev/pytest-cov/issues/517
+	ln -s /${py3_sitelib}/coverage ${testdir}${py3_sitelib#usr}
+	PATH="${testdir}/bin:${PATH}" "${testpy}" -m pytest -n ${XBPS_MAKEJOBS}
+}
 
 post_install() {
 	vlicense LICENSE

From 23095e0bbf6876bd0175231b4e51690dfba384f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 20:40:38 -0300
Subject: [PATCH 0360/1854] python3-pytest-mock: update to 3.10.0.

---
 srcpkgs/python3-pytest-mock/template | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 602337199a41..abb1557f6655 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,28 +1,18 @@
 # Template file for 'python3-pytest-mock'
 pkgname=python3-pytest-mock
-version=3.9.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=3.10.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-pytest"
-checkdepends="$depends"
-short_desc="Thin-wrapper around mock for easier use with py.test (Python3)"
+checkdepends="python3-pytest-asyncio python3-mock"
+short_desc="Pytest plugin for mock"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pytest-mock/"
 changelog="https://raw.githubusercontent.com/pytest-dev/pytest-mock/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=c899a0dcc8a5f22930acd020b500abd5f956911f326864a3b979e4866e14da82
-
-# pytest-mock requires pytest-mock to be installed so it'll always fail during
-# packaging
-make_check=no
-
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires=/d' \
-		-e "s|use_scm_version=.*|version='${version}',|"
-}
+checksum=fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f
 
 post_install() {
 	vlicense LICENSE

From a14e1f28c8c4fc5ba473000d72445539e1326892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 5 Jun 2023 02:54:48 -0300
Subject: [PATCH 0361/1854] New package: python3-pytest-trio-0.8.0

---
 srcpkgs/python3-pytest-trio/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-trio/template

diff --git a/srcpkgs/python3-pytest-trio/template b/srcpkgs/python3-pytest-trio/template
new file mode 100644
index 000000000000..4009a6de72c4
--- /dev/null
+++ b/srcpkgs/python3-pytest-trio/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pytest-trio'
+pkgname=python3-pytest-trio
+version=0.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-trio python3-outcome python3-pytest"
+checkdepends="$depends python3-hypothesis"
+short_desc="Pytest plugin for trio"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT, Apache-2.0"
+homepage="https://github.com/python-trio/pytest-trio"
+changelog="https://raw.githubusercontent.com/python-trio/pytest-trio/master/docs/source/history.rst"
+distfiles="${PYPI_SITE}/p/pytest-trio/pytest-trio-${version}.tar.gz"
+checksum=8363db6336a79e6c53375a2123a41ddbeccc4aa93f93788651641789a56fb52e
+make_check_pre="env PYTHONPATH=."
+
+post_patch() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no
+	# longer supported in pytest
+	mv pytest_trio/_tests/conftest.py .
+}
+
+post_install() {
+	vlicense LICENSE
+}

From caa4b8d0d757b3d80749643e6655ecbb7b67005f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 29 May 2023 21:01:36 -0300
Subject: [PATCH 0362/1854] python3-pytest-xdist: enable tests.

---
 srcpkgs/python3-pytest-xdist/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pytest-xdist/template b/srcpkgs/python3-pytest-xdist/template
index b327702316a3..91a4f148cf5c 100644
--- a/srcpkgs/python3-pytest-xdist/template
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -3,8 +3,9 @@ pkgname=python3-pytest-xdist
 version=3.3.1
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-pytest python3-execnet"
+checkdepends="$depends python3-filelock python3-pexpect python3-psutil"
 short_desc="Pytest plugin for distributed testing & loop-on-failures testing modes"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
@@ -12,8 +13,6 @@ 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=d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93
-# tests only work in tox
-make_check=no
 
 post_install() {
 	vlicense LICENSE

From 2399065610f9fb8ab9049f0e99dd6649f3dd2b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 13:16:19 -0300
Subject: [PATCH 0363/1854] python3-testpath: update to 0.6.0.

Closes: #44272 [via git-merge-pr]
---
 srcpkgs/python3-testpath/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-testpath/template b/srcpkgs/python3-testpath/template
index a439b95a62b0..ef041edb6a91 100644
--- a/srcpkgs/python3-testpath/template
+++ b/srcpkgs/python3-testpath/template
@@ -1,20 +1,23 @@
 # Template file for 'python3-testpath'
 pkgname=python3-testpath
-version=0.4.4
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
-short_desc="Test utilities for code working with files and commands (Python3)"
+checkdepends="python3-pytest"
+short_desc="Test utilities for Python code working with files and commands"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/testpath"
+changelog="https://raw.githubusercontent.com/jupyter/testpath/master/doc/history.rst"
 distfiles="${PYPI_SITE}/t/testpath/testpath-${version}.tar.gz"
-checksum=60e0a3261c149755f4399a1fff7d37523179a70fdc3abdf78de9fc2604aeec7e
+checksum=2f1b97e6442c02681ebe01bd84f531028a7caea1af3825000f52345c30285e0f
 
 pre_build() {
 	rm -f testpath/cli-*.exe
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 92012b4bdc917c3ccca833781ed500592315e078 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 30 May 2023 11:05:07 -0500
Subject: [PATCH 0364/1854] perl-Alien-Build: update to 2.80.

---
 srcpkgs/perl-Alien-Build/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Alien-Build/template b/srcpkgs/perl-Alien-Build/template
index e3b41551c3bc..dfdc366425be 100644
--- a/srcpkgs/perl-Alien-Build/template
+++ b/srcpkgs/perl-Alien-Build/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Alien-Build'
 pkgname=perl-Alien-Build
-version=2.50
+version=2.80
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-PkgConfig perl-File-Which"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/Alien::Build"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-${version}.tar.gz"
-checksum=4ed2e175ba2d46d77fc8bb3b726a583cd3b28dc5c2885c375cfa2bf2a7c17347
+checksum=d9edc936b06705bb5cb5ee5a2ea8bcf6111a3e8815914f177e15e3c0fed301f3

From 8f5f225553a54267cd7d0a8b349ade575e14c0c3 Mon Sep 17 00:00:00 2001
From: Rei Eventide <rei@eventide.space>
Date: Sat, 27 May 2023 09:25:43 +0000
Subject: [PATCH 0365/1854] retroarch: update to 1.15.0

---
 srcpkgs/retroarch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 240d3df9db00..28016aa0129e 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.14.0
+version=1.15.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -24,7 +24,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=aa4d579bfceb43450725171f594f69877f007a8892cb46678f8b62935c4de635
+checksum=3d3da8c1613820ce4b9360df794d36fd0f7ff902ae164936145a1d4f9e1014db
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From 53dd5963a4597a93505fb76a135d0429563d96fc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 30 May 2023 14:38:43 +0200
Subject: [PATCH 0366/1854] helix: switch from launcher script to symlink

---
 srcpkgs/helix/files/hx | 2 --
 srcpkgs/helix/template | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/helix/files/hx

diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
deleted file mode 100644
index a43e49fadc5b..000000000000
--- a/srcpkgs/helix/files/hx
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index f920843b9ce4..ee11896d0803 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=23.05
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 short_desc="Post-modern modal text editor"
@@ -30,7 +30,7 @@ post_install() {
 	vinstall contrib/helix.png 644 usr/share/icons/hicolor/128x128/apps
 
 	vmkdir usr/lib/helix
-	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
 	vcopy runtime usr/lib/helix
-	vbin ${FILESDIR}/hx
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	ln -s /usr/lib/helix/hx ${DESTDIR}/usr/bin/
 }

From d047c667bf176dc42ed4736fa97dbd3c8eeeeaa6 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 26 May 2023 18:34:16 +0200
Subject: [PATCH 0367/1854] xonsh: update to 0.14.0

---
 srcpkgs/xonsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 83df2334ceb5..94561f0ccfe3 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,6 +1,6 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.13.4
+version=0.14.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=2386351e2dc29120466b937f8b25cb0e86ffb2c629c1d0df71175d712cdea478
+checksum=a83f9540f5652ec84b1f0d38aa6f17443a288a71791223421495e6bcd2f8625a
 register_shell="/bin/xonsh"
 # FIXME: fails with multiple AttributeErrors
 make_check=extended

From 67cf7f73df0fd8f2b1d980eaac4ab0057eb8fa64 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Fri, 26 May 2023 09:46:23 -0700
Subject: [PATCH 0368/1854] aws-vault: update to 7.2.0.

---
 srcpkgs/aws-vault/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index 77575438c1d4..c0abaae96558 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,16 +1,16 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
-version=6.3.1
-revision=3
+version=7.2.0
+revision=1
 build_style=go
-go_import_path=github.com/99designs/aws-vault/v6
+go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"
 short_desc="Vault for securely storing and accessing AWS credentials"
 maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/99designs/aws-vault"
 distfiles="https://github.com/99designs/aws-vault/archive/v${version}.tar.gz"
-checksum=433df90b7ed1cf1ec08aa75a4f1f993edfe5fa3fecfff5519574613ab0ab4630
+checksum=3f2f1d0ec06eb0873f9b96b59dc70f9fcc832dc97b927af3dbab6cdc87477b0e
 
 post_install() {
 	vlicense LICENSE

From 3b06f26a2dbba6d67374b2b82652f2724aac5a94 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 15:56:22 +0530
Subject: [PATCH 0369/1854] Marker: update to 2023.05.02.

MathJax is now optional dep, Katex is used by default.
---
 srcpkgs/Marker/patches/elf_files_in_lib.patch | 19 -----------
 srcpkgs/Marker/patches/system-mathjax.patch   | 12 -------
 srcpkgs/Marker/template                       | 32 +++++++++++++------
 3 files changed, 23 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/Marker/patches/elf_files_in_lib.patch
 delete mode 100644 srcpkgs/Marker/patches/system-mathjax.patch

diff --git a/srcpkgs/Marker/patches/elf_files_in_lib.patch b/srcpkgs/Marker/patches/elf_files_in_lib.patch
deleted file mode 100644
index 63d2cc5f6969..000000000000
--- a/srcpkgs/Marker/patches/elf_files_in_lib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN Marker/meson.build Marker1/meson.build
---- Marker/meson.build	2019-11-06 14:44:46.000000000 +0200
-+++ Marker1/meson.build	2019-12-06 22:39:56.434367811 +0200
-@@ -5,13 +5,14 @@
-
- PREFIX = get_option('prefix')
- DATA_DIR = join_paths(PREFIX, 'share')
-+LIBS_DIR = join_paths(PREFIX, 'lib')
- APP_DIR = join_paths(DATA_DIR, 'com.github.fabiocolacio.marker')
- ICONS_DIR = join_paths(APP_DIR, 'icons')
- STYLES_DIR = join_paths(APP_DIR, 'styles')
- COMMON_DIR = join_paths(APP_DIR, 'common')
- SCRIPTS_DIR = join_paths(APP_DIR, 'scripts')
- HIGHLIGHT_STYLES_DIR = join_paths(join_paths(SCRIPTS_DIR, 'highlight'),'styles')
--WEB_EXTENSIONS_DIRECTORY = join_paths(APP_DIR, 'extensions')
-+WEB_EXTENSIONS_DIRECTORY = join_paths(LIBS_DIR, 'Marker.extensions')
- APPDATA_DIR = join_paths(DATA_DIR, 'metainfo')
- LOCALE_DIR = join_paths(PREFIX, get_option('localedir'))
-
diff --git a/srcpkgs/Marker/patches/system-mathjax.patch b/srcpkgs/Marker/patches/system-mathjax.patch
deleted file mode 100644
index 1ef9fde3693d..000000000000
--- a/srcpkgs/Marker/patches/system-mathjax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/marker-markdown.c
-+++ b/src/marker-markdown.c
-@@ -87,8 +87,7 @@ char* html_header(MarkerMathJSMode    ma
-       } else
-       {
-         mathjs_css = g_strdup(" ");
--        mathjs_script = g_strdup_printf("<script src=\"file://%smathjax/MathJax.js?config=TeX-AMS_HTML\"></script>",
--                                        SCRIPTS_DIR);
-+        mathjs_script = g_strdup("<script src=\"file:///usr/share/mathjax/MathJax.js?config=TeX-AMS_HTML\"></script>");
-         mathjs_auto = g_strdup(" ");
-       }
-       break;
diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index 1bc21fc39379..0bcf2f8f9f44 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -1,22 +1,36 @@
 # Template file for 'Marker'
 pkgname=Marker
-version=2020.04.04
-revision=3
+version=2023.05.02
+revision=1
+_scidown_commit=a7b7f063de4f272ef0ec12d00b98470888e8cb32
+_charter_commit=a25dee1214ea9ba5882325066555cb813efbb489
+_tinyexpr_commit=9476568b69de4c384903f1d5f255907b92592f45
+build_wrksrc="Marker-${version}"
 build_style=meson
 hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
- webkit2gtk-devel"
-depends="iso-codes mathjax2"
+ libwebkit2gtk41-devel"
+depends="iso-codes"
 short_desc="Gtk3 markdown editor"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later, ISC"
+license="GPL-3.0-or-later, ISC, Zlib"
 homepage="https://fabiocolacio.github.io/Marker/"
-distfiles="https://github.com/fabiocolacio/Marker/releases/download/${version}/marker.zip"
-checksum=ca493e7e94f171c15f7ffc9f697ce265d3b4fdb20fae157601d091d89dd6fb40
+distfiles="https://github.com/fabiocolacio/Marker/archive/refs/tags/${version}.tar.gz
+ https://github.com/Mandarancio/scidown/archive/${_scidown_commit}.tar.gz
+ https://github.com/Mandarancio/charter/archive/${_charter_commit}.tar.gz
+ https://github.com/codeplea/tinyexpr/archive/${_tinyexpr_commit}.tar.gz"
+checksum="097a6e3811f0c4c14c574b8aafee27ee62232ae3ad3084e18a35c2dc8a1e93dd
+ 31e63658e2e79b5c5b0497d568e548f177fc89cb1dd9b6d78aba7685f0506ff0
+ 60237a813383b44891e57049ba1f86cc5b89c28eee620b6ee90582a0c7ba6f8a
+ 1c0c9496d9e9b693ae364860f0b66c403b87337db1b5a78275a0c78a07495286"
 
 post_extract() {
-	# don't include bundled mathjax
-	rm -rf data/scripts/mathjax
+	rmdir "${build_wrksrc}/src/scidown"
+	mv "scidown-${_scidown_commit}" "${build_wrksrc}/src/scidown"
+	rmdir "${build_wrksrc}/src/scidown/src/charter"
+	mv "charter-${_charter_commit}" "${build_wrksrc}/src/scidown/src/charter"
+	rmdir "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr"
+	mv "tinyexpr-${_tinyexpr_commit}" "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr"
 }
 
 post_install() {

From 53f5ff706e88f0b111e8fa3a2fa694510620abcb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 11:40:06 +0530
Subject: [PATCH 0370/1854] gping: update to 1.12.0.

---
 srcpkgs/gping/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gping/template b/srcpkgs/gping/template
index 27c92c18b985..4993e855f42d 100644
--- a/srcpkgs/gping/template
+++ b/srcpkgs/gping/template
@@ -1,6 +1,6 @@
 # Template file for 'gping'
 pkgname=gping
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=cargo
 make_install_args="--path gping"
@@ -10,7 +10,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://crates.io/crates/gping"
 distfiles="https://github.com/orf/gping/archive/refs/tags/gping-v${version}.tar.gz"
-checksum=df32aa9d435fa724c1fefe00e32d3f53c7e8d29c11d63031b97c9cd82c0afc26
+checksum=63b5a60d1389e44c5baef07cec41d148b454798683baf220bb260d450a4906b8
 
 post_install() {
 	vlicense LICENSE

From 52f0811bb4ffef95dbc788e51abfaf844f7cec6b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 26 May 2023 21:25:06 +0100
Subject: [PATCH 0371/1854] tdb: update to 1.4.8.

---
 srcpkgs/tdb/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index 23bea72ec8e0..5df924f26a67 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -1,6 +1,6 @@
 # Template file for 'tdb'
 pkgname=tdb
-version=1.4.7
+version=1.4.8
 revision=1
 build_style=waf3
 build_helper="qemu"
@@ -15,11 +15,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tdb.samba.org/"
 distfiles="https://download.samba.org/pub/tdb/tdb-${version}.tar.gz"
-checksum=a4fb168def533f31ff2c07f7d9844bb3131e6799f094ebe77d0380adc987c20e
+checksum=8434c9c857d13ce3fa8466f75601f25c3693676b36919f159e0ad6121baf5ce8
 
 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
 export PYTHONHASHSEED=1
 
+do_check() {
+	${configure_script} test ${makejobs}
+}
+
 tdb-devel_package() {
 	depends="libtdb-${version}_${revision}"
 	short_desc+=" - development files"

From 7f4274a91b93ec05983855c26c5d835274d02e0c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 26 May 2023 22:42:01 +0100
Subject: [PATCH 0372/1854] sqlite: update to 3.42.0.

---
 .../sqlite/patches/3.41-perf-regression.patch | 19 -------------------
 srcpkgs/sqlite/template                       |  6 +++---
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/sqlite/patches/3.41-perf-regression.patch

diff --git a/srcpkgs/sqlite/patches/3.41-perf-regression.patch b/srcpkgs/sqlite/patches/3.41-perf-regression.patch
deleted file mode 100644
index d3e3e20a4c92..000000000000
--- a/srcpkgs/sqlite/patches/3.41-perf-regression.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch-Source: https://sqlite.org/src/info/aa6bd6dff751223e
-https://sqlite.org/forum/forumpost/3a180ba0d4
-
-Can be removed in 3.42.x
-
-diff --git a/sqlite3.c b/sqlite3.c
-index 947a154..bf9ce16 100644
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -143420,9 +143420,6 @@ static int pushDownWhereTerms(
-       if( pSel->pWin ) return 0;    /* restriction (6b) */
- #endif
-     }
--    if( compoundHasDifferentAffinities(pSubq) ){
--      return 0;  /* restriction (9) */
--    }
-     if( notUnionAll ){
-       /* If any of the compound arms are connected using UNION, INTERSECT,
-       ** or EXCEPT, then we must ensure that none of the columns use a
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 14d03054c9e3..e6eb425185fd 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,7 +1,7 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.41.2
-revision=2
+version=3.42.0
+revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 build_style=gnu-configure
 configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5"
@@ -12,7 +12,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/changes.html"
 distfiles="https://sqlite.org/2023/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=e98c100dd1da4e30fa460761dab7c0b91a50b785e167f8c57acc46514fae9499
+checksum=7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From bae80fe6dd2f1c495515df92c46e32c0b1f75540 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 5 Apr 2023 19:46:13 +0100
Subject: [PATCH 0373/1854] xfsprogs: update to 6.3.0.

---
 srcpkgs/xfsprogs/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 2e55f5e0b458..a57d12193edc 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-editline=yes --enable-lib64=no --libdir=/usr/lib
@@ -13,7 +13,11 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=d67dcba5a28e0904b60886b6e5f752bc7c9c3a5c7096153855b5adca9db86c51
+checksum=ec987c9f0bcb2db2991bffb80d353150b389c3a2b79b6830411f7042adf6990c
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" liburcu-devel"
+fi
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \

From 9501ff92d0127292e61b43514daedccc793e3c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 28 May 2023 16:03:25 +0100
Subject: [PATCH 0374/1854] btrfs-progs: update to 6.3.1.

---
 srcpkgs/btrfs-progs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 0aa9eb6a3be6..4ba0fb11a9b9 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=6.2.2
+version=6.3.1
 revision=1
 build_style=gnu-configure
 make_check_target=test
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"
-checksum=e4888db8637d92e667448386992d0856b954cf2515b98d39b667da43c482d693
+checksum=9ad98394c7936c3650445a134103a0db6ad3bf6f163917dfff49ff77614b3f14
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no

From f5367d94cfe9965c2122bdb6a851b0c250bae216 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 28 May 2023 18:44:08 +0100
Subject: [PATCH 0375/1854] python3-docutils: update to 0.20.1.

---
 srcpkgs/python3-docutils/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
index 60f911f1bdf6..de11fe3d00fc 100644
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
-version=0.19
+version=0.20.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 # docutils/writers/odf_odt/pygmentsformatter.py
 depends="python3-Pygments"
-checkdepends="${depends}"
+checkdepends="${depends} python3-pytest"
 short_desc="Python3 documentation utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
+homepage="https://docutils.sourceforge.io"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6
+checksum=f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py
@@ -28,11 +28,6 @@ alternatives="
  docutils:rst2xml:/usr/bin/rst2xml.py
  docutils:rstpep2html:/usr/bin/rstpep2html.py"
 
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
 post_install() {
 	vlicense COPYING.txt COPYING
 }

From fe6982b9794d4d78beddc34df714b12b2aab3ac0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH 0376/1854] rust-sccache: update to 0.5.3.

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..f16c5ebf6041 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.4.2
+version=0.5.3
 revision=1
 build_style=cargo
 # 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 changelog="https://github.com/mozilla/sccache/releases"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 549ea0261ae5ccb919cd12376a8e8d50a836f2f7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 01:16:00 +0530
Subject: [PATCH 0377/1854] vale: update to 2.27.0.

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 115fcdb1b9b7..83730b8aaeb2 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.26.0
+version=2.27.0
 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=a54e5cce0b29e395a22a2476e42c52b2f2a9105caa9520ddf7b7cbf58fb3087b
+checksum=65de0683d653767da8ef9f58fe3bf5978263978db4b98ee9609d7b90f2c4f4dc
 
 post_install() {
 	vlicense LICENSE

From 17cb942f815dae98dfb9d846cae3996a15e2f579 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Thu, 25 May 2023 22:16:15 +0200
Subject: [PATCH 0378/1854] translate-shell: update to 0.9.7.1

---
 srcpkgs/translate-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/translate-shell/template b/srcpkgs/translate-shell/template
index 2975a3706dbd..7aa9dbbb1729 100644
--- a/srcpkgs/translate-shell/template
+++ b/srcpkgs/translate-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'translate-shell'
 pkgname=translate-shell
-version=0.9.7
+version=0.9.7.1
 revision=1
 build_style=gnu-makefile
 make_build_args="$(vopt_if zsh TARGET=zsh)"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Unlicense"
 homepage="https://www.soimort.org/translate-shell"
 distfiles="https://github.com/soimort/translate-shell/archive/v${version}.tar.gz"
-checksum=fe328bff9670a925f6dd6f80629ed92b078edd9a4c3f8414fbb3d921365c59a7
+checksum=f949f379779b9e746bccb20fcd180d041fb90da95816615575b49886032bcefa
 
 build_options="zsh"
 desc_option_zsh="Use zsh compatible wrapper"

From 1fe06a45213a82363fb39ce1ed4d5cda8360b3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 26 May 2023 00:14:46 +0200
Subject: [PATCH 0379/1854] tectonic: update to 0.13.1.

---
 srcpkgs/tectonic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 30a37226eb1e..59f2209266a9 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.12.0
-revision=2
+version=0.13.1
+revision=1
 build_style=cargo
 configure_args="--features=external-harfbuzz"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=96a53ab5ba29d2bf263f19b6f07450471118bf2067c610b362a1492d0b9b989f
+checksum=bc16c2d7c85b646f5d168371a6cf1f2c219d8fcdcc919addcc9d74ce0cfbd442
 
 post_install() {
 	vlicense LICENSE

From ba985e9e74411df3297d09c9124ad7548b6ff61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 7 May 2023 12:27:26 +0200
Subject: [PATCH 0380/1854] kopia: update to 0.13.0.

---
 srcpkgs/kopia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index a30dd1d241b0..1f0b8a016118 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
-version=0.12.1
-revision=2
+version=0.13.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=c42d4c7c7d0e3e0c80cfee1e42b7567264d97e36d18d2d5e7b675cd7e2fdb5a6
+checksum=017fe4375207ce2ed73433b072249882735de1a8a5aedebec2ca1c6fee9e5a9b
 
 post_install() {
 	for shell in bash zsh; do

From 015c256dbc08f59078521ed14c611483227856cf Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 15:16:32 +0100
Subject: [PATCH 0381/1854] wavpack: update to 5.6.0.

---
 srcpkgs/wavpack/template | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index b82b264a5065..d9b0f68f014b 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -1,20 +1,21 @@
 # Template file for 'wavpack'
 pkgname=wavpack
-version=5.4.0
+version=5.6.0
 revision=1
 build_style=gnu-configure
+configure_args="--enable-static"
 short_desc="Hybrid lossless audio compression"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.wavpack.com/"
-distfiles="http://www.wavpack.com/${pkgname}-${version}.tar.bz2"
-checksum=0716a6dcf9a72d61005e1b09bbbd61aaf49837cb4e4a351992a6daed16cac034
+homepage="https://www.wavpack.com/"
+changelog="https://raw.githubusercontent.com/dbry/WavPack/master/NEWS"
+distfiles="https://www.wavpack.com/wavpack-${version}.tar.bz2"
+checksum=8cbfa15927d29bcf953db35c0cfca7424344ff43ebe4083daf161577fb839cc1
+
+case "$XBPS_TARGET_MACHINE" in
+	armv5*) configure_args+=" --disable-asm";;
+esac
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		armv5*) configure_args+=" --disable-asm";;
-	esac
-}
 post_install() {
 	vlicense COPYING LICENSE
 }
@@ -25,6 +26,7 @@ libwavpack_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
 wavpack-devel_package() {
 	depends="libwavpack>=${version}_${revision}"
 	short_desc+=" - development files"

From 9f3dd7d91e64e14cbe2fb8741e56df4717a0d294 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 May 2023 17:18:15 +0300
Subject: [PATCH 0382/1854] setzer: update to 55

---
 srcpkgs/setzer/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index 035e71b8f05d..1a50dd02d31b 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,13 +1,15 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.4.8
-revision=2
+version=55
+revision=1
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pexpect"
+depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pexpect
+ libwebkit2gtk41 libhandy1"
+checkdepends="desktop-file-utils AppStream"
 short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
 maintainer="Bleznudd <bleznudd@pm.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cvfosammmm/setzer"
 distfiles="https://github.com/cvfosammmm/setzer/archive/v${version}.tar.gz"
-checksum=4e347f538a5bf9d0be73de3b91fa79d3601c94ba1faf74f191f1904ec67fa2cf
+checksum=e0096886627159e61925b1d623c7f419193c4577b1f32acd8f6ea94a89ed0513

From 4af51e912b8817bb1d50dce3172e1c845b589cb0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 20 May 2023 19:27:24 +0200
Subject: [PATCH 0383/1854] cargo-update: update to 13.0.4

---
 srcpkgs/cargo-update/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 860dfe924247..086d3660bfaa 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
-version=13.0.3
+version=13.0.4
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
@@ -11,12 +11,7 @@ license="MIT"
 homepage="https://github.com/nabijaczleweli/cargo-update"
 changelog="https://github.com/nabijaczleweli/cargo-update/releases"
 distfiles="https://github.com/nabijaczleweli/cargo-update/archive/refs/tags/v${version}.tar.gz"
-checksum=36643823e3dc5e7905ca6515ee5672799cbeb347ba9cb029ffc35265bd901fcb
-
-# on i686, unexpected index dir hashes are generated
-if [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
-	make_check_args="-- --skip ops::assert_index_path"
-fi
+checksum=cc07255dc6b7b61d7c54955ea33486b447f629564d9f3ebb88d421ab5bcdcdf6
 
 post_patch() {
 	# Upstream does not ship a lockfile and is very vocal about that being

From 3da62a0ded6f2b16601904fe462e6467a0ecf1ae Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 18 May 2023 11:08:47 +0530
Subject: [PATCH 0384/1854] pre-commit: update to 3.3.2.

---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 6b93d5cab7f3..53c3d6716f24 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pre-commit.com/"
 changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=733f78c9a056cdd169baa6cd4272d51ecfda95346ef8a89bf93712706021b907
+checksum=66e37bec2d882de1f17f88075047ef8962581f83c234ac08da21a0c58953d1f0
 make_check=no # unpackaged: pytest-env re-assert
 
 post_install() {

From fa78f0abd442bb99103d87e3ecd3269b6122f626 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 23 May 2023 17:11:07 -0400
Subject: [PATCH 0385/1854] mdbook-toc: update to 0.12.0

---
 srcpkgs/mdbook-toc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdbook-toc/template b/srcpkgs/mdbook-toc/template
index a4a7d7911b8b..e7db8b9ec1a2 100644
--- a/srcpkgs/mdbook-toc/template
+++ b/srcpkgs/mdbook-toc/template
@@ -1,6 +1,6 @@
 # Template file for 'mdbook-toc'
 pkgname=mdbook-toc
-version=0.11.2
+version=0.12.0
 revision=1
 build_style=cargo
 short_desc="Preprocessor for mdbook to add inline TOC support"
@@ -8,8 +8,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/badboy/mdbook-toc"
 changelog="https://raw.githubusercontent.com/badboy/mdbook-toc/main/CHANGELOG.md"
-distfiles="https://github.com/badboy/mdbook-toc/archive/${version}.tar.gz"
-checksum=39a1cbf3d50d19c0a304c41408439b6f3a053bcfedb1958af00cf20b8daa8cc7
+distfiles="https://github.com/badboy/mdbook-toc/archive/refs/tags/${version}.tar.gz"
+checksum=cd7f0a929a23657370feb620d2159ccf728164a3a69f8c1c4d34200a4c4476d2
 
 post_install() {
 	vlicense LICENSE

From 5ffab44acc60bb3d7d5fdf565699d9b02096aa9c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 24 May 2023 17:37:56 +0100
Subject: [PATCH 0386/1854] wpebackend-fdo: update to 1.14.2.

---
 srcpkgs/wpebackend-fdo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template
index 3286f2431d31..d2f197cf276b 100644
--- a/srcpkgs/wpebackend-fdo/template
+++ b/srcpkgs/wpebackend-fdo/template
@@ -1,6 +1,6 @@
 # Template file for 'wpebackend-fdo'
 pkgname=wpebackend-fdo
-version=1.12.1
+version=1.14.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -9,8 +9,8 @@ short_desc="FreeDesktop.org backend for WPE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://wpewebkit.org"
-distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz"
-checksum=45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629
+distfiles="https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"
+checksum=93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38
 
 post_install() {
 	vlicense COPYING

From 7994b913b2189c75ae1f919288ae6cca1d6fdcfa Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 19 May 2023 23:00:46 +0200
Subject: [PATCH 0387/1854] ncdu: add update file

---
 srcpkgs/ncdu/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/ncdu/update

diff --git a/srcpkgs/ncdu/update b/srcpkgs/ncdu/update
new file mode 100644
index 000000000000..4bb77c330916
--- /dev/null
+++ b/srcpkgs/ncdu/update
@@ -0,0 +1,2 @@
+site="https://dev.yorhel.nl/ncdu/changes"
+pattern='<strong>\K[\d.]+(?=</strong>)'

From 8bad4cfdd1d52e673d7a4c642f0e6b01084da8b3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 19 May 2023 23:01:41 +0200
Subject: [PATCH 0388/1854] ncdu2: add update file

---
 srcpkgs/ncdu2/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/ncdu2/update

diff --git a/srcpkgs/ncdu2/update b/srcpkgs/ncdu2/update
new file mode 100644
index 000000000000..2d8983e5d62f
--- /dev/null
+++ b/srcpkgs/ncdu2/update
@@ -0,0 +1,2 @@
+site="https://dev.yorhel.nl/ncdu/changes2"
+pattern='<strong>\K[\d.]+(?=</strong>)'

From 3f344a9798d70ae706f88e80204675b748ed5f1f Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 21 May 2023 14:41:06 +0200
Subject: [PATCH 0389/1854] python3-ansible-lint: update to 6.16.2

---
 srcpkgs/python3-ansible-lint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index f99a3c167dd6..a842f6193637 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=6.14.3
+version=6.16.2
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -17,7 +17,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/ansible/ansible-lint"
 distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=73ec59929b6214f6d2ce5858c22c64e3a1daba7b8cdc1271833bb6d3c7155449
+checksum=93ad8a04adcda6025d4ff218a10694120fe70cb91da8ac9f85c5dc82b32456e4
 # cba anymore, the list of failing tests changes with every update
 make_check="no"
 

From 23600f127c43bea7cb9dc72f0d5fb55a4ca82b63 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 21 May 2023 15:03:34 +0200
Subject: [PATCH 0390/1854] python3-ansible-compat: update to 4.1.0

---
 srcpkgs/python3-ansible-compat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index 4f24371ccc7e..7f3de3717f45 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
-version=3.0.1
+version=4.1.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/ansible/ansible-compat"
 distfiles="${PYPI_SITE}/a/ansible-compat/ansible-compat-${version}.tar.gz"
-checksum=d7dc5e4b7fade9b7375c568a24475b7be81024cac2a20caef3260ef0b51287b4
+checksum=bcc6b3cf4bb102e1b1b36a8639fee7ad18ddb1d99fb055d208c8a0f650a51621
 
 post_patch() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"

From eeeb1c06c45e24a5183e57e27a3d83e482e6f081 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 19 May 2023 09:06:48 -0400
Subject: [PATCH 0391/1854] ntfy: update to 2.5.0.

---
 srcpkgs/ntfy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index d4cd86aa7a50..54a11d3e5da6 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,6 +1,6 @@
 # Template file for 'ntfy'
 pkgname=ntfy
-version=2.4.0
+version=2.5.0
 revision=1
 build_style=go
 go_import_path="heckel.io/ntfy"
@@ -13,7 +13,7 @@ license="Apache-2.0,GPL-2.0-only"
 homepage="https://ntfy.sh"
 changelog="https://raw.githubusercontent.com/binwiederhier/ntfy/main/docs/releases.md"
 distfiles="https://github.com/binwiederhier/ntfy/archive/refs/tags/v${version}.tar.gz"
-checksum=798e186a76b30d8e3ed2e3839e1389f136882ac6293753cb32e3bc96e9cf9b90
+checksum=16128c38c5ef8397463a44c953f77b14643caf8c044ddc1cc84377b3127ffc9f
 system_accounts="_ntfy"
 make_dirs="/var/lib/ntfy 0700 _ntfy _ntfy"
 _ntfy_homedir="/var/lib/ntfy"

From 15c8a28c40fd0d4ceb51f9c8dab48fcfa7873a91 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 20 May 2023 14:04:13 +0100
Subject: [PATCH 0392/1854] python-zope.interface: update to 5.5.2.

---
 srcpkgs/python-zope.interface/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 6a35a71e2bb8..35f87781a1d8 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,7 +1,7 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
-version=5.4.0
-revision=3
+version=5.5.2
+revision=1
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel"
@@ -12,7 +12,7 @@ license="ZPL-2.1"
 homepage="https://github.com/zopefoundation/zope.interface"
 changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e
+checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
 # Tests can't find the package they test
 make_check=no
 

From c562030a5ce0595f071911c16657a11b81a61421 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Fri, 19 May 2023 23:34:06 -0500
Subject: [PATCH 0393/1854] rpi-imager: update to 1.7.5.

---
 srcpkgs/rpi-imager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 223eb357a3a4..0b69c027c140 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.7.4
+version=1.7.5
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Adam Gausmann <adam@gaussian.dev>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
 distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=c605a4770da5dbae67fa775bad226311529450fd6ef1fdec708f9f384d1aff34
+checksum=876c4e22483cb28bba975ad000589963e4e952e541f5a985fa68e44490e235a0
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From 15904f5853a66becd528f5431f818f795683c48a Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Mon, 15 May 2023 12:49:19 -0500
Subject: [PATCH 0394/1854] OpenJK, gamemode: orphan; senpai: swap

* Swap senpai's maintainer to Emil Miler
---
 srcpkgs/OpenJK/template   | 2 +-
 srcpkgs/gamemode/template | 2 +-
 srcpkgs/senpai/template   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
index 69b4bde71121..e21aa5b7e2cd 100644
--- a/srcpkgs/OpenJK/template
+++ b/srcpkgs/OpenJK/template
@@ -9,7 +9,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DBuildJK2SPEngine=on
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
 short_desc="Open Source Implementation of Jedi Knight II and III Engine"
-maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/JACoders/OpenJK"
 distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
index c70be770dee5..dd699a75dbd0 100644
--- a/srcpkgs/gamemode/template
+++ b/srcpkgs/gamemode/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="inih-devel dbus-devel elogind-devel"
 depends="lib${pkgname}>=${version}_${revision}"
 short_desc="Optimise Linux system performance on demand"
-maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/FeralInteractive/gamemode"
 changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/master/CHANGELOG.md"
diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 15b2a518314a..0546d041f163 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -7,7 +7,7 @@ go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"
 hostmakedepends="scdoc"
 short_desc="IRC client that works best with bouncers"
-maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+maintainer="Emil Miler <em@0x45.cz>"
 license="ISC"
 homepage="https://git.sr.ht/~taiite/senpai"
 distfiles="https://git.sr.ht/~taiite/senpai/archive/v${version}.tar.gz"

From 33987367db2d2c12397a20be9cbba57cbe949af8 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH 0395/1854] zoxide: update to 0.9.1

---
 srcpkgs/zoxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
 
 post_install() {
 	vlicense LICENSE

From ed67210c88aa57947a52e5e707082064c3a62472 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 15 Apr 2023 22:32:55 +0200
Subject: [PATCH 0396/1854] calibre: update to 6.17.0

---
 srcpkgs/calibre/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 052b1b4a5a4c..0bed9e49972e 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=6.13.0
-revision=3
+version=6.17.0
+revision=1
 build_wrksrc=calibre
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -26,7 +26,7 @@ depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
  python3-pyqt6-network python3-pyqt6-dbus python3-pyqt6-opengl-widgets
  python3-pyqt6-widgets python3-pyqt6-gui python3-pyqt6-declarative
  python3-pyqt6-printsupport python3-pyqt6-webchannel python3-pyqt6-svg
- python3-pyqt6-webengine"
+ python3-pyqt6-webengine python3-fonttools"
 checkdepends="${depends} libjpeg-turbo-tools jxrlib"
 short_desc="Ebook management application"
 maintainer="skmpz <dem.procopiou@gmail.com>"
@@ -36,7 +36,7 @@ changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog
 _lover=7.4.3.2
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz
  https://download.documentfoundation.org/libreoffice/src/${_lover%.*}/libreoffice-dictionaries-${_lover}.tar.xz"
-checksum="eb40f34b7106e3f36d37e0b65dacb5cec863665c68fb2350592dbc1ec133aea3
+checksum="1ca4abb8a5d850c1f5963e37080dd1a7795736538d5c4d4ff6014b687d7a368e
  3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389"
 python_version=3
 lib32disabled=yes

From d78cc3e96d8ec176695998ec4cae56cd8d18aef3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 15 Apr 2023 21:51:40 +0100
Subject: [PATCH 0397/1854] rav1e: update to 0.6.6.

---
 srcpkgs/rav1e/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rav1e/template b/srcpkgs/rav1e/template
index e4589a60170e..e454757f8d78 100644
--- a/srcpkgs/rav1e/template
+++ b/srcpkgs/rav1e/template
@@ -1,21 +1,19 @@
 # Template file for 'rav1e'
 pkgname=rav1e
-version=0.6.3
+version=0.6.6
 revision=1
 build_style=cargo
-hostmakedepends="nasm cargo-c"
+hostmakedepends="cargo-c"
 short_desc="Fastest and safest AV1 encoder"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://crates.io/crates/rav1e"
 distfiles="https://static.crates.io/crates/rav1e/rav1e-${version}.crate"
-checksum=277898094f0d03c6a609e491324102daf5080e71c06b4b25e5acf8b89d26c945
+checksum=16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	# error: ran out of registers during register allocation
-	# LLVM ERROR: Cannot emit physreg copy instruction
-	make_check=no # Tests fail to compile
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*) hostmakedepends+=" nasm" ;;
+esac
 
 post_build() {
 	cargo auditable cbuild --release --target ${RUST_TARGET} \

From 8a976dbc072bc738f5496c52cd510f71d235f34b Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Mon, 17 Apr 2023 08:28:05 +0530
Subject: [PATCH 0398/1854] xdg-desktop-portal-wlr: update to 0.7.0.

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 srcpkgs/xdg-desktop-portal-wlr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-wlr/template b/srcpkgs/xdg-desktop-portal-wlr/template
index 888b905842d3..dfcd7ff97da5 100644
--- a/srcpkgs/xdg-desktop-portal-wlr/template
+++ b/srcpkgs/xdg-desktop-portal-wlr/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-wlr'
 pkgname=xdg-desktop-portal-wlr
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc"
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://github.com/emersion/xdg-desktop-portal-wlr"
 distfiles="https://github.com/emersion/xdg-desktop-portal-wlr/archive/v${version}.tar.gz"
-checksum=20f145f00a40b41221aca73b1423f3ea4633980e1a2b1c4b25045d5eacd313e2
+checksum=78377c976645c07fe5a099c75976ac3477db4764899acfe43f0910803cadf450
 
 post_install() {
 	vlicense LICENSE

From 0090143469beb8dbf26b91031986cb6d0d3560c0 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0399/1854] bluedevil: update to 5.27.5

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index decb0ff31839..a48ce07318ae 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=101871f56da19ae667d61ec32addc446eb94f81ce0c541cf0367de96c3c896a3
+checksum=61535ae665a5bc1e17c8210d660ba79a3a694ae4ca4b3016e6523ab227a54ded

From 7b4229b03c2b70eda34e9d07cb3c9630556e3bb8 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0400/1854] breeze-gtk: update to 5.27.5

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 04bde046f314..ba5e31ead109 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo qt5-devel"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb967dcd258065f87a9cb43f8022378e7ead1db83590ca2eea4e77196226999f
+checksum=c4956ddab4d65471dcf26634672c088b4499d27f766e41b6a8d083442e55c968

From c3ec34386c1f4ceae95bc7971627ba40a68a42ce Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0401/1854] breeze: update to 5.27.5

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 3f4c8b43b157..8b16b3342bb9 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=62d80ebd690c7822bf05b19bec8b37af67cc1cd4bb3f38d2a88d8360fd6b1901
+checksum=70d8a35bf8c0758f9c3e3873b657250b1e09c1c79f92b066d3385a1e44fec868
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From c44433cd281086dab0d76eb40bfa430be070030a Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0402/1854] flatpak-kcm: update to 5.27.5

---
 srcpkgs/flatpak-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index b90605935277..37e14d15abf2 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak-kcm'
 pkgname=flatpak-kcm
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/flatpak-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ad6156443c3da839eed26e2577352af0d2e2b5729254243006175546223d2145
+checksum=7b7541780654c1007ff268c8e0460def4aa7a58360550410a57531cb0e45ba9a

From cf0454246fca064075d4d2aba49a399f0f472bc1 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0403/1854] kactivitymanagerd: update to 5.27.5

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 7ecbeed46e47..6cf9a1001ee7 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9e1fd492012127e20c8ae76cf6462c5690cf842f241ffa95f83c9bf6a91da72
+checksum=a209f4727bc5c44754f48ed1947fbe66419877407f83a0bad458dcab2d03b619

From 732f1754042ce8cc72d0d92dac845775bd2788c6 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0404/1854] kde-cli-tools: update to 5.27.5

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 4afaf139842b..0436ff1231a8 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c594fde05df078eb9d0455b0e298c201a3143b949c1c3b1ff5526b5e4340b419
+checksum=ed745637701210102e0e2e1354823e4e0f2bf8b7d4778cf5ed9c104fb57cef67
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From c213a7580bf4dc50d202c3ac686d43f6afb0cc79 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:08 -0700
Subject: [PATCH 0405/1854] kde-gtk-config5: update to 5.27.5

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index a24f9bd57c58..0fda095c0818 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=98f5adf85bc56e01956f749849694d21c222e98d082e9b82ee8b469ffa6220e2
+checksum=477bb7c20901926faaaa0ad9d5ef61e33891a5d3bf4e51a5798eee6e5c5c1028
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 29d6c68feff638747e84ef755b14ab8933a836d9 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0406/1854] kdecoration: update to 5.27.5

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 2e81ce495d71..17d328c513fa 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=415f22a21073dcc8024eba45a5a8f19b83d3af8335404d3a253554b1a483fa6e
+checksum=effbf6c5c79802d07fa14f8bd40a9d57bbfc2af2861b6ed596687db48230be42
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 6e3733ab5689ce1fff34c713378f3e927df3ac6e Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0407/1854] kdeplasma-addons5: update to 5.27.5

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index b6f1a148d8f3..4e3e38d15db2 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=6a82a57988f336345738630217f49b191a379eeea586565a802bcebed7941f89
+checksum=c9351ab0317c75b0340be44cc906b7ba66e69f5c672d33fbfd5b32bc2a560ff9

From f4619e4a9f3239163b979a8c20f88d004ea90718 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0408/1854] kgamma5: update to 5.27.5

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 0f1b7de1767f..181febdc4142 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4a81c50b7f96b5a6f0e60b58a1d38fc375f445595e2e349e692d4c40d8355802
+checksum=7b6626473944a8b4afb8e986a9d06ffe9afb6f24938f24053b33fcfb5ce84dd9

From d5eb4d7aeaa3f5ed0a87ce1a48fde41ed82c0822 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0409/1854] khotkeys: update to 5.27.5

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 9c05eaf4f201..edcbecd5d0e1 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=841224dea79b4607ecebe79b5c94e36bfbc290b623d5efe5dbe1cd566a921023
+checksum=83e85326de1e3b430ebd0364955e2167ccee50d33fdaaba9fa0e5cf488e6ec20
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From bef17c79bf3f3e0315e03b3dc643bbdf5c0d098b Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0410/1854] kinfocenter: update to 5.27.5

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index c9508298f487..354a7a0b042c 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6875ca14c4fc139f007bc4b318fa3812f7d73ef26fa2ae54a49bd48bda67e495
+checksum=0be970049e2be8a5c21128a0ce3ba69e6b82415268a1ed1aa0a30c77c94adc48

From accd187545bb342936a999da4a3a826fcebb28e1 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0411/1854] kmenuedit: update to 5.27.5

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 5649e619d048..253320d9914b 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=37abb72d193ae1273b9a5265e8decfeeebee12811eb9977ba69af8850c8ca7b3
+checksum=446263c4bcc4592251c0e93f3bbab1635452b26e5650605928d4933d70f31127

From 64fb24175eb6649b6b3cba3dd85d0383bd0a2738 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0412/1854] kpipewire: update to 5.27.5

---
 srcpkgs/kpipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template
index 467ab823a5e1..05ad025944da 100644
--- a/srcpkgs/kpipewire/template
+++ b/srcpkgs/kpipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'kpipewire'
 pkgname=kpipewire
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules plasma-wayland-protocols gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kpipewire"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a653408693ea16fee1b12a447982af48823aae86e5813b30b5a889cd2b883165
+checksum=41326adceeaad0d5e0fba78af69403dea12c007b769ed4b5d5534c21f27bdd98
 
 kpipewire-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e617ded235243ba45b1d958dbb3affb2112c17bc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:09 -0700
Subject: [PATCH 0413/1854] kscreen: update to 5.27.5

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 554fb82deb63..ba630a1f14a1 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=456f249772f53807dcc0b5076dcf6975d5b29b0b2b6a037ca0a5e45017a4c5ed
+checksum=7297aac39b79d477ecd66df5a5c464d2064d375e7b2249eb67f62195a9824468

From 70c19f08ea60cd963e1d9c2fb5247287754c95ce Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0414/1854] kscreenlocker: update to 5.27.5

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f328878846fd..262dd08205cb 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9da7f59b3fe35879adae4c67d1b2263085ee5c79004cd2bec46ce6901b97191
+checksum=4c8807f1c2ed8fa14a9b29639c7d5697b5d5bab44d6b88020e5d3f463880ec92
 
 kscreenlocker-devel_package() {
 	short_desc+=" - development"

From 92887876c8bc517bb082fb2319ba514fb7acae87 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0415/1854] ksshaskpass: update to 5.27.5

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 84987f1d8ef8..206db539f9f5 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9050264181d58eafb7aa36d797cf510eb55d3f4d8057746dfd76565cf3ef46a
+checksum=f6ed26693e3dea8387c0980bf7335d96dc18c5c68c9e289d009dba22c79b0cd7
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 3b8f30fca4c3829c8554e7bca1318d36bddc6b73 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0416/1854] ksystemstats: update to 5.27.5

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index e46a66c0357a..a899f447f23f 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1fd68961450fb8c37c6969a3a9b927a59aa7d13e0820898f2fe73d6fdc9edece
+checksum=d59d84cdf8c9cd8a2c3639ebb5986f50995f1f7f74a833af867709b7c336dcf8

From 4785431d473b6606f2835747bdd68a2b0e465ac5 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0417/1854] kwallet-pam: update to 5.27.5

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 264e3f3ad422..8a71a61a4d3f 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea13f6b4cc17cb692cf0f94880926e4a072f6af8f4c0bce343ef3d5eafc126c
+checksum=6a9aaa8dc25ed62058058c1d813d674c7b430b4915e42253f48227e997929190

From d3e7892518512b03d6c5749ca9ff70ddb7f180eb Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0418/1854] kwayland-integration: update to 5.27.5

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index c84cc73bf343..6f9815bcab65 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f74a856a93e0bd91ad7c34905603c2ed74df1dc85e687354d9d588274026fe08
+checksum=9ae1fc40a70d1453841e16dca2e399fc5c68de3a9ffa7475673f98bf7dcb18f9

From e638cd0b9d770b95bddee3f234c1f29fb358ff01 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0419/1854] kwin: update to 5.27.5

---
 srcpkgs/kwin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 5d17ba513ad0..d04158fdf630 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,8 +21,8 @@ short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b39f1d3cc528505213dbb72958e80d6cdad75617cb26c215607d6f12bf0e02b1
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=bb1226b15919681ea5f1de58b24ea4b568ea3f2b5452411f76daa80eb30c20ea
 replaces="kwayland-server>=0"
 
 kwin-devel_package() {

From 5b1f981b067f9e4d71efaa6713705de9d11e36e9 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:10 -0700
Subject: [PATCH 0420/1854] kwrited: update to 5.27.5

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 182daf30f919..2f3cd4b4af73 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed3a4b80d6c32c6a9ce4a5be1b6b02a662d2eb0a90ee7dfc6307a335b87407fc
+checksum=f2baec5827a87c035a116795615f2dba51ebaaab6297cbe8adf50410865fcc91

From a04bdb2c6dcc1a1b88923f7efbe93dff8e628a82 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0421/1854] layer-shell-qt: update to 5.27.5

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index d1b188a704fb..e03e6a3efa7f 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b3aedc14b23023c8e8a4e5d0a16711f24b505cd8a2f470baf595a6ed0e3d0fe
+checksum=ccdf6aa579f0437f3bad377ac35268dfab36f6816227c03bae0591301c8d1d21
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4fcb3b1548f2c115abcecbbd1da1f1c6962b3e5c Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0422/1854] libkscreen: update to 5.27.5

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 3fa88086bb73..b40c6b2d9151 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a89dfb5e8c40958a41c264f9b26ec4c39b386c2e416aa29a17967a22c107fa7e
+checksum=29aff3f28d8706e864b914dea4ab59e5518ed0381bb1c6625f454f08196deb65
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From ce390d085039ef7edd95358d8c12a28e7e6a5ab8 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0423/1854] libksysguard: update to 5.27.5

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index ebcecd70ba10..006ac131c898 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e0128d0c515cba3fde36c4a5cf5872dbf4e58c29a0d297b84f32bcfbe622f8f8
+checksum=7e7eb53af05fefcfea6b38fed4947409370ad303247892e4719bc2a809e85e14
 
 build_options="webengine"
 

From 73c2fdd110d2f6bf19cced66ad8b0ac4395484fe Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0424/1854] milou: update to 5.27.5

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 08da9b3637c8..8d94a9cad774 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4d0f67b80f0580dbd4479dfa65e597fed2b8f9ab671eca3d7f5156f6871f57a8
+checksum=1b1b0a3e672f06eb81f889b0c48726af4b3702b103eb1e680c3972ef5c8d0298
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f6009c458df47d2c88e148d77b5a6f5cff81a380 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0425/1854] oxygen-sounds: update to 5.27.5

---
 srcpkgs/oxygen-sounds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-sounds/template b/srcpkgs/oxygen-sounds/template
index ab3324ecd9fb..1713e184170a 100644
--- a/srcpkgs/oxygen-sounds/template
+++ b/srcpkgs/oxygen-sounds/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-sounds'
 pkgname=oxygen-sounds
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,4 +9,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen-sounds"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9ea3ad7497c74e796b49f36b23da1d0facda8d2c05466fd8c477cf0f3c9384ec
+checksum=21fb31e2c4047f56e3ec09cd4960f56120b746152485336f716c9101cd2c8566

From 52bfd7239d8e375f9a69c568e6bbfc16a77f33dc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0426/1854] oxygen: update to 5.27.5

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 750cc3b3bab3..7ce53c433e2a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e20e969b7b71eb19673153103142ad4fc6b78b0b6f152b87a54b61f4b5cde3eb
+checksum=fb764ea8820a01ab9c9d0cfccf588b64c4a5b9e6644b6e4188c618a793227ebd

From 66512608c7c80fcdcac0489c7f238c1c7ea1121b Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:11 -0700
Subject: [PATCH 0427/1854] plasma-browser-integration: update to 5.27.5

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index f092b56b0f44..4210c96ba5bd 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d37af781b11ec1622476b51af25ac82c8d2373bb8ff9c23981cb8a1c6d97f466
+checksum=b490451d672bb2f0294f53422d41df7594690bc8761f9724081147d5fdd1d925

From 67b164725ec10adfed436b336c2023c1a0bfa4ab Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0428/1854] plasma-desktop: update to 5.27.5

---
 srcpkgs/plasma-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 79bf86afb24a..7fb502a99151 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.27.4
-revision=2
+version=5.27.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -20,6 +20,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b94f1cd5f121312268d757078041d83220556c90f73e895518fb19542ae3c800
+checksum=4f2b573134658f640717d6ee67eaee41d9df4c578856016efa769b4415e91cb1
 replaces="user-manager>=0"
 python_version=3

From 3f4e5fc8a72b5b83c3074b286454984355e19219 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0429/1854] plasma-disks: update to 5.27.5

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 990de15817f3..9b0da9de04cd 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=97f4aee2e2db0ce2dbc1bfbe4b5ad85253f435f58af5f402916ff2d1e0e98323
+checksum=ea10e289596b3ce53c0d6ea5ee714306918c5b7368262c22965f44a1dab1480b

From 2ffce123906790d864e020644581cc55c3b4c437 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0430/1854] plasma-firewall: update to 5.27.5

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 91063515e3ef..5ca700e07262 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=349db4a0908d7a6565eb8b80971eb2ed4f6d4f1730ee65de2fd23f2b1343a3ac
+checksum=e32c90aa52ec35d35fd04e04d00989f18d43ea1f7b244e53de7feb7745235b41

From fb72e0c744744c8924b2046fc150a92976ca6493 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0431/1854] plasma-integration: update to 5.27.5

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 66e01e2ed938..ae9952e93c10 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9aa095f628d601d71283bb7b3274e2b8bfebd913c5804e3b371a5326f24b892e
+checksum=8dedc5630828f0fb5912ca7cad9df5cde2492e17fd2956de6f514d43b4f89f7b

From 9b6882dd987dc2789fd2fde6171478ca7223c366 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0432/1854] plasma-nm: update to 5.27.5

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index cd076036ecee..a4b533ef4c38 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2ee6bff818e5168062e1e4358851697e4397d8b666e4a58a4883489c1a51214b
+checksum=152f48e44b6207a606b89548c9f298f1a12a9778ff4876c3ffeeb1f2188ca62e

From dbc43becc7585b7528fa9518b1b7ad42a1240ef9 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0433/1854] plasma-pa: update to 5.27.5

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 326295cc3871..fc410aa573f6 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed344553bd7516579f0c647414811f46b19789ebf4f5544181299ee52ad3f2e6
+checksum=c2ab3f73bfdeed68a5cda3bf72a67ef609bef1c3e96e43bab0a18df822d98188

From 267e9822f2a11a16eeed0d182a6c1ef61c7c9a57 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:12 -0700
Subject: [PATCH 0434/1854] plasma-sdk: update to 5.27.5

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index e54873841579..d0fce312449e 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f98849e361c19b192998bb4966f561ea8539d6ceb98fc967e783edb36c36db21
+checksum=f10245b27687bbd21b18e78267a1895aab9644722456a2b92fb54f7ca0b06915
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f46b5a684e4200065304159badb7c7c4581bfc9f Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0435/1854] plasma-systemmonitor: update to 5.27.5

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 024f9d1371d7..01ded45075a8 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=294847847d9ade0cad8723f4af95bf5b36588c43c69ae4e624aaee3c2b45c3eb
+checksum=82e551398f208270f543d5f91be6f3f3b27b1ce9f2c0e90263f29f8d238b2e34

From c2c1802ed0c9cfc167665a8b061d099254285a33 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0436/1854] plasma-thunderbolt: update to 5.27.5

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 30511dad8cc9..ea02f0d85a7d 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.27.4
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=28f605034102572d406978b81f891ff5a15d50979116dd3bebc849e5712af4ff
+checksum=310564c501c6621c3d0f1421865d18839191bc82915ffba555a80214e0db90d5
 
 do_check() {
 	: # Requires running dbus and bolt services

From 1be50f04d45d035207b7c190b448a9e4e7b08a0e Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0437/1854] plasma-vault: update to 5.27.5

---
 srcpkgs/plasma-vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index db994f5c2cda..ebc592f1c804 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -13,5 +13,5 @@ short_desc="Plasma applet and services for creating encrypted vaults"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e7d0d8f06767b849bd27937415b1098619d804f3870c62f7c40537f8843102ae
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=74f22be02ae0e02cf2e9eb3fad62a5ca9fb5f984775455f6c7e1c6aa553527e8

From f093a7882f7e1d9459ee5d331cf30d5fa9fe18e5 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0438/1854] plasma-workspace-wallpapers: update to 5.27.5

---
 srcpkgs/plasma-workspace-wallpapers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index ff45328b2e51..d2c3eb5e5bb7 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,5 +9,5 @@ short_desc="KDE Plasma wallpapers"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e44d7bc716f99ce13bf034d4eeed99cdd33e12db7068d74ac37d2304ee44656b
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=23805edcc147377c7bd7444278e76327003d142f9c4048e3970000cb6f38c840

From e57c42b78e73f3e942fadf9d31aad17f2ab6c3ff Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0439/1854] plasma-workspace: update to 5.27.5

---
 srcpkgs/plasma-workspace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index bfb480b88d94..027ec664e9e8 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -22,8 +22,8 @@ short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb3906ac954bfd0784614843b1aaf9abda640ea3ed944d8651aaa4149baf65a5
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=ed0b95b2eefd0782ea652c2c6eed262e8eb91f97ff72925bb3f7e161d1f72a17
 
 build_options="pipewire"
 build_options_default="pipewire"

From ef16e56d77b32654dabea5ff9b03bae5ec95279b Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0440/1854] polkit-kde-agent: update to 5.27.5

---
 srcpkgs/polkit-kde-agent/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 64af642c6368..9f5ce9a706c0 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,5 +11,5 @@ short_desc="KDE PolKit auth agent"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-1-${version}.tar.xz"
-checksum=26e795f6016e6e64e3fd4518b2a49e8df66716fab073784d943a3b7782ce70c6
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
+checksum=2ae3b4ff0c74d9f55fe85cb0fb8106401f0301a96760d0ffefb66161215a2a2f

From 34d8ea76ee9573af8a4c83d84f951c321b2510b6 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:13 -0700
Subject: [PATCH 0441/1854] powerdevil: update to 5.27.5

---
 srcpkgs/powerdevil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 4398c8730892..e6198d4f2cdb 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,5 +12,5 @@ short_desc="Power consumption settings of a Plasma"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=644994c77d071480d9df221b1d8f798ecc468380c174da24a3271ce5d83cd368
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=0379862c57efef4ce980f6c9583d66deafde1ed522f0e129aa50cef038fb500e

From 319fd8e1296b2063325c7e70d5f31af3d2511f01 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:14 -0700
Subject: [PATCH 0442/1854] sddm-kcm: update to 5.27.5

---
 srcpkgs/sddm-kcm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 2e9f1cfed4ff..cd45480f71b6 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,5 +13,5 @@ short_desc="KDE Config Module for SDDM"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=977a526713fed18483234e6dd33347eece8bd02c7ca46fd473e50d59d1ac0551
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=5605f2dffe33b731b08ec51b7ef4cea8ec6fb796497ae46242fe8f40e8aa199a

From 9c89c93e41084fb41bee92cd66d2f8f97ca8b30f Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:14 -0700
Subject: [PATCH 0443/1854] systemsettings: update to 5.27.5

---
 srcpkgs/systemsettings/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 03969adefe6b..287ef9b9c8bd 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,5 +13,5 @@ short_desc="KDE System settings"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f9d1d2f2f829d75467798ceea471b79ecc7c91437fbcb5b8f36bd67d512730e
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=d5454eb0aaba331e724bd91650474bbe1658f26fcc543ab7804186bccf50b4db

From bd33e5ef34088718e79309110891e486ab2338fc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Fri, 12 May 2023 10:35:14 -0700
Subject: [PATCH 0444/1854] xdg-desktop-portal-kde: update to 5.27.5

---
 srcpkgs/xdg-desktop-portal-kde/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 771f4d988b8f..818e2c721b77 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.27.4.1
+version=5.27.5
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,5 +12,5 @@ short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF5"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efc6c2dda2893507acc574b7327140b8982752d6ed71740e1f4bf91128a63d43
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=7cfa3f24cff9b18baeef245e122f969092a89c41d872ea5a8df628061d8f1aab

From 8c407869da6048b6163371be90f8f79b8d0ff3d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Jun 2023 22:48:25 +0200
Subject: [PATCH 0445/1854] kde5: update to 5.27.5.

---
 srcpkgs/kde5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index ed6bb91633e9..08991643cc41 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.27.3
+version=5.27.5
 revision=1
 build_style=meta
 depends="bluedevil>=${version}

From cc667f8dbb32c1204f42ecf40205b6f4e1ade6cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Fri, 9 Jun 2023 11:20:28 +0400
Subject: [PATCH 0446/1854] go: update to 1.20.5.

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 18ee1751f2f9..0e28996e75e0 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.4
+version=1.20.5
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
+checksum=9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git

From 4341c5c683117ea2d78180e3ff4cff1226b199b2 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 9 Jun 2023 10:00:37 +0200
Subject: [PATCH 0447/1854] linux-firmware: update to 20230515

---
 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 411477bbf308..b1e33ee38296 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20230404
+version=20230515
 revision=1
 depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ 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=09343acd48cb1e33dd6e1f4c2736ceadaa943c42eb20d04a26a5701d05ddde0d
+checksum=8b8be098110f47ff6cb3e02e0c7cf0b25d9427a09870b1c2df3637e5708eb158
 python_version=3
 nostrip=yes
 
@@ -95,7 +95,7 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/mrvl
 		vmove "usr/lib/firmware/mt7*.bin"
 		# don't move mediatek SoC firmware
-		( shopt -s extglob; vmove "usr/lib/firmware/mediatek/!(mt7986*|mt81*|sof*)" )
+		( shopt -s extglob; vmove "usr/lib/firmware/mediatek/!(mt7981*|mt7986*|mt81*|sof*)" )
 		vmove usr/lib/firmware/ueagle-atm
 		vmove usr/lib/firmware/ti-connectivity
 		vmove usr/lib/firmware/dpaa2

From c7cc26eead8c06d8ff6cd197832bf1156465e561 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 8 Jun 2023 15:38:38 -0400
Subject: [PATCH 0448/1854] mdocml: fix hang when rendering stress-ng(1)

see https://inbox.vuxu.org/mandoc-discuss/ZIIbRuk+yJtoAJhv@asta-kit.de/
---
 srcpkgs/mdocml/patches/stress-ng-hang.patch | 75 +++++++++++++++++++++
 srcpkgs/mdocml/template                     |  2 +-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mdocml/patches/stress-ng-hang.patch

diff --git a/srcpkgs/mdocml/patches/stress-ng-hang.patch b/srcpkgs/mdocml/patches/stress-ng-hang.patch
new file mode 100644
index 000000000000..fd6a3a7c0037
--- /dev/null
+++ b/srcpkgs/mdocml/patches/stress-ng-hang.patch
@@ -0,0 +1,75 @@
+fixes hang from rendering stress-ng(1)
+
+from https://inbox.vuxu.org/mandoc-discuss/ZIIbRuk+yJtoAJhv@asta-kit.de/
+
+===================================================================
+RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
+retrieving revision 1.54
+retrieving revision 1.55
+diff -u -r1.54 -r1.55
+--- a/out.c	2021/09/07 17:05:30	1.54
++++ b/out.c	2021/09/28 17:06:17	1.55
+@@ -121,6 +121,7 @@
+ 	const struct tbl_dat	*dp;
+ 	struct roffcol		*col;
+ 	struct tbl_colgroup	*first_group, **gp, *g;
++	size_t			*colwidth;
+ 	size_t			 ewidth, min1, min2, wanted, width, xwidth;
+ 	int			 done, icol, maxcol, necol, nxcol, quirkcol;
+ 
+@@ -254,16 +255,28 @@
+ 			gp = &(*gp)->next;
+ 	}
+ 
++	colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));
+ 	while (first_group != NULL) {
+ 
+ 		/*
++		 * Rebuild the array of the widths of all columns
++		 * participating in spans that require expansion.
++		 */
++
++		for (icol = 0; icol <= maxcol; icol++)
++			colwidth[icol] = SIZE_MAX;
++		for (g = first_group; g != NULL; g = g->next)
++			for (icol = g->startcol; icol <= g->endcol; icol++)
++				colwidth[icol] = tbl->cols[icol].width;
++
++		/*
+ 		 * Find the smallest and second smallest column width
+ 		 * among the columns which may need expamsion.
+ 		 */
+ 
+ 		min1 = min2 = SIZE_MAX;
+ 		for (icol = 0; icol <= maxcol; icol++) {
+-			width = tbl->cols[icol].width;
++			width = colwidth[icol];
+ 			if (min1 > width) {
+ 				min2 = min1;
+ 				min1 = width;
+@@ -281,7 +294,7 @@
+ 		for (g = first_group; g != NULL; g = g->next) {
+ 			necol = 0;
+ 			for (icol = g->startcol; icol <= g->endcol; icol++)
+-				if (tbl->cols[icol].width == min1)
++				if (colwidth[icol] == min1)
+ 					necol++;
+ 			if (necol == 0)
+ 				continue;
+@@ -298,7 +311,7 @@
+ 		while ((g = *gp) != NULL) {
+ 			done = 0;
+ 			for (icol = g->startcol; icol <= g->endcol; icol++) {
+-				if (tbl->cols[icol].width != min1)
++				if (colwidth[icol] != min1)
+ 					continue;
+ 				if (g->wanted <= wanted - min1) {
+ 					tbl->cols[icol].width += g->wanted;
+@@ -315,6 +328,7 @@
+ 				gp = &(*gp)->next;
+ 		}
+ 	}
++	free(colwidth);
+ 
+ 	/*
+ 	 * Align numbers with text.
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 4dda1338fc9c..9b9d5394a292 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=6
+revision=7
 build_style=configure
 make_build_args="all man.cgi"
 make_check_target="regress"

From 3f487545a8b845d11fb79e6e83789f21cb6f417d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 18 Apr 2023 11:29:29 +0530
Subject: [PATCH 0449/1854] New package: python3-SQLAlchemy2-2.0.9

---
 srcpkgs/python3-SQLAlchemy2/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-SQLAlchemy2/template

diff --git a/srcpkgs/python3-SQLAlchemy2/template b/srcpkgs/python3-SQLAlchemy2/template
new file mode 100644
index 000000000000..d445ccb52fe2
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy2/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-SQLAlchemy2'
+pkgname=python3-SQLAlchemy2
+version=2.0.9
+revision=1
+build_style=python3-pep517
+make_install_target="dist/SQLAlchemy-${version}-*-*-*.whl"
+hostmakedepends="python3-setuptools python3-Cython python3-wheel"
+makedepends="python3-devel"
+depends="python3-greenlet python3-typing_extensions"
+checkdepends="${depends} python3-mypy python3-pytest-xdist"
+short_desc="SQL Toolkit and Object Relational Mapper for Python3 (v2)"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://www.sqlalchemy.org"
+changelog="https://docs.sqlalchemy.org/en/20/changelog/"
+distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
+checksum=95719215e3ec7337b9f57c3c2eda0e6a7619be194a5166c07c1e599f6afc20fa
+
+conflicts="python3-SQLAlchemy"
+
+post_install() {
+	vlicense LICENSE
+}

From 9b2d81ffeb0173ea7519c3e41aa076e739680ce1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 17 Apr 2023 21:40:55 +0530
Subject: [PATCH 0450/1854] pychess: update to 1.0.4.

---
 srcpkgs/pychess/template | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pychess/template b/srcpkgs/pychess/template
index 92622121157e..7e52b7d8bf2f 100644
--- a/srcpkgs/pychess/template
+++ b/srcpkgs/pychess/template
@@ -1,23 +1,27 @@
 # Template file for 'pychess'
 pkgname=pychess
-version=1.0.3
-revision=2
+version=1.0.4
+revision=1
 build_style=python3-module
-_commondeps="python3-gobject python3-pexpect python3-SQLAlchemy
- gobject-introspection gtksourceview"
+_commondeps="python3-gobject python3-cairo python3-pexpect python3-SQLAlchemy2
+ gst1-python3 gtksourceview"
 hostmakedepends="python3-setuptools gettext ${_commondeps}"
-depends="stockfish gnome-icon-theme python3-websockets
+depends="stockfish hicolor-icon-theme python3-websockets
  python3-psutil gst-plugins-base1 ${_commondeps}"
 checkdepends="${depends} xvfb-run"
 short_desc="GTK chess client written in Python"
 maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-3.0-or-later"
 homepage="https://pychess.github.io"
-distfiles="https://github.com/pychess/${pkgname}/archive/${version}.tar.gz"
-checksum=86b193dd1af1f40d37820afb33b3b3b890be2737d57df5f8e024a489840b25a4
+distfiles="https://github.com/pychess/pychess/archive/refs/tags/${version}.tar.gz"
+checksum=68cd4a0197d7e325f0e46fb52b88ce8ac7425c6c9adea60c8838a57af713b0a5
+
+pre_build() {
+	PYTHONPATH=lib python3 pgn2ecodb.py
+	PYTHONPATH=lib python3 create_theme_preview.py
+}
 
 do_check() {
 	cd testing/
-	rm remotegame.py
-	PYTHONPATH=../lib PYCHESS_UNITTEST=true xvfb-run -a python3 -m unittest discover -p "*.py"
+	PYTHONPATH=../lib PYCHESS_UNITTEST=true xvfb-run -a python3 run_tests.py
 }

From c994f1f84278eac2213866601f88b31bf4f2f801 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 20:46:05 -0400
Subject: [PATCH 0451/1854] NetworkManager: update to 1.42.6

---
 srcpkgs/NetworkManager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 1e8c290705a3..6311d82924c1 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.42.4
+version=1.42.6
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-42/NEWS"
 distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
-checksum=86ee16a2f7f525629133fa0c3dc060caf96ae4f34084eda1c24551951abe5a3c
+checksum=8c388ac3775ac6bceb605fae21be2c3e261cafe6067994a89f0dfa4610ed0279
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes

From a0cf50acc476ff3db8abbd3b5d8d0e354abea177 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 20:48:25 -0400
Subject: [PATCH 0452/1854] network-manager-applet: update to 1.32.0

---
 srcpkgs/network-manager-applet/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index ee5e63b467ed..f6f79f9680c4 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.30.0
-revision=2
+version=1.32.0
+revision=1
 build_style=meson
 configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
@@ -16,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.gnome.org/GNOME/network-manager-applet/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/network-manager-applet/${version%.*}/network-manager-applet-${version}.tar.xz"
-checksum=9516b84e9d9f100db89a0c67cbfe57cedb0562310d45caafb6332e27bbeb5cd3
+checksum=a2b5affa1505ad43902959fdbe09e5bcec57b11ed333fa60458ffb9c62efba38
 lib32disabled=yes

From 7fe9c52ea999c378db1a6775da8792ea0c2de81a Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 3 May 2023 01:41:58 +0000
Subject: [PATCH 0453/1854] peru: update to 1.3.1.

---
 srcpkgs/peru/template | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template
index 164984d6f4fc..6b37a010445c 100644
--- a/srcpkgs/peru/template
+++ b/srcpkgs/peru/template
@@ -1,17 +1,31 @@
 # Template file for 'peru'
 pkgname=peru
-version=1.2.0
-revision=5
-build_style=python3-module
-pycompile_module="peru"
-hostmakedepends="python3-setuptools"
+version=1.3.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling python3-wheel"
 depends="curl git mercurial python3 python3-docopt python3-yaml"
+checkdepends="${depends} python3-pytest rsync subversion"
 short_desc="Tool for fetching code"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="MIT"
 homepage="https://github.com/buildinspace/peru"
 distfiles="https://github.com/buildinspace/peru/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=fb0fb02639e1c5403c9a6ddfd9719c5ea5ddf69fb440fbcfafe234470645e1dc
+checksum=6a21108f8b0417301d3cd76fa220906cea9d58f95208b70191282972f8bb8ff9
+
+do_check() {
+	local skiptests
+
+	skiptests+=" test_curl_plugin_fetch or"
+	skiptests+=" test_curl_plugin_fetch_archives or"
+	skiptests+=" test_curl_plugin_reup or"
+	skiptests+=" test_git_plugin_with_relative_submodule or"
+	skiptests+=" test_git_plugin_with_submodule or"
+	skiptests+=" test_plugin_fetch or"
+	skiptests+=" test_plugin_get_reup_fields"
+
+	PYTHONPATH="$(cd tests && pwd)" python3 -m pytest -k "not (${skiptests})"
+}
 
 post_install() {
 	vlicense LICENSE

From f2094b1c8b76ddf6709f4437b2e9a351b97fb873 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Tue, 6 Jun 2023 02:15:38 +0200
Subject: [PATCH 0454/1854] limine: update to 4.20230606.0.

---
 srcpkgs/limine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index 1fad25363c8a..25e23c5cd630 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230428.0
+version=4.20230606.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=8771a86769a3405dad729cabceac0a76316964c40dc2f0690398b1e6e01aae41
+checksum=8a6fdb8b520a030928ab4e11756126a7b80790889a5567d0c92b907a1b131759
 
 post_install() {
 	vlicense LICENSE

From 643f375e0b819a20fc43f274ffefde1c57c04aa9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 4 May 2023 11:57:34 +0530
Subject: [PATCH 0455/1854] xarchiver: update to 0.5.4.21.

---
 srcpkgs/xarchiver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index b669c6eae41d..47ef5230f29c 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
 # Template file for 'xarchiver'
 pkgname=xarchiver
-version=0.5.4.20
+version=0.5.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-doc --enable-gtk2=no"
@@ -12,4 +12,4 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ib/xarchiver"
 distfiles="https://github.com/ib/xarchiver/archive/refs/tags/${version}.tar.gz"
-checksum=929e8609d769ab97a18494ef75bef443e244a62b045f637078fe5df87bbcf9ff
+checksum=65329bff7e901452f3f927d913c47ffca759a36e83e8b82d04fe6945e7393fd4

From 4f71a61daacc0fc6d657609b964a952cdc4cd01e Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Fri, 5 May 2023 11:59:08 +0200
Subject: [PATCH 0456/1854] ncspot: update to 0.13.2.

---
 srcpkgs/ncspot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncspot/template b/srcpkgs/ncspot/template
index 98b3d847ed12..19a47daeca3c 100644
--- a/srcpkgs/ncspot/template
+++ b/srcpkgs/ncspot/template
@@ -1,6 +1,6 @@
 # Template file for 'ncspot'
 pkgname=ncspot
-version=0.13.1
+version=0.13.2
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/hrkfdn/ncspot"
 changelog="https://github.com/hrkfdn/ncspot/releases"
 distfiles="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${version}.tar.gz"
-checksum=51394f0a4f75c6d6273f1a98be350dca3f50a8ba21e5b563e85b08b9da04af89
+checksum=c329fc3fe229c47c2b3490555b4c8df550a3e2bbe3d0ade4e07f59434fa14e77
 
 post_build() {
 	cargo auditable build --release --target ${RUST_TARGET} --package xtask

From bbff426db1de902159a320d34b03a8d448481192 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 7 May 2023 01:09:25 +0530
Subject: [PATCH 0457/1854] dust: update to 0.8.6.

---
 srcpkgs/dust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index e52b02aeae3d..a59cdf788fea 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,6 +1,6 @@
 # Template file for 'dust'
 pkgname=dust
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=cargo
 short_desc="More intuitive version of du"
@@ -8,7 +8,7 @@ maintainer="Neel <neel@chot.ai>"
 license="Apache-2.0"
 homepage="https://github.com/bootandy/dust"
 distfiles="https://github.com/bootandy/dust/archive/refs/tags/v${version}.tar.gz"
-checksum=0eff8b1b4e53f5ec2ffc0cfb9e5500bf27a9a5a68b1ff115c98facb4d20a7b7c
+checksum=feede818e814011207c5bfeaf06dd9fc95825c59ab70942aa9b9314791c5d6b6
 
 post_install() {
 	vcompletion completions/dust.bash bash

From 64f858876d6b8eab84f5ea815622293e9b4312a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=2E=20C=2E=20Moreira?=
 <andrelcmoreira@disroot.org>
Date: Sat, 6 May 2023 23:36:08 -0300
Subject: [PATCH 0458/1854] volumeicon: add changelog, adopt.

---
 srcpkgs/volumeicon/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index 3d3e14eff617..2b15a200d804 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -7,9 +7,10 @@ configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André L. C. Moreira <andrelcmoreira@disroot.org>"
 license="GPL-3.0-only, ISC, MIT"
 homepage="http://nullwise.com/volumeicon.html"
+changelog="https://raw.githubusercontent.com/Maato/volumeicon/master/ChangeLog"
 distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 

From d70407d9de2e2a3d34fac6276949a8d63bdda007 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 6 May 2023 23:35:53 -0400
Subject: [PATCH 0459/1854] urlwatch: update to 2.28

---
 ...afbb047060277b00f570345e7e1969266712.patch | 88 -------------------
 srcpkgs/urlwatch/template                     |  4 +-
 2 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch

diff --git a/srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch b/srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch
deleted file mode 100644
index 832b963517e0..000000000000
--- a/srcpkgs/urlwatch/patches/6b68afbb047060277b00f570345e7e1969266712.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 6b68afbb047060277b00f570345e7e1969266712 Mon Sep 17 00:00:00 2001
-From: Thomas Perl <m@thp.io>
-Date: Wed, 12 Apr 2023 15:22:02 +0200
-Subject: [PATCH] Rework handling of running from a source checkout (fixes
- #755)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 657e0494..fccf1f1d 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
- 
- The format mostly follows [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- 
-+## UNRELEASED
-+
-+### Fixed
-+
-+- Rework handling of running from a source checkout, fixes issues with example files
-+  when `urlwatch` was run as `/usr/sbin/urlwatch`, e.g. on Void Linux (fixes #755)
-+
- ## [2.26] -- 2023-04-11
- 
- ### Added
-diff --git a/lib/urlwatch/cli.py b/lib/urlwatch/cli.py
-index 75332f09..f6a5802a 100755
---- a/lib/urlwatch/cli.py
-+++ b/lib/urlwatch/cli.py
-@@ -47,9 +47,6 @@
- # Check if we are installed in the system already
- (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
- 
--if bindir != 'bin':
--    sys.path.insert(0, os.path.join(prefix, bindir, 'lib'))
--
- from urlwatch.command import UrlwatchCommand
- from urlwatch.config import CommandConfig
- from urlwatch.main import Urlwatch
-@@ -90,7 +87,7 @@ def main():
-     if os.path.exists(old_cache_file) and not os.path.exists(new_cache_file):
-         cache_file = old_cache_file
- 
--    command_config = CommandConfig(sys.argv[1:], pkgname, urlwatch_dir, bindir, prefix,
-+    command_config = CommandConfig(sys.argv[1:], pkgname, urlwatch_dir, prefix,
-                                    config_file, urls_file, hooks_file, cache_file, False)
-     setup_logger(command_config.verbose)
- 
-diff --git a/lib/urlwatch/config.py b/lib/urlwatch/config.py
-index c1075460..40d206ec 100644
---- a/lib/urlwatch/config.py
-+++ b/lib/urlwatch/config.py
-@@ -52,20 +52,12 @@ def __init__(self, pkgname, urlwatch_dir, config, urls, cache, hooks, verbose):
- 
- class CommandConfig(BaseConfig):
- 
--    def __init__(self, args, pkgname, urlwatch_dir, bindir, prefix, config, urls, hooks, cache, verbose):
-+    def __init__(self, args, pkgname, urlwatch_dir, prefix, config, urls, hooks, cache, verbose):
-         super().__init__(pkgname, urlwatch_dir, config, urls, cache, hooks, verbose)
--        self.bindir = bindir
--        self.prefix = prefix
-         self.migrate_cache = migrate_cache
-         self.migrate_urls = migrate_urls
- 
--        if self.bindir == 'bin':
--            # Installed system-wide
--            self.examples_dir = os.path.join(prefix, 'share', self.pkgname, 'examples')
--        else:
--            # Assume we are not yet installed
--            self.examples_dir = os.path.join(prefix, bindir, 'share', self.pkgname, 'examples')
--
-+        self.examples_dir = os.path.join(prefix, 'share', self.pkgname, 'examples')
-         self.urls_yaml_example = os.path.join(self.examples_dir, 'urls.yaml.example')
-         self.hooks_py_example = os.path.join(self.examples_dir, 'hooks.py.example')
- 
-diff --git a/lib/urlwatch/tests/test_handler.py b/lib/urlwatch/tests/test_handler.py
-index 1d5d22e6..7886acc9 100644
---- a/lib/urlwatch/tests/test_handler.py
-+++ b/lib/urlwatch/tests/test_handler.py
-@@ -89,8 +89,7 @@ def test_pep8_conformance():
- 
- class ConfigForTest(CommandConfig):
-     def __init__(self, config, urls, cache, hooks, verbose):
--        (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
--        super().__init__([], 'urlwatch', os.path.dirname(__file__), bindir, prefix, config, urls, hooks, cache, verbose)
-+        super().__init__([], 'urlwatch', os.path.dirname(__file__), root, config, urls, hooks, cache, verbose)
- 
- 
- @contextlib.contextmanager
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index 58287278fe90..809ce89c7b43 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,6 +1,6 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
-version=2.26
+version=2.28
 revision=1
 build_style=python3-module
 # skip the tests that require python modules that aren't packaged
@@ -19,7 +19,7 @@ license="BSD-3-Clause"
 homepage="https://thp.io/2008/urlwatch/"
 changelog="https://raw.githubusercontent.com/thp/urlwatch/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=b14bbe23d87b7d4ac8b4e71a51fd2066908a947ccf7b557c3e4f87b09f455e8f
+checksum=911df3abbd8923e46ec167a9657a812436caf93f7f9917cb7c95ebd73d28cce5
 
 post_install() {
 	vlicense COPYING

From 3e1fcbdcca5ed795b403c4df5d645403bf1b86fd Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Sun, 7 May 2023 12:41:03 +0200
Subject: [PATCH 0460/1854] swayimg: update to 1.11.

---
 srcpkgs/swayimg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9361b4aa492d..389ee535394b 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
-version=1.10
-revision=2
+version=1.11
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel
@@ -12,7 +12,7 @@ maintainer="Orphan <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/artemsen/swayimg"
 distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz"
-checksum=fa20e9d5e260ca45ca3fb83343a6c7e7c93bcdb1184a99b19b630aec598f4b17
+checksum=b7853417caf3c928195107644df31ba80a906fc3ecca180db2841abbfac27736
 
 post_install() {
 	vcompletion extra/bash.completion bash

From accc60b220b15d4907b8b27b3ae9efb840904e4d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 7 May 2023 16:42:53 +0200
Subject: [PATCH 0461/1854] praat: update to 6.3.10

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 8a88f55deea6..56d62e1a18de 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.3.09
+version=6.3.10
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.fon.hum.uva.nl/praat/"
 changelog="https://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=047a8295a5097a4c101b62d49cf9e4e3f13655d94e35b4d9c00be0b3d2ca3330
+checksum=8aa1e19376d2ac730c1b191eab67e10708002747220baa9f1c807fbf5a5cec48
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From 89a563e37c9c8034df305f02ce58b8bcb18716fc Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 11 Apr 2023 17:43:29 +0200
Subject: [PATCH 0462/1854] neovim-qt: update to 0.2.17

---
 srcpkgs/neovim-qt/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template
index 459fd23b19b7..faea60a20084 100644
--- a/srcpkgs/neovim-qt/template
+++ b/srcpkgs/neovim-qt/template
@@ -1,17 +1,18 @@
 # Template file for 'neovim-qt'
 pkgname=neovim-qt
-version=0.2.16.1
+version=0.2.17
 revision=1
 build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DUSE_SYSTEM_MSGPACK=ON"
 hostmakedepends="qt5-host-tools qt5-qmake neovim"
-makedepends="qt5-devel qt5-svg-devel"
+makedepends="msgpack-devel qt5-devel qt5-svg-devel"
 depends="neovim"
 short_desc="Neovim client library and GUI, in Qt5"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="ISC"
 homepage="https://github.com/equalsraf/neovim-qt"
 distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz"
-checksum=971d4597b40df2756b313afe1996f07915643e8bf10efe416b64cc337e4faf2a
+checksum=ac538c2e5d63572dd0543c13fafb4d428e67128ea676467fcda68965b2aacda1
 
 post_install() {
 	vlicense LICENSE

From 79b1a138260f2e1277f594575d2b32e525351159 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 19:58:00 +0200
Subject: [PATCH 0463/1854] falkon: update to 23.04.2.

---
 srcpkgs/falkon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 3298c3cc1922..4a4d7be0ae3a 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,6 +1,6 @@
 # Template file for 'falkon'
 pkgname=falkon
-version=23.04.1
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
@@ -17,7 +17,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="https://www.falkon.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c56bc0224d6df90ae9959a8ee81dfe5ef570db2452040c7219d2939237019f02
+checksum=c14202fa08821d3f18436f309d3ae1ad410865be2453b3e4eba3fe6c137aa2c9
 
 LDFLAGS="-Wl,--no-fatal-warnings"
 

From aa684a30b35dcc9dc4585611a4e7887c07c0286e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 20:00:34 +0200
Subject: [PATCH 0464/1854] libkdcraw5: update to 23.04.2.

---
 srcpkgs/libkdcraw5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 27e416dca9f8..09ef908651f1 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=23.04.1
-revision=2
+version=23.04.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
  gettext"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=14a61b808443ff8b3a6566e5f6141278ed71af223b39a4b0c322dd137de51701
+checksum=25d790c0d42534a55c3a95b084a1ee5fca8801d1fee52dc9add047b6e296ec69
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 1b170b0e8d620e3a9f930bb56c1aec3004ca81bb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 20:12:49 +0200
Subject: [PATCH 0465/1854] gwenview: update to 23.04.2.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index adf26f060150..4ab9a1c9ab0a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=23.04.1
+version=23.04.2
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -19,4 +19,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b11c745999f20eaaa18c85d221063a77af28fc0e7a9176da651a5210fec8b0d5
+checksum=bf1de549931a53ea8298a186c63fb2778b414db9018dd86816d58e6731477922

From 3f5b824e02c0880e6d9fd4a31b3a0ce2ecd30cd7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 9 Jun 2023 20:13:49 +0200
Subject: [PATCH 0466/1854] perl-Locale-Codes: update to 3.74.

---
 srcpkgs/perl-Locale-Codes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Locale-Codes/template b/srcpkgs/perl-Locale-Codes/template
index 46bb8193d4e2..a161a9dcc886 100644
--- a/srcpkgs/perl-Locale-Codes/template
+++ b/srcpkgs/perl-Locale-Codes/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Locale-Codes'
 pkgname=perl-Locale-Codes
-version=3.73
+version=3.74
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Locale-Codes"
 distfiles="${CPAN_SITE}/Locale/${pkgname/perl-/}-${version}.tar.gz"
-checksum=9a6db8e2b0843eba8a2287785c9b7d051dee68c73f1e575780a097f375e8e682
+checksum=a310b4cad11d2708ab3d602724d16f5ef01362d57de57cb5e99e1221e9a16ecb

From 293c2051bd0eab6e21365e843f174e20794bf703 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:31:35 +0200
Subject: [PATCH 0467/1854] rust-bootstrap: update to 1.70.0

---
 srcpkgs/rust-bootstrap/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 567c4ae1e69d..d1025550e850 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-bootstrap'
 pkgname=rust-bootstrap
-version=1.69.0
+version=1.70.0
 revision=1
 short_desc="Rust programming language bootstrap toolchain"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -31,24 +31,24 @@ case "$XBPS_TARGET_MACHINE" in
 		 ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
 		checksum="
-		 788ff61555857680d5ea7cf76023f74a7f4820dd1c26abf76536561d4de3cbe6
-		 bef330af5bfb381a01349186e05402983495a3e2d4d1c35723a8443039d19a2d"
+		 f89c90f80864f68e42b70d9c14984195629ed9894bb5cfe6c8a0f1140f7816ff
+		 0e5543c35196ca5b08f1b7e49fa3f3b671444d75648504cdbcfd854e2e7efd2d"
 		;;
 	x86_64)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
 		checksum="
-		 70e97ab5b9600328b977268fc92ca4aa53064e4e97468df35215d4396e509279
-		 4c95739e6f0f1d4defd937f6d60360b566e051dfb2fa71879d0f9751392f3709"
+		 7d891d3e9bc4f1151545c83cbe3bc6af9ed234388c45ca2e19641262f48615e2
+		 0c0129717da1e27ccf2c56da950d2fe56973f71beec9e80ae6904b282d2f0ee9"
 		;;
 	x86_64-musl)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
 		checksum="
-		 7d9e64850a79292d2cda6f4464dfd67d2cbd22ac8c7f3e170291396ef8be8041
-		 29d98c004629ab536bd2461f715f26ddce3b0f0212db85939c7bc66a8d234b2d"
+		 69a3ba1273aedaf7aadc91f6ccf59061eb00205c9c523f0b1f91ca14cfa2058c
+		 7ebaba08385d1ec87d0a27ca8b4e1eb454374da18ffa12621bd1578973754101"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 1930e457668d1281b461bd34a1fc9736117ada65 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:33:09 +0200
Subject: [PATCH 0468/1854] cargo-bootstrap: update to 1.70.0

---
 srcpkgs/cargo-bootstrap/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index b5dc2e9aed89..d591e4233c57 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-bootstrap'
 pkgname=cargo-bootstrap
-version=1.69.0
+version=1.70.0
 revision=1
 short_desc="Bootstrap binaries of Rust package manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,15 +24,15 @@ esac
 case "$XBPS_TARGET_MACHINE" in
 	i686)
 		distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
-		checksum="4c9b1b2fb692bb0c81e524df6368723f061c8bb0d21a1f487eb8e5c2bdf323ab"
+		checksum="5d20e9b8e56f641c3ef4aef965563806aa220044397485ec56f784657451a329"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="336eeabf231a7665c26c127a37b8aefffe28cb087c5c8d4ba0460419f5f8eff2"
+		checksum="650e7a890a52869cd14e2305652bff775aec7fc2cf47fc62cf4a89ff07242333"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="17f5c6481a881599adb5f665480d9985073155eda9c9fdc1e5663563db51b970"
+		checksum="4d7513e23b8710ebacb01ed333d00692331295e45191f5c0795aada00f291d19"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 01009665b4cf09ef23da8cf0cdfb65f1bf61a42f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:36:10 +0200
Subject: [PATCH 0469/1854] rust: update to 1.70.0

---
 srcpkgs/rust-src                              |   1 +
 ...dlib-and-musl_root-from-musl-targets.patch |  63 +++-----
 ...e-debugger-scripts-to-usr-share-rust.patch |  26 +--
 ...4-fix-shebang-on-install-template.sh.patch |  15 +-
 ...kage-of-musl-libc-for-the-libc-crate.patch |  28 ++--
 srcpkgs/rust/template                         | 149 +++++++++---------
 6 files changed, 124 insertions(+), 158 deletions(-)
 create mode 120000 srcpkgs/rust-src

diff --git a/srcpkgs/rust-src b/srcpkgs/rust-src
new file mode 120000
index 000000000000..6ef8575b5fa4
--- /dev/null
+++ b/srcpkgs/rust-src
@@ -0,0 +1 @@
+rust
\ No newline at end of file
diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 1759147c989f..07c24412f6d9 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -4,17 +4,6 @@ Date: Sun, 3 May 2020 17:53:33 +0200
 Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
 
 extended by various void contributors to match our musl setup
----
- compiler/rustc_target/src/spec/crt_objects.rs | 22 ----------
- .../rustc_target/src/spec/linux_musl_base.rs  |  7 ---
- config.toml.example                           |  8 ----
- src/bootstrap/cc_detect.rs                    | 25 +----------
- src/bootstrap/compile.rs                      | 43 +------------------
- src/bootstrap/config.rs                       |  9 ----
- src/bootstrap/configure.py                    | 28 ------------
- src/bootstrap/lib.rs                          | 19 --------
- src/bootstrap/sanity.rs                       | 23 ----------
- 9 files changed, 3 insertions(+), 181 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
 index c126390f5..7aef73d3b 100644
@@ -70,13 +59,13 @@ index 61553e71b..88f807a58 100644
  
      base
  }
-diff --git a/config.toml.example b/config.toml.example
-index ca54cbd2d..beec9bb04 100644
---- a/config.toml.example
-+++ b/config.toml.example
-@@ -540,14 +540,6 @@ changelog-seen = 2
+diff --git a/config.example.toml b/config.example.toml
+index 6d9c762ce..7a1375d8a 100644
+--- a/config.example.toml
++++ b/config.example.toml
+@@ -556,14 +556,6 @@ changelog-seen = 2
  # behavior -- this may lead to miscompilations or other bugs.
- #description = <none> (string)
+ #description = ""
  
 -# The root location of the musl installation directory. The library directory
 -# will also need to contain libunwind.a for an unwinding implementation. Note
@@ -90,10 +79,10 @@ index ca54cbd2d..beec9bb04 100644
  # platforms to ensure that the compiler is usable by default from the build
  # directory (as it links to a number of dynamic libraries). This may not be
 diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index 7128d542a..668245f3c 100644
+index 65c882fb8..f35a92821 100644
 --- a/src/bootstrap/cc_detect.rs
 +++ b/src/bootstrap/cc_detect.rs
-@@ -101,7 +101,7 @@ pub fn find(build: &mut Build) {
+@@ -103,7 +103,7 @@ pub fn find(build: &mut Build) {
          if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
              cfg.compiler(cc);
          } else {
@@ -102,7 +91,7 @@ index 7128d542a..668245f3c 100644
          }
  
          let compiler = cfg.get_compiler();
-@@ -122,7 +122,7 @@ pub fn find(build: &mut Build) {
+@@ -124,7 +124,7 @@ pub fn find(build: &mut Build) {
              cfg.compiler(cxx);
              true
          } else if build.hosts.contains(&target) || build.build == target {
@@ -111,7 +100,7 @@ index 7128d542a..668245f3c 100644
              true
          } else {
              // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
-@@ -158,7 +158,6 @@ fn set_compiler(
+@@ -160,7 +160,6 @@ fn set_compiler(
      compiler: Language,
      target: TargetSelection,
      config: Option<&Target>,
@@ -119,7 +108,7 @@ index 7128d542a..668245f3c 100644
  ) {
      match &*target.triple {
          // When compiling for android we may have the NDK configured in the
-@@ -194,26 +193,6 @@ fn set_compiler(
+@@ -196,26 +195,6 @@ fn set_compiler(
              }
          }
  
@@ -147,10 +136,10 @@ index 7128d542a..668245f3c 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 0deed3f99..0bddac5d1 100644
+index 4a4e7adcb..f2cdc4a07 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -228,39 +228,7 @@ fn copy_self_contained_objects(
+@@ -246,39 +246,7 @@ fn copy_self_contained_objects(
      let mut target_deps = vec![];
  
      // Copies the libc and CRT objects.
@@ -174,7 +163,7 @@ index 0deed3f99..0bddac5d1 100644
 -                DependencyType::TargetSelfContained,
 -            );
 -        }
--        let crt_path = builder.ensure(native::CrtBeginEnd { target });
+-        let crt_path = builder.ensure(llvm::CrtBeginEnd { target });
 -        for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"] {
 -            let src = crt_path.join(obj);
 -            let target = libdir_self_contained.join(obj);
@@ -191,7 +180,7 @@ index 0deed3f99..0bddac5d1 100644
          let srcdir = builder
              .wasi_root(target)
              .unwrap_or_else(|| {
-@@ -344,15 +312,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -375,15 +343,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
              .arg("--manifest-path")
              .arg(builder.src.join("library/test/Cargo.toml"));
  
@@ -208,10 +197,10 @@ index 0deed3f99..0bddac5d1 100644
              if let Some(p) = builder.wasi_root(target) {
                  let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap());
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index d8c15c76e..53f95e49b 100644
+index cc3b3bc25..eb472c5e8 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -200,7 +200,6 @@ pub struct Config {
+@@ -210,7 +210,6 @@ pub struct Config {
      pub missing_tools: bool,
  
      // Fallback musl-root for all targets
@@ -219,7 +208,7 @@ index d8c15c76e..53f95e49b 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -440,8 +439,6 @@ pub struct Target {
+@@ -456,8 +455,6 @@ pub struct Target {
      pub sanitizers: Option<bool>,
      pub profiler: Option<bool>,
      pub crt_static: Option<bool>,
@@ -228,7 +217,7 @@ index d8c15c76e..53f95e49b 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -734,7 +731,6 @@ define_config! {
+@@ -753,7 +750,6 @@ define_config! {
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
          description: Option<String> = "description",
@@ -236,7 +225,7 @@ index d8c15c76e..53f95e49b 100644
          rpath: Option<bool> = "rpath",
          verbose_tests: Option<bool> = "verbose-tests",
          optimize_tests: Option<bool> = "optimize-tests",
-@@ -781,8 +777,6 @@ define_config! {
+@@ -801,8 +797,6 @@ define_config! {
          sanitizers: Option<bool> = "sanitizers",
          profiler: Option<bool> = "profiler",
          crt_static: Option<bool> = "crt-static",
@@ -245,7 +234,7 @@ index d8c15c76e..53f95e49b 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -1187,7 +1181,6 @@ impl Config {
+@@ -1133,7 +1127,6 @@ impl Config {
              set(&mut config.llvm_tools_enabled, rust.llvm_tools);
              config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
              config.rustc_default_linker = rust.default_linker;
@@ -253,7 +242,7 @@ index d8c15c76e..53f95e49b 100644
              config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
              set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings));
              set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -1251,8 +1244,6 @@ impl Config {
+@@ -1293,8 +1286,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.map(PathBuf::from);
                  target.linker = cfg.linker.map(PathBuf::from);
                  target.crt_static = cfg.crt_static;
@@ -263,10 +252,10 @@ index d8c15c76e..53f95e49b 100644
                  target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
                  target.sanitizers = cfg.sanitizers;
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 6b139decb..a2e19b8f4 100755
+index abd28b400..6f0f8d879 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -112,34 +112,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -111,34 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
    "aarch64-linux-android NDK standalone path")
  v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
    "x86_64-linux-android NDK standalone path")
@@ -302,10 +291,10 @@ index 6b139decb..a2e19b8f4 100755
    "rootfs in qemu testing, you probably don't want to use this")
  v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 3ed534523..c7c7a75f0 100644
+index 419bcbc63..dc98f5197 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -1181,25 +1181,6 @@ impl Build {
+@@ -1139,25 +1139,6 @@ impl Build {
          }
      }
  
diff --git a/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch b/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch
index bc7053800945..b10510ca6f27 100644
--- a/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch
+++ b/srcpkgs/rust/patches/0003-move-debugger-scripts-to-usr-share-rust.patch
@@ -3,18 +3,11 @@ From: Daniel Kolesa <daniel@octaforge.org>
 Date: Mon, 20 Dec 2021 00:45:35 +0100
 Subject: [PATCH 03/15] move debugger scripts to /usr/share/rust
 
----
- src/bootstrap/dist.rs | 2 +-
- src/etc/rust-gdb      | 2 +-
- src/etc/rust-gdbgui   | 2 +-
- src/etc/rust-lldb     | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
 diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index b1fae356d..e7a077134 100644
+index 76aad16c1..db53459e8 100644
 --- a/src/bootstrap/dist.rs
 +++ b/src/bootstrap/dist.rs
-@@ -460,7 +460,7 @@ impl Step for DebuggerScripts {
+@@ -528,7 +528,7 @@ impl Step for DebuggerScripts {
      fn run(self, builder: &Builder<'_>) {
          let host = self.host;
          let sysroot = self.sysroot;
@@ -24,7 +17,7 @@ index b1fae356d..e7a077134 100644
          let cp_debugger_script = |file: &str| {
              builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
 diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index b950cea79..559bfe3f1 100755
+index 9abed30ea..4c7f953ed 100755
 --- a/src/etc/rust-gdb
 +++ b/src/etc/rust-gdb
 @@ -12,7 +12,7 @@ fi
@@ -33,11 +26,11 @@ index b950cea79..559bfe3f1 100755
  RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
 -GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 +GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
  
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
 diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
-index 9744913b6..8722acdcc 100755
+index 913269316..f444fbc4b 100755
 --- a/src/etc/rust-gdbgui
 +++ b/src/etc/rust-gdbgui
 @@ -41,7 +41,7 @@ fi
@@ -46,9 +39,9 @@ index 9744913b6..8722acdcc 100755
  RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
 -GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 +GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
  
- # Set the environment variable `RUST_GDB` to overwrite the call to a
- # different/specific command (defaults to `gdb`).
 diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
 index bce72f1ba..8abb01245 100755
 --- a/src/etc/rust-lldb
@@ -64,6 +57,3 @@ index bce72f1ba..8abb01245 100755
  
  # Call LLDB with the commands added to the argument list
  exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"
--- 
-2.37.2
-
diff --git a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
index 2ca7ffeaf73f..2326d3cc4232 100644
--- a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
+++ b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
@@ -3,20 +3,13 @@ From: Daniel Kolesa <daniel@octaforge.org>
 Date: Mon, 20 Dec 2021 00:55:18 +0100
 Subject: [PATCH 04/15] fix shebang on install-template.sh
 
----
- src/tools/rust-installer/install-template.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh
-index e68be8911..beaa90f7b 100644
+index 92a3f1f2c..fca281191 100644
 --- a/src/tools/rust-installer/install-template.sh
 +++ b/src/tools/rust-installer/install-template.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
- # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
- # file at the top-level directory of this distribution and at
- # http://rust-lang.org/COPYRIGHT.
--- 
-2.37.2
-
+ 
+ # No undefined variables
+ set -u
diff --git a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index f2780ae08dfb..0f09cef58f70 100644
--- a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -3,29 +3,23 @@ From: q66 <daniel@octaforge.org>
 Date: Sun, 3 May 2020 18:02:03 +0200
 Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate
 
----
- vendor/libc/src/unix/mod.rs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
 diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
-index ecee44411..7ae05f24e 100644
+index b005970b9..c53093a09 100644
 --- a/vendor/libc/src/unix/mod.rs
 +++ b/vendor/libc/src/unix/mod.rs
-@@ -337,11 +337,11 @@ cfg_if! {
+@@ -351,7 +351,14 @@ cfg_if! {
+         #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
          #[link(name = "c", cfg(not(target_feature = "crt-static")))]
          extern {}
-     } else if #[cfg(target_env = "musl")] {
+-    } else if #[cfg(any(target_env = "musl", target_env = "ohos"))] {
++    } else if #[cfg(target_env = "musl")] {
 +        #[link(name = "c")]
 +        extern {}
-         #[cfg_attr(feature = "rustc-dep-of-std",
--                   link(name = "c", kind = "static", modifiers = "-bundle",
++        #[cfg_attr(feature = "rustc-dep-of-std",
 +                   link(name = "gcc", kind = "static", modifiers = "-bundle",
++                        cfg(target_feature = "crt-static")))]
++        extern {}
++    } else if #[cfg(target_env = "ohos")] {
+         #[cfg_attr(feature = "rustc-dep-of-std",
+                    link(name = "c", kind = "static", modifiers = "-bundle",
                          cfg(target_feature = "crt-static")))]
--        #[cfg_attr(feature = "rustc-dep-of-std",
--                   link(name = "c", cfg(not(target_feature = "crt-static"))))]
-         extern {}
-     } else if #[cfg(target_os = "emscripten")] {
-         #[link(name = "c")]
--- 
-2.37.2
-
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 88e35a5a43ad..523f2ccfe58c 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
 # uploaded to https://repo-default.voidlinux.org/distfiles/
 #
 pkgname=rust
-version=1.69.0
+version=1.70.0
 revision=1
 hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
 makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15"
@@ -18,9 +18,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://www.rust-lang.org/"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=fb05971867ad6ccabbd3720279f5a94b99f61024923187b56bb5c455fa3cf60f
+checksum=b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c
 lib32disabled=yes
 make_check=no # CBA for now
+python_version=3 # needed for python files in rust-src
 
 build_options="bindist"
 desc_option_bindist="Generate tarballs for bootstrap"
@@ -70,97 +71,85 @@ post_patch() {
 }
 
 do_configure() {
-	local _local_rebuild _use_debug _use_debug_rustc _use_rpath _use_docs _llvm_shared
+	local _local_rebuild _debug _debug_rustc _rpath _docs _llvm_shared
+	local _cross_args
 
 	if [ "$CROSS_BUILD" ]; then
-		_local_rebuild="true"
+		_local_rebuild="enable"
 	else
-		_local_rebuild="false"
+		_local_rebuild="disable"
 	fi
 
 	# disable rustc debug info as it bloats up rust-std significantly
 	# set to 1 or 2 if you wish to have debug info for rustc, it won't
 	# link on 32-bit platforms though (too big)
-	_use_debug_rustc="0"
+	_debug_rustc="0"
 	# just disable debug for now
-	_use_debug="0"
+	_debug="0"
 
 	# if true, the binaries will be built with rpath, so the binaries will be
 	# usable directly from the build directory, this is not desirable for
 	# packaging but is useful when building bootstrap binaries
 	if [ "$build_option_bindist" ]; then
-		_use_rpath="true"
-		_use_docs="false"
-		_llvm_shared="false"
+		_rpath="enable"
+		_docs="disable"
+		_llvm_shared="disable"
 	else
-		_use_rpath="false"
-		_use_docs="true"
-		_llvm_shared="true"
+		_rpath="disable"
+		_docs="enable"
+		_llvm_shared="enable"
 	fi
 
-	cat > config.toml <<- EOF
-		changelog-seen = 2
-		[llvm]
-		ninja = false
-		link-shared = ${_llvm_shared}
-		[build]
-		build = "${RUST_BUILD}"
-		host = [ "${RUST_TARGET}" ]
-		target = [ "${RUST_TARGET}" ]
-		cargo = "/usr/bin/cargo"
-		rustc = "/usr/bin/rustc"
-		submodules = false
-		python = "python3"
-		locked-deps = true
-		vendor = true
-		full-bootstrap = false
-		local-rebuild = ${_local_rebuild}
-		extended = false
-		docs = ${_use_docs}
-		tools = []
-		[install]
-		prefix = "/usr"
-		[rust]
-		optimize = true
-		debug = false
-		codegen-units = 1
-		codegen-units-std = 1
-		debuginfo-level = ${_use_debug}
-		debuginfo-level-rustc = ${_use_debug_rustc}
-		debuginfo-level-tests = 0
-		incremental = false
-		parallel-compiler = false
-		channel = "stable"
-		description = "Void Linux"
-		rpath = ${_use_rpath}
-		verbose-tests = true
-		dist-src = false
-		jemalloc = false
-		llvm-libunwind = "no"
-		codegen-tests = false
-		[dist]
-		src-tarball = false
-		[target.${RUST_BUILD}]
-		llvm-config = "/usr/bin/llvm-config"
-		crt-static = false
-		cc = "${CC_host:-$CC}"
-		cxx = "${CXX_host:-$CXX}"
-		ar = "${AR_host:-$AR}"
-		linker = "${CC_host:-$CC}"
-	EOF
-
 	if [ "$CROSS_BUILD" ]; then
-		cat >> config.toml <<- EOF
-			[target.${RUST_TARGET}]
-			llvm-config = "/usr/bin/llvm-config"
-			crt-static = false
-			cc = "${CC}"
-			cxx = "${CXX}"
-			ar = "${AR}"
-			linker = "${CC}"
-			sysroot = "${XBPS_CROSS_BASE}"
-		EOF
+		_cross_args="--set=target.${RUST_TARGET}.llvm-config=/usr/bin/llvm-config
+		 --set=target.${RUST_TARGET}.crt-static=false
+		 --set=target.${RUST_TARGET}.cc=${CC}
+		 --set=target.${RUST_TARGET}.cxx=${CXX}
+		 --set=target.${RUST_TARGET}.ar=${AR}
+		 --set=target.${RUST_TARGET}.linker=${CC}"
 	fi
+
+	./configure \
+		--build="${RUST_BUILD}" \
+		--host="${RUST_TARGET}" \
+		--target="${RUST_TARGET}" \
+		--prefix=/usr \
+		--python=python3 \
+		--enable-vendor \
+		--enable-locked-deps \
+		--enable-verbose-tests \
+		--disable-full-bootstrap \
+		--disable-extended \
+		--disable-codegen-tests \
+		--disable-dist-src \
+		--${_llvm_shared}-llvm-link-shared \
+		--${_rpath}-rpath \
+		--${_local_rebuild}-local-rebuild \
+		--${_docs}-docs \
+		--debuginfo-level="${_debug}" \
+		--debuginfo-level-rustc="${_debug_rustc}" \
+		--debuginfo-level-tests=0 \
+		--release-channel=stable \
+		--release-description="Void Linux" \
+		--llvm-libunwind=no \
+		--llvm-config=/usr/bin/llvm-config \
+		--set="rust.optimize=true" \
+		--set="rust.debug=false" \
+		--set="rust.codegen-units=1" \
+		--set="rust.codegen-units-std=1" \
+		--set="rust.incremental=false" \
+		--set="rust.parallel-compiler=false" \
+		--set="rust.jemalloc=false" \
+		--set="build.submodules=false" \
+		--set="build.rustc=/usr/bin/rustc" \
+		--set="build.cargo=/usr/bin/cargo" \
+		--set="target.${RUST_BUILD}.crt-static=false" \
+		--set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \
+		--set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \
+		--set="target.${RUST_BUILD}.ar=${AR_host:-$AR}" \
+		--set="target.${RUST_BUILD}.linker=${CC_host:-$CC}" \
+		--set="dist.src-tarball=false" \
+		${_cross_args}
 }
 
 # Set the correct CFLAGS for the build host, we have to compile libbacktrace
@@ -213,6 +202,8 @@ do_install() {
 	 -C "$DESTDIR/usr/lib" --strip-components=3 --exclude=manifest.in
 	tar xf build/dist/rust-docs-${version}-${RUST_TARGET}.tar.gz \
 	 -C "$DESTDIR/usr" --strip-components=2 --exclude=manifest.in
+	tar xf build/dist/rust-src-${version}.tar.gz \
+	 -C "$DESTDIR/usr" --strip-components=2 --exclude=manifest.in
 
 	vlicense COPYRIGHT
 	vlicense LICENSE-APACHE
@@ -237,6 +228,14 @@ rust-std_package() {
 		depends="libexecinfo-devel"
 	fi
 	pkg_install() {
-		vmove usr/lib/rustlib
+		vmove usr/lib/rustlib/${RUST_TARGET}
+		vmove usr/lib/rustlib/rustc-src
+	}
+}
+
+rust-src_package() {
+	short_desc+=" - source code"
+	pkg_install() {
+		vmove usr/lib/rustlib/src
 	}
 }

From cb6ef91d3667c866bae6f1dc3c9c4b42a38582e7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:37:18 +0200
Subject: [PATCH 0470/1854] cargo: update to 1.70.0

---
 srcpkgs/cargo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 6b748e7f95f3..3921088c1e04 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.69.0
+version=1.70.0
 revision=1
-_cargo_revision=0.70.0
+_cargo_revision=0.71.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
 makedepends="rust libcurl-devel openssl-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
-checksum=35d9a86e8d6d942e6c7c8e3333760de33a886063a918a86083724df02a43da7f
+checksum=43ddf8be33d0f9d2514a75ae0df57ed95c8e99a9869deddf49e6eeee5d56e940
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

From 66d1381156f7ba42fdca3c24a147508a2798da41 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 31 May 2023 00:37:43 +0200
Subject: [PATCH 0471/1854] common/environment/build-style/cargo.sh: remove
 obsolete sparse crates.io config

---
 common/environment/build-style/cargo.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/environment/build-style/cargo.sh b/common/environment/build-style/cargo.sh
index bc836b06cf06..473750c7a359 100644
--- a/common/environment/build-style/cargo.sh
+++ b/common/environment/build-style/cargo.sh
@@ -8,6 +8,4 @@ if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"
 fi
 
-export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-
 build_helper+=" rust"

From f53d9525361e495b755117cda598ae80e17650b2 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 2 Jun 2023 14:36:47 +0200
Subject: [PATCH 0472/1854] gdu: update to 5.25.0.

---
 srcpkgs/gdu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 7a56c0f4a7bd..35b31bc49406 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
 # Template file for 'gdu'
 pkgname=gdu
-version=5.23.0
+version=5.25.0
 revision=1
 build_style=go
 go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/dundee/gdu"
 distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=7fa8fbfb33e3abe71f89e90aac84111e49fb226ffba145822e1f2e0072668d70
+checksum=83fe876d953b4f2f7a856552e758aae4aa0cd9569dcf1aded61bdc834b834275
 
 post_install() {
 	vman gdu.1

From 19531639d08151f570f3bd3f56b74d11bf6f9761 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 8 Jun 2023 10:02:09 -0400
Subject: [PATCH 0473/1854] python3-phonenumbers: update to 8.13.13.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 3690912d6585..e0fd2119165f 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.13.11
+version=8.13.13
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=3e3274d88cab3609b55ff5b93417075dbca2d13064f103fbf562e0ea1dda0f9a
+checksum=4bdf8c989aff0cdb105aef170ad2c21f14b4537bcb32cf349f1f710df992a40a

From 2e261e55567c75f1a0c5575cba6807553fa3b492 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 30 May 2023 08:19:35 -0400
Subject: [PATCH 0474/1854] synapse: update to 1.85.2.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 47e9393dcb8f..81f887e451ff 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.84.0
+version=1.85.2
 revision=1
 build_style=python3-pep517
 build_helper=rust
@@ -24,7 +24,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=f87b0565403bdf457f92c75e314fd3581e50bf48259089f22406dc5d90be44bd
+checksum=a227c7347996eae008e0f8f0f2e9290c70e1d96e7687293b2ebd1533766ad43b
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 0dace005aaff5c4acc3b10224e39371aacb7f827 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:22:52 -0400
Subject: [PATCH 0475/1854] syncthingtray: update to 1.4.3.

---
 common/shlibs                  | 6 +++---
 srcpkgs/syncthingtray/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e34e372b84f0..0b1bca75e5d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,9 +4196,9 @@ libopensmtpd.so.0 libopensmtpd-0.7_1
 libiio.so.0 libiio-0.23_1
 libqtforkawesome.so.1 qtforkawesome-0.1.0_1
 libqtquickforkawesome.so.1 qtforkawesome-0.1.0_1
-libsyncthingwidgets.so.6 syncthingtray-1.4.1_1
-libsyncthingmodel.so.6 syncthingtray-1.4.1_1
-libsyncthingconnector.so.6 syncthingtray-1.4.1_1
+libsyncthingwidgets.so.7 syncthingtray-1.4.3_1
+libsyncthingmodel.so.7 syncthingtray-1.4.3_1
+libsyncthingconnector.so.7 syncthingtray-1.4.3_1
 libglibutil.so.1 libglibutil-1.0.64_1
 libgbinder.so.1 libgbinder-1.1.20_1
 libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 55d1086bd533..e77910beae02 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthingtray'
 pkgname=syncthingtray
-version=1.4.1
-revision=2
+version=1.4.3
+revision=1
 build_style=cmake
 configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
  -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)
@@ -18,7 +18,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Martchus/syncthingtray"
 distfiles="https://github.com/Martchus/syncthingtray/archive/refs/tags/v${version}.tar.gz"
-checksum=6a2102c82dc6a8d9b0cf72941e997bb300b5011fe877696edc762e1440abd133
+checksum=fa3ffe19210c0438fe513fcee49fae00b6087b4ad3f6855615e96c51bbb5150d
 
 # requires weird port-binding shenanigans that may not work on ipv6
 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=syncthingtray#n50

From e33f5108326e9d830745368fd0ca61c5f16f8854 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:06 -0400
Subject: [PATCH 0476/1854] pyright: update to 1.1.313.

---
 srcpkgs/pyright/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index 1ccc8edff5c9..28b0db32be36 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.311
+version=1.1.313
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=33c2aa5d47d05d24fa741c068d7e87cdc17aa4d7c72b2e255dc38aa4b5c54752
+checksum=3bdd9dbd026fb2dc580178753bcea113907797caa0971561aa3b8e00fe30112a
 
 do_configure() {
 	cd "$wrksrc"

From 99172409af4cef27187c5ced51247076ac0ee37f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:20 -0400
Subject: [PATCH 0477/1854] typst: update to 0.5.0.

---
 srcpkgs/typst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 81626e340ed7..7d517adbf6cd 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -1,7 +1,7 @@
 # Template file for 'typst'
 pkgname=typst
 reverts="23.03.28_1"
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=cargo
 make_install_args="--path cli"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://typst.app"
 changelog="https://typst.app/docs/changelog/"
 distfiles="https://github.com/typst/typst/archive/refs/tags/v${version}.tar.gz"
-checksum=97bc0f62d373595ace556677e581daea5845bac18863ff014ced3bf8e650d94b
+checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
 
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"

From 73e5d48befd3a236756afea3dff49b97272e5e9f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:34 -0400
Subject: [PATCH 0478/1854] typst-lsp: update to 0.5.1.

---
 srcpkgs/typst-lsp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index b67dec7ecfa2..6d4f0cef0ae2 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'typst-lsp'
 pkgname=typst-lsp
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=cargo
 short_desc="Language server for Typst"
@@ -8,7 +8,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
-checksum=8bd207a9af9e2498205148274260b45b392ad9d8eb80b62c36fad2adc73ee87c
+checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
 
 post_install() {
 	vlicense LICENSE-MIT.txt

From 1a3755ead3e9afd93bcf81458d19b84250b3aba8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 15:23:42 -0400
Subject: [PATCH 0479/1854] vivaldi: update to 6.1.3035.75.

---
 srcpkgs/vivaldi/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 12b5400171bf..13a1769c7d81 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
 # Permission to redistribute is granted.
 # see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.0.2979.25
+version=6.1.3035.75
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ 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=9b737b76f3ad4676b71582d97643e301f19117828027c5e50e5a469d3a00c156
+	checksum=f8acb92f5346ec0a7b4086b2f6709d1b1430ace9f0a27c1439443ecf6afdc96a
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=b918fd16b71943de7f2775ce9bf8ad4637e35a41a05f1a3aade1d5eb2667c012
+	checksum=fe1063fa6ccb14a4f1e6edbea47c0631334d6ea3f49daf319a0bf40eaab053c6
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=e0dfd628ca39962f3772687548d181a0fe5e3be823f8935368514983060b101a
+	checksum=f3af5b7cc192db0d69080b3c4348bc83cca3a39bd31f2beb29cf4e5c7bb119e9
 	;;
 *)
 	broken="No distfiles available for this target"

From 65ef21c9d081c1a7d46127dc91b12cc2c7490a85 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 22:15:28 -0400
Subject: [PATCH 0480/1854] typst-lsp: broken for now on i686

---
 srcpkgs/typst-lsp/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 6d4f0cef0ae2..339ae5ddb0d5 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -10,6 +10,10 @@ homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
 checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
 
+if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
+fi
+
 post_install() {
 	vlicense LICENSE-MIT.txt
 }

From 363494ebbd44b17e199e20d90b16a6b7d887b9c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 22:18:26 -0400
Subject: [PATCH 0481/1854] typst: also broken on i686 for now

---
 srcpkgs/typst/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 7d517adbf6cd..6e9ee26e16b8 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -16,6 +16,10 @@ checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"
 
+if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
+fi
+
 post_install() {
 	for f in cli/generated/*.?; do
 		vman "$f"

From 25b413a30e3d848faa60019617b8d72b467e8b23 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 4 Jun 2023 22:15:11 +0200
Subject: [PATCH 0482/1854] termdown: update to 1.18.0.

---
 srcpkgs/termdown/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template
index 6f3ee136076a..29d0ee59dcb5 100644
--- a/srcpkgs/termdown/template
+++ b/srcpkgs/termdown/template
@@ -1,7 +1,7 @@
 # Template file for 'termdown'
 pkgname=termdown
-version=1.17.0
-revision=4
+version=1.18.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet"
@@ -10,4 +10,6 @@ maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="GPL-3.0-only"
 homepage="https://github.com/trehn/termdown"
 distfiles="https://github.com/trehn/termdown/archive/${version}.tar.gz"
-checksum=cfdfc20f73250492b57d26c6b2ebcafdda9f88dd3d164607090e6aa7e46542d6
+checksum=67c6393a117a41080e3b7fe912ffe401fe94281f7c5022641046282cef71a2de
+# no tests
+make_check=no

From 498233cdd912f9fd3890711c2dada088d8ea5dea Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 2 Jun 2023 03:30:08 +0000
Subject: [PATCH 0483/1854] MoarVM: update to 2023.05.

---
 srcpkgs/MoarVM/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 824c21761c0e..d5a1b302328c 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2023.04
+version=2023.05
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -13,7 +13,7 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
-distfiles="https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz"
-checksum=8e83e894a3e04a213adb340552520f30181d4d280c77a576b5c1ee2214a03364
+distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
+checksum=c8e75883c1e1936d71ac081b21e8c2a344c80c6db5b4f8e1e6bb9481dd8b7547
 nocross=yes
 shlib_provides="libmoar.so"

From 2223b58c292c860e32fe51953f088c2f4b6fa89c Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 2 Jun 2023 03:31:12 +0000
Subject: [PATCH 0484/1854] nqp: update to 2023.05.

---
 srcpkgs/nqp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index b79dec039c5b..5c05ed55c9a5 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2023.04
+version=2023.05
 revision=1
 build_style=configure
 make_check_target=test
@@ -13,6 +13,6 @@ short_desc="Lightweight Raku-like environment for virtual machines"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
-distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz"
-checksum=6735e5e601921cd427651e99bdf63be8338f4b815520803a97985dec488e50b5
+distfiles="https://rakudo.org/dl/nqp/nqp-${version}.tar.gz"
+checksum=1402db7e3ca6f2f3dfc1e98aa32e0e2a937e49b2a777a74c62268a98abb3bbd2
 nocross=yes

From a00d122ae01ae89bf8fb121efa73703bb4fe16c3 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 2 Jun 2023 03:32:11 +0000
Subject: [PATCH 0485/1854] rakudo: update to 2023.05.

---
 srcpkgs/rakudo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 1a19842929b0..5ccd01e973fd 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2023.04
+version=2023.05
 revision=1
 build_style=configure
 make_check_target=test
@@ -30,8 +30,8 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
-distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz"
-checksum=810b12bd7ef45178fa92371c593094fa731a94e6e4894596bf542222fedd983d
+distfiles="https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"
+checksum=cfae1cf1321c8130e4746eb5f5c926f65adc9774e92c1b3a89c2c48f0b22236a
 nocross=yes
 provides="raku-${version}_${revision}"
 

From d6ea7705b56eca7784274232cc77e234933d24cb Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 9 Jun 2023 11:23:15 +0200
Subject: [PATCH 0486/1854] vscode: update to 1.79.0

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 554ed2ade55e..d7de2feef325 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.78.2
+version=1.79.0
 revision=1
 _electronver=24.2.0
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=30c98b459e2cded101d26deb050cbc554167ff0986b47229703e9d4acf74f48a
+checksum=37a5182d77fbe670be180d1e19907ef5a0b970afda0ba57626a1d2c3d715ce28
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 7f3f19aec93d36fa0edd85e169a23f88fba7543e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 9 Jun 2023 12:25:00 +0200
Subject: [PATCH 0487/1854] exiftool: update to 12.63.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 58c4d4c7a9d4..b2524e18874b 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.62
+version=12.63
 revision=1
 build_style=perl-module
 short_desc="Reader and rewriter of EXIF information that supports raw files"
@@ -9,4 +9,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=4990a46c69b656888d7d5732baf4039da964688edddf7a1c2eeb51404999ec1d
+checksum=15162912ac37cdc6a7018498435a8348b5e6d7a10385f38b75e053695c9b5658

From 1c77d6c6540b01c0e6b215323b00e5975549df4a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 10 Jun 2023 10:54:56 +0200
Subject: [PATCH 0488/1854] plocate: update to 1.1.19.

---
 srcpkgs/plocate/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index f288bcf8dd32..bc37ca01e974 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.18
+version=1.1.19
 revision=1
 build_style=meson
 configure_args="
@@ -8,14 +8,14 @@ configure_args="
  -Dupdatedb_progname=pupdatedb
  -Dlocategroup=_plocate"
 hostmakedepends="pkg-config"
-makedepends="libzstd-devel"
+makedepends="libzstd-devel liburing-devel"
 short_desc="Much faster locate based on posting lists"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=939657050b70719b01ce04fc1c8b64270062a0d53da2c72eafbe036a1964e12c
+checksum=d95bc8ee8a9f79b9f69ce63df53fb85b202139f243bbb84c399555eda22e6165
 
 system_accounts="_plocate"
 

From 843fad25b2232058bd0dc2356f83523cb2456a45 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Jun 2023 12:47:53 +0200
Subject: [PATCH 0489/1854] bird_exporter: update to 1.4.2.

---
 srcpkgs/bird_exporter/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 88ebcdd12186..44ded1c65e76 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
-version=1.4.1
-revision=2
+version=1.4.2
+revision=1
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/czerwonk/bird_exporter"
 distfiles="https://github.com/czerwonk/bird_exporter/archive/${version}.tar.gz"
-checksum=ee1286c08cd09f169c5f12178d5f956a234bdd386070d78bef48887ea55cdf6e
+checksum=7b7a627142ec60e7f0f616117f3f5c86d0c04487d1a20bef227e75b05cb38876
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From e3721e96ac70108c1fc6e3fe8d90449c4442b689 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Jun 2023 21:22:15 +0200
Subject: [PATCH 0490/1854] ksh: update to 1.0.5.

---
 srcpkgs/ksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 1118fd30967d..cbde81e4e581 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,14 +1,14 @@
 # Template file for 'ksh'
 pkgname=ksh
 reverts="2020.0.0_1"
-version=1.0.4
+version=1.0.5
 revision=1
 short_desc="AT&T's Korn shell (community branch ksh93u+m)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/ksh93/ksh"
 distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=7ab7785a277f96acd8b645dc70769adf0cc92546dac356639852bff1d708275f
+checksum=940d6dd6b4204f4965cf87cbba5bdf2d2c5153975100ee242038425f9470c0fe
 nocross=yes
 
 register_shell="/bin/ksh"

From 8e799a929822c4ec993946c678cb2345b0f49242 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Jun 2023 07:11:28 +0200
Subject: [PATCH 0491/1854] stress-ng: update to 0.15.08.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 5606e9cb47cd..c77ba2ecefda 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.15.07
+version=0.15.08
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=7ad1f30237011149e7f83451ea7cb49e88c0a79bed55e29b556c6a72b9f1d79d
+checksum=aca526f434bcf27fcf62da57f70458c7736899318b570bce0ee3da05a51cb84a
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From b10fff6080fc9e54aa658eec3a8adc5a9cd27a60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Jun 2023 11:17:02 +0200
Subject: [PATCH 0492/1854] python3-pipenv: update to 2023.6.2.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index ad7b7d958cc1..593540c2e15b 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2023.4.29
+version=2023.6.2
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=98e5aed45bbae89832bedd874828b327adc6b429043e1d75fe1a833f0010604d
+checksum=be42b0a6d4e7d2c3fdeae4d825a91038610bc6be3c3e7eb26f35d8da7b3485ad
 conflicts="python-pipenv>=0"
 make_check=no # tests are not contained in release tarball
 

From ea1d3fef9024b56c043efeb76f76c0105c2453b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 6 Jun 2023 08:19:31 +0200
Subject: [PATCH 0493/1854] postfix: update to 3.8.1.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..1a5fb172288c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.8.0
+version=3.8.1
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=a3ad8029bd2c6b0c576477a0f77bf9d2c0b761cbaa0efbfef47969efea6eade9
+checksum=54e1bffded3032828a70de22c2a1a94d1c097fc4513e0fdbfcfdbf3bff6b7092
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From dba2a4df9201a41546126fb36470d3a6121e5e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 6 Jun 2023 08:14:09 +0200
Subject: [PATCH 0494/1854] doctl: update to 1.96.1.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 03c6ca38bb4f..fd72254c2fb5 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.96.0
+version=1.96.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -15,4 +15,4 @@ license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 changelog="https://raw.githubusercontent.com/digitalocean/doctl/main/CHANGELOG.md"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=5963bfb113632df33d0ef6c2d076cedd180f73ce82f3162e7d1bc93b190a9951
+checksum=1a5d71a4c387fcc7d5bea60d2ee80188f539b77744be0db29bdfef1fb5ecda66

From cd6866a25e523f23d9159107b17d9604c34e86f2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 8 Jun 2023 18:17:37 +0100
Subject: [PATCH 0495/1854] gtk4: update to 4.10.4.

---
 ...7d7f1d0f1aea8a5697a50299594ef523faf7.patch | 100 ------------------
 srcpkgs/gtk4/template                         |  10 +-
 2 files changed, 5 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch

diff --git a/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch b/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
deleted file mode 100644
index 6232575a9395..000000000000
--- a/srcpkgs/gtk4/patches/4a187d7f1d0f1aea8a5697a50299594ef523faf7.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 4f47683710bbb4b56c286c6ee6a5c394fcf2b755 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 29 Mar 2023 02:23:46 +0000
-Subject: [PATCH] Merge branch 'wip/otte/trelistmodel-fixage' into 'main'
-
-treelistmodel: Don't add items in reverse
-
-Closes #5707
-
-See merge request GNOME/gtk!5744
-
-(cherry picked from commit c5a53f235a2ed1b0acd0a8c29153e62377262d04)
-
-1718db14 treelistmodel: Don't add items in reverse
-cd860beb Add a test for splicing treelistmodel
----
- gtk/gtktreelistmodel.c        |  2 +-
- testsuite/gtk/treelistmodel.c | 46 +++++++++++++++++++++++++++++++++++
- 2 files changed, 47 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
-index dd3b3009ccc..1e55323c0a4 100644
---- a/gtk/gtktreelistmodel.c
-+++ b/gtk/gtktreelistmodel.c
-@@ -357,7 +357,7 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
-     }
- 
-   tree_added = added;
--  for (i = 0; i < added; i++)
-+  for (i = added; i-- > 0;)
-     {
-       child = gtk_rb_tree_insert_before (node->children, child);
-       child->parent = node;
-diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c
-index 941ac3d306b..98493a3ba56 100644
---- a/testsuite/gtk/treelistmodel.c
-+++ b/testsuite/gtk/treelistmodel.c
-@@ -261,6 +261,51 @@ test_remove_some (void)
-   g_object_unref (tree);
- }
- 
-+static void
-+splice (GListStore *store,
-+        guint       pos,
-+        guint       removed,
-+        guint      *numbers,
-+        guint       added)
-+{
-+  GObject **objects = g_newa (GObject *, added);
-+  guint i;
-+
-+  for (i = 0; i < added; i++)
-+    {
-+      /* 0 cannot be differentiated from NULL, so don't use it */
-+      g_assert_cmpint (numbers[i], !=, 0);
-+      objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
-+      g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
-+    }
-+
-+  g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
-+
-+  for (i = 0; i < added; i++)
-+    g_object_unref (objects[i]);
-+}
-+
-+static void
-+test_splice (void)
-+{
-+  GtkTreeListModel *tree = new_model (100, TRUE);
-+  gpointer item;
-+
-+  assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
-+  assert_changes (tree, "");
-+
-+  item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
-+  g_assert_true (G_IS_LIST_MODEL (item));
-+  splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
-+  /* expected */
-+  assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
-+  /* real outcome */
-+  // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
-+  assert_changes (tree, "2-5+5");
-+
-+  g_object_unref (tree);
-+}
-+
- /* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
- typedef struct _DemoNode DemoNode;
- 
-@@ -391,6 +436,7 @@ main (int argc, char *argv[])
- 
-   g_test_add_func ("/treelistmodel/expand", test_expand);
-   g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
-+  g_test_add_func ("/treelistmodel/remove_splice", test_splice);
-   g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
- 
-   return g_test_run ();
--- 
-GitLab
-
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 5fafa50f6f33..b318b7bae1dd 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,11 +1,11 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.10.3
-revision=2
+version=4.10.4
+revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dgtk_doc=true
- -Dbuild-tests=false -Dbuild-testsuite=false
+configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false
+ -Dbuild-testsuite=false -Dbuild-examples=false
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
@@ -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=4545441ad79e377eb6e0a705026dc7a46886e46a1b034db40912909da801cea9
+checksum=7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"

From a3a87d9f6cf5454c18882f183dc0f787481907c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:31 +0200
Subject: [PATCH 0496/1854] akonadi-calendar: update to 23.04.2.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index f1569c8a5f12..e111f848545b 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=ee58cf76e820af9c51d14121a4b2e4a171c6ef702655aaa111ac96aadb0e6cda
+checksum=5cf3e5169a2b3caa58d19575adf8c4a4a69ff39fff2eb4b584a4ceaa96d055b7
 
 do_check() {
 	cd build

From ec303574084bff7691b30fdcea1abb9b78bfbda4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:33 +0200
Subject: [PATCH 0497/1854] akonadi-contacts: update to 23.04.2.

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index b56c84674ac5..bf1f45611177 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=afd816058723d4fda79b61f0f052b24d47b822699695522db21c1a2141d7f83b
+checksum=f48a51288623b6f8efaf78f0477efdbe9d19418d2c885953694601ca89b45d5b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From f6191b9861a75a34195ba53ad064e41ac4d6003b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:34 +0200
Subject: [PATCH 0498/1854] akonadi-import-wizard: update to 23.04.2.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 2ec62397f60f..3611e1b4ff7a 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0969c6d87f027af12af96243c1af124a7a03b511067c95d5e82ae7bc7503d59b
+checksum=42fe5809c9f42f8df05817e4d0cf1064d6a2c50ffb19f3716d6e93012254a069
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 40eeaf1b192bed82926651eb748e6d09864ef926 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:35 +0200
Subject: [PATCH 0499/1854] akonadi-mime: update to 23.04.2.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 2d1a3833d1fd..f33e548a93f4 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=a91275c5ce277eefc9da76430c2228cdea90ffee0cb523432fcccb01c695b780
+checksum=88a60b9b945b286ba8fdb163e91a90ebfca5c57a0050cd2f15ab94be8adf4802
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 40d8f4c5ca868066b35ab146f7347023ed6ac778 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:36 +0200
Subject: [PATCH 0500/1854] akonadi-notes: update to 23.04.2.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 5589d60b0749..ed88f9d04e70 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c4f64ff89816ae14d8fc93e02ab0971d9beda6ae69dd710443d4efd0d94ff93f
+checksum=b24ad1c07ec2e41d18ffe5d0f627cf48ca0fdfd2eeb04cee9d8c7624570c9a81
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From df3221c5c5f0e4a5fce7172a7cf76316d5e226c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:38 +0200
Subject: [PATCH 0501/1854] akonadi-search: update to 23.04.2.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 9a291fd0d637..a0adb06f6571 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=46d1893902ec874251b659b256e8b6e63b68de3862988d998e5307022c166fa1
+checksum=4037177c7bdf442341b6575c268caa439a855e0a30a35206121c4a5060e24257
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 1c9cd7022a634b072ee027cd0e02e806d85d1a66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:39 +0200
Subject: [PATCH 0502/1854] akonadi5: update to 23.04.2.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 80ad8f782ac2..b38d9fe0d6a7 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=e528c3d737c742b2e359345b71f18f65d7973761714716d64b58d35e11094ece
+checksum=5e91b86e895263b76d6f1f00cd9fcd8399d5a6c293581e629ab310fc72dfa6a9
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 372072aaadaaed3ae23cfb759e71f9f54a6021ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:41 +0200
Subject: [PATCH 0503/1854] ark: update to 23.04.2.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 3f878738a982..484995d7655d 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ae6645060a5cc497fc196f695378fa6057e77222fb1874f6b31fafbf5a5330e5
+checksum=de386d0a2aec6772fba51a7710e186718c75cecdf589fa3fd8d8dbd203e464ac
 
 do_check() {
 	cd build

From 646aab36d9ce2299390e7a9fc17ce8ad4737a033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:42 +0200
Subject: [PATCH 0504/1854] baloo-widgets5: update to 23.04.2.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index b393db9dd19f..9fae1efe69f5 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=4eae3b9e4127e773daec2098969c7928b2ebc6908c26329b4a09da30b3125c95
+checksum=d3a01392811ab0a6e850e0058518a95617ad50a2e2bb8c553931130a13a98b66
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 3aa32f7d7a0d61e36afc93d67d7d1e80e76e0c49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:43 +0200
Subject: [PATCH 0505/1854] calendarsupport: update to 23.04.2.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index a9685bf1cb38..d378cea9f1a1 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=2af0ccc66ec8d8b58a74da575413bf8b58bfee1619e82caa895343dc901232ca
+checksum=2daf1f1aef1d6b986b9a9fd8bc2741f407b89601585b94989a744b4942c855de
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c229175522a4b5c33400f1b3d70dc16bf47b7c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:45 +0200
Subject: [PATCH 0506/1854] dragon-player: update to 23.04.2.

---
 srcpkgs/dragon-player/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 16254114c485..452a3bea783a 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=c4c5c3d78be99c23efbf274ab45ee84f175ac494e78f9a18e2c1c1e2c9c9a9bb
+checksum=6fe4235543fab5931d1d4c3e9469ea4d1e72e2f98aa0fcd096d04f6c106b9d95

From 4737e445efc2308f987598a948d3d78e681c6810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:46 +0200
Subject: [PATCH 0507/1854] elisa: update to 23.04.2.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 69e38aadc2ae..e0f743778adb 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=a086572cd0f721834a071a8748e7c1cc76ae01102f287a355a36507157784d63
+checksum=d16fd47b9a41d5ca51cafe1c09b41446b933b47c03fc55ef8f311aad40f1ea7a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 5886a63210ad33240ab4c75f287bd18275bbf695 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:47 +0200
Subject: [PATCH 0508/1854] grantleetheme: update to 23.04.2.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0b804ab8a6e1..ee1e4398b228 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=5c6462d4cb4857460a61db4919081804e2451bc28f43a0b655ea8a37e7ab7395
+checksum=cba8b6ea835e560a01ba7382eac4e02c363e33ff71f281cdc6421533c17aec19
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 5e8bd8b20c7512982c42e948741516944664c135 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:48 +0200
Subject: [PATCH 0509/1854] juk: update to 23.04.2.

---
 srcpkgs/juk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index a9f7be2f1e72..7a674a8e0e03 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=982f2d58a13d7f2b8384eea8e938bbcff02c3d338b74957c63173d34a97a4846
+checksum=6ac44ab6a00df7b10e09b1e64361df7178b0d5ccb1785dd53ec5a0548b53309b

From 0eea94db73adacbfcc0c5f534af8ad7d678e9a1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:50 +0200
Subject: [PATCH 0510/1854] kate5: update to 23.04.2.

---
 common/shlibs          | 2 +-
 srcpkgs/kate5/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0b1bca75e5d6..f02af5cf58ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -474,7 +474,7 @@ libfsimage.so.1.0 xen-libs-4.10.0_1
 libxenstat.so.4.14 xen-libs-4.14.0_1
 libfam.so.0 gamin-0.1.10_1
 libgamin-1.so.0 gamin-0.1.10_1
-libkateprivate.so.23.04.0 libkate-23.04.0_1
+libkateprivate.so.23.04.2 libkate-23.04.2_1
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libKPim5Libkleo.so.5 libkleo-23.04.0_1
 libKPim5GrantleeTheme.so.5 grantleetheme-23.04.0_1
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index d71d4f4606dd..d1d1820ab9b7 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=589c33501f98fa7937a7e3075c155e22a31f746ce4e5f15022b509c5fc1c1c0d
+checksum=7db103a3cb0f1cd771d4e63389ded0757d815f14b9a260b918d83c3e96f74485
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From d79df645394468bb761d762c6601882e23784746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:51 +0200
Subject: [PATCH 0511/1854] kcalutils: update to 23.04.2.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 189259b555dc..34c08a6e54f7 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=9b62dc83f84151f71ee4766ecea38b23e266225b17e031fbb51ea480c09b5379
+checksum=09533df6deeaa7c69698a80c7626bf165b998b57791eb7327b179b8ddf3678dd
 
 do_check() {
 	cd build

From 0c62b818c3a54eeff043d326f73b7e9fdaeab2c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:52 +0200
Subject: [PATCH 0512/1854] kdeconnect: update to 23.04.2.

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 16747ea53cb7..89b073be13d3 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -21,5 +21,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=80bae0d03fd688ee30b7872e2ea04af690346a6d86ca2db17de9253f781a019d
+checksum=2edbbe3e0aef7e6e19603a7870fd14ac0388a53ea665720c9ece625efb445a00
 python_version=3

From 92b55bfdf79c2bea61312870b7506c1b9b256c11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:53 +0200
Subject: [PATCH 0513/1854] kdegraphics-thumbnailers: update to 23.04.2.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 9f8adfc0423c..c0569b063423 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=bdbf4873402a8f0400abd661d18b94209e63d471e4bc6dbbfba6deb5d036d562
+checksum=29456352b96b5a10fa4b8feaaaa0e179209c34587401b2e087783eaf8ea58290
 
 kdegraphics-mobipocket_package() {
 	short_desc+=" (transitional dummy package)"

From 72c26b2fd383b4d586b1b4d2d1b8e1956c784bb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:55 +0200
Subject: [PATCH 0514/1854] kdepim-runtime: update to 23.04.2.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 756e452ff0d7..aa01edcd05a5 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6ecb39a4235155471c58971b4ad79601bd16c454183b5a435f782592c0797949
+checksum=987d372f50f9e821f901d70b858a3af5a5830d75253fbe792a517c95b7f28f70
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From a85c56d1f1a188ee31fbb1d1a09cce1774415543 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:56 +0200
Subject: [PATCH 0515/1854] khelpcenter: update to 23.04.2.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 2d9ebff0f470..8f7db92e58b9 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b6e05d020278729bf8b45ce5ec5097c8a209508764c12bcfaa296508aa33b5bf
+checksum=b8eb6e271839dcba0259891c71e2bdae8cc4f94aafe724aeb46f01ff2aa3bf63
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From faa97a238109c4ba6d25b31e02b57f6d0a2462e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:57 +0200
Subject: [PATCH 0516/1854] kidentitymanagement: update to 23.04.2.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 81be124ac574..7ee3ced86b29 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=59a86d0fd424dead29f9c3a82c500830c7efa4a4e499e1a31e21e27480fbf098
+checksum=526b286c976d1d9296cfe42d26c0619a03bf179288b1e5d1fd769d4ffce630d7
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From bbd3e7efc3614485426b3aa5470e27339833f9b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:23:59 +0200
Subject: [PATCH 0517/1854] kimap: update to 23.04.2.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index c6469f58b2f0..52dd23c3b579 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=64c20ff927ca2368a6aa9b6922f8db26d6a2f2d8461d278eb4be329d07ffb164
+checksum=bcc4a1ced8f55e5d7106b3cfb18ee639e23761a3cb23fdb8d63d925907b784de
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From ed98c6e4e971f6c29aaa16ce27841857bf76149f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:01 +0200
Subject: [PATCH 0518/1854] kldap: update to 23.04.2.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..56ce6bc70d7c 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=b27a690c0502198caf334b8eab498fbd14ff7280d3bdadf2afd4904c29a84e31
+checksum=cccf41aa9a8e80944bb72e7baa271b81a84777ed672e662e0279582ea7e0c342
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c020d9cd31d11baf8b099ac368cab00bee9f2fcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:02 +0200
Subject: [PATCH 0519/1854] kmail-account-wizard: update to 23.04.2.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 8172b4397985..0ab112cd1db9 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=1f1ac3bf9070d5f78270e4c00ba936ca6212295facba205251999eefe63518c4
+checksum=0e42467f176650b0888e614d3e4346c7e03c9b6f89e674581ac99fd0eb7bff59

From 9a0640b51375728f8f872eafac7dc0a7e7cf90ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:04 +0200
Subject: [PATCH 0520/1854] kmail: update to 23.04.2.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 3909629f7f46..7bf67ab803dc 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=4a06cd4bddef1d507898f42203b334aed8e3bc50759fd46f2095dec00c1fd9bb
+checksum=08a05b95153b0178974427234e094c75093b0a54dd97db3a2e0c78b9d4a5e4e6

From c6f0d260b51c3d36e55b6dffb5d2fa1d093f392f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:05 +0200
Subject: [PATCH 0521/1854] kmailtransport: update to 23.04.2.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 157f6da10a06..ccaf5562d101 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=431cd1d663b41b7de08b692a6fa6863c6e9fed5c245410caea48179fb396c6af
+checksum=c1ad46ef79451446a91c1c0c55099c16486ad026cfa9e96458091e4a68fb2b7b
 
 do_check() {
 	cd build

From 8f4aeea8e86cb46f13a9d66c1431c5a3f478376a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:06 +0200
Subject: [PATCH 0522/1854] kmbox: update to 23.04.2.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 1954c347ac33..69f8fd5a3252 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=d587f87fb5358e8d7f0495c7e9e6dfea4a4de33671387a71fd4033145c26386b
+checksum=6c893e105aa88785a90c936e21cbc9c961d837982fee66e1f121625b438ebea9
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c672ee5a069e13158146ae2d37024896bb7b16a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:08 +0200
Subject: [PATCH 0523/1854] kmime: update to 23.04.2.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 2c6d655d6677..286b46339ae2 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=a3cfb0ad644060a333a44a233f8f946f5f9c80ca55294843a91b1eb58091b24b
+checksum=0aa7a2463d91bae39c3a5339226b976a2a82e3b2a0829da2ee709860714e6c0a
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 6c0460c8709fdbea5b83e8b8c851581f9261ad99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:09 +0200
Subject: [PATCH 0524/1854] knights: update to 23.04.2.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index b6ad242a431f..645ccfb4242a 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=067f470c3e8168e1e0f78981b193e97dae45d7532bdd9b5c104087336a809825
+checksum=fd9332601586c5c12a14d1eb92cc901a29d516c3c37051e6b257815cb1fdabe8

From d5c7bf41c04077a32134fae108fd543c63477f6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:10 +0200
Subject: [PATCH 0525/1854] konsole: update to 23.04.2.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 74e94a9d424d..e210bd4803de 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=21ce6f3cbc9add1a33c27b8a32aa5f71001c106e7d2566d2dec7a23d8eb7a59c
+checksum=acc9565ede884284760e1b04654d2b187da82afde82c8a0411664943f23eecea
 replaces="konsole5>=0"
 
 konsole5_package() {

From 5a2ed0e1c9ae49d088d7254328944a41362dcf95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:12 +0200
Subject: [PATCH 0526/1854] kontactinterface: update to 23.04.2.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index b6c6c7ce6db8..7967942b46f8 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=d7475f9abdb4809eaaf5aa78c4ac96f5118d84ceaa0015f70d3ed73f6c029cbb
+checksum=39566fa1ca2d37b167751419f93c5e8364a2dc6f6198852b3d5a45e14e97aed4
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From dc569103c7c6ce70032cbfdbf4866411ee544e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:13 +0200
Subject: [PATCH 0527/1854] kpimtextedit: update to 23.04.2.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index b54fbfed1bd6..b0ad7b5d11e2 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=cc6819004d5e73aae9b3b8f0679b79cf49f1d3b9c9f0451e78bd1ef809319cf1
+checksum=3f843ce22bfe75c5841b40c1ee454efd8733c16fbc27d44f841242ee33b72e4b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 348eeb33cd15e1a08b00b49856eb6a45a6f49f1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:14 +0200
Subject: [PATCH 0528/1854] kqtquickcharts: update to 23.04.2.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b01e2a9f89b8..f78a8793f73d 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=21797552c32393fe385060e856afac8d3f9abf60a5502cc61c66ab9306869a2d
+checksum=b6416561058dfd7cc66fc54a6bd6eb87d785b09abf8543d98b8efd0966bd9724
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d6e452789b587b0652ae27f742028baadcc48b03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:15 +0200
Subject: [PATCH 0529/1854] ksanecore: update to 23.04.2.

---
 srcpkgs/ksanecore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksanecore/template b/srcpkgs/ksanecore/template
index 1225a80380ee..c97fb62d0fee 100644
--- a/srcpkgs/ksanecore/template
+++ b/srcpkgs/ksanecore/template
@@ -1,6 +1,6 @@
 # Template file for 'ksanecore'
 pkgname=ksanecore
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/graphics"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksanecore"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksanecore-${version}.tar.xz"
-checksum=2434460fe67cf38293a1c90568ace1e52ffc8c3b6a1a57581d079d8237f482d8
+checksum=aecf6c6b6d53275ddf4a642e29118f515e85cb138693d5484caa15da5e6464de
 
 ksanecore-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ee34fc3af3cf1f433c483ac06354f65fc609d063 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:16 +0200
Subject: [PATCH 0530/1854] ksmtp: update to 23.04.2.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 68f5d34a7044..40f16f0ea805 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=a0fa8bfc5ec158b2cfcabd025e93e381659b39da1b03678a82ef74f34678fb53
+checksum=20e0e15f793729aaa22971dc875582f3092421b8998bc4b140c242509798bed7
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From efb5a2fbf1b7314729ea942a9e98777b5eda2c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:17 +0200
Subject: [PATCH 0531/1854] ktnef: update to 23.04.2.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index f795a3347848..4eed9ca546dd 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=4adc253d58d47be7ec6488b120ae750c47e182975275ba2a94a051e88d446ba8
+checksum=dad17abcaabd4f7556286dea82f00f7cb4d754e7e6031629d5d5f2faa06136e8
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8e7f5f18e6c35d89fa2cf435d0aab13c85184be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:19 +0200
Subject: [PATCH 0532/1854] libgravatar: update to 23.04.2.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index c74753f5aa51..984437a08bcc 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=6891bce0ebeeda6676f938a296c020b42ed192463986959687ad55c298e6cf24
+checksum=760077d270bc17ce7bcad9e498b7ce041200d8cedd136655a387df660783538f
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e707abbf25f1356b4465b50d80bb12f7e093eaef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:20 +0200
Subject: [PATCH 0533/1854] libkdepim: update to 23.04.2.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 1b1446c603f9..33bb12b6ec4b 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=605b1725c2dc656016ff3ea16e3119354caeb9e555e7de79dd752883d440ebcb
+checksum=11c56b7d8e0f24ba28ff84a69d7eb68739e55c6b2f6b68f17b7221422ddb410c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 15bfac29d5cde0b03aea779e8175b7d1a7964b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:21 +0200
Subject: [PATCH 0534/1854] libkgapi: update to 23.04.2.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index c62a3512f116..1efc658ddd6b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=aceb156db7c7caee88fd1ea57b3e06e94200e94196e4a420c3896db1709d6551
+checksum=14ed86e65d753ec5c967caeacfe40b300fc812778aaffcf6d7460785803e9856
 
 do_check() {
 	:

From ebc9e8765a7c29e17e00e71df116559ee1749ba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:23 +0200
Subject: [PATCH 0535/1854] libkipi5: update to 23.04.2.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 56e7384be9c3..a6e4e509cf9a 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=a07859eed5cb9c130a6abc1f1b8c1ec895a32e735d13be609e26ca722deacca6
+checksum=987f6b1125465b2e32db9013612071e044bee0bd3da0c1df2d96ea0a5fa6522f
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 9a31a07f9d6f9c3f47c93e2fab2baadc1dc5ef62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:24 +0200
Subject: [PATCH 0536/1854] libkleo: update to 23.04.2.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index e53644615e85..b0fe59f71183 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=ae210e3849395044be778cc7b92746e209be91722928c991a3324932adda6e69
+checksum=1b478d60775c2ec87372d2b8d012eb343d16b01dff3bd2a10cf6baf74f44a4c5
 
 do_check() {
 	cd build

From 6facaae83a4883513889e22a64240baa1637240e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:26 +0200
Subject: [PATCH 0537/1854] libksieve: update to 23.04.2.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 2196b1fafffa..724cb5dcf740 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=146be9aad30c711b6f7666a34ad385aeb91a44f01186838b56d46da393625f1b
+checksum=d91f0eeba9e851a5bf0478553ce2de45975586d16bb7955e9e8f0a597c072b85
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 463c7034e3b69b355c35b7358205f24a918aaaf0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:27 +0200
Subject: [PATCH 0538/1854] mailcommon: update to 23.04.2.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 3a883325e357..0c5a36189cf7 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=f4ea4dcccaf5c35cb96e374e01ca8d6e40c2a92bd6e661834685a451cfc75951
+checksum=d02582735ebaea6d669e4b7393247b073299366d03681a87aa1c7d42d6e40857
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From a4520ead5a41ded2ca1879add346fafbd6bf789a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:28 +0200
Subject: [PATCH 0539/1854] mailimporter: update to 23.04.2.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 8eb6e73c6655..989f9e5315cf 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=52ad8927a1b1f9b155824a26dc7307c04d870b369afa7c1dd0f2736a100402cc
+checksum=b3e599e726b3cfe32f2d3ee41d9b024b38002c0767d9ced312d0fff6dface775
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 26ce915ea7c6d27f0cba4050cdfda3b69f61ba1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:30 +0200
Subject: [PATCH 0540/1854] messagelib: update to 23.04.2.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 20ae0f232502..d49add61f4e4 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=9f6263f032e8f93da2cf6e68da6f477587ab720020f46b7fb62cc71840f1afde
+checksum=9b9fcce6bec1c4b499b30b32ff37c76953a8bff46c2e39eb67844f96ef14d88e
 
 #TODO: fix build without qca-qt5
 

From d3d16dcf91325aace5ae2eca7de9faf2ec71b0d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:31 +0200
Subject: [PATCH 0541/1854] okular: update to 23.04.2.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 10e6b8f36ad0..f92fe9c8fc26 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6c0dff299abf86df88d86e7d31d1dac2633775a2cca801ab3ca5104fafbcd40c
+checksum=5f86f2be71c47dcaaf10a21b6bbc6b92cc2c6d8930530d201a06643a34aba825
 
 do_check() {
 	cd build

From 2738ef14b1bab5297e3f315a8a771b05bd9c336d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:33 +0200
Subject: [PATCH 0542/1854] pim-data-exporter: update to 23.04.2.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 3d6c9653e6c8..ec5a6f24cf8d 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4121db2bff1190090b4d63e2e9ad6a99e2953f3da0cb1b72051bafaee12bae9f
+checksum=a4bf2e0096805a74581428b43b2eae73a4ca3c6b15e974cb78174aaea6f83c49

From 59b90eb77fcc44eaf0ab4b2fc225e48502d694c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:34 +0200
Subject: [PATCH 0543/1854] pimcommon: update to 23.04.2.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 30345799581f..973ecaf378ba 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=3446344b154fe444848efea27368be6da8e21aca30a9c6b03d9a078ead6681ac
+checksum=44b7584f0095b5e55a75e56722b7a5c9e5cd968e7a3a2b553405d8e524352bef
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f3d199c788bcd791034f10a32591f292a5c1360a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:24:35 +0200
Subject: [PATCH 0544/1854] spectacle: update to 23.04.2.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index d00b5eeffe42..a8828fbb68ec 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=db8d4a668b532847b0031038037b42c83d2d600b5084eb40fe29698131d14b17
+checksum=278bf372cf6ac8270b77e12aaf2440278a874939f2b29608b677955da4309659

From da7b5d528c8b2537f6cfafb039568392f0055f0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Jun 2023 10:26:42 +0200
Subject: [PATCH 0545/1854] ghostwriter: update to 23.04.2.

---
 srcpkgs/ghostwriter/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index d8ede7e67dd1..5b4008d43274 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,11 +1,11 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=23.03.90
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools
  kcoreaddons kdoctools"
-makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
+makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
  qt5-webengine-devel qt5-location-devel qt5-webchannel-devel
  qt5-declarative-devel sonnet-devel kcoreaddons-devel kxmlgui-devel
  kconfigwidgets-devel"
@@ -14,8 +14,8 @@ short_desc="Distraction-free Markdown editor"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://kde.github.io/ghostwriter"
-distfiles="https://invent.kde.org/office/ghostwriter/-/archive/v${version}/ghostwriter-v${version}.tar.bz2"
-checksum=38a2598ea27e5c72d8678c1a085814d1e889b22f92f42eb3beed9a92f03ff432
+distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=db8b1c9370863a9596cd00e1dc230caf94cac01ad963e962820db58281efbdda
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From 2fbbd76161edeaab498c83e18d2bc81c173a1522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:36 +0200
Subject: [PATCH 0546/1854] filelight: update to 23.04.2.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 6a162e2f4236..29ae6615a011 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,4 +13,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=2caa450ed7eeaeefa1c00f2b53bc5180b6249381d05589c81362a7ba92050f26
+checksum=3c8fa00479e59c1b2b313193a259616a0c853a6a960fc345d31c4c550bd9850d

From b91401e8f8ab1c445c08cbaf51eeef43edc1ee5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:37 +0200
Subject: [PATCH 0547/1854] kaccounts-integration: update to 23.04.2.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 08ca325d1439..c58d1a96ba0b 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kaccounts-integration"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=9a068cf7579ca376a27abee31ca0b2a6544b0a08d1f204d88a4833c41d8ae698
+checksum=10eac98f0f5f432b43a36cc748e8029924e8cf9128735bfe91bb0ff5e0ce6d55
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From b17d80340951e5245aa594d31a968d32bfa5be85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:39 +0200
Subject: [PATCH 0548/1854] kaccounts-providers: update to 23.04.2.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 8305f10fad11..41a00795b35a 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kaccounts-providers"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=cf37813acf5b1895d5a6d2315c60f186ccd7b798ef7bb3b0ad98bd6e29547b1e
+checksum=10350da084e979027189b73a688d0065c0625cf87935d22a0edb81ffd8290a45
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 83ac0822b2462affaba1bbea53f47b3b78e81209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:40 +0200
Subject: [PATCH 0549/1854] kcachegrind: update to 23.04.2.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 2fcb92b544c7..d1c738844aab 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=e721f45994ca756876914008951191b54ca21a01c4019e3bcfe64058232028c4
+checksum=9bb17cc9e85e396e8591d06e04974d6f106b1d8de00596af77555afc93915902
 python_version=2

From ab83c99c0bfe734f0d24ef48a47f6ecd6699f5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:41 +0200
Subject: [PATCH 0550/1854] kcron: update to 23.04.2.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 90555a62ab45..68926c58e865 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=e0b4cbbc0ce3d43298694449c05c6761b46f4421efac6c076a96ec80383d5b59
+checksum=64f2680f71304304656400a2fa6b5aa5c8976c86a9c732f0974e1e8cbca60fd3

From 69addd1a5df07f2b3ef88340f907030d25105365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:43 +0200
Subject: [PATCH 0551/1854] kdialog: update to 23.04.2.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 1b4214e398fc..dbceae98fb78 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=4aa31abdb191504d123f293ef50e3058588679df4969e37d9c5ff121298436ae
+checksum=ec4054c2f319f01668bdecff796a91c7c055775ae15b0dd72b86a5538fee591a

From f2683ac1c0e5884f55b6fff0f30ca9be3eeebd51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:44 +0200
Subject: [PATCH 0552/1854] keditbookmarks: update to 23.04.2.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 043842721b5f..6c2fbc632259 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=dd0296cc85ac8de39eebb96ff2322598acb6ab3fec0dddabb033489419c3558a
+checksum=4103680487bc9e9bada50736608f0d98bed4c0f537a2aeda49d8972d3e76dc7e

From 14ab895cecca547e6a590b71795217f845ca9bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:45 +0200
Subject: [PATCH 0553/1854] kfind: update to 23.04.2.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 2346e3ebfe45..bf4ef41ff5e5 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=e806f337e8ed689a7bdd0066360a81dfe38dd1d1fc79ec1637a5294cf5364ceb
+checksum=f9fe6dde619e45b9122824a3bc704f36ba367995bbcc93b8d08bb601c596dc38

From 280ba0ef485d1698b6cc497249964c38a8f727f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:47 +0200
Subject: [PATCH 0554/1854] kig: update to 23.04.2.

---
 srcpkgs/kig/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index e479f46c3bea..9719dbc661cc 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
 # Template file for 'kig'
 pkgname=kig
-version=22.12.3
-revision=2
+version=23.04.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
  pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=657adb23885f755af40a085ff8eeb45571a7756e576ba2a3c05c2df15ee5b1d9
+checksum=21f78d9b2e85ab70438cb19a72c5c5669dbf00ef289e5a8931e9da405926ee2a

From b13fad4f84ac17f0c2dc1bcf4e370a15a9909d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:48 +0200
Subject: [PATCH 0555/1854] kio-gdrive: update to 23.04.2.

---
 srcpkgs/kio-gdrive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 52215d38790b..956b0bae0fa1 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=23.04.0
-revision=2
+version=23.04.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
  kcoreaddons libaccounts-qt5-devel kdoctools"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=3998ee8ad380ccc90963e2439674c692e9ee8495ae775b6486e55476785b5442
+checksum=2d823b5f41a30ebaf566991856999029dda0df8885cf502be6d597396616eb59

From d3bbeafe0385e1f3019bb4d212c696d8b93ae7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:49 +0200
Subject: [PATCH 0556/1854] kmag: update to 23.04.2.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index b5258b7e2819..5e854ee09346 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=6fe6d8d119e987c928bff9db92bfec10628c7d38ddbecd5e7c45e5b6d7d1b207
+checksum=05a053874f112a5add21d62b46c06ab83efcd042bafed8e179a4119dc93d5108

From cbc0da91061b89000c174672286ae8e50ca45ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:51 +0200
Subject: [PATCH 0557/1854] kmix: update to 23.04.2.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 3e6747d6cfff..17fd0f6818df 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=523e0aa22cb3413b962d3eba2ba638fe6ecdfb7de4f019fa8bff03dbeee46fb8
+checksum=2cab30dc756a612e503d6bf95a6e1fa0a46108bc5bd09526d42886f954f3b4d8

From b32d7b1dc91e616e895403c5bfe26a509fcd6805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:52 +0200
Subject: [PATCH 0558/1854] kolourpaint: update to 23.04.2.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index f79546c23206..9a1f2d8729fd 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=8e03434746ac62b367ea945edb10f37cbe51e73ed08339059a03ea041f7d2268
+checksum=fec26e6ae0c2e0e155a9e12c0776a69ed5c0c278509bef7d90e2d4ec20bde090
 
 post_install() {
 	vlicense COPYING

From dd376b56cedb2e69bf30bca88c27ab1f0af39cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:54 +0200
Subject: [PATCH 0559/1854] kompare: update to 23.04.2.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index b273a0a5dc77..444ca997e084 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=a4af41c00d495c5a71ce327bde6b413981324e39cf09feb3f0b6885908f65561
+checksum=b58ad6898de895a54f9d61e869d8f78e7acb44f989b9a17e8d93b0f1965654cf

From a5b2113f9f764c5cf88c010e08a7c52607d85ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:55 +0200
Subject: [PATCH 0560/1854] konversation: update to 23.04.2.

---
 srcpkgs/konversation/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9f446b757953..84f976f7ba37 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -13,5 +13,5 @@ license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=9b644c4c609c195aa98e3d59e3b8b89e7add3dbe34e1182981ddd260c8aa4765
+checksum=01a24fdd01e3dcff9465c295c7d7eae0fda59654af40d90cbe7323eb1ab887d6
 python_version=3

From 9cce416549aad5002f60a2ea79df81d801285e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:56 +0200
Subject: [PATCH 0561/1854] kpat: update to 23.04.2.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 37439e860be5..19de3064422f 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=9fae8b86624b44714751f14ecea652b6ef2be338beb08a6a698a0f516ad35239
+checksum=191583e363e1544d5f9423094e0e494c421d10a34193fb8ead0e9bccae941942

From 2d99c500bfab3eb72fb2e59f3a9fb8952bd9f525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:58 +0200
Subject: [PATCH 0562/1854] kruler: update to 23.04.2.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index c30722590409..396d476b4755 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=67d80e608003d698623cbce5ee2048d44d89349a074349d884f784d08f2f0b49
+checksum=d324691c067610726a5a37265f2dfa8d4b4b2d4d989f4c1a7b20a697c1e38d48

From bf3a7b6ba093dd76571576f0c322beeb4e7822de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:25:59 +0200
Subject: [PATCH 0563/1854] ksystemlog: update to 23.04.2.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 275f4229221b..7bf44e3ce1c0 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=0cf79c529641a087c83a3f6249ec1b9a493c5a28d954478ca8ddd5c16e8e7f42
+checksum=10040138c02ed49433c77e82ac82349f2d3885c0fda2e264ca4aa0373482af8a

From 3d7cc6257f769e772a318d793d8c96cd1dd20e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:00 +0200
Subject: [PATCH 0564/1854] kteatime: update to 23.04.2.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 183eee3ccaaf..50e8336e6533 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=d8f1e562bf69ff1acee04e38ba514d29ee998ed8042789e8cf9b510e8f9e7ca9
+checksum=3b6fd3d343ba79e5ecba05dc7f6d2d02ddc9f60a296737dea4242ff5d0042404

From 329e53f7128d7805ff8de4ac729708c2eb335e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:02 +0200
Subject: [PATCH 0565/1854] kturtle: update to 23.04.2.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index fcff3aac40c9..9ceb2173c5bf 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=8ed5580324dd0f5a65f64f95e5ce7387de9160f543e59818bffca2a35385258b
+checksum=009870ebfb38fbf51daeea9177bb3e87ec4610ea1b3de7ba31761b306a93ef50

From 010f748203f90813504232248c90c7923e047027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:03 +0200
Subject: [PATCH 0566/1854] kwalletmanager: update to 23.04.2.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 5ef43cf18512..a765e72a059b 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=fed842eaa53a2fdc0ef04d1a623388a0dde386bf8d0cdec55ac2f96d9eacc288
+checksum=f0447365f75834c18ac9833a86e86acbb56309143afbc6daf1e63aa63d95c101

From b0a7173204cac14a8eecedc0e007c09990221765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:05 +0200
Subject: [PATCH 0567/1854] libkcddb: update to 23.04.2.

---
 srcpkgs/libkcddb/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index c24955fbe8d1..cf971184918c 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,18 +1,19 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=22.12.3
+version=23.04.2
 revision=1
 build_style=cmake
+configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
- qt5-host-tools qt5-qmake"
-makedepends="kio-devel libmusicbrainz5-devel"
+ qt5-host-tools qt5-qmake kcmutils-devel"
+makedepends="kcmutils-devel kio-devel libmusicbrainz5-devel"
 short_desc="KDE CDDB library"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=530a5e377bd55409c8fe789b8efb71510d49fe38a23241189235aaf51e057a1a
+checksum=519d321b6cf079f8ac514cf37ac338577ac1fc6fb305c85fa8868bd93427f384
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 273ea7e82c03c91c7bb8cbd2b8ddde2e121b6574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:06 +0200
Subject: [PATCH 0568/1854] libkdegames: update to 23.04.2.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 011797e6820d..e59f7a4f5fc4 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=26c3afffd24b1efe41ebb839daba7ecbd7feceb290281e5b9ea5195a80bf55f2
+checksum=05ec31527325980f30dbcbc342b0c1092ad9593a19bb88a1b80e735d1f632593
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 57012cea469e0ca751779adc76bc38ab1b5ed8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:07 +0200
Subject: [PATCH 0569/1854] libkomparediff2: update to 23.04.2.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index c6a886d84daa..13b20a4c7d55 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=305a54f663203f549bc5a3c0903a3cc5353b459a9278a39d26c4566268812115
+checksum=958595c10e95ec19cf3451604f871edef69912f2496e1ac2870c2d871cd8a990
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9b2b866c88bdc394e8a780eaf9fa0e3cd29ddada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:26:09 +0200
Subject: [PATCH 0570/1854] marble5: update to 23.04.2.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 4dd68bfddfe3..fc68f8cd358b 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=195f7d921c16f494e2d1df4073bf45cd97044f207fc2db3181caeb838277ae54
+checksum=3b1d8c53db6c71ec727f7e8153cf667be6d1aa2b2f5befa4ef499bc6b79da09b
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 1542094ac858753512789f51da0516e77a38bf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:31 +0200
Subject: [PATCH 0571/1854] signon-kwallet-extension: update to 23.04.2.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 4b9dcf2b2cd0..3b4f3e95447e 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://invent.kde.org/network/signon-kwallet-extension"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=07c9dbe4470d8cd4e1b81661138ea2adbcd5077ec99203445d27257ddb2de8fb
+checksum=d27b3f9f4eacf39096ccbbd02c4f6e307ee6596b24b11c528a757f604f17ca96

From a3b0ec113da0bd84a12c68fd94afcb95d67290ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:32 +0200
Subject: [PATCH 0572/1854] svgpart: update to 23.04.2.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index dfd62ceb7f2a..a728d61b6a52 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/svgpart"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=51c8f20eb1d18b4edc8d130d4132818f11e3f8dc5eb12aff505714448ab298cb
+checksum=c93c80c702442d821967bd13ff456afbc054b9e67fc7574fe076104c25f77649

From d395a88bfe48256fa1b482559c8f324bff8a2294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:35 +0200
Subject: [PATCH 0573/1854] umbrello: update to 23.04.2.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 79acdb13f4e9..3632a6030c91 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=e8209ed8579e983016e1f4dae3a961a0a7a81892d6be00922c0bb07bb464a445
+checksum=2e643111347fb79f40321f82725f92c293cd3bc6bba75f3caf912b3fa0b7fb00
 python_version=2
 
 pre_configure() {

From 8b5bb4c11904954076ded28d9f09312d45e7bce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 10 Jun 2023 21:28:37 +0200
Subject: [PATCH 0574/1854] yakuake: update to 23.04.2.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index e22fd6e69cb6..72bd208a460e 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -13,7 +13,7 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=0f769bbb226f44f502d482b415f0403a68c1f95b25fbc255dc8df319ab12c061
+checksum=2810931947dd2dd11195caf2c8ae99293d6155cfef923a3c5859322abf091ae4
 
 build_options="wayland"
 build_options_default="wayland"

From e0132cdc15decd53cf1664aa1b7d463334d35951 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 10 Jun 2023 21:40:46 -0400
Subject: [PATCH 0575/1854] openjdk17: update to 17.0.8+5.

---
 srcpkgs/openjdk17/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 7aff34f6e911..a937dc0640d7 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.7+7
+version=17.0.8+5
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${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="43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8
+checksum="adf42ea4a9bb2cffa4689c9eb98605a7cd804034cb88312c2b7bf4c5285e32ce
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"

From f56afbf958cae1925d62bad6d7d073df8ed3163f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Jun 2023 09:33:19 +0200
Subject: [PATCH 0576/1854] wine: update to 8.10.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 785393a98776..18d0a93517fd 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.9
+version=8.10
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="8cdf86b250d9080fcd4e3b939680fcd38ebf0f274a7afa2dcc65f74fa2c1b320
- ad5fef3487240033aed83c0a7d5b449c85b2d1af5aeb7efe02db12903221a9d4"
+checksum="c4f36dd73c176cef8e7016ca4139ee76f5b498a4afd7edb517e14c0d5394736f
+ 04ff999dd3c8a469f66cb559296051bb234ab355991374deceabeaf546b7d5e3"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 992357c3afaefb4f3f62cd3bcc9f455d8bc5057e Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 26 May 2023 12:14:17 +0200
Subject: [PATCH 0577/1854] angrysearch: update to 1.0.3.

---
 srcpkgs/angrysearch/patches/00-fiximport.patch | 13 -------------
 srcpkgs/angrysearch/template                   |  8 ++++----
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/angrysearch/patches/00-fiximport.patch

diff --git a/srcpkgs/angrysearch/patches/00-fiximport.patch b/srcpkgs/angrysearch/patches/00-fiximport.patch
deleted file mode 100644
index 4143059338de..000000000000
--- a/srcpkgs/angrysearch/patches/00-fiximport.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git angrysearch.py angrysearch.py
-index 33c181d..ef9d5a2 100644
---- a/angrysearch.py
-+++ b/angrysearch.py
-@@ -18,6 +18,8 @@ import subprocess
- import sys
- import time
-
-+sys.path.append('/usr/share/angrysearch/')
-+
- # QT RESOURCE FILE WITH MIME ICONS AND DARK GUI THEME ICONS
- # IF NOT AVAILABLE ONLY 2 ICONS REPRESENTING FILE & DIRECTORY ARE USED
- try:
diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index b6dc5ecde7a7..05306db0a28f 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,7 +1,7 @@
 # Template file for 'angrysearch'
 pkgname=angrysearch
-version=1.0.1
-revision=5
+version=1.0.3
+revision=1
 pycompile_dirs="usr/share/angrysearch"
 hostmakedepends="python3"
 depends="python3-PyQt5 xdg-utils"
@@ -9,8 +9,8 @@ short_desc="Instant file search"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/dotheevo/angrysearch/"
-distfiles="http://github.com/dotheevo/${pkgname}/archive/v${version}.tar.gz"
-checksum=9a550649c3efafb26660860758f2e75702ce96a0a0c50dc34ced2967b51a843f
+distfiles="http://github.com/dotheevo/angrysearch/archive/v${version}.tar.gz"
+checksum=bb20907d97804931863f377fe19ac2008a9e43c80517f775667f9fe49792c585
 python_version=3
 
 do_install() {

From a56f01ca2e87e4f01de63d24680a43648b6395a1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 25 May 2023 15:28:31 +0530
Subject: [PATCH 0578/1854] rust-analyzer: update to 2023.06.05.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 1f5c7e62e5b6..ec58fe55835a 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.05.15
+version=2023.06.05
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=4724405553135e9ee399a435f95d89defbcba9b8b6261640921d1c46dbecbd39
+checksum=ae616d81e31df1f97342d2f55c0fe1b82fe88f4773a98bb6cb04e9303bf3d612
 # tests require Rust source code
 make_check=no
 

From b43d1b064b284ca65c506d16aa3cc3a68aad7a6c Mon Sep 17 00:00:00 2001
From: astral <astral@astralchan.xyz>
Date: Fri, 10 Mar 2023 02:47:30 -0700
Subject: [PATCH 0579/1854] jamulus: update to 3.9.1

---
 srcpkgs/jamulus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
index db577f6dd83a..452d9d6f513d 100644
--- a/srcpkgs/jamulus/template
+++ b/srcpkgs/jamulus/template
@@ -1,6 +1,6 @@
 # Template file for 'jamulus'
 pkgname=jamulus
-version=3.9.0
+version=3.9.1
 revision=1
 _version=r${version//./_}
 build_style=qmake
@@ -11,5 +11,6 @@ short_desc="Play music online. With friends. For free"
 maintainer="astralchan <astral@astralchan.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://jamulus.io"
-distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
-checksum=742b1954111c55b39ea7b2863c762d6731359e2b4793ef2409b150096fb196a5
+changelog="https://raw.githubusercontent.com/jamulussoftware/jamulus/main/ChangeLog"
+distfiles="https://github.com/jamulussoftware/jamulus/archive/${_version}.tar.gz"
+checksum=758381a92ff7b264534773b71b6bf8e098bbeb6d693efdc2916609f2ff842889

From 7de2cf3a2e1086b411331851be871f06e1edeb54 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 07:37:31 -0400
Subject: [PATCH 0580/1854] chezmoi: update to 2.34.1.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 0204f59e0984..346c8f4ae203 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.34.0
+version=2.34.1
 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=66a65bb283ba8259d0ca0205b3c3457da220c55d486da10b42f31fe5e478f5e8
+checksum=d81bb3a9f4632ab27422c05bb243692f1d55e33cae2c55c691f7f0b9248f46cf
 
 pre_build() {
 	local _date

From 12f3155f96bbec98a34e142b82c9b0f76db81b8b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 0581/1854] libgit2: update to 1.6.4

---
 common/shlibs                                 |  2 +-
 ...-remove-ftrunacte-from-libgit2-tests.patch | 15 ------------
 ...test-validate_current_user_ownership.patch |  8 +++----
 .../patches/fix-missing-oid-type.patch        | 24 +++++++++++++++++++
 srcpkgs/libgit2/template                      |  6 ++---
 5 files changed, 32 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
 create mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch

diff --git a/common/shlibs b/common/shlibs
index f02af5cf58ea..d83c2b6a1c9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1353,7 +1353,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
- 
- include(AddClarTest)
- add_clar_test(libgit2_tests offline             -v -xonline)
--add_clar_test(libgit2_tests invasive            -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive            -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online              -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert   -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon           -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
 diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
 --- a/tests/util/path.c
 +++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
  #else
  	cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
--	cl_assert_equal_i(is_cur, 0);
-+	//cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+-	cl_assert_equal_i(is_cur, (geteuid() == 0));
++	//cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
  
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
  #endif
diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
new file mode 100644
index 000000000000..8d24809f244a
--- /dev/null
+++ b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
@@ -0,0 +1,24 @@
+From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001
+From: Oliver Reiche <oliver.reiche@gmail.com>
+Date: Wed, 3 May 2023 12:57:06 +0200
+Subject: [PATCH] Fix missing oid type for "fake" repositories
+
+... otherwise git_tree__parse_raw() will fail to obtain
+the correct oid size, which causes the entire parse to fail.
+---
+ src/libgit2/repository.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
+index 804e436abeb..c45c5855058 100644
+--- a/src/libgit2/repository.c
++++ b/src/libgit2/repository.c
+@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb)
+ 	repo = repository_alloc();
+ 	GIT_ERROR_CHECK_ALLOC(repo);
+ 
++	repo->oid_type = GIT_OID_DEFAULT;
++
+ 	git_repository_set_odb(repo, odb);
+ 	*repo_out = repo;
+ 
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 9d9da1496d67..24b56f20099a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
 hostmakedepends="python3 pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
 homepage="https://libgit2.org"
 distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

From 8bd091fb4aa5b4001f07ebe19cfa802e14530f47 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 0582/1854] python3-pygit2: update to 1.12.1

---
 srcpkgs/python3-pygit2/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 307a83fff604..b8db662c7715 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-pygit2'
 pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools python3-cffi"
+version=1.12.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
 makedepends="python3-devel libgit2-devel python3-cached-property libssh2-devel
  openssl-devel"
 depends="python3-cached-property python3-cffi"
@@ -14,4 +14,4 @@ license="LGPL-2.0-only"
 homepage="https://www.pygit2.org/"
 changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz"
-checksum=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=8218922abedc88a65d5092308d533ca4c4ed634aec86a3493d3bdf1a25aeeff3

From 4e7d42c690ec8e10fdc6448bc155f356ab4e868d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 0583/1854] DarkRadiant: rebuild for libgit2

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=3.8.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From 6a5bcbfe9026a8384fc8c7bc22b5b08bd1438ee9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 0584/1854] Fritzing: rebuild for libgit2

---
 srcpkgs/Fritzing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
 # Template file for 'Fritzing'
 pkgname=Fritzing
 version=0.9.3b
-revision=6
+revision=7
 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
 create_wrksrc=yes
 build_wrksrc="app"

From 042abbe67cb476bd4034252a63da451062aaab49 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 0585/1854] geany-plugins: rebuild for libgit2

---
 srcpkgs/geany-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index c5de461efb17..f0bb0b04ed80 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
 version=1.38.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"

From c69b190a1ad66326d0d4989af1b25264809a5b80 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 0586/1854] kup: rebuild for libgit2

---
 srcpkgs/kup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
 # Template file for 'kup'
 pkgname=kup
 version=0.9.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
  kpackage gettext kconfig"

From cc9b9bb1818ef2992e319fb029cdfc45a5db5e0d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 0587/1854] slcp: rebuild for libgit2

---
 srcpkgs/slcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
 # Template file for 'slcp'
 pkgname=slcp
 version=0.2
-revision=13
+revision=14
 build_style=gnu-makefile
 makedepends="libgit2-devel"
 short_desc="Simple shell prompt written in C"

From f15626619d8e5299cbaf413c069f746874312ce3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 0588/1854] stagit: rebuild for libgit2

---
 srcpkgs/stagit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
 # Template file for 'stagit'
 pkgname=stagit
 version=1.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"

From bf238d1e88b892da5c4826d43283a650068be8b5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 0589/1854] libgit2-glib: rebuild for libgit2

---
 srcpkgs/libgit2-glib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 7873e51a0b28..f20b53b73211 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
 version=1.1.0
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)

From 8f3a6781c677dfc9acd80245c171792f91438890 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 0590/1854] gnome-builder: rebuild for libgit2

---
 srcpkgs/gnome-builder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=44.1
-revision=2
+revision=3
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
  libsoup3-devel cmark-devel pango-devel libportal-devel
  libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
 depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 14751824f43d2797b96ee8173a03e14bccd340c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:29:54 +0200
Subject: [PATCH 0591/1854] juCi++: rebuild for libgit2

---
 srcpkgs/juCi++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index ad903e98b150..1948023bd290 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
 # Template file for 'juCi++'
 pkgname=juCi++
 version=1.7.2
-revision=4
+revision=5
 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
 _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
 create_wrksrc=yes

From ded9540b6141446b70f6d88ab61f9a22ff6ae49a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:30:40 +0200
Subject: [PATCH 0592/1854] horizon: rebuild for libgit2

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 4d7fe5cb44d9..1d1b8cf1891c 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From a10913bb406951d37951da4c3c59dd47747df369 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:18:59 +0200
Subject: [PATCH 0593/1854] calligra: rebuild for libgit2

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index d0bdd2fec265..38d7984727af 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=13
+revision=14
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 34b44d38857e627ac3c554899d95e1f47900a849 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 0594/1854] cargo: rebuild for libgit2

---
 srcpkgs/cargo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 3921088c1e04..5c610b2bcf83 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=1.70.0
-revision=1
+revision=2
 _cargo_revision=0.71.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"

From 330995544fbaef425a75c0a83c7817e6ecd61bf8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:39:55 +0200
Subject: [PATCH 0595/1854] cargo-edit: update to 0.12.0

---
 srcpkgs/cargo-edit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index e8cf16b500cb..c6f1015c91a2 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
-version=0.11.11
+version=0.12.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # uses ring
 build_style=cargo
-configure_args="--no-default-features -F add,rm,upgrade,set-version"
+configure_args="--no-default-features -F upgrade,set-version"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libgit2-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/killercup/cargo-edit"
 changelog="https://raw.githubusercontent.com/killercup/cargo-edit/master/CHANGELOG.md"
 distfiles="https://github.com/killercup/cargo-edit/archive/refs/tags/v${version}.tar.gz"
-checksum=9ce140e840498d61c1573ff4206214d0c41c8db24048f0f0f27b7f4464310f9a
+checksum=a8168ea2320c095f55d2b32f8bede8c814dcdc4290c250df36dc8ce0f6fb2095
 
 post_install() {
 	vlicense LICENSE

From 66ca589c56bdbd3f980f7a29096f84b7d074b38c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:44:29 +0200
Subject: [PATCH 0596/1854] exa: rebuild for libgit2

---
 srcpkgs/exa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index ec5649613174..89bf6611d9fb 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,7 +1,7 @@
 # Template file for 'exa'
 pkgname=exa
 version=0.10.1
-revision=3
+revision=4
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=cargo

From b085bd2d18e8dd8879ff8bd0bc273dddab9bd3a7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:45:07 +0200
Subject: [PATCH 0597/1854] git-series: rebuild for libgit2

---
 srcpkgs/git-series/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 79c561af76b6..365dc53ab02d 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=15
+revision=16
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -10,7 +10,7 @@ short_desc="Track patch series in git"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/git-series/git-series"
-distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
+distfiles="https://github.com/git-series/git-series/archive/refs/tags/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
@@ -18,9 +18,11 @@ post_extract() {
 	cargo update --package url@1.2.3 --precise 1.7.2
 	cargo update --package openssl-sys@0.9.1 --precise 0.9.60
 }
+
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes
 }
+
 post_install() {
 	vman git-series.1
 	vlicense LICENSE.txt

From 5d23c295eec207b6594d3a3a436c9a61f3fd505d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:00:03 +0200
Subject: [PATCH 0598/1854] bat: rebuild for libgit2

---
 srcpkgs/bat/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/bat/template                |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bat/patches/bump-git2.patch

diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
new file mode 100644
index 000000000000..842b57d4ee6b
--- /dev/null
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 44460e0..78dfbde 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
+ bytesize = { version = "1.1.0" }
+ 
+ [dependencies.git2]
+-version = "0.16"
++version = "0.17"
+ optional = true
+ default-features = false
+ 
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index c20fc0e09edd..6d6b39fae611 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
 # Template file for 'bat'
 pkgname=bat
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="cmake llvm clang pkg-config"
 makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -19,7 +19,9 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
-export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
+}
 
 pre_build() {
 	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"

From fda93158394e98f66304d881e5e347f5ef096e5e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:05:15 +0200
Subject: [PATCH 0599/1854] cargo-update: rebuild for libgit2

---
 srcpkgs/cargo-update/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/cargo-update/template                |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cargo-update/patches/bump-git2.patch

diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
new file mode 100644
index 000000000000..90a31fbdcb02
--- /dev/null
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index e62e9c8..1aa0658 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -52,7 +52,7 @@ tabwriter = "1.2"
+ lazysort = "0.2"
+ regex = "1.6"
+ serde = "1.0"
+-git2 = "0.16"
++git2 = "0.17"
+ home = "0.5"
+ toml = "0.5"
+ hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 086d3660bfaa..b411c99f0a7c 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
 version=13.0.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
 makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"

From 653095896627ebe559f08b6be0184011fa90219f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:11:08 +0200
Subject: [PATCH 0600/1854] cocogitto: rebuild for libgit2

---
 srcpkgs/cocogitto/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index dbed47399d80..a4399ef38921 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
 version=5.3.1
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -17,6 +17,10 @@ checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
 post_install() {
 	local cog="${DESTDIR}/usr/bin/cog"
 	for shell in bash zsh fish; do

From 401e02d277060540ff9be2bab0349cbcbc9fe835 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:21:18 +0200
Subject: [PATCH 0601/1854] delta: rebuild for libgit2

---
 srcpkgs/delta/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/delta/template                |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/delta/patches/bump-git2.patch

diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/bump-git2.patch
new file mode 100644
index 000000000000..05255c23c9cc
--- /dev/null
+++ b/srcpkgs/delta/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 8c0c6d8..4fdaa9d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -46,7 +46,7 @@ vte = "0.11.0"
+ xdg = "2.4.1"
+ 
+ [dependencies.git2]
+-version = "0.16.1"
++version = "0.17"
+ default-features = false
+ features = []
+ 
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 7904e323b89f..e0e2c44370d7 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
 # Template file for 'delta'
 pkgname=delta
 version=0.16.5
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel oniguruma-devel"
@@ -13,8 +13,8 @@ homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
 checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
 
-pre_build() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
 }
 
 post_install() {

From b5f0f79f5634589d5f4bd2239f31cd2ed77a5a51 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:25:52 +0200
Subject: [PATCH 0602/1854] git-absorb: rebuild for libgit2

---
 srcpkgs/git-absorb/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/git-absorb/template                |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/git-absorb/patches/bump-git2.patch

diff --git a/srcpkgs/git-absorb/patches/bump-git2.patch b/srcpkgs/git-absorb/patches/bump-git2.patch
new file mode 100644
index 000000000000..bab771ba1be8
--- /dev/null
+++ b/srcpkgs/git-absorb/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 20a0ec5..7b86eed 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ name = "git-absorb"
+ path = "src/main.rs"
+ 
+ [dependencies.git2]
+-version = "~0.16"
++version = "~0.17"
+ default-features = false
+ 
+ [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 9af2b5ca4edb..5f7d34c5fb31 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,7 +1,7 @@
 # Template file for 'git-absorb'
 pkgname=git-absorb
 version=0.6.10
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://github.com/tummychow/git-absorb"
 distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
 checksum=6cc58d2ae50027a212811faa065623666ccb6e8bd933e801319aaf92b164aa0a
 
+post_patch() {
+	cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
 post_install() {
 	vlicense LICENSE.md
 	vman Documentation/git-absorb.1

From 94fd6e60ac366410ff4584cd1588f9f6b4d5bd5f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:39:34 +0200
Subject: [PATCH 0603/1854] gitui: rebuild for libgit2

closes #43435
---
 srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++
 srcpkgs/gitui/template                |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gitui/patches/bump-git2.patch

diff --git a/srcpkgs/gitui/patches/bump-git2.patch b/srcpkgs/gitui/patches/bump-git2.patch
new file mode 100644
index 000000000000..e4b5dfc1fad5
--- /dev/null
+++ b/srcpkgs/gitui/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
+index 5ab4da1..f17fbbe 100644
+--- a/asyncgit/Cargo.toml
++++ b/asyncgit/Cargo.toml
+@@ -14,7 +14,7 @@ keywords = ["git"]
+ [dependencies]
+ crossbeam-channel = "0.5"
+ easy-cast = "0.5"
+-git2 = "0.15"
++git2 = "0.17"
+ log = "0.4"
+ # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
+ # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index a97b179e2331..14a6deb5ba43 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,8 +1,9 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.22.1
-revision=1
+revision=2
 build_style=cargo
+make_check_args="-- --skip  components::textinput::tests::test_visualize_newline"
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"
 short_desc="Blazing fast terminal-ui for git"
@@ -13,6 +14,10 @@ changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
 checksum=285e86c136ee7f410fdd52c5284ccf0d19011cc5f7709e5e10bb02f439a218ea
 
+post_patch() {
+	cargo update --package git2@0.15.0 --precise 0.17.2
+}
+
 post_install() {
 	vlicense LICENSE.md
 }

From 591bacb7015ce67f89bc28087f2c1fde0dc981fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 May 2023 18:07:35 +0200
Subject: [PATCH 0604/1854] abseil-cpp: add more entries to common/shlibs.

---
 common/shlibs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d83c2b6a1c9c..005700403d0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,6 +4225,31 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_base.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_civil_time.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cord_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_functions.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_cordz_handle.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_debugging_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_demangle_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_exponential_biased.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_graphcycles_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_hashtablez_sampler.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_int128.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_log_severity.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_low_level_hash.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_malloc_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_distributions.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_platform.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_randen_hwaes.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_internal_seed_material.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_seed_gen_exception.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_random_seed_sequences.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_raw_logging_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_stacktrace.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strerror.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_strings_internal.so.2206.0.0 abseil-cpp-20220623.1_1
+libabsl_symbolize.so.2206.0.0 abseil-cpp-20220623.1_1
 libairspyhf.so.0 libairspyhf-1.6.8_1
 libtraceevent.so.1 libtraceevent-1.6.2_1
 libtracefs.so.1 libtracefs-1.4.2_1

From ec01b0694492cfa0536f4b28ae045a3c06edf1b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 2 Dec 2022 19:19:02 +0100
Subject: [PATCH 0605/1854] New package: justbuild-1.1.2.

---
 srcpkgs/justbuild/template | 68 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 srcpkgs/justbuild/template

diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
new file mode 100644
index 000000000000..1ad8e334617d
--- /dev/null
+++ b/srcpkgs/justbuild/template
@@ -0,0 +1,68 @@
+# Template file for 'justbuild'
+pkgname=justbuild
+version=1.1.2
+revision=1
+create_wrksrc=yes
+hostmakedepends="jo pandoc pkg-config python3 tar unzip wget"
+makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
+ libarchive-devel libcurl-devel libgit2-devel openssl-devel re2-devel"
+depends="python3"
+short_desc="Generic build system supporting multi-repository builds"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://github.com/just-buildsystem/justbuild/"
+changelog="https://github.com/just-buildsystem/justbuild/blob/master/CHANGELOG.md"
+distfiles="https://github.com/just-buildsystem/justbuild/archive/v${version}.tar.gz"
+checksum=50341bdf3742ad6dec20454b338770e8428b531d04c675ca976d1e410c5b33ba
+conflicts="just>=0"
+nocross="not supported by bootstrapping"
+
+do_build() {
+	mkdir -p just-work
+	export JUST_BUILD_CONF=$(jo \
+		AR=/usr/bin/ar \
+		COMPILER_FAMILY=gnu \
+		CC=$CC \
+		CXX=$CXX \
+		CFLAGS=$(jo -a -- $CFLAGS) \
+		CXXFLAGS=$(jo -a -- $CXXFLAGS) \
+		LDFLAGS=$(jo -a -- $LDFLAGS) \
+		SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH \
+		VERSION_EXTRA_SUFFIX=-void
+	)
+	export NON_LOCAL_DEPS=$(jo -a \
+		bazel_remote_apis \
+		cli11 \
+		com_github_microsoft_gsl \
+		google_apis \
+		protobuf
+	)
+
+	PACKAGE=YES LOCALBASE=/usr python3 \
+		justbuild-${version}/bin/bootstrap.py \
+		justbuild-${version}/ $PWD/just-work
+
+	./just-work/src/out-boot/bin/just install \
+		-C $PWD/just-work/repo-conf.json \
+		-D "$JUST_BUILD_CONF" \
+		-o $PWD/just-work/out \
+		--local-build-root $PWD/just-work/.just \
+		'' just-mr
+
+	for m in justbuild-${version}/share/man/*.md; do
+		pandoc --standalone --to man -o ${m%.md}.man $m
+	done
+}
+
+do_install() {
+	vbin just-work/out/bin/just
+	vbin just-work/out/src/other_tools/just_mr/just-mr
+	vbin just-work/src/bin/just-import-git.py just-import-git
+
+	eval vcompletion justbuild-${version}/share/just_complete.bash bash
+
+	for m in justbuild-${version}/share/man/*.man; do
+		echo $m
+		vman $m ${m%.man}
+	done
+}

From edbf432f3b9d68b8a6ffcbe70823e661d0b5e60f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 12:27:20 -0400
Subject: [PATCH 0606/1854] typst: unbroken

---
 srcpkgs/typst/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 6e9ee26e16b8..7d517adbf6cd 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -16,10 +16,6 @@ checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"
 
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
-fi
-
 post_install() {
 	for f in cli/generated/*.?; do
 		vman "$f"

From 94ffa5d51be379d0c059791f9d397b12a07993f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 12:27:44 -0400
Subject: [PATCH 0607/1854] typst-lsp: unbroken

---
 srcpkgs/typst-lsp/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 339ae5ddb0d5..6d4f0cef0ae2 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -10,10 +10,6 @@ homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
 checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
 
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
-	broken="cargo needs to dynlink libgit2, broken on builders: https://build.voidlinux.org/builders/i686_builder/builds/43240"
-fi
-
 post_install() {
 	vlicense LICENSE-MIT.txt
 }

From aee81a221444d2be3eebeaea5190cae91f5b3963 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 12:54:16 -0400
Subject: [PATCH 0608/1854] wezterm: depend on wezterm-terminfo

---
 srcpkgs/wezterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
index 44b465839329..c3041986e395 100644
--- a/srcpkgs/wezterm/template
+++ b/srcpkgs/wezterm/template
@@ -1,7 +1,7 @@
 # Template file for 'wezterm'
 pkgname=wezterm
 version=20230408
-revision=1
+revision=2
 _srcver=${version}-112425-69ae8472
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="fontconfig-devel freetype-devel harfbuzz-devel openssl-devel
  libssh2-devel libX11-devel libxkbcommon-devel wayland-devel xcb-util-devel
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel"
-depends="noto-fonts-emoji fonts-roboto-ttf"
+depends="noto-fonts-emoji fonts-roboto-ttf wezterm-terminfo-${version}_${revision}"
 short_desc="GPU-accelerated cross-platform terminal emulator and multiplexer"
 maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"

From 4012652984a704b43e1e55e16a317343c557dbe6 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 14:07:10 +0100
Subject: [PATCH 0609/1854] libheif: update to 1.16.2.

Closes: #44331 [via git-merge-pr]
---
 srcpkgs/libheif/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 59d6fe2778c2..2056a8d8d491 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,9 +1,8 @@
 # Template file for 'libheif'
 pkgname=libheif
-version=1.14.2
+version=1.16.2
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf pkg-config libtool"
+build_style=cmake
 makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
  libaom-devel"
 short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -12,18 +11,13 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/strukturag/libheif"
 changelog="https://github.com/strukturag/libheif/releases"
 distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=e9c88e75e3b7fad9df32e42d28646752de2679df57efddfb3f63cd25110ce9d9
-
-pre_configure() {
-	./autogen.sh
-}
+checksum=d207f2ff5c86e6af3621c237f186130b985b7a9ff657875944b58ac5d27ba71c
 
 libheif-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} libde265-devel x265-devel libaom-devel"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}

From 23e5253cc6c024d1c592251e7322ef62db1fe8f2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 12:52:01 +0100
Subject: [PATCH 0610/1854] pcre2: update to 10.42.

Closes: #44329 [via git-merge-pr]
---
 srcpkgs/pcre2/patches/ppc-icache-flush.patch | 102 -------------------
 srcpkgs/pcre2/template                       |   7 +-
 2 files changed, 4 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/pcre2/patches/ppc-icache-flush.patch

diff --git a/srcpkgs/pcre2/patches/ppc-icache-flush.patch b/srcpkgs/pcre2/patches/ppc-icache-flush.patch
deleted file mode 100644
index b1abb1109a9a..000000000000
--- a/srcpkgs/pcre2/patches/ppc-icache-flush.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-GCC's version of __builtin___clear_cache() is a no-op on PowerPC.
-Change to use an improved version of the existing ppc_cache_flush().
-
---- a/src/sljit/sljitConfigInternal.h	2021-08-20 09:51:28.000000000 -0700
-+++ b/src/sljit/sljitConfigInternal.h	2022-02-11 20:56:43.159092563 -0800
-@@ -320,7 +320,8 @@
- /****************************/
- 
- #if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin)
--#if __has_builtin(__builtin___clear_cache)
-+#if __has_builtin(__builtin___clear_cache) && \
-+	!(defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
- 
- #define SLJIT_CACHE_FLUSH(from, to) \
- 	__builtin___clear_cache((char*)(from), (char*)(to))
---- a/src/sljit/sljitNativePPC_common.c	2022-02-12 20:46:28.383224561 -0800
-+++ b/src/sljit/sljitNativePPC_common.c	2022-02-12 20:48:22.210099029 -0800
-@@ -46,6 +46,39 @@
- #define SLJIT_PASS_ENTRY_ADDR_TO_CALL 1
- #endif
- 
-+#ifdef __linux__
-+#include <sys/auxv.h>
-+
-+/* Return the instruction cache line size, in bytes. */
-+static SLJIT_INLINE sljit_u32 get_icache_line_size()
-+{
-+	static sljit_u32 icache_line_size = 0;
-+	if (SLJIT_UNLIKELY(!icache_line_size)) {
-+		icache_line_size = (sljit_u32) getauxval(AT_ICACHEBSIZE);
-+		SLJIT_ASSERT(icache_line_size != 0);
-+	}
-+	return icache_line_size;
-+}
-+
-+/* Cache and return the first hardware capabilities word. */
-+static SLJIT_INLINE unsigned long get_hwcap()
-+{
-+	static unsigned long hwcap = 0;
-+	if (SLJIT_UNLIKELY(!hwcap)) {
-+		hwcap = getauxval(AT_HWCAP);
-+		SLJIT_ASSERT(hwcap != 0);
-+	}
-+	return hwcap;
-+}
-+
-+/* Return non-zero if this CPU has the icache snoop feature. */
-+static SLJIT_INLINE unsigned long has_feature_icache_snoop()
-+{
-+	return (get_hwcap() & PPC_FEATURE_ICACHE_SNOOP);
-+}
-+
-+#endif  /* __linux__ */
-+
- #if (defined SLJIT_CACHE_FLUSH_OWN_IMPL && SLJIT_CACHE_FLUSH_OWN_IMPL)
- 
- static void ppc_cache_flush(sljit_ins *from, sljit_ins *to)
-@@ -68,14 +101,40 @@
- #	error "Cache flush is not implemented for PowerPC/POWER common mode."
- #	else
- 	/* Cache flush for PowerPC architecture. */
--	while (from < to) {
-+	/* For POWER5 and up with icache snooping, only one icbi in the range
-+ 	 * is required. The sync flushes the store queue, and the icbi/isync
-+	 * kills the local prefetch.
-+	 */
-+	if (has_feature_icache_snoop()) {
- 		__asm__ volatile (
--			"dcbf 0, %0\n"
- 			"sync\n"
- 			"icbi 0, %0\n"
--			: : "r"(from)
-+			"isync\n"
-+			: : "r"(from) : "memory"
-+		);
-+		return;
-+	}
-+
-+	sljit_u32 cache_line_bytes = get_icache_line_size();
-+	sljit_u32 cache_line_words = cache_line_bytes / sizeof(sljit_ins);
-+	uintptr_t cache_line_mask = ~(uintptr_t)(cache_line_bytes - 1);
-+
-+	/* Round down to start of cache line to simplify the end condition. */
-+	sljit_ins* start = (sljit_ins*)((uintptr_t)(from) & cache_line_mask);
-+
-+	for (from = start; from < to; from += cache_line_words) {
-+		__asm__ volatile (
-+			"dcbf 0, %0"
-+			: : "r"(from) : "memory"
-+		);
-+	}
-+	__asm__ volatile ( "sync" );
-+
-+	for (from = start; from < to; from += cache_line_words) {
-+		__asm__ volatile (
-+			"icbi 0, %0"
-+			: : "r"(from) : "memory"
- 		);
--		from++;
- 	}
- 	__asm__ volatile ( "isync" );
- #	endif
diff --git a/srcpkgs/pcre2/template b/srcpkgs/pcre2/template
index cbb58f41e9ee..24677648eb60 100644
--- a/srcpkgs/pcre2/template
+++ b/srcpkgs/pcre2/template
@@ -1,7 +1,7 @@
 # Template file for 'pcre2'
 pkgname=pcre2
-version=10.39
-revision=2
+version=10.42
+revision=1
 build_style=gnu-configure
 configure_args="--with-pic --enable-pcre2-16 --enable-pcre2-32
 --enable-pcre2test-libreadline --enable-pcre2grep-libz --enable-pcre2grep-libbz2
@@ -11,8 +11,9 @@ short_desc="Perl Compatible Regular Expressions (2nd version)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.pcre.org/"
+changelog="https://raw.githubusercontent.com/PCRE2Project/pcre2/master/NEWS"
 distfiles="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"
-checksum=0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440
+checksum=8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
 
 post_install() {
 	vlicense LICENCE

From e30dbdf96d3a8e5fecd1bb40c6a2173009f2ad67 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 5 Jun 2023 20:25:32 +0100
Subject: [PATCH 0611/1854] fribidi: update to 1.0.13, adopt.

Fixes empty manpages, see https://github.com/fribidi/fribidi/issues/197.

Closes: #44283 [via git-merge-pr]
---
 srcpkgs/fribidi/template | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index 39f2fbc41ca9..6f3ffad86454 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,26 +1,20 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.12
+version=1.0.13
 revision=1
 build_style=gnu-configure
-configure_args="--disable-docs"
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config"
 short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
 changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS"
-distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d
-disable_parallel_build=yes
-
-pre_configure() {
-	NOCONFIGURE=1 autoreconf -fi
-}
+distfiles="https://github.com/fribidi/fribidi/releases/download/v${version}/fribidi-${version}.tar.xz"
+checksum=7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
-		sed -i gen.tab/Makefile \
+		vsed -i gen.tab/Makefile \
 			-e "s;^\(CC =\) .*;\1 cc;" \
 			-e "s;^\(CFLAGS =\) .*;\1 -O2 -pipe;" \
 			-e "s;^\(LDFLAGS =\) .*;\1 -s;"
@@ -28,7 +22,7 @@ pre_build() {
 }
 
 fribidi-devel_package() {
-	depends="fribidi>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 4199e8184e2952eedb0e474c71fc20573d60cc05 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 24 May 2023 17:27:10 +0100
Subject: [PATCH 0612/1854] xcb-util-errors: update to 1.0.1.

Closes: #44061 [via git-merge-pr]
---
 srcpkgs/xcb-util-errors/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xcb-util-errors/template b/srcpkgs/xcb-util-errors/template
index cff1bb5d3902..31efb626ab66 100644
--- a/srcpkgs/xcb-util-errors/template
+++ b/srcpkgs/xcb-util-errors/template
@@ -1,17 +1,17 @@
 # Template file for 'xcb-util-errors'
 pkgname=xcb-util-errors
-version=1.0
+version=1.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config m4"
-makedepends="libxcb-devel"
+hostmakedepends="pkg-config m4 python3"
+makedepends="libxcb-devel xcb-proto"
 short_desc="XCB errors library"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"
 homepage="https://xcb.freedesktop.org"
-distfiles="https://xcb.freedesktop.org/dist/${pkgname}-${version}.tar.bz2"
-checksum=682681769e818ba085870d1ccd65f1f282ca16ca7d6f0f73ee70bc3642aa1995
+distfiles="https://xcb.freedesktop.org/dist/xcb-util-errors-${version}.tar.xz"
+checksum=5628c87b984259ad927bacd8a42958319c36bdf4b065887803c9d820fb80f357
 
 post_install() {
 	vlicense COPYING

From 326b177859b7f86d29507f8d88718ba9e64dab7e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 24 May 2023 10:02:16 +0100
Subject: [PATCH 0613/1854] gtk+3: update to 3.24.38.

Closes: #44060 [via git-merge-pr]
---
 srcpkgs/gtk+3/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 44843eb762c0..bc2ab1ad90fd 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.37
+version=3.24.38
 revision=1
 build_style=meson
 build_helper="gir"
@@ -32,14 +32,17 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57
+checksum=ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7
+make_check_pre="xvfb-run dbus-run-session"
 # _broken_tests=""
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) _broken_tests="reftests/linear-gradient.ui" ;;
 esac
 
-if [ -z "$XBPS_CHECK_PKGS" ]; then
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=true"
+else
 	configure_args+=" -Dtests=false"
 fi
 
@@ -63,10 +66,6 @@ pre_check() {
 	done
 }
 
-do_check() {
-	xvfb-run dbus-run-session ninja -C build ${makejobs} test
-}
-
 post_install() {
 	rm ${DESTDIR}/usr/bin/gtk-update-icon-cache
 	rm ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1

From baa1e0e77c6aaa79eb466933f019c1bc0975ba24 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 15 May 2023 22:30:15 +0100
Subject: [PATCH 0614/1854] telepathy-idle: move to python3.

Closes: #43890 [via git-merge-pr]
---
 srcpkgs/telepathy-idle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template
index 96758ec345ab..e518153fefc3 100644
--- a/srcpkgs/telepathy-idle/template
+++ b/srcpkgs/telepathy-idle/template
@@ -3,10 +3,10 @@ pkgname=telepathy-idle
 version=0.2.2
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config python libxslt"
+hostmakedepends="pkg-config python3 libxslt"
 makedepends="dbus-glib-devel telepathy-glib-devel"
 depends="telepathy-glib>=0.22"
-checkdepends="python-dbus"
+checkdepends="python3-dbus"
 short_desc="IRC connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 025ea59fe4c33629bf9d8f8f8bfd0488f785580a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 3 May 2023 01:38:56 +0300
Subject: [PATCH 0615/1854] thin-provisioning-tools: update to 1.0.4.

Closes: #43722 [via git-merge-pr]
---
 .../patches/fix-musl.patch                    | 90 +++++++++++++++++++
 srcpkgs/thin-provisioning-tools/template      | 22 +++--
 2 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thin-provisioning-tools/patches/fix-musl.patch

diff --git a/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch b/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch
new file mode 100644
index 000000000000..8e433e96a32a
--- /dev/null
+++ b/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch
@@ -0,0 +1,90 @@
+From fbce51f27fa164ebad7994b177908e5a200b95c9 Mon Sep 17 00:00:00 2001
+From: triallax <triallax@tutanota.com>
+Date: Thu, 4 May 2023 20:42:39 +0300
+Subject: [PATCH] [build] fix build on musl
+
+Before this commit, compilation would fail with this error:
+
+```
+error[E0308]: mismatched types
+   --> src/file_utils.rs:59:28
+    |
+59  |         if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
+    |            -----------     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
+    |            |
+    |            arguments to this function are incorrect
+    |
+note: function defined here
+   --> /host/cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.142/src/unix/linux_like/linux/musl/mod.rs:739:12
+    |
+739 |     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+    |            ^^^^^
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+    |
+59  |         if libc::ioctl(fd, (BLKGETSIZE64 as libc::c_ulong).try_into().unwrap(), &mut cap) == 0 {
+    |                            +                             +++++++++++++++++++++
+
+error[E0308]: mismatched types
+   --> src/thin/trim.rs:138:28
+    |
+138 |         if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
+    |            -----------     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
+    |            |
+    |            arguments to this function are incorrect
+    |
+note: function defined here
+   --> /host/cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.142/src/unix/linux_like/linux/musl/mod.rs:739:12
+    |
+739 |     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+    |            ^^^^^
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+    |
+138 |         if libc::ioctl(fd, (BLKDISCARD as libc::c_ulong).try_into().unwrap(), range) == 0 {
+    |                            +                           +++++++++++++++++++++
+
+For more information about this error, try `rustc --explain E0308`.
+```
+---
+ src/file_utils.rs | 8 +++++++-
+ src/thin/trim.rs  | 7 ++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/file_utils.rs b/src/file_utils.rs
+index 0ca3c0fc..81d4a8a7 100644
+--- a/src/file_utils.rs
++++ b/src/file_utils.rs
+@@ -55,8 +55,14 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+     let file = File::open(path.as_ref())?;
+     let fd = file.as_raw_fd();
+     let mut cap = 0u64;
++
++    #[cfg(target_env = "musl")]
++    type RequestType = libc::c_int;
++    #[cfg(not(target_env = "musl"))]
++    type RequestType = libc::c_ulong;
++
+     unsafe {
+-        if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
++        if libc::ioctl(fd, BLKGETSIZE64 as RequestType, &mut cap) == 0 {
+             Ok(cap)
+         } else {
+             Err(io::Error::last_os_error())
+diff --git a/src/thin/trim.rs b/src/thin/trim.rs
+index 3d938caf..0d1fb590 100644
+--- a/src/thin/trim.rs
++++ b/src/thin/trim.rs
+@@ -134,8 +134,13 @@ impl<'a> Iterator for RangeIterator<'a> {
+ 
+ const BLKDISCARD: u32 = 0x1277;
+ fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> {
++    #[cfg(target_env = "musl")]
++    type RequestType = libc::c_int;
++    #[cfg(not(target_env = "musl"))]
++    type RequestType = libc::c_ulong;
++
+     unsafe {
+-        if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
++        if libc::ioctl(fd, BLKDISCARD as RequestType, range) == 0 {
+             Ok(())
+         } else {
+             Err(std::io::Error::last_os_error())
diff --git a/srcpkgs/thin-provisioning-tools/template b/srcpkgs/thin-provisioning-tools/template
index d74be6fe5d72..71b00ac1e89e 100644
--- a/srcpkgs/thin-provisioning-tools/template
+++ b/srcpkgs/thin-provisioning-tools/template
@@ -1,21 +1,25 @@
 # Template file for 'thin-provisioning-tools'
 pkgname=thin-provisioning-tools
-version=0.9.0
+version=1.0.4
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf libtool pkg-config"
-makedepends="boost-devel expat-devel libaio-devel"
+build_style=cargo
+hostmakedepends="pkg-config"
+# Note: statically links to libzstd.
+makedepends="libzstd-devel"
 short_desc="Tools for manipulating the metadata of dm-thin device-mapper targets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jthornber/thin-provisioning-tools"
+changelog="https://raw.githubusercontent.com/jthornber/thin-provisioning-tools/main/CHANGES"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8
+checksum=a973786fb9cb49d30be6fb8178d6739bc23609d4114ab601f0983ecdbf349abf
+# Does a ton of disk IO.
+make_check=extended
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -e "s:target/release/pdata_tools:target/${RUST_TARGET}/release/pdata_tools:" -i Makefile
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin MANDIR=/usr/share/man install
+post_install() {
+	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install
 }

From b6c2ad067ab1899941cf9f872f9a3a38757a4e6a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 23 Mar 2023 19:35:21 +0000
Subject: [PATCH 0616/1854] iproute2: update to 6.2.0.

`check` is the make target to run tests, at least in iproute2 6.2.0, so
that's why I removed `do_check`.

Closes: #42955 [via git-merge-pr]
---
 .../0001-ipstats-Add-param.h-for-musl.patch   | 28 ----------------
 .../0002-ipstats-add-missing-headers.patch    | 32 -------------------
 srcpkgs/iproute2/template                     | 12 +++----
 3 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
 delete mode 100644 srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch

diff --git a/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch b/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
deleted file mode 100644
index 82363b263654..000000000000
--- a/srcpkgs/iproute2/patches/0001-ipstats-Add-param.h-for-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From beb3215602f9a3a8fa5404bd308e0f2820492b19 Mon Sep 17 00:00:00 2001
-From: Changhyeok Bae <changhyeok.bae@gmail.com>
-Date: Tue, 9 Aug 2022 04:01:05 +0000
-Subject: [PATCH 1/2] ipstats: Add param.h for musl
-
-Fix build error for musl
-| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: undefined reference to `MIN'
-
-Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
----
- ip/ipstats.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ip/ipstats.c b/ip/ipstats.c
-index 5cdd15ae..1ac275bd 100644
---- a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0+
- #include <assert.h>
- #include <errno.h>
-+#include <sys/param.h>
- 
- #include "list.h"
- #include "utils.h"
--- 
-2.37.3
-
diff --git a/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch b/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch
deleted file mode 100644
index d6825e4e77d2..000000000000
--- a/srcpkgs/iproute2/patches/0002-ipstats-add-missing-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7115ca05b23d66ce5a88e52a05b7813443f5059e Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Tue, 9 Aug 2022 13:27:33 -0700
-Subject: [PATCH 2/2] ipstats: add missing headers
-
-IWYU reports several headers are not explicitly
-included by ipstats.
-
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- ip/ipstats.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ip/ipstats.c b/ip/ipstats.c
-index 1ac275bd..dadded14 100644
---- a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,7 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0+
-+#include <alloca.h>
- #include <assert.h>
- #include <errno.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <sys/param.h>
-+#include <sys/socket.h>
- 
- #include "list.h"
- #include "utils.h"
--- 
-2.37.3
-
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 4e4beeed7be8..413c49151c02 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.19.0
+version=6.2.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -10,8 +10,10 @@ short_desc="IP Routing Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
-distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791
+distfiles="${KERNEL_SITE}/utils/net/iproute2/iproute2-${version}.tar.xz"
+checksum=4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62
+# Requires unshare, which is not provided by chroot-util-linux.
+make_check=no
 
 conf_files="
  /etc/iproute2/ematch_map
@@ -24,10 +26,6 @@ conf_files="
  /etc/iproute2/group
  /etc/iproute2/nl_protos"
 
-do_check() {
-	make -C testsuite
-}
-
 post_install() {
 	rm -r ${DESTDIR}/usr/share/man/man3
 }

From 434d6116dc0c00936f4ac18a0002daa6af1b3cd0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 24 Mar 2023 20:22:05 +0000
Subject: [PATCH 0617/1854] python3-msgpack: update to 1.0.5.

Closes: #42984 [via git-merge-pr]
---
 srcpkgs/python3-msgpack/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
index ab557acf721a..173ef79642ae 100644
--- a/srcpkgs/python3-msgpack/template
+++ b/srcpkgs/python3-msgpack/template
@@ -1,16 +1,16 @@
 # Template file for 'python3-msgpack'
 pkgname=python3-msgpack
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
-short_desc="Python module for Msgpack serializer (Python3)"
+short_desc="Python module for Msgpack serializer"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
-homepage="https://msgpack.org/"
+homepage="https://github.com/msgpack/msgpack-python"
 changelog="https://raw.githubusercontent.com/msgpack/msgpack-python/main/ChangeLog.rst"
 distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f
+checksum=c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c

From 5060ae5e1b263d1050fe20685333caeb704ba4b4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 11 Mar 2023 11:00:20 +0000
Subject: [PATCH 0618/1854] sudo: update to 1.9.13p3.

Closes: #42701 [via git-merge-pr]
---
 srcpkgs/sudo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 9482385e0508..0cd929eb9eba 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.9.13p2
-revision=2
+version=1.9.13p3
+revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
  --enable-shell-sets-home --enable-noargs-shell --without-sendmail
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d
+checksum=92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 

From 5273fdb8a3b930f0633d3baf3866b4d237bad1f5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 15 Dec 2022 00:23:46 +0000
Subject: [PATCH 0619/1854] bash: update to 5.2.015.

Closes: #41098 [via git-merge-pr]
---
 srcpkgs/bash/template | 49 ++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index a1c2a25cd6e5..b7057db94dbe 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,13 +1,14 @@
 # Template file for 'bash'
 pkgname=bash
-version=5.1.016
-revision=2
+version=5.2.015
+revision=1
 _bash_distver=${version%.*}
 _bash_patchlevel=${version##*.}
 _patchprefix="bash${_bash_distver/./}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --without-installed-readline"
 make_build_args="TERMCAP_LIB=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
+make_check_target=tests
 hostmakedepends="bison"
 makedepends="ncurses-devel"
 checkdepends="perl"
@@ -15,7 +16,7 @@ short_desc="GNU Bourne Again Shell"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/bash/bash.html"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_bash_distver}.tar.gz"
+distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 $_bash_patchlevel); do
@@ -25,23 +26,22 @@ done
 unset _url
 unset _p
 
-checksum="cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
- ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa
- 15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe
- 22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1
- 9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86
- cccbb5e9e6763915d232d29c713007a62b06e65126e3dd2d1128a0dc5ef46da5
- 75e17d937de862615c6375def40a7574462210dce88cf741f660e2cc29473d14
- acfcb8c7e9f73457c0fb12324afb613785e0c9cef3315c9bbab4be702f40393a
- f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1
- e45cda953ab4b4b4bde6dc34d0d8ca40d1cc502046eb28070c9ebcd47e33c3ee
- a2c8d7b2704eeceff7b1503b7ad9500ea1cb6e9393faebdb3acd2afdd7aeae2a
- 58191f164934200746f48459a05bca34d1aec1180b08ca2deeee3bb29622027b
- 10f189c8367c4a15c7392e7bf70d0ff6953f78c9b312ed7622303a779273ab98
- c7acb66df435d284304c16ca83a5265f9edd9368612095b01a733d45c77ed5ad
- 6a4ee0c81b437b96279a792c1efcec4ba56f009195a318083db6b53b096f83d0
- 1b37692ef1f6cc3dcec246773443276066e6b1379868f8c14e01f4dfd4df80f0
- 8899144f76a5db1fb41a89ed881c9f19add95728dd71db324f772ef225c5384f"
+checksum="a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
+ f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a
+ 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8
+ 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff
+ 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512
+ ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357
+ d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c
+ 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490
+ 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8
+ f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd
+ c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd
+ 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4
+ 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c
+ 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
+ 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
+ ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a"
 
 make_dirs="/etc/bash/bashrc.d 755 root root"
 conflicts="chroot-bash>=0"
@@ -62,15 +62,6 @@ post_patch() {
 	done
 }
 
-do_check() {
-	# when xbps-src is run from interactive shell, this tests receives SIGTTIN,
-	# and suspends xbps-src
-	sed -i tests/read2.sub -e '/read -t 2 a < \/dev\/tty/,/echo $a/ d'
-	sed -i tests/read.right -e '/timeout 1: ok/,+1 d'
-	sed -i tests/read.right -e '/read2.sub: line 36: read:/s/ 36:/ 27:/'
-	make tests
-}
-
 post_install() {
 	rm -r ${DESTDIR}/usr/share/doc
 	ln -s bash ${DESTDIR}/usr/bin/rbash

From 19514833abdd00b20ac3f2f28b98a1e672197161 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 9 Feb 2023 20:56:25 +0000
Subject: [PATCH 0620/1854] libreadline8: update to 8.2.001.

Closes: #42170 [via git-merge-pr]
---
 .../patches/no-rpath-and-link.patch           | 42 +------------------
 srcpkgs/libreadline8/template                 | 15 ++++---
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
index 45548e5fb9b4..bec079ef31ae 100644
--- a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
+++ b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
@@ -4,49 +4,9 @@ Date: Thu, 5 Nov 2020 02:49:21 +0100
 Subject: [PATCH] drop rpath and link against the termcap library
 
 ---
- configure          | 8 ++++----
- configure.ac       | 8 ++++----
  support/shobj-conf | 2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 1 insertions(+), 1 deletions(-)
 
-diff --git configure configure
-index 7d7bce0..eff4e76 100755
---- a/configure
-+++ b/configure
-@@ -6823,10 +6823,10 @@ if test -f ${srcdir}/support/shobj-conf; then
- $as_echo_n "checking configuration for building shared libraries... " >&6; }
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 
- 
- 
-diff --git configure.ac configure.ac
-index db788a6..9ac3eef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,10 +227,10 @@ if test -f ${srcdir}/support/shobj-conf; then
-         AC_MSG_CHECKING(configuration for building shared libraries)
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 	
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)
 diff --git support/shobj-conf support/shobj-conf
 index 7920f1b..7ac9c9f 100644
 --- a/support/shobj-conf
diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template
index e0bca94a7a7e..8517bf9854b2 100644
--- a/srcpkgs/libreadline8/template
+++ b/srcpkgs/libreadline8/template
@@ -1,25 +1,30 @@
 # Template file for 'libreadline8'
 pkgname=libreadline8
-version=8.1.000
+version=8.2.001
 revision=1
 _dist_ver="${version%.*}"
 _patch_ver="${version##*.}"
 bootstrap=yes
 build_style=gnu-configure
-configure_args="--with-curses --enable-multibyte bash_cv_termcap_lib=libncursesw"
+configure_args="--with-curses --with-shared-termcap-library --enable-multibyte
+ bash_cv_termcap_lib=libncursesw"
 makedepends="ncurses-devel"
 short_desc="GNU Readline Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
-distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz"
-checksum=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
+changelog="https://tiswww.cwru.edu/php/chet/readline/NEWS"
+distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001"
+checksum="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
+ bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7"
+skip_extraction="readline${_dist_ver/./}-001"
 
 post_patch() {
 	cd ${wrksrc}
 	for p in $(seq -w 001 ${_patch_ver}); do
 		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
-		msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
+		msg_normal "Applying patch readline${_dist_ver/./}-$p.\n"
 	done
 }
 

From cfecf6717f6909e7c94821bf9ba6db6e9fb6cb5d Mon Sep 17 00:00:00 2001
From: chax <mcakaric@gmail.com>
Date: Sat, 29 Apr 2023 00:00:14 +0200
Subject: [PATCH 0621/1854] budgie-desktop: update to 10.7.2

---
 srcpkgs/budgie-desktop/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index bfde56e60dc7..48c4dd2b55c9 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,25 +1,25 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.7.1
+version=10.7.2
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dwith-gtk-doc=false"
+configure_args="-Dwith-gtk-doc=false -Duse-old-zenity=true"
 hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
- sassc budgie-screensaver"
+ sassc budgie-screensaver zenity"
 makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel
  accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel
  gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel
  gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala
  libupower-glib3 libuuid-devel"
 depends="gnome-session gnome-settings-daemon budgie-control-center elogind
- gnome-themes-extra budgie-screensaver budgie-desktop-view"
+ gnome-themes-extra budgie-screensaver budgie-desktop-view zenity"
 short_desc="Modern desktop environment from the Solus Project"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=f8b277fb674f4c9e9d1dac9e45a7f93a1364d2f25cb1b3b513ec8154cfd7d6bd
+checksum=cce9ebe21b4bba4886bb2a227d739b7340c35085f08c132d3d8ae6b6621ba7b4
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 90aef8cd81cfb0bc282c9736ecd66ddf3da89314 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Jun 2023 14:16:35 -0400
Subject: [PATCH 0622/1854] pcsclite: update to 2.0.0.

---
 srcpkgs/pcsclite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 195c54e8bf58..457ba7120a9d 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.9
+version=2.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libudev --disable-libsystemd"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=a945e7cf0ffa81b8c1dfa6e2d20299b44dbb010a52be3c7f88aacf3cd99df75e
+checksum=0c75a2266b9962c7eb3853492b245d471127fa22ef342adfe76300fcc89cbaab
 
 post_install() {
 	vsv pcscd

From 99355c0968e7937af1a5e6d37d0d33920f460bea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Jun 2023 14:22:29 -0400
Subject: [PATCH 0623/1854] pcsc-acsccid: update to 1.1.9.

---
 srcpkgs/pcsc-acsccid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsc-acsccid/template b/srcpkgs/pcsc-acsccid/template
index fe03eed971c8..2bc8a9103698 100644
--- a/srcpkgs/pcsc-acsccid/template
+++ b/srcpkgs/pcsc-acsccid/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-acsccid'
 pkgname=pcsc-acsccid
-version=1.1.8
+version=1.1.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-udev"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://acsccid.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname/pcsc-/}/${pkgname/pcsc-/}-${version}.tar.bz2"
-checksum=f86fd846bc88594a569ea27040cb441d933b7eca8d51d2a90bacf161e7740051
+checksum=cd7e41817364d2ad2e049e55bd2d10b073e1eec99dbc5a08dfb787dd449f5a48
 
 post_install() {
 	vinstall src/92_pcscd_acsccid.rules 644 usr/lib/udev/rules.d/

From 83cead6fde53deedc23dc71d265143cb73825207 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 15:25:47 +0200
Subject: [PATCH 0624/1854] git-cliff: update to 1.2.0

---
 srcpkgs/git-cliff/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 9596ab6b7436..c957b30cb061 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,19 +1,21 @@
 # Template file for 'git-cliff'
 pkgname=git-cliff
-version=1.1.2
+version=1.2.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
 build_helper=qemu
 make_install_args="--path git-cliff"
 make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
 short_desc="Changelog generator based on conventional commits"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/orhun/git-cliff"
 changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=26f05e4cfea07768d06ae92cd4b34bae786ed354089d9b5b1659d6408bf583c6
+checksum=10db6fd8fe777f384de2e00336b1cb664095a2f068526f8ace4e7944a7ada270
 
 post_install() {
 	vdoc README.md

From b55e53e49b18569bd5a98154ce74d8410cd9fd9c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:46:17 +0300
Subject: [PATCH 0625/1854] opera: update to 99.0.4788.65.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 5608978f6725..309afaa56fa5 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=98.0.4759.6
+version=99.0.4788.65
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=1deac0d4ba218a731870123608a96c712eb53901226b5f097962d51678d43016
+checksum=62bf232a8b648b59616a2a870a2afc0f4be77f74f8e898d2dfe1295058e1b2db
 repository="nonfree"
 nostrip=yes
 

From 37083e4974cbfb878ca9675a5fa38433f71b9433 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:54:13 +0300
Subject: [PATCH 0626/1854] skype: update to 8.98.0.402.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 908f4addd4e5..9928e91e7c9e 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.97.0.204
+version=8.98.0.402
 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=5b2fbb303db5cc10b90713a404cb6cedf227cc0b0e6f16599b513853127ba984
+checksum=a7ca6b4a81ce8a28f0d6106dbd928c9b7e6c6dff987b413d8f73e1757dc0de1c
 repository="nonfree"
 nostrip="yes"
 

From 0ab445b58eba13fcb4eea56bdeefc4eef35beaa0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 12:05:00 +0300
Subject: [PATCH 0627/1854] stremio-shell: update to 4.4.160.

---
 srcpkgs/stremio-shell/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 2b0c0b23af69..c2a2e14dbfeb 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.159
-revision=3
+version=4.4.160
+revision=1
 _singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
 create_wrksrc=yes
@@ -21,11 +21,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://raw.githubusercontent.com/mpv-player/mpv/v0.32.0/libmpv/qthelper.hpp
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="aca0e5bf026e31399571f5cdc1485cbb2540e7ad7b981f10adb0e87ee47b9af5
+checksum="08c2f8e916fd60fd7bf756eb600e3a49848969880bf047c128e61a7ddb57654e
  ddab4bec60e4221580f8bb65ac200619bd2d1c9144a8ac7dccc0c78ea4667dc2
  86e1fcba6001829b7e23a856db84d01ebc76e63528f74064d7bc5705015a2684
- c31c98fe4cd8158523c45685ba2a949cffd3fc0f06dffef66797d07e3a2bbbee
- d01ba5d69cf0e94f3d44c8e4ed5b10eaab67e83398a7d86f86f378ade59cf8f9"
+ 3088ef4dfb26426cca5d54386a65066d07a20b5c7729742e30522cd96d2786e8
+ b253331df5aef953208691e5bece1e33c8e9705c981979d9392052356c1eb352"
 skip_extraction="server.js stremio.asar qthelper.hpp"
 
 post_extract() {

From 5b91216e2780954d96199d808ec1089c9a881a93 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:38:46 +0300
Subject: [PATCH 0628/1854] xfce4-screensaver: update to 4.18.2.

---
 srcpkgs/xfce4-screensaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-screensaver/template b/srcpkgs/xfce4-screensaver/template
index bb3fc877275b..af28a7f3fd7c 100644
--- a/srcpkgs/xfce4-screensaver/template
+++ b/srcpkgs/xfce4-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-screensaver'
 pkgname=xfce4-screensaver
-version=4.18.1
+version=4.18.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-elogind --with-libgl --with-shadow --with-mit-ext
@@ -15,4 +15,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.xfce.org/apps/xfce4-screensaver"
 changelog="https://gitlab.xfce.org/apps/xfce4-screensaver/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/xfce4-screensaver/${version%.*}/xfce4-screensaver-${version}.tar.bz2"
-checksum=b731e8abd68a18cc5d3b523351aa8f9f293c9f63290c1781c9155259deb04a5c
+checksum=e4fcd2c414d3a4215e9e86a55edd87e2545b15c961917f5d72cace35b76e2b98

From ca37f2963bd3bdf9277b0147699274896f2947c4 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 11 Jun 2023 01:30:54 +0300
Subject: [PATCH 0629/1854] io.elementary.files: update to 6.3.1

---
 srcpkgs/io.elementary.files/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index 5ebfcb8499f2..50aa71c44a75 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=6.2.1
+version=6.3.1
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=780ae93df5eff6d201c3b07d3f3d22226ba24cd56687b96a9d187600b96bd605
+checksum=a14e7aeca4a1e9e19e4ecec6fea3fded73da701e2cd0131075767e2a96336012
 
 CFLAGS="-fcommon"
 

From 980ea155faefba82e1080825da883de0316825f6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 10 Jun 2023 14:11:03 +0530
Subject: [PATCH 0630/1854] muon: update to 0.2.0.

---
 srcpkgs/muon/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/muon/template b/srcpkgs/muon/template
index 310187b9aac5..31ea11c5109b 100644
--- a/srcpkgs/muon/template
+++ b/srcpkgs/muon/template
@@ -1,23 +1,23 @@
 # Template file for 'muon'
 pkgname=muon
-version=0.1.0
+version=0.2.0
 revision=1
 build_style=meson
-build_helper=qemu
+build_helper="qemu"
 configure_args="
  -Dlibcurl=enabled
  -Dlibarchive=enabled
  -Dlibpkgconf=enabled
  -Dsamurai=disabled
  -Dbestline=enabled"
-hostmakedepends="pkg-config samurai cmake"
+hostmakedepends="pkg-config samurai cmake scdoc"
 makedepends="pkgconf-devel libcurl-devel libarchive-devel"
 depends="samurai"
-checkdepends="git"
 short_desc="Meson implementation in C"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-only, Apache-2.0"
 homepage="https://muon.build"
-changelog="https://git.sr.ht/~lattis/muon/refs/$version"
+changelog="https://muon.build/releases/v${version}/docs/release_notes.html"
 distfiles="https://git.sr.ht/~lattis/muon/archive/$version.tar.gz"
-checksum="9d3825c2d562f8f8ad96d1f02167e89c4e84973decf205d127efd9293d7da35b"
+checksum=d73db1be5388821179a25a15ba76fd59a8bf7c8709347a4ec2cb91755203f36c
+make_check_pre="env PATH=/usr/libexec/chroot-git:${PATH}"

From 59078e761670059edcb0ba510d5ef0f5c3a6a7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 10 Jun 2023 18:54:43 +0100
Subject: [PATCH 0631/1854] font-sil-harmattan: update to 4.000.

---
 srcpkgs/font-sil-harmattan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sil-harmattan/template b/srcpkgs/font-sil-harmattan/template
index 79a4f8d22f43..902316a6adbf 100644
--- a/srcpkgs/font-sil-harmattan/template
+++ b/srcpkgs/font-sil-harmattan/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sil-harmattan'
 pkgname=font-sil-harmattan
-version=2.000
+version=4.000
 revision=1
 depends="font-util"
 short_desc="Arabic Warsh font designed to suit the needs of West African languages"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1"
 homepage="https://software.sil.org/harmattan/"
 distfiles="https://software.sil.org/downloads/r/harmattan/Harmattan-${version}.zip"
-checksum=0b2e1fad07b6101bfb140801a71bc53956105376fd8ac261dd76eab178280a5c
+checksum=f777b86bf874ce299895f78768d7a034e893b89bd1dfee7bd947075fd2656973
 font_dirs="/usr/share/fonts/SIL"
 
 do_install() {

From 0388095e445b2fe69a2e74ee31a980240732e2af Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Sun, 11 Jun 2023 10:15:54 -0700
Subject: [PATCH 0632/1854] zoom: update to 5.14.10.3738

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 61471d7dc3f4..7c2f5befa040 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.14.7.2928
+version=5.14.10.3738
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=86155c03b7620f31ed227ba2a83027f9a6e28deb653a020d0fbe9293ca8aa25a
+checksum=a0b2b0b1d7cab73ad884ab469d22f2a2ba895593eae78b91f2f3d5ec91710e8a
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 67d14d42d3c86c4ad507e97830355b022ac4b59e Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:27:10 +0200
Subject: [PATCH 0633/1854] zrepl: update to 0.6.0.

---
 srcpkgs/zrepl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index 11716ebcee40..bdc82dcf8a60 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
-version=0.5.0
-revision=2
+version=0.6.0
+revision=1
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"
@@ -10,8 +10,8 @@ short_desc="One-stop ZFS backup & replication solution"
 maintainer="Frans Bergman <frans@tankernn.eu>"
 license="MIT"
 homepage="https://github.com/zrepl/zrepl"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4acfde9e7a09eca2de3de5c7d2987907ae446b345b69133e4b3c58a99c294465
+distfiles="https://github.com/zrepl/zrepl/archive/v${version}.tar.gz"
+checksum=0bf1dcf634a43af81cd9a0d7b9ae65f63a5938c35d3e6cd804177c8db52929f4
 
 conf_files="/etc/zrepl/*"
 

From 27c559f75a43c7230932f28237f1280b58415f6f Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Tue, 30 May 2023 15:13:40 +0200
Subject: [PATCH 0634/1854] tpacpi-bat: update to 3.2.

---
 srcpkgs/tpacpi-bat/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tpacpi-bat/template b/srcpkgs/tpacpi-bat/template
index 59b39817b201..f2d118fcefdb 100644
--- a/srcpkgs/tpacpi-bat/template
+++ b/srcpkgs/tpacpi-bat/template
@@ -1,15 +1,15 @@
 # Template file for 'tpacpi-bat'
 pkgname=tpacpi-bat
-version=3.1
-revision=2
+version=3.2
+revision=1
 archs="i686 x86_64*"
 depends="acpi_call-dkms perl"
 short_desc="ThinkPad ACPI Battery Util using acpi_call"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/teleshoes/$pkgname"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=017084cc82061ebf2837373adb516f1fd1beb78694bbef257a1d112d6081d9d6
+homepage="https://github.com/teleshoes/tpacpi-bat"
+distfiles="https://github.com/teleshoes/tpacpi-bat/archive/v$version.tar.gz"
+checksum=ac3c2dad1db2175e8e650b81941a87a591cf50e9cdb4a64afaa70f25aa069250
 
 do_install() {
 	vbin $pkgname

From bfdd896d5bf1acf816635ca00e731c5e0a239b80 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 11 Jun 2023 00:16:57 +0300
Subject: [PATCH 0635/1854] gnome-mahjongg: update to 3.40.0

---
 .../gnome-mahjongg/patches/meson-0.61.patch   | 37 -------------------
 srcpkgs/gnome-mahjongg/template               | 11 +++---
 2 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
deleted file mode 100644
index 2a17ad713752..000000000000
--- a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:22:48 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:24:0: ERROR: Function does not take positional arguments.
-data/meson.build:45:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 8740503..edb8583 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
- install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
- 
- desktop_file = i18n.merge_file (
--  'desktop-file',
-   input:       'org.gnome.Mahjongg.desktop.in',
-   output:      'org.gnome.Mahjongg.desktop',
-   install:     true,
-@@ -41,7 +40,7 @@ if desktop_file_validate.found()
-   )
- endif
- 
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-                  input: 'org.gnome.Mahjongg.appdata.xml.in',
-                  output: 'org.gnome.Mahjongg.appdata.xml',
-                  install: true,
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 9cf1ef18d634..8f4d5992c527 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-mahjongg'
 pkgname=gnome-mahjongg
-version=3.38.3
+version=3.40.0
 revision=1
 build_style=meson
-configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
-hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="librsvg-devel gtk+3-devel libglib-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config vala
+ gtk-update-icon-cache"
+makedepends="librsvg-devel libadwaita-devel"
 short_desc="GNOME Mahjongg solitaire game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190
+checksum=5a8ac86d763c5660dd9025f7bc08310b922346fa7e2df7b648c9894dae3f183f

From 15c9bf1edc8712a391bb766879c96496f241ea5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 30 May 2023 18:00:45 +0200
Subject: [PATCH 0636/1854] quickjs: Fix stack overflow in CVE-2023-31922

---
 .../patch-gh-issue-178-cve-2023-31922.patch   | 42 +++++++++++++++++++
 srcpkgs/quickjs/template                      |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch

diff --git a/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch b/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch
new file mode 100644
index 000000000000..754924c60639
--- /dev/null
+++ b/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch
@@ -0,0 +1,42 @@
+From 056459314305f666aee132565df710c42f41ec04 Mon Sep 17 00:00:00 2001
+From: Nick Vatamaniuc <vatamane@gmail.com>
+Date: Sun, 28 May 2023 01:50:46 -0400
+Subject: [PATCH] Fix stack overflow in CVE-2023-31922
+
+isArray and proxy isArray can call each other indefinitely in a mutually
+recursive loop.
+
+Add a stack overflow check in the js_proxy_isArray function before calling
+JS_isArray(ctx, s->target).
+
+With ASAN the the poc.js from issue 178:
+
+```
+./qjs ./poc.js
+InternalError: stack overflow
+  at isArray (native)
+  at <eval> (./poc.js:4)
+```
+
+Fix: https://github.com/bellard/quickjs/issues/178
+---
+ quickjs.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/quickjs.c b/quickjs.c
+index 79160139..a3b0b55f 100644
+--- a/quickjs.c
++++ b/quickjs.c
+@@ -45243,6 +45243,12 @@ static int js_proxy_isArray(JSContext *ctx, JSValueConst obj)
+     JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
+     if (!s)
+         return FALSE;
++
++    if (js_check_stack_overflow(ctx->rt, 0)) {
++        JS_ThrowStackOverflow(ctx);
++        return -1;
++    }
++
+     if (s->is_revoked) {
+         JS_ThrowTypeErrorRevokedProxy(ctx);
+         return -1;
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 7cfe6f3e7f43..562ca371bc5d 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickjs'
 pkgname=quickjs
 version=2021.03.27
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=true
 make_build_args="CONFIG_LTO="

From 6a13508744b79214e786fbf4cf925ad53ea80bf1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 12 Jun 2023 00:56:01 +0200
Subject: [PATCH 0637/1854] terragrunt: update to 0.46.3.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fc654aa02f70..8be2655d6368 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.46.2
+version=0.46.3
 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=0d8bb4e98276e68c76d770e662bb434fb5c89f8fc06c3c00e14e717417123ec5
+checksum=7ccb057317d5c7073a3c510ab9670cdb429dde87e5c6b18597a3118a6b0107dc
 
 post_install() {
 	vlicense LICENSE.txt

From 6b55bd5924dd9200eff70313c2ada85acec551a9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 10 Jun 2023 12:09:22 +0530
Subject: [PATCH 0638/1854] d2: update to 0.5.1.

---
 srcpkgs/d2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index a9417fefa503..57f3d732b43a 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,6 +1,6 @@
 # Template file for 'd2'
 pkgname=d2
-version=0.4.2
+version=0.5.1
 revision=1
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
@@ -11,4 +11,4 @@ license="MPL-2.0"
 homepage="https://d2lang.com/"
 changelog="https://d2lang.com/releases/intro/"
 distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
-checksum=5a7fb24f2116ff63f7350c60933134a80d93f0e4f298f7d2b654e2e3ee58378a
+checksum=245e3864fcdf2f82eafd7878a38f57e43065324fd7709332e2b8544af8f1f131

From 5f58142a995acf880337bcf4fee878f200b83b0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 12 Jun 2023 12:20:29 +0200
Subject: [PATCH 0639/1854] youtube-viewer: update to 3.10.8.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 26710b9f4e82..353c253df8a5 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.10.7
+version=3.10.8
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=aa929b3157486587c70c6757d7995c8d6a0a89bc41a6c0fdb587aa3447c37c94
+checksum=010e2af3337842b039f9e582330a5ac0ffa1bf94b53bed016e4a07049f3a6b94
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 7c70139ac1cb19b44772cbf6cd058811e0a991a8 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 12 Jun 2023 08:26:59 +0200
Subject: [PATCH 0640/1854] acme.sh: update to 3.0.6

---
 srcpkgs/acme.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template
index 20a13462210c..92c12cb60636 100644
--- a/srcpkgs/acme.sh/template
+++ b/srcpkgs/acme.sh/template
@@ -1,13 +1,13 @@
 # Template file for 'acme.sh'
 pkgname=acme.sh
-version=3.0.5
+version=3.0.6
 revision=1
 short_desc="Pure Unix shell script implementing ACME client protocol"
 maintainer="Emil Miler <em@0x45.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/acmesh-official/acme.sh"
 distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz"
-checksum=a19132ed65491409a8d8a93c264dcbcf265a91d45a46de674811b93f5995398f
+checksum=4a8e44c27e2a8f01a978e8d15add8e9908b83f9b1555670e49a9b769421f5fa6
 
 do_install() {
 	vmkdir usr/share/acme.sh/deploy

From 93e3bce1a2adb6b6301ca0ca333760f09172d6b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 12 Jun 2023 14:36:27 +0200
Subject: [PATCH 0641/1854] scrot: update to 1.10.

---
 srcpkgs/scrot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 4e5b5b44492e..7c3edc74ee6e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,6 +1,6 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.9
+version=1.10
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=c4bf3fc88331a1fb0c78dba541a873b43fdeb6f7cde673162950a1290d0bf688
+checksum=5f18f5234964513409141eb08b268c83e9e5d340062de37c3a04772be4bf4058
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"

From 6a9ecd60f4c2dcb64b8e6e643640096794fdaa7f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 12 Jun 2023 14:39:14 +0200
Subject: [PATCH 0642/1854] nsd: update to 4.7.0.

---
 srcpkgs/nsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 96d681ab0191..fae1cf58b12e 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.6.1
+version=4.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3f60a3a13ec3f68e84bfa7e19daff663c82bcf1de96e4f53f2246525e773a27a
+checksum=8faca44e299ad2915fa000887ab1632631ea68709c62ce35f110bfe721ecf214
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From c639023d0d486d49d9dfba78452091cc466c3c45 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Jun 2023 15:22:27 -0400
Subject: [PATCH 0643/1854] curl: disable ssh option to break build cycle

Now that libssh2 builds with cmake, enabling SSH support in curl
introduces a build cycle:

    binutils -> elfutils -> curl -> libssh2 -> cmake -> curl

Because SSH support in curl seems superfluous anyway, just disable it.
---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 1ce72a58c188..b43961934747 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=8.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  --enable-websockets --with-random=/dev/urandom
@@ -27,7 +27,7 @@ changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/curl-${version}.tar.bz2"
 checksum=9b6b1e96b748d04b968786b6bdf407aa5c75ab53a3d37c1c8c81cdb736555ccf
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
-build_options_default="ssh ssl zstd"
+build_options_default="ssl zstd"
 vopt_conflict ssl gnutls
 
 if [ "$CROSS_BUILD" ]; then

From 30cb872e0366ac26aa2a0752e376f389cee05dc2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 11 Jun 2023 18:34:26 +0200
Subject: [PATCH 0644/1854] pnpm: update to 8.6.1

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 5e3f10c0aa8b..f3e52bc62974 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=8.6.0
+version=8.6.1
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=1e9c17c34c2eebaba02e78b619e296db08d302c296e58c2f51b0cd4e3e5bcda2
+checksum=5380612e01e0a3029991d3f329f07429313f4825de47b885b4bb3d1aec9e44e1
 python_version=3
 
 do_install() {

From 112e814c76c2444e8700929ef019d582b24b3bd2 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 10 Jun 2023 11:49:08 +0530
Subject: [PATCH 0645/1854] python3-platformdirs: update to 3.5.3.

---
 srcpkgs/python3-platformdirs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index 033324479559..dc60d45ecfa4 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.5.1
+version=3.5.3
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f
+checksum=e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From bfe1f8c3fe985120062fdf2532df06d83983ca2c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 5 Jun 2023 19:28:15 +0530
Subject: [PATCH 0646/1854] usql: update to 0.14.8.

---
 srcpkgs/usql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index c2b9ba4a303e..10451ea33b52 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
 # Template file for 'usql'
 pkgname=usql
-version=0.14.6
+version=0.14.8
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="MIT"
 homepage="https://github.com/xo/usql"
 distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=b6ec5aa900f10ff34a2120b8a8de473c3ac192d887215fc58722093fd27054e8
+checksum=56e4a0c384a32abe61b7aa37fa5d72e830ed459757c06da9cc000333892f1094
 
 post_install() {
 	vlicense LICENSE

From 96c0c215cc16f376b9258ce256e03893de14eb40 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Thu, 1 Jun 2023 01:51:40 -0300
Subject: [PATCH 0647/1854] python3-lsp-server: update to 1.7.3.

---
 srcpkgs/python3-lsp-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
index d3624735f4db..e1f6d28beaed 100644
--- a/srcpkgs/python3-lsp-server/template
+++ b/srcpkgs/python3-lsp-server/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-lsp-server'
 pkgname=python3-lsp-server
-version=1.7.2
-revision=2
+version=1.7.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
 depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://github.com/python-lsp/python-lsp-server"
 changelog="https://raw.githubusercontent.com/python-lsp/python-lsp-server/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/python-lsp-server/python-lsp-server-${version}.tar.gz"
-checksum=b2433467d0fcb8fd45828463ff1cc805837c08731fcea5d7d953d9be776881e1
+checksum=a31b0525be6ec831c7d2b476b744e5aa5074633e1d1b77ee97f332cde15983ea
 
 do_check() {
 	python3 -m pytest \

From 30690087ebf3cb8421cc3b4b6254c79f22ca9cdb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 13:54:44 +0200
Subject: [PATCH 0648/1854] trace-cmd: update to 3.2.

---
 srcpkgs/trace-cmd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template
index 22bae936a8e2..9ebbb861b63e 100644
--- a/srcpkgs/trace-cmd/template
+++ b/srcpkgs/trace-cmd/template
@@ -1,6 +1,6 @@
 # Template file for 'trace-cmd'
 pkgname=trace-cmd
-version=3.1.6
+version=3.2
 revision=1
 build_style=gnu-makefile
 make_build_args="libdir_relative=lib${XBPS_TARGET_WORDSIZE}"
@@ -10,13 +10,13 @@ make_install_target="install install_libs install_doc"
 make_use_env=yes
 hostmakedepends="asciidoc xmlto source-highlight pkg-config"
 makedepends="libzstd-devel libtracefs-devel libtraceevent-devel"
-checkdepends="CUnit-devel"
 short_desc="Tools to use ftrace Linux kernel internal tracer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, LGPL-2.1-only"
 homepage="https://trace-cmd.org"
 distfiles="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"
-checksum=f9198ea306deee9cda3b262342b03b6029e82c1b9c671ba521739a9703e115b9
+checksum=62af2c6062eeb434925921bb5936774b0a0e17a5f86671fa2ea2f40704a080cd
+make_check=no # needs privileges
 
 post_install() {
 	rm ${DESTDIR}/etc/bash_completion.d/*

From 7b583fb2d2f94d55ebd1acc27a716d8f0772da17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 13:55:33 +0200
Subject: [PATCH 0649/1854] b3sum: update to 1.4.0.

---
 srcpkgs/b3sum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/b3sum/template b/srcpkgs/b3sum/template
index 80b08f8fddcf..8d5ef73962e2 100644
--- a/srcpkgs/b3sum/template
+++ b/srcpkgs/b3sum/template
@@ -1,6 +1,6 @@
 # Template file for 'b3sum'
 pkgname=b3sum
-version=1.3.3
+version=1.4.0
 revision=1
 build_wrksrc="b3sum"
 build_style=cargo
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CC0-1.0"
 homepage="https://github.com/BLAKE3-team/BLAKE3/"
 distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
-checksum=27d2bc4ee5945ba75434859521042c949463ee7514ff17aaef328e23ef83fec0
+checksum=012db50d676c177842650ff55235990b8dc73d18e4e4730824773df22257fb51

From ba8e5b0cbc4a7e095c92da27d766bf174c60a004 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 13:56:34 +0200
Subject: [PATCH 0650/1854] byacc: update to 20230521.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 926937cb4d33..de2d3a3f2047 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20230219
+version=20230521
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://invisible-island.net/byacc/"
 distfiles="https://invisible-island.net/archives/byacc/byacc-${version}.tgz"
-checksum=36b972a6d4ae97584dd186925fbbc397d26cb20632a76c2f52ac7653cd081b58
+checksum=5ad915a7d5833aa38a5e31bd077505666029c35e365dff8569fe4598eaa9fef2
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From b849ae1c0e6dcb0192466ef5805acd5ad4e345f2 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sat, 10 Jun 2023 11:15:41 +0200
Subject: [PATCH 0651/1854] antimicrox: update to 3.3.4

---
 srcpkgs/antimicrox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/antimicrox/template b/srcpkgs/antimicrox/template
index 11e54c4cc47f..c2207a398fcb 100644
--- a/srcpkgs/antimicrox/template
+++ b/srcpkgs/antimicrox/template
@@ -1,6 +1,6 @@
 # Template file for 'antimicrox'
 pkgname=antimicrox
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules itstool gettext qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/AntiMicroX/antimicrox"
 changelog="https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/CHANGELOG.md"
 distfiles="https://github.com/AntiMicroX/antimicrox/archive/${version}.tar.gz"
-checksum=80c446b1149b742b51e3b6d355866294bd6171f48534b3cf23848011736edc2b
+checksum=c5e8d7c827f64b0a162133f9cac2ddc8dc0c9243541fae1a8ced5424b4fb7b3c
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From b0a175943bae787fcf7350053b46832513831e70 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Sat, 10 Jun 2023 09:59:56 +0200
Subject: [PATCH 0652/1854] got: update to 0.89

---
 srcpkgs/got/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 6cae12702ada..873094582d8a 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
 # Template file for 'got'
 pkgname=got
-version=0.88
+version=0.89
 revision=1
 build_style=gnu-configure
 hostmakedepends="byacc pkg-config"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://gameoftrees.org"
 changelog="https://gameoftrees.org/releases/CHANGES"
 distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="17c10730a010abf7d5fe2ebe55fe3686656385ba6dbae88ef337c4f647f3cea0"
+checksum="27404932c07713400124c15e318417385411b7a1fe7ee534e48f2b9e4f096d8c"
 
 post_install() {
 	sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE

From b97fafa9883e12170ff7e378b3f758bf3c0076a4 Mon Sep 17 00:00:00 2001
From: voidbert <humbertogilgomes@protonmail.com>
Date: Fri, 9 Jun 2023 15:23:16 +0100
Subject: [PATCH 0653/1854] doxygen: update to 1.9.7.

---
 srcpkgs/doxygen/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 981eb49049a9..f627aa84027b 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,7 +1,7 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.5
-revision=2
+version=1.9.7
+revision=1
 build_style=cmake
 hostmakedepends="perl python3 flex"
 checkdepends="libxml2 texlive-BibTeX"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=55b454b35d998229a96f3d5485d57a0a517ce2b78d025efb79d57b5a2e4b2eec
+checksum=87007641c38e2c392c8596f36711eb97633b984c8430f389e7bcf6323a098d94
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From e3f63e5b2e631184f06225640eb968f07d5dfa06 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 9 Jun 2023 12:15:23 +0300
Subject: [PATCH 0654/1854] python3-regex: update to 2023.6.3.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 9bb4c0912487..bf85b2b4db12 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2023.5.5
+version=2023.6.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://github.com/mrabarnett/mrab-regex"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=7d76a8a1fc9da08296462a18f16620ba73bcbf5909e42383b253ef34d9d5141e
+checksum=72d1a25bf36d2050ceb35b517afe13864865268dfb45910e2e17a84be6cbfeb0
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 3314e14cc02d1e640554f706c7ac26077ed7bcb3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 9 Jun 2023 12:07:37 +0300
Subject: [PATCH 0655/1854] nghttp2: update to 1.54.0.

---
 srcpkgs/nghttp2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 13dc332d9ca6..592193c90792 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,6 +1,6 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
-version=1.53.0
+version=1.54.0
 revision=1
 build_style=gnu-configure
 # build system errors out if python isn't available
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://nghttp2.org"
 distfiles="https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=b867184254e5a29b0ba68413aa14f8b0ce1142a371761374598dec092dabb809
+checksum=20533c9354fbb6aa689b6aa0ddb77f91da1d242587444502832e1864308152df
 python_version=3
 
 post_install() {

From 212b257a57a6e335758b45954cf96606beacf8ec Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Fri, 9 Jun 2023 03:29:14 -0300
Subject: [PATCH 0656/1854] oil: update to 0.16.0

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 72f6708e5157..e39a0124d456 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.15.0
+version=0.16.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="https://www.oilshell.org/download/oil-${version}.tar.xz"
-checksum=d6860ffec461606da825863cd163b1a925f0ab250c6e32197739c11dc9c63318
+checksum=7111c8a8571d1a6d1d620131bc67f377dd8fe6224edbeff249e1d5d68f1dd566
 register_shell="/usr/bin/osh /usr/bin/oil"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 80d9e13b7ab98f016ba51d4c0c70d33817f345a6 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Tue, 13 Jun 2023 08:02:56 -0400
Subject: [PATCH 0657/1854] font-iosevka: update to 24.1.3.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index c464f5a8d207..aeadf16c95b6 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=24.1.1
+version=24.1.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
 changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
 distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="f452e564737131c4425c6784024d9b9fb83d24a4775ca7fb1f03e21a466137f5
- e33e7785e34892506e60def6d6e2b38b2bb87edd9fdeaedc53913e6d0fb66ea0"
+checksum="25ec1fff2d7ed2707be5a5ae40cd4c0d929cd78c80f8ff9445326951ce746987
+ a03ab099709b7a988065ef94ff25edc98ed1491b29fd3246233963e7f343d357"
 
 font_dirs="/usr/share/fonts/TTF"
 

From a10abbbfe29824de1c2c671df26c3b9f6fac4b34 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 02:15:37 +0300
Subject: [PATCH 0658/1854] python3-setproctitle: update to 1.3.1

---
 srcpkgs/python3-setproctitle/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
index 42bd3cf78d18..fd707cfb9908 100644
--- a/srcpkgs/python3-setproctitle/template
+++ b/srcpkgs/python3-setproctitle/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-setproctitle'
 pkgname=python3-setproctitle
-version=1.2.1
-revision=3
+version=1.3.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest procps-ng"
 short_desc="Python3 library to allow customization of the process title"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/dvarrazzo/py-setproctitle"
 distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=5f0eecb27815e31799a69eb6a06b4d375d38887d079d410565b0be82da65c950
+checksum=3d134c2effeb945e8227f7d3d24ea8ad49c03c87ac91a8d67bf967730fa9daba
 
 post_install() {
 	vlicense COPYRIGHT LICENSE

From 0250a0e508ec59ee94f6129c186977642ff64986 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Tue, 13 Jun 2023 01:06:49 +0200
Subject: [PATCH 0659/1854] docker-compose: update to 2.18.1

---
 srcpkgs/docker-compose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 5d33c60c9209..7271843da8cf 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=2.17.2
+version=2.18.1
 revision=1
 build_style=go
 go_import_path="github.com/docker/compose/v2/cmd"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 changelog="https://github.com/docker/compose/releases"
 distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=d6e6de858ecdb0104991c86c66dde5dd4fb6a1160d707308d8ad3167450c8094
+checksum=192c47c177d9bfd8492ed0c49214af0c740586da6db0b7e9c9a07da37c9dc722
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins

From f0506bceaa047f9ca3548edbb51c8b6f073baf23 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Jun 2023 13:34:54 +0530
Subject: [PATCH 0660/1854] pscircle: update to 1.4.0.

---
 srcpkgs/pscircle/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pscircle/template b/srcpkgs/pscircle/template
index 792245d8f2b6..6ca3a0d0990f 100644
--- a/srcpkgs/pscircle/template
+++ b/srcpkgs/pscircle/template
@@ -1,6 +1,6 @@
 # Template file for 'pscircle'
 pkgname=pscircle
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,5 +9,6 @@ short_desc="Radial tree process visualisation"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/mildlyparallel/pscircle"
+changelog="https://gitlab.com/mildlyparallel/pscircle/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/mildlyparallel/pscircle/-/archive/v${version}/pscircle-v${version}.tar.gz"
-checksum=29e278e34816be06b3355394b15a8db6b5818ddb305181be7dd408f4cdc43f43
+checksum=99a4fa1d7e4ca28b067c5c2bb977352b4e6fcb9eb22349c9d33456971f282d7f

From b5c4d15484cec7819ae0110f9bec920f0a08b968 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Jun 2023 14:01:06 +0530
Subject: [PATCH 0661/1854] python3-requests-toolbelt: update to 1.0.0.

Adopt.
---
 srcpkgs/python3-requests-toolbelt/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-requests-toolbelt/template b/srcpkgs/python3-requests-toolbelt/template
index 01b8272cca2e..c87ee8e31c16 100644
--- a/srcpkgs/python3-requests-toolbelt/template
+++ b/srcpkgs/python3-requests-toolbelt/template
@@ -1,13 +1,16 @@
 # Template file for 'python3-requests-toolbelt'
 pkgname=python3-requests-toolbelt
-version=0.9.1
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=1.0.0
+revision=1
+build_style=python3-pep517
+make_check_args="--ignore tests/test_x509_adapter.py"
+hostmakedepends="python3-wheel python3-setuptools"
 depends="python3-requests"
+checkdepends="python3-pytest python3-openssl python3-betamax python3-trustme"
 short_desc="Utilities for advanced use of python-requests (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="Apache-2.0"
 homepage="https://toolbelt.readthedocs.io"
+changelog="https://raw.githubusercontent.com/requests/toolbelt/master/HISTORY.rst"
 distfiles="${PYPI_SITE}/r/requests-toolbelt/requests-toolbelt-${version}.tar.gz"
-checksum=968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0
+checksum=7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6

From dfddbcbd768b7a6ed68b859ddf7dd032ec7e3d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 12 Jun 2023 17:02:26 +0200
Subject: [PATCH 0662/1854] tectonic: update to 0.14.0.

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 59f2209266a9..e07f8841815b 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.13.1
+version=0.14.0
 revision=1
 build_style=cargo
 configure_args="--features=external-harfbuzz"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=bc16c2d7c85b646f5d168371a6cf1f2c219d8fcdcc919addcc9d74ce0cfbd442
+checksum=2191e3599b7e34f01d24a8d0ed873d8a8696e5ed4af05e9ce30685a053e9b57a
 
 post_install() {
 	vlicense LICENSE

From 27637a151a184b079b6709cfc7ab16880e86f18e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 12 Jun 2023 11:07:17 -0400
Subject: [PATCH 0663/1854] jdupes: update to 1.24.0

---
 srcpkgs/jdupes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index df162703bb76..3124ed79ffea 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.23.0
+version=1.24.0
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=5fdf7646518a26fefc322d7c9a5953c61db72d96626120ffa7f18197b59153d1
+checksum=76ee1ffcf958958c3e093bbe9674c9410d4b1d730081b50f6d1e2dc342b230dd
 
 post_install() {
 	vlicense LICENSE

From 5e576d02bc20872776d22c157a82a6307e5d1e52 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 15:20:10 +0100
Subject: [PATCH 0664/1854] diff-pdf: update to 0.5.1.

---
 srcpkgs/diff-pdf/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index d58932a4a0df..1b1c1b690814 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,18 +1,15 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
-version=0.5
-revision=2
+version=0.5.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
-hostmakedepends="automake pkg-config"
-makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
+hostmakedepends="pkg-config"
+makedepends="wxWidgets-gtk3-devel cairo-devel poppler-glib-devel"
 short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
-homepage="http://vslavik.github.io/diff-pdf/"
-distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
-checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475
-
-pre_configure() {
-	./bootstrap
-}
+homepage="https://vslavik.github.io/diff-pdf/"
+changelog="https://github.com/vslavik/diff-pdf/releases"
+distfiles="https://github.com/vslavik/diff-pdf/releases/download/v${version}/diff-pdf-${version}.tar.gz"
+checksum=017d52cb7ddabdbf63c6a47f39b2e5a1790022b95295b0d047817904e093245c

From 52e046c3251a36be7fce98f158890825d65f87fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 12 Jun 2023 16:24:50 +0200
Subject: [PATCH 0665/1854] epy: update to 2023.6.11.

---
 srcpkgs/epy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/epy/template b/srcpkgs/epy/template
index ba5c54cef647..de7963bce66f 100644
--- a/srcpkgs/epy/template
+++ b/srcpkgs/epy/template
@@ -1,9 +1,9 @@
 # Template file for 'epy'
 pkgname=epy
-version=2023.2.8
+version=2023.6.11
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="CLI ebook reader"
@@ -11,4 +11,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/wustho/epy"
 distfiles="https://github.com/wustho/epy/archive/refs/tags/v${version}.tar.gz"
-checksum=22404cb30a4886d1fa7f75c6792b81a280ccb1d458ac56e0ec08adc864e507ff
+checksum=9f29b7fdc6312bc89adafd86acce93959b5d9eb62ea0a942c8d345c18ee5c87f

From f832143bb91b1d542e93dff0d91ebeb955f212e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 12 Jun 2023 15:12:00 +0100
Subject: [PATCH 0666/1854] xorg-server-xwayland: update to 23.1.2.

---
 srcpkgs/xorg-server-xwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index d3268e282961..e4c44e034575 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=23.1.1
+version=23.1.2
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
@@ -16,7 +16,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=5a10b26c62495435449f9bd5aad3db8ad29fe8eccd7cf7324011cd981d82dbf0
+checksum=ea63218a4608cf88e98b1437de87f4757acf0d162eae8160559465385e01d391
 make_check=no # needs xtest repository
 
 post_install() {

From f4f0243a43f24a3cd12e671aef357fa52c4370d5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Jun 2023 10:10:36 -0400
Subject: [PATCH 0667/1854] memtest86+: update to 6.20, adopt.

- improve grub hook to support the efi bundle from upstream
- fix update check
---
 srcpkgs/memtest86+/files/20_memtest86+ | 62 +++++++++++++++++++-------
 srcpkgs/memtest86+/template            | 17 ++++---
 srcpkgs/memtest86+/update              |  3 +-
 3 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/memtest86+/files/20_memtest86+ b/srcpkgs/memtest86+/files/20_memtest86+
index aa9b84013548..38648b365f86 100644
--- a/srcpkgs/memtest86+/files/20_memtest86+
+++ b/srcpkgs/memtest86+/files/20_memtest86+
@@ -9,21 +9,49 @@ fi
 
 . /usr/share/grub/grub-mkconfig_lib
 
-if test -e /boot/memtest86+ ; then
-  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
-  echo "Found memtest86+ image: $MEMTESTPATH" >&2
-  cat << EOF
-menuentry "Memory test (memtest86+)" {
-EOF
-  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
-  cat << EOF
-	linux16 $MEMTESTPATH
-}
-menuentry "Memory test (memtest86+, serial console 115200)" {
-EOF
-  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
-  cat << EOF
-	linux16 $MEMTESTPATH console=ttyS0,115200n8
-}
-EOF
+if [ "${grub_platform}" != "efi" ]; then
+	MEMTESTSFX="bin"
+else
+	MEMTESTSFX="efi"
+fi
+
+if [ -e /boot/memtest.bin ]; then
+	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.bin" )
+	echo "Found memtest86+ image: $MEMTESTPATH" >&2
+	cat <<- EOF
+	if [ "\${grub_platform}" != "efi" ]; then
+	menuentry "Memory test (memtest86+)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH
+	}
+	menuentry "Memory test (memtest86+, serial console 115200)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH console=ttyS0,115200n8
+	}
+	fi
+	EOF
+fi
+if [ -e /boot/memtest.efi ]; then
+	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.efi" )
+	echo "Found memtest86+ image: $MEMTESTPATH" >&2
+	cat <<- EOF
+	if [ "\${grub_platform}" = "efi" ]; then
+	menuentry "Memory test (memtest86+)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH
+	}
+	menuentry "Memory test (memtest86+, serial console 115200)" {
+	EOF
+	prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
+	cat <<- EOF
+		linux $MEMTESTPATH console=ttyS0,115200n8
+	}
+	fi
+	EOF
 fi
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index ecffaa62c401..1fc9559e9908 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,20 +1,19 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
-version=5.01
-revision=6
+version=6.20
+revision=1
 archs="i686* x86_64*"
 short_desc="Advanced Memory Diagnostic Tool - upstream binary"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz"
-checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8
-
-create_wrksrc=yes
+distfiles="https://www.memtest.org/download/v${version}/mt86plus_${version}.binaries.zip"
+checksum=ccabd43063b65e53be4fddb08de0cc6bedc94b4ab44706855e4145e17fa52c72
 nostrip=yes
 noverifyrdeps=yes
 
 do_install() {
-	vinstall memtest86+-5.01.bin 755 boot memtest86+
-	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
+	vinstall "memtest${XBPS_TARGET_WORDSIZE}.bin" 755 boot memtest.bin
+	vinstall "memtest${XBPS_TARGET_WORDSIZE}.efi" 755 boot memtest.efi
+	vinstall "${FILESDIR}/20_memtest86+" 755 etc/grub.d
 }
diff --git a/srcpkgs/memtest86+/update b/srcpkgs/memtest86+/update
index 7730266b3518..9aa0b361aefd 100644
--- a/srcpkgs/memtest86+/update
+++ b/srcpkgs/memtest86+/update
@@ -1 +1,2 @@
-ignore="*[!0-9]"
+site="https://github.com/memtest86plus/memtest86plus/tags"
+pattern='/archive/refs/tags/v\K[0-9.]+(?=\.tar\.gz)'

From 33b339cc606b724c8a02c6fbba4f35060fa39c5e Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 11 Jun 2023 20:45:46 +0200
Subject: [PATCH 0668/1854] pyradio: update to 0.9.2.7.

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index cfd11b0339af..65c463fe6539 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.6
+version=0.9.2.7
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=92f46fde9b298392f8f236126b47e3f0214d152b3f07ef04e8f2ae9b1800bd97
+checksum=3694b423aa7b3302f90db9a620aa8155ee05501493d748544522f70f50a50d81
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 94b2b73f1fa7efa6a58aa02155e3528a3637eebf Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Mon, 12 Jun 2023 11:12:12 +0200
Subject: [PATCH 0669/1854] element-desktop: update to 1.11.33.

---
 srcpkgs/element-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 4c805a19f318..884a022da7f5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.11.32
+version=1.11.33
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -17,8 +17,8 @@ homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
 distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
-checksum="be4cc53354741690361aa5c933828a6f16a9826546650f03202005d449afc1d2
- 5aa9c183a8e23e0114d51339519be1a14081c76531a4828057fec1a7f171f2b2"
+checksum="ac657d25576c6151f4a96ce067363d27bbc0ed940b3c16d79eee5fafc5ce0024
+ 4015804125d448065c68e1f9e8673c1fea9f11a2e937159edbdc64113c564d45"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 2551d0285147eccbbb570c2fed5ae016e4e9f715 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 12 Jun 2023 01:36:53 +0300
Subject: [PATCH 0670/1854] timeshift: update to 23.06.2

---
 srcpkgs/timeshift/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 3e8fa0d212c4..05a171c266e9 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,26 +1,26 @@
 # Template file for 'timeshift'
 pkgname=timeshift
-version=22.11.2
+version=23.06.2
 revision=1
-build_style=gnu-makefile
-hostmakedepends="gettext pkg-config vala which"
-makedepends="libgee-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
-depends="rsync psmisc"
+build_style=meson
+hostmakedepends="gettext pkg-config vala help2man"
+makedepends="libgee-devel json-glib-devel vte3-devel libgirepository-devel
+ xapps-devel libxkbfile-devel"
+depends="rsync psmisc xhost"
 short_desc="System restore tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/linuxmint/timeshift"
 changelog="https://raw.githubusercontent.com/linuxmint/timeshift/master/debian/changelog"
 distfiles="https://github.com/linuxmint/timeshift/archive/${version}/timeshift-${version}.tar.gz"
-checksum=36fd19865d1d30dc5f6eca468ceaa3dad01cd95d9090d050d67f5c2cd98fe37d
+checksum=a88c947a70e850fcac11e34484bd9074ec48302998f9d734f579387b5b88eeaf
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends=${hostmakedepends%help2man}
+	configure_args="-Dman=false"
+fi
 
 # Remove hard-dep on crontab, leave up to user to decide
 post_extract() {
 	vsed -i src/Core/Main.vala -e '/dependencies/s:"crontab",::'
 }
-
-# timeshift.1.gz is not a gzip file.
-pre_install() {
-	mv man/timeshift.1.gz man/timeshift.1
-	gzip man/timeshift.1
-}

From 0f8139e2f4d0d8adfdb07cc5ee6a6984d5b44ec8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 11 Jun 2023 22:46:22 +0100
Subject: [PATCH 0671/1854] fluidsynth: update to 2.3.2.

---
 srcpkgs/fluidsynth/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index eab2facc39a7..31594e422a73 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.3.0
+version=2.3.2
 revision=1
 build_style=cmake
 make_check_target=check
@@ -11,9 +11,10 @@ makedepends="SDL2-devel glib-devel jack-devel libsndfile-devel pipewire-devel pu
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.fluidsynth.org/"
+homepage="https://www.fluidsynth.org/"
+changelog="https://github.com/FluidSynth/fluidsynth/releases"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=1df5a1afb91acf3b945b7fdb89ac0d99877622161d9b5155533da59113eaaa20
+checksum=cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 08fed2c913f88b2109c12eaf33233de80446262a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:51:02 -0400
Subject: [PATCH 0672/1854] aravis: update to 0.8.27.

---
 srcpkgs/aravis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 2c7f25f2c958..09ecb091d08e 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -1,6 +1,6 @@
 # Template file for 'aravis'
 pkgname=aravis
-version=0.8.26
+version=0.8.27
 revision=1
 build_style=meson
 configure_args="-Ddocumentation=enabled"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/AravisProject/aravis"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fb6f0f0c1b47bb29d19ce8e5630be6e22534015fa56000891940c78e064b194
+checksum=68700b2f1b871707f92a89f0aa22941bc525ca3657620968b4b90a9d9b512b2b
 # Network test causes timeout in CI
 make_check=ci-skip
 

From 86e89536aafa99d49a8180ebef16654bd00160ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:52:07 -0400
Subject: [PATCH 0673/1854] maturin: update to 1.1.0.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 210d359f7e56..a0b5a85dbf40 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=python3-pep517
 build_helper="qemu rust"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/PyO3/maturin"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c4141615078313a5afbb581fefc4b3673c24466d37c939dc44a816a265067c74
+checksum=57b990348a9182897d64e7bc2b7be6e323912500c10a56174090fa8008173ad0
 # Tests use unstable features and fail to build
 make_check=no
 

From 1971d4f57684c96232829293e527c95b22a0e6f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:52:50 -0400
Subject: [PATCH 0674/1854] python3-imageio: update to 2.31.1.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 859954e3973c..f8854d04daa1 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.31.0
+version=2.31.1
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2833a9e648a7d95d3dbbe74d3488283de59722463c67fa4d0481185f7de29ed6
+checksum=7aef6dc3d10e270404ab9f826612a4b851198beacea5416af615bf29d87e2a35
 
 post_install() {
 	vlicense LICENSE

From 7c112baf32d857ec75f56116ec3fe2dd767645bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:54:27 -0400
Subject: [PATCH 0675/1854] python3-hypothesis: update to 6.78.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 67321c20e2d2..21f3e940e2d3 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.76.0
+version=6.78.0
 revision=1
 build_wrksrc=hypothesis-python
 build_style=python3-pep517
@@ -24,7 +24,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=4564bbd860413af105dcdee6d5a9f8a1d08274f940266dfd2b45492d61f8b847
+checksum=d0d9059f9f87da798802a6cc92e55b15bb3c16e4df824618e6d6f9d508cdbae6
 
 if [ "$XBPS_CHECK_PKGS" != full ]; then
 	# Skip "full" tests unless explicitly requested"

From 22de3e5d21bd72c4d703d85ebe1cd65426fc1c57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:57:44 -0400
Subject: [PATCH 0676/1854] python3-iso8601: update to 2.0.0.

---
 srcpkgs/python3-iso8601/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template
index 52cdd1f1b6da..3a5281c7a98e 100644
--- a/srcpkgs/python3-iso8601/template
+++ b/srcpkgs/python3-iso8601/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-iso8601'
 pkgname=python3-iso8601
-version=1.1.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=2.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3"
 checkdepends="python3-pytest python3-hypothesis python3-pytz"
 short_desc="ISO8601 formatted dated parser for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/micktwomey/pyiso8601"
+changelog="https://raw.githubusercontent.com/micktwomey/pyiso8601/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f
+checksum=739960d37c74c77bd9bd546a76562ccb581fe3d4820ff5c3141eb49c839fda8f
 replaces="python3-iso-8601>=0"
 
 post_install() {

From 974fc41104a073e73824aa0674fcd9b25fae8321 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:58:26 -0400
Subject: [PATCH 0677/1854] python3-ultrajson: update to 5.8.0.

---
 srcpkgs/python3-ultrajson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index b01ead00f297..2fb7a15f6bcc 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=5.7.0
+version=5.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23
+checksum=78e318def4ade898a461b3d92a79f9441e7e0e4d2ad5419abed4336d702c7425
 
 export UJSON_BUILD_NO_STRIP=1
 

From 682a03891e647a44b63221870fc9aaa7c6716d10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:58:50 -0400
Subject: [PATCH 0678/1854] qtutilities: update to 6.12.2.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 06cc1b888bd8..a92b9858837b 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.12.1
+version=6.12.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=83a68a39a2edbd1ba3ec2e50b9b4c84ed5a54c30fb3cb1bc3088e8d0290989c2
+checksum=1e8ad562fdf02e6a8d8fbbfda43ba7082a97d632fe330862b6cf661a3dd6b22a
 
 pre_check() {
 	ninja -C build tests

From f6456c388a43e1bbc45bd99a35bac7c8a2fc31f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 08:59:18 -0400
Subject: [PATCH 0679/1854] tageditor: update to 3.8.1.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 26b4421b4396..d780c96fbd64 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.8.0
+version=3.8.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz"
-checksum=9ab25924be61b1ddd12510c2fa90a9fd9ebae1b634764e50415f47c1e0be28ab
+checksum=92965ed67676e46196d3178c99deb043d0af36c78f3756d72837de9fdfa10937
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 7cf0ba7c2528ccaaa25badecca4baf1858bd08f3 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 12 Jun 2023 15:01:12 +0200
Subject: [PATCH 0680/1854] kteatime: update homepage.

---
 srcpkgs/kteatime/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 50e8336e6533..023218632f31 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -9,7 +9,7 @@ makedepends="kparts-devel knotifyconfig-devel"
 short_desc="Handy timer for steeping tea"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
-homepage="https://www.kde.org/applications/games/kteatime/"
+homepage="https://apps.kde.org/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
 checksum=3b6fd3d343ba79e5ecba05dc7f6d2d02ddc9f60a296737dea4242ff5d0042404

From fb41003602d5f34aace484d3f3275e594ba0d799 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 3 Jun 2023 20:16:37 +0200
Subject: [PATCH 0681/1854] hcloud: update to 1.34.1.

---
 srcpkgs/hcloud/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 8307a8578f4e..fcdc3c3963fc 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.33.1
+version=1.34.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,8 +11,9 @@ short_desc="Command-line interface for Hetzner Cloud"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
+changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=bbd337684b51ecd6848f6b7531f3a2793c43d0fbe2ece13f153ce1504a1e72f6
+checksum=00ec9466bedca9fbe3ab5151a79df4db6a8997b263bcc6bffb50f25ccc191c80
 
 post_install() {
 	vlicense LICENSE

From c129078427e019b9f0472c21bc98638eb78bd179 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:02:43 -0400
Subject: [PATCH 0682/1854] python3-nbxmpp: update to 4.3.0.

---
 srcpkgs/python3-nbxmpp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index c0b5750436b7..3243c1b3c6a8 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=ba16ab684c678f15cb85f582a51be690e48330bbcb569aa32b7d104293392d28
+checksum=60124e8ad0f84ade76df44c54354c040c5d14bfdef262598988e7c9e31b4a6f7
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

From 7e1cbbc6dde7a26938852499adfd35cb3c8cf60f Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:08:54 -0400
Subject: [PATCH 0683/1854] New package: python3-omemo-dr-1.0.0

This is the python library required by Gajim since v1.8.0
---
 srcpkgs/python3-omemo-dr/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-omemo-dr/template

diff --git a/srcpkgs/python3-omemo-dr/template b/srcpkgs/python3-omemo-dr/template
new file mode 100644
index 000000000000..51ea07714c96
--- /dev/null
+++ b/srcpkgs/python3-omemo-dr/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-omemo-dr'
+pkgname=python3-omemo-dr
+version=1.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+makedepends="python3-devel"
+depends="python3-cryptography python3-protobuf"
+short_desc="Python library implementing OMEMO cryptography"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://dev.gajim.org/gajim/omemo-dr"
+distfiles="${PYPI_SITE}/o/omemo-dr/omemo-dr-${version}.tar.gz"
+checksum=b0fe5023e947a17b740fb7ed4aa246120d6f21d819b5812e94dfc9570520be61

From d8d9627e095a713337a7caa75f9e6da418cc74bf Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:12:31 -0400
Subject: [PATCH 0684/1854] gajim: update to 1.8.0.

---
 srcpkgs/gajim/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 918d84bec7e9..ea8982bcfbe3 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,6 +1,6 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="gettext python3-wheel"
@@ -8,6 +8,7 @@ depends="python3-gobject python3-setuptools python3-Pillow
  python3-cairo python3-dbus libsecret gsound libnm
  python3-nbxmpp python3-openssl python3-css-parser python3-keyring
  python3-precis-i18n python3-packaging python3-setuptools python3-distro
+ python3-qrcode python3-omemo-dr
  python3-netifaces python3-pyasn1 python3-jeepney libsoup3 farstream gst-plugins-base1
  gst-plugins-ugly1 gst-libav gtksourceview4"
 checkdepends="${depends} python3-packaging"
@@ -17,7 +18,7 @@ license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/-/raw/master/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=b9a26a353549189fe65e0bc130cf98cbc42bd7105e72ac2041cb4a7f9d7543c6
+checksum=1201fc9add1a9b697dcf872c1871faae92ea4f3162051cce3c1e0d0843fc4d43
 
 post_build() {
 	./pep517build/build_metadata.py -o dist/metadata

From bc5b3f86f4e4140fb8b157823f65c3bf210fa5a9 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:16:07 -0400
Subject: [PATCH 0685/1854] gajim-omemo: change to dummy package

The functionality of Gajim's OMEMO plugin has been merged into the
client since v1.8.0.
---
 srcpkgs/gajim-omemo          |  1 +
 srcpkgs/gajim-omemo/template | 19 -------------------
 srcpkgs/gajim-omemo/update   |  2 --
 srcpkgs/gajim/template       |  6 ++++++
 4 files changed, 7 insertions(+), 21 deletions(-)
 create mode 120000 srcpkgs/gajim-omemo
 delete mode 100644 srcpkgs/gajim-omemo/template
 delete mode 100644 srcpkgs/gajim-omemo/update

diff --git a/srcpkgs/gajim-omemo b/srcpkgs/gajim-omemo
new file mode 120000
index 000000000000..61722e706beb
--- /dev/null
+++ b/srcpkgs/gajim-omemo
@@ -0,0 +1 @@
+gajim
\ No newline at end of file
diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
deleted file mode 100644
index 917b9e7d676e..000000000000
--- a/srcpkgs/gajim-omemo/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gajim-omemo'
-pkgname=gajim-omemo
-version=2.9.0
-revision=1
-create_wrksrc="omemo"
-hostmakedepends="unzip"
-depends="python3 python3-setuptools python3-cryptography python3-axolotl
- python3-qrcode gajim"
-short_desc="Gajim plugin for OMEMO Encryption"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="GPL-3.0-or-later"
-homepage="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
-distfiles="https://ftp.gajim.org/plugins/master/omemo/omemo_${version}.zip"
-checksum=076396ac441b4e5bae62328575be85492a87229c7a214b23f7edd1ac5dcac97b
-
-do_install() {
-	install -d "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
-	cp -r * "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
-}
diff --git a/srcpkgs/gajim-omemo/update b/srcpkgs/gajim-omemo/update
deleted file mode 100644
index 693efdeaed67..000000000000
--- a/srcpkgs/gajim-omemo/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://dev.gajim.org/gajim/gajim-plugins/raw/gajim_1.3/omemo/manifest.ini
-pattern="version: \K[\d.]+"
diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index ea8982bcfbe3..16ba231c9064 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -32,3 +32,9 @@ post_install() {
 do_check() {
 	python -m unittest discover -s test
 }
+
+gajim-omemo_package() {
+	depends="gajim"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 92ef91229170eb7a9bb29360efb27a39eeff3c2d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jun 2023 20:51:33 +0200
Subject: [PATCH 0686/1854] ksh: update to 1.0.6.

---
 srcpkgs/ksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index cbde81e4e581..8e238126bdcf 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,14 +1,14 @@
 # Template file for 'ksh'
 pkgname=ksh
 reverts="2020.0.0_1"
-version=1.0.5
+version=1.0.6
 revision=1
 short_desc="AT&T's Korn shell (community branch ksh93u+m)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/ksh93/ksh"
 distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=940d6dd6b4204f4965cf87cbba5bdf2d2c5153975100ee242038425f9470c0fe
+checksum=bcb230cb3cbe045e0c08ed8d379fb4e1b434784bb0aab0e990c51a03e63d6721
 nocross=yes
 
 register_shell="/bin/ksh"

From 2b79120feb85a33edb51bc1f34c583cb7ad3fb83 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 7 Jun 2023 08:50:17 -0500
Subject: [PATCH 0687/1854] zfs: update to 2.1.12.

---
 srcpkgs/zfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 914114f1cfb7..e53f25d27084 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.11
+version=2.1.12
 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=a54fe4e854d0a207584f1799a80e165eae66bc30dc8e8c96a1f99ed9d4d8ceb2
+checksum=64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From 679710d33b0bf1738b9f4a423194954e41d29034 Mon Sep 17 00:00:00 2001
From: toomyem <toomyem@gmail.com>
Date: Mon, 12 Jun 2023 13:49:55 +0200
Subject: [PATCH 0688/1854] moosefs: update to 3.0.117

---
 srcpkgs/moosefs/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index adc8125a13e6..0c14645f9b22 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -1,7 +1,7 @@
 # Template file for 'moosefs'
 pkgname=moosefs
-version=3.0.113
-revision=2
+version=3.0.117
+revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib --with-default-user=_mfs
  --with-default-group=_mfs"
@@ -10,10 +10,10 @@ makedepends="zlib-devel libpcap-devel fuse-devel"
 short_desc="Fault tolerant, network distributed file system"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://moosefs.org/"
-distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
-checksum=f88cc0142b5fe8a6a4c3fcb2ae58053fcb98787848cf09286a57718a982093a9
-python_version=2 #unverified
+homepage="https://moosefs.com/"
+distfiles="https://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
+checksum=d77947d0d8b699e2373926a1274ae81a9a8b24445c5ab986a1ec5e9203e3c3ba
+python_version=3
 system_accounts="_mfs"
 
 pre_configure() {

From c8e8f41cd0c845a3b5452d29128f2496ec57fd95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 11 Jun 2023 07:15:42 -0400
Subject: [PATCH 0689/1854] kdenlive: update to 23.04.2.

---
 srcpkgs/kdenlive/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 66e562d99f25..429126ef3c3b 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=23.04.0
+version=23.04.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -10,14 +10,15 @@ makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
-depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols"
+depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols
+ kirigami2 mediainfo"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
-distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=eba17db62714e56eb9433499d559dab0657677c6876b0735a756b0d9afc48e6a
+distfiles="${KDE_SITE}/release-service/${version}/src/kdenlive-${version}.tar.xz"
+checksum=8f754f2e000d2536e88a63f7a3f3ec7abe992d396f3d957899da978f7a255992
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From 6884b651f8a33e929b0c98dc47fc3436fb7d97c1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 9 Jun 2023 13:39:30 -0400
Subject: [PATCH 0690/1854] kitty: update to 0.28.1, adopt.

add subpackages for components that can be used in remote/headless envs
---
 srcpkgs/kitty-kitten              |   1 +
 srcpkgs/kitty-shell-integration   |   1 +
 srcpkgs/kitty/patches/cross.patch | 128 ++++++++++++++++++++++++++++++
 srcpkgs/kitty/template            |  51 +++++++++---
 4 files changed, 171 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/kitty-kitten
 create mode 120000 srcpkgs/kitty-shell-integration
 create mode 100644 srcpkgs/kitty/patches/cross.patch

diff --git a/srcpkgs/kitty-kitten b/srcpkgs/kitty-kitten
new file mode 120000
index 000000000000..659fb6b426aa
--- /dev/null
+++ b/srcpkgs/kitty-kitten
@@ -0,0 +1 @@
+kitty
\ No newline at end of file
diff --git a/srcpkgs/kitty-shell-integration b/srcpkgs/kitty-shell-integration
new file mode 120000
index 000000000000..659fb6b426aa
--- /dev/null
+++ b/srcpkgs/kitty-shell-integration
@@ -0,0 +1 @@
+kitty
\ No newline at end of file
diff --git a/srcpkgs/kitty/patches/cross.patch b/srcpkgs/kitty/patches/cross.patch
new file mode 100644
index 000000000000..b718adb3e6d3
--- /dev/null
+++ b/srcpkgs/kitty/patches/cross.patch
@@ -0,0 +1,128 @@
+From 88a5086f71f44e09539cae9af0cf62697df01f45 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 13 Jun 2023 07:56:16 +0530
+Subject: [PATCH] Add rudimentary support for cross-compilation
+
+Not really tested, actual cross compilers, feel free to send patches.
+Fixes #6354
+---
+
+diff --git a/setup.py b/setup.py
+index 1d3c76f0f7..2b1ba6fde9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -62,6 +62,8 @@ class Options(argparse.Namespace):
+     sanitize: bool = False
+     prefix: str = './linux-package'
+     dir_for_static_binaries: str = 'build/static'
++    skip_code_generation: bool = False
++    clean_for_cross_compile: bool = False
+     incremental: bool = True
+     profile: bool = False
+     libdir_name: str = 'lib'
+@@ -841,16 +843,17 @@ def extract_rst_targets() -> Dict[str, Dict[str, str]]:
+     return cast(Dict[str, Dict[str, str]], m['main']())
+ 
+ 
+-def build_ref_map() -> str:
+-    d = extract_rst_targets()
+-    h = 'static const char docs_ref_map[] = {\n' + textwrap.fill(', '.join(map(str, bytearray(json.dumps(d).encode('utf-8'))))) + '\n};\n'
++def build_ref_map(skip_generation: bool = False) -> str:
+     dest = 'kitty/docs_ref_map_generated.h'
+-    q = ''
+-    with suppress(FileNotFoundError), open(dest) as f:
+-        q = f.read()
+-    if q != h:
+-        with open(dest, 'w') as f:
+-            f.write(h)
++    if not skip_generation:
++        d = extract_rst_targets()
++        h = 'static const char docs_ref_map[] = {\n' + textwrap.fill(', '.join(map(str, bytearray(json.dumps(d).encode('utf-8'))))) + '\n};\n'
++        q = ''
++        with suppress(FileNotFoundError), open(dest) as f:
++            q = f.read()
++        if q != h:
++            with open(dest, 'w') as f:
++                f.write(h)
+     return dest
+ 
+ 
+@@ -868,7 +871,7 @@ def build(args: Options, native_optimizations: bool = True, call_init: bool = Tr
+     if call_init:
+         init_env_from_args(args, native_optimizations)
+     sources, headers = find_c_files()
+-    headers.append(build_ref_map())
++    headers.append(build_ref_map(args.skip_code_generation))
+     compile_c_extension(
+         kitty_env(), 'kitty/fast_data_types', args.compilation_database, sources, headers
+     )
+@@ -881,6 +884,9 @@ def safe_makedirs(path: str) -> None:
+ 
+ 
+ def update_go_generated_files(args: Options, kitty_exe: str) -> None:
++    if args.skip_code_generation:
++        print('Skipping generation of Go files due to command line option', flush=True)
++        return
+     # update all the various auto-generated go files, if needed
+     if args.verbose:
+         print('Updating Go generated files...', flush=True)
+@@ -1493,7 +1499,7 @@ def clean_launcher_dir(launcher_dir: str) -> None:
+             os.remove(x)
+ 
+ 
+-def clean() -> None:
++def clean(for_cross_compile: bool = False) -> None:
+ 
+     def safe_remove(*entries: str) -> None:
+         for x in entries:
+@@ -1506,7 +1512,9 @@ def safe_remove(*entries: str) -> None:
+     safe_remove(
+         'build', 'compile_commands.json', 'link_commands.json',
+         'linux-package', 'kitty.app', 'asan-launcher',
+-        'kitty-profile', 'docs/generated')
++        'kitty-profile')
++    if not for_cross_compile:
++        safe_remove('docs/generated')
+     clean_launcher_dir('kitty/launcher')
+ 
+     def excluded(root: str, d: str) -> bool:
+@@ -1521,7 +1529,9 @@ def excluded(root: str, d: str) -> bool:
+             dirs.remove(d)
+         for f in files:
+             ext = f.rpartition('.')[-1]
+-            if ext in ('so', 'dylib', 'pyc', 'pyo') or f.endswith('_generated.h') or f.endswith('_generated.go') or f.endswith('_generated.bin'):
++            if ext in ('so', 'dylib', 'pyc', 'pyo') or (not for_cross_compile and (
++                    f.endswith('_generated.h') or f.endswith('_generated.go') or f.endswith('_generated.bin'))
++            ):
+                 os.unlink(os.path.join(root, f))
+     for x in glob.glob('glfw/wayland-*-protocol.[ch]'):
+         os.unlink(x)
+@@ -1581,6 +1591,19 @@ def option_parser() -> argparse.ArgumentParser:  # {{{
+         default=Options.dir_for_static_binaries,
+         help='Where to create the static kitten binary'
+     )
++    p.add_argument(
++        '--skip-code-generation',
++        default=Options.skip_code_generation,
++        action='store_true',
++        help='Do not create the *_generated.* source files. This is useful if they'
++        ' have already been generated by a previous build, for example during a two-stage cross compilation.'
++    )
++    p.add_argument(
++        '--clean-for-cross-compile',
++        default=Options.clean_for_cross_compile,
++        action='store_true',
++        help='Do not clean generated Go source files. Useful for cross-compilation.'
++    )
+     p.add_argument(
+         '--full',
+         dest='incremental',
+@@ -1743,7 +1766,7 @@ def main() -> None:
+         texe = os.path.abspath(os.path.join(launcher_dir, 'kitty'))
+         os.execl(texe, texe, '+launch', 'test.py')
+     if args.action == 'clean':
+-        clean()
++        clean(for_cross_compile=args.clean_for_cross_compile)
+         return
+ 
+     with CompilationDatabase(args.incremental) as cdb:
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 90eb7261085c..6ec5e8af4a50 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,20 +1,26 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.26.5
-revision=2
+version=0.28.1
+revision=1
+build_helper="python3"
 pycompile_dirs="usr/lib/kitty"
-hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
+hostmakedepends="go pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
- python3-devel wayland-devel wayland-protocols librsync-devel libcanberra-devel openssl-devel"
-depends="kitty-terminfo-${version}_${revision}"
+ python3-devel wayland-devel wayland-protocols librsync-devel libcanberra-devel
+ openssl-devel dbus-devel libXcursor-devel libXrandr-devel libXi-devel
+ fontconfig-devel libxcb-devel lcms2-devel"
+depends="kitty-terminfo-${version}_${revision} kitty-shell-integration-${version}_${revision}
+ kitty-kitten-${version}_${revision}"
 short_desc="Modern, hackable, featureful, OpenGL based terminal emulator"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
+checksum=c11c545ca56adf1c26cfd8f5b4a3ba5f149f00542fbf0fa2c4439bd9bf6f78a5
 python_version=3
+nopie_files="/usr/bin/kitten"
+
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
 # TIOCSWINSZ on ppc overflows signed int, used in ioctl()
@@ -23,11 +29,22 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*-musl) CFLAGS+=" -Wno-error=overflow";;
 esac
 
+if [ "$CROSS_BUILD" ]; then
+	# cursed but this build system is a hot mess
+	hostmakedepends+=" $makedepends"
+fi
+
 do_build() {
+	local _cross_args
 	if [ "$CROSS_BUILD" ]; then
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+		# hot mess, continued
+		env CC="cc" CFLAGS="$XBPS_CFLAGS" LDFLAGS="$XBPS_LDFLAGS" python3 setup.py build \
+			--prefix="${DESTDIR}/usr" --update-check-interval=0 --verbose
+		python3 setup.py clean --clean-for-cross-compile
+		_cross_args=(--skip-code-generation)
 	fi
-	python3 setup.py linux-package --prefix=${DESTDIR}/usr --update-check-interval=0 --verbose
+	. /void-packages/common/environment/build-style/go.sh
+	python3 setup.py linux-package --prefix="${DESTDIR}/usr" --update-check-interval=0 --verbose "${_cross_args[@]}"
 }
 
 do_install() {
@@ -40,3 +57,17 @@ kitty-terminfo_package() {
 		vmove usr/share/terminfo
 	}
 }
+
+kitty-shell-integration_package() {
+	short_desc+=" - shell integration scripts"
+	pkg_install() {
+		vmove usr/lib/kitty/shell-integration
+	}
+}
+
+kitty-kitten_package() {
+	short_desc+=" - kitten client"
+	pkg_install() {
+		vmove usr/bin/kitten
+	}
+}

From 5ecdd70a24499d3c62da04fd4e4d0d4a829c1468 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 12:57:05 -0400
Subject: [PATCH 0691/1854] openlierox: remove package

python 2, no release/activity upstream since 2018
---
 srcpkgs/openlierox/patches/fix-cflags.patch | 17 ---------
 srcpkgs/openlierox/patches/ppc-musl.patch   | 24 ------------
 srcpkgs/openlierox/template                 | 41 ---------------------
 srcpkgs/openlierox/update                   |  1 -
 srcpkgs/removed-packages/template           |  1 +
 5 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 srcpkgs/openlierox/patches/fix-cflags.patch
 delete mode 100644 srcpkgs/openlierox/patches/ppc-musl.patch
 delete mode 100644 srcpkgs/openlierox/template
 delete mode 100644 srcpkgs/openlierox/update

diff --git a/srcpkgs/openlierox/patches/fix-cflags.patch b/srcpkgs/openlierox/patches/fix-cflags.patch
deleted file mode 100644
index 711358a3bf68..000000000000
--- a/srcpkgs/openlierox/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: CMakeOlxCommon.cmake
-===================================================================
---- a/CMakeOlxCommon.cmake
-+++ b/CMakeOlxCommon.cmake
-@@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support
- OPTION(DISABLE_JOYSTICK "Disable joystick support" No)
- OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No)
- 
--IF (DEBUG)
--	SET(CMAKE_BUILD_TYPE Debug)
--ELSE (DEBUG)
--	SET(CMAKE_BUILD_TYPE Release)
--ENDIF (DEBUG)
--
- IF (DEDICATED_ONLY)
- 	SET(X11 No)
- 	SET(WITH_G15 No)
diff --git a/srcpkgs/openlierox/patches/ppc-musl.patch b/srcpkgs/openlierox/patches/ppc-musl.patch
deleted file mode 100644
index dc1441fc726e..000000000000
--- a/srcpkgs/openlierox/patches/ppc-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/client/CrashHandler.cpp
-+++ b/src/client/CrashHandler.cpp
-@@ -23,6 +23,9 @@
- 
- #include "../breakpad/BreakPad.h"
- 
-+#if defined(__linux__) && defined(__powerpc__)
-+#include <asm/ptrace.h>
-+#endif
- 
- #ifdef NBREAKPAD
- 
-@@ -320,7 +322,11 @@ public:
- 		pnt = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0x3UL ;
- #	elif (defined (__ppc__)) || (defined (__powerpc__))
- 		ucontext_t* uc = (ucontext_t*) secret;
-+#	if !defined(__GLIBC__) && !defined(__powerpc64__)
-+		pnt = (void*) ((struct pt_regs *)uc->uc_regs)->nip ;
-+#	else
- 		pnt = (void*) uc->uc_mcontext.regs->nip ;
-+#	endif
- #	elif defined(__sparc__)
- 		struct sigcontext* sc = (struct sigcontext*) secret;
- #		if __WORDSIZE == 64
diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
deleted file mode 100644
index 626bdd4d97a8..000000000000
--- a/srcpkgs/openlierox/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'openlierox'
-pkgname=openlierox
-version=0.58.rc5
-revision=2
-build_style=cmake
-configure_args="-DSYSTEM_DATA_DIR=/usr/share -DDEBUG=OFF -DBREAKPAD=OFF"
-hostmakedepends="pkg-config python"
-makedepends="SDL_image-devel SDL_mixer-devel freealut-devel
- gd-devel libcurl-devel libvorbis-devel libxml2-devel libzip-devel"
-depends="virtual?libGL python"
-short_desc="Addictive real-time excessive Worms-clone"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.openlierox.net/"
-distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2"
-checksum=3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb
-python_version=2
-replaces="openlierox-data>=0"
-
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libexecinfo-devel";;
-esac
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i CMakeLists.txt -e "/^TARGET_LINK_LIBRARIES/s/)/ execinfo)/" ;;
-	esac
-}
-
-do_install() {
-	# This package uses cmake yet it lacks an install target
-	vbin build/bin/openlierox
-	vman doc/openlierox.6
-	vinstall share/OpenLieroX.svg 644 usr/share/pixmaps
-	vinstall share/openlierox-openlierox.desktop 644 usr/share/applications openlierox.desktop
-	vmkdir usr/share/OpenLieroX
-	vcopy share/gamedir/* usr/share/OpenLieroX
-	find ${DESTDIR}/usr/share/OpenLieroX -type d -exec chmod 755 "{}" \;
-	find ${DESTDIR}/usr/share/OpenLieroX -type f -exec chmod 644 "{}" \;
-}
diff --git a/srcpkgs/openlierox/update b/srcpkgs/openlierox/update
deleted file mode 100644
index fdb55f617cda..000000000000
--- a/srcpkgs/openlierox/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='OpenLieroX_\K[\d]+\.[\d]+(_rc[\d]+)?(?=\.src.tar.bz2)'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9b0ce9c93fce..12b6b96fed5d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -379,6 +379,7 @@ replaces="
  oce<=0.18.3_1
  onionshare<=2.2_5
  opencl-clhpp<=2.0.15_1
+ openlierox<=0.58.rc5_2
  orage<=4.12.1_7
  parallel-rust<=0.11.3_2
  paraview<=5.8.1_3

From 8057d7071c9eac1cbc08a0f4229ba63fea692c8b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 13:06:02 -0400
Subject: [PATCH 0692/1854] libproxy: move to python3

---
 srcpkgs/{libproxy-python => libproxy-python3} |  0
 srcpkgs/libproxy/template                     | 13 +++++++------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename srcpkgs/{libproxy-python => libproxy-python3} (100%)

diff --git a/srcpkgs/libproxy-python b/srcpkgs/libproxy-python3
similarity index 100%
rename from srcpkgs/libproxy-python
rename to srcpkgs/libproxy-python3
diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template
index 3b516025354e..bb619c15ec74 100644
--- a/srcpkgs/libproxy/template
+++ b/srcpkgs/libproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'libproxy'
 pkgname=libproxy
 version=0.4.18
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0
- -DWITH_PERL=0 -DWITH_PYTHON=1 -DWITH_WEBKIT=0"
-hostmakedepends="pkg-config python"
+ -DWITH_PERL=0 -DWITH_PYTHON3=1 -DWITH_WEBKIT=0"
+hostmakedepends="pkg-config python3"
 makedepends="zlib-devel"
 short_desc="Library handling all the details of proxy configuration"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -28,9 +28,10 @@ libproxy-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-libproxy-python_package() {
-	depends="libproxy>=${version} python"
-	short_desc+=" - python bindings"
+
+libproxy-python3_package() {
+	depends="libproxy>=${version} python3"
+	short_desc+=" - python3 bindings"
 	pkg_install() {
 		vmove "usr/lib/python*"
 	}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 12b6b96fed5d..20fce6e997ee 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -312,6 +312,7 @@ replaces="
  libpipewire0.2-devel<=0.2.7_2
  libpipewire0.2<=0.2.7_2
  libpng12<=1.2.59_1
+ libproxy-python<=0.4.18_1
  libpyside-python3<=5.15.0_2
  libqmatrixclient-devel<=0.5.3.2_1
  libqmatrixclient<=0.5.3.2_1

From 5d17668d306614f1cf1d19210c46eec827a3d067 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 02:58:11 -0400
Subject: [PATCH 0693/1854] base-files: add MPL-2.0 to licenses

---
 srcpkgs/base-files/files/licenses/MPL-2.0 | 373 ++++++++++++++++++++++
 srcpkgs/base-files/template               |   2 +-
 2 files changed, 374 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/base-files/files/licenses/MPL-2.0

diff --git a/srcpkgs/base-files/files/licenses/MPL-2.0 b/srcpkgs/base-files/files/licenses/MPL-2.0
new file mode 100644
index 000000000000..a612ad9813b0
--- /dev/null
+++ b/srcpkgs/base-files/files/licenses/MPL-2.0
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 27b83604b648..b96d09351a08 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=1
+revision=2
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 94642c47e6b89e72fe9a3c5180791980ce46b057 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 14 Jun 2023 14:38:14 +0200
Subject: [PATCH 0694/1854] libmd: update to 1.1.0.

---
 srcpkgs/libmd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmd/template b/srcpkgs/libmd/template
index 51ea5f1d5d61..858dbb8e0b0d 100644
--- a/srcpkgs/libmd/template
+++ b/srcpkgs/libmd/template
@@ -1,6 +1,6 @@
 # Template file for 'libmd'
 pkgname=libmd
-version=1.0.4
+version=1.1.0
 revision=1
 build_style=gnu-configure
 short_desc="Message Digest functions from BSD systems"
@@ -8,7 +8,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause, BSD-2-Clause, ISC, Beerware, custom:Public Domain"
 homepage="https://www.hadrons.org/software/libmd/"
 distfiles="https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz"
-checksum=f51c921042e34beddeded4b75557656559cf5b1f2448033b4c1eec11c07e530f
+checksum=1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332
 
 post_install() {
 	vlicense COPYING

From e26db9f12c26761d9fb14f752da4e4b585a15b82 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 14 Jun 2023 11:10:55 +0200
Subject: [PATCH 0695/1854] man-db: update to 2.11.2

---
 srcpkgs/man-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 3d60f4e91878..cea1193c9d6e 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.10.2
+version=2.11.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.nongnu.org/man-db/"
 changelog="https://gitlab.com/cjwatson/man-db/-/raw/main/NEWS.md"
 distfiles="${NONGNU_SITE}/man-db/man-db-${version}.tar.xz"
-checksum=ee97954d492a13731903c9d0727b9b01e5089edbd695f0cdb58d405a5af5514d
+checksum=cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d
 provides="man-0_1"
 lib32disabled=yes
 system_accounts="_man"

From 7d0856378c4a8fc1c66ca477035095a74a86a09e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 10 Jun 2023 21:46:22 +0300
Subject: [PATCH 0696/1854] atomix: update to 44.0

---
 srcpkgs/atomix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 31f34e1efc59..23dc8bdcfd03 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -1,6 +1,6 @@
 # Template file for 'atomix'
 pkgname=atomix
-version=3.34.0
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config gettext"
@@ -10,6 +10,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0054c3b3830f1fe4383e17d716e6034b608859f4352a102130c13156894a2041
+checksum=c8849317688d87da734c9063035631052007f2a8799b6c6cc915265880b55fb4
 
 CFLAGS="-fcommon"

From cb9287c891ef5ddf2219f85b89e2e6f5491df054 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 11 Jun 2023 23:26:17 +0200
Subject: [PATCH 0697/1854] New package: wlrctl-0.2.2

---
 srcpkgs/wlrctl/patches/fix-ascii-check.patch | 13 +++++++++++++
 srcpkgs/wlrctl/template                      | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/wlrctl/patches/fix-ascii-check.patch
 create mode 100644 srcpkgs/wlrctl/template

diff --git a/srcpkgs/wlrctl/patches/fix-ascii-check.patch b/srcpkgs/wlrctl/patches/fix-ascii-check.patch
new file mode 100644
index 000000000000..aa1803c9eaca
--- /dev/null
+++ b/srcpkgs/wlrctl/patches/fix-ascii-check.patch
@@ -0,0 +1,13 @@
+diff --git a/keyboard.c b/keyboard.c
+index 8dc090c..3afd490 100644
+--- a/keyboard.c
++++ b/keyboard.c
+@@ -90,7 +90,7 @@ static bool
+ is_ascii(const char str[])
+ {
+ 	for (int i = 0; str[i] != '\0'; i++) {
+-		if (str[i] < 0) {
++		if (!isprint(str[i]) && !iscntrl(str[i])) {
+ 			return false;
+ 		}
+ 	}
diff --git a/srcpkgs/wlrctl/template b/srcpkgs/wlrctl/template
new file mode 100644
index 000000000000..82ccb2aedeb5
--- /dev/null
+++ b/srcpkgs/wlrctl/template
@@ -0,0 +1,17 @@
+# Template file for 'wlrctl'
+pkgname=wlrctl
+version=0.2.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="libxkbcommon-devel wayland-devel"
+short_desc="Utility for miscellaneous wlroots extensions"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://git.sr.ht/~brocellous/wlrctl"
+distfiles="https://git.sr.ht/~brocellous/wlrctl/archive/v${version}.tar.gz"
+checksum=b5b3836091c41de09a832df1e5eb4747841d7ae670367e413487d5be7a5f2849
+
+post_install() {
+	vlicense LICENSE
+}

From ef7c9625bd5db762a25d768b31c1b335f60f99d1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 14:44:14 +0100
Subject: [PATCH 0698/1854] gwe: update to 0.15.5.

---
 srcpkgs/gwe/template | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index ce70ed78573c..ea56c8f02967 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -1,20 +1,17 @@
 # Template file for 'gwe'
 pkgname=gwe
-version=0.15.2
-revision=4
+version=0.15.5
+revision=1
 build_style=meson
-hostmakedepends="pkg-config meson ninja glib-devel gtk+3-devel python3 python3-devel
- python3-matplotlib python3-peewee python3-gobject python3-xlib python3-xdg
- python3-requests python3-rx python3-nvml python3-injector python3-urllib3 python3-six
- python3-chardet python3-idna python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
-makedepends="gobject-introspection appstream-glib"
-depends="python3 gobject-introspection libayatana-appindicator libdazzle python3-matplotlib
+hostmakedepends="gobject-introspection pkg-config ninja appstream-glib glib-devel"
+makedepends="gtk+3-devel python3-devel"
+depends="python3 libayatana-appindicator libdazzle python3-matplotlib
  python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
- python3-nvml python3-injector python3-urllib3 python3-six python3-chardet python3-idna
- python3-xlib python3-numpy python3-parsing python3-cycler python3-dateutil python3-Pillow"
+ python3-nvml python3-injector"
 short_desc="Utility for overclocking NVIDIA cards"
 maintainer="Duje Mihanovic <mihaduje@pm.me>"
 license="GPL-3.0-or-later"
-homepage="https://www.gitlab.com/leinardi/gwe"
+homepage="https://gitlab.com/leinardi/gwe"
+changelog="https://gitlab.com/leinardi/gwe/-/raw/release/CHANGELOG.md"
 distfiles="https://gitlab.com/leinardi/gwe/-/archive/${version}/gwe-${version}.tar.gz"
-checksum=a827eeb8f18fd08213fb22e0e1ef6437ea749eb4b34fcea9d0ae5282912753a0
+checksum=67c30c735b6160c2f4af61ce353108dc9709b6c850ce8bc21d2d2a506dfa3b70

From 335aba1cc588edace89810f6a4355acd6d6a0bb0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 16 May 2023 16:49:33 -0400
Subject: [PATCH 0699/1854] New package: python3-aputils-0.1.4

---
 srcpkgs/python3-aputils/template | 18 ++++++++++++++++++
 srcpkgs/python3-aputils/update   |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-aputils/template
 create mode 100644 srcpkgs/python3-aputils/update

diff --git a/srcpkgs/python3-aputils/template b/srcpkgs/python3-aputils/template
new file mode 100644
index 000000000000..feb418822aa0
--- /dev/null
+++ b/srcpkgs/python3-aputils/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-aputils'
+pkgname=python3-aputils
+version=0.1.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-pycryptodome"
+short_desc="Various classes and functions for ActivityPub servers"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="custom:CNPL"
+homepage="https://git.barkshark.xyz/barkshark/aputils"
+changelog="https://git.barkshark.xyz/barkshark/aputils/releases"
+distfiles="https://git.barkshark.xyz/barkshark/aputils/archive/${version}.tar.gz"
+checksum=2fa255df5998f10d9eeb2791ce3fe6ea3fc4f1701d84942d81ba8e4f66642896
+
+post_install() {
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/python3-aputils/update b/srcpkgs/python3-aputils/update
new file mode 100644
index 000000000000..f906de7f0769
--- /dev/null
+++ b/srcpkgs/python3-aputils/update
@@ -0,0 +1,2 @@
+site="https://git.barkshark.xyz/barkshark/aputils/tags"
+pattern='<a.*>\K[\d.]+(?=</a>)'

From 351c30b36fcc0b6cbc63ab21f76bc140175f8230 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 16 May 2023 11:47:28 -0400
Subject: [PATCH 0700/1854] activityrelay: update to 0.2.4.

---
 srcpkgs/activityrelay/files/activityrelay/run | 2 +-
 srcpkgs/activityrelay/template                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/activityrelay/files/activityrelay/run b/srcpkgs/activityrelay/files/activityrelay/run
index 2082710dd442..695abd209d17 100755
--- a/srcpkgs/activityrelay/files/activityrelay/run
+++ b/srcpkgs/activityrelay/files/activityrelay/run
@@ -2,4 +2,4 @@
 [ -r ./conf ] && . ./conf
 exec 2>&1
 exec chpst -u _activityrelay:_activityrelay activityrelay \
-	-c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml}
+	-c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml} run
diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template
index 4b8d80b8f6b0..74b8e8dbc880 100644
--- a/srcpkgs/activityrelay/template
+++ b/srcpkgs/activityrelay/template
@@ -1,17 +1,17 @@
 # Template file for 'activityrelay'
 pkgname=activityrelay
-version=0.2.2
-revision=2
+version=0.2.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-aiohttp python3-cachetools python3-click python3-pycryptodome
+depends="python3-aiohttp python3-aputils python3-cachetools python3-click
  python3-yaml"
 short_desc="Generic LitePub relay (works with LitePub consumers and Mastodon)"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="AGPL-3.0-or-later"
 homepage="https://git.pleroma.social/pleroma/relay"
 distfiles="https://git.pleroma.social/pleroma/relay/-/archive/${version}/relay-${version}.tar.gz"
-checksum=f460037a522e45fd030735da893e5851d90b6340caab0bcd24346996474aac25
+checksum=32c127b789d3305301f6a408299a9d59035665674dae6806fb4bb3206698b40e
 make_check=no # no tests specified
 
 system_accounts="_activityrelay"

From 417d23bae0c9e6250bdf78df1ff374c4b6656a31 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 5 Jun 2023 21:43:29 -0400
Subject: [PATCH 0701/1854] syft: update to 0.83.0

---
 srcpkgs/syft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index e76deeba40c9..dd7ea798ffb6 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,6 +1,6 @@
 # Template file for 'syft'
 pkgname=syft
-version=0.80.0
+version=0.83.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/syft"
 distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz"
-checksum=f53b05b2092118c02010c9be35c5a094834afbd057a2c0cbebe08333b52de76d
+checksum=46124db55e6c56a09f80be123737716a9b6e35e675908639ba3bf34d10e650f6
 
 post_install() {
 	syft="${DESTDIR}/usr/bin/syft"

From 2aca7a0e3a2f4d9568b63dbb39053b005b511b32 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 5 Jun 2023 21:44:05 -0400
Subject: [PATCH 0702/1854] grype: update to 0.62.3

---
 srcpkgs/grype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 56b8bc759698..47170f268d9e 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,6 +1,6 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.61.1
+version=0.62.3
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=e9599fbf1c42133e1d07719a3bb1489a5d261a099af8ec515be3409e12dbc56c
+checksum=f97c8412f7c5f74a348fe011f84f5926153d23475d875e2dc61ddca30872e489
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

From 998d3fa657c82e8a9178d32bb8a940c96ba1f90d Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Mon, 29 May 2023 18:35:33 +0000
Subject: [PATCH 0703/1854] mesa: update to 23.1.1.

---
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 -------------------
 srcpkgs/mesa/template                         | 14 ++--
 2 files changed, 6 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
deleted file mode 100644
index f56327367526..000000000000
--- a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sun, 12 Feb 2023 22:33:30 +0100
-Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
-
-resource_from_handle implementations create an additional reference to
-the scanout resource, which caused lima to leak those resources after
-commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
-
-Do as the other drivers do and import the bo directly while creating
-the scanount resource.
-
-Cc: 22.3 mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
----
- src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
-index 54869ec03d24..0b7691f2b46f 100644
---- a/src/gallium/drivers/lima/lima_resource.c
-+++ b/src/gallium/drivers/lima/lima_resource.c
-@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    struct lima_screen *screen = lima_screen(pscreen);
-    struct renderonly_scanout *scanout;
-    struct winsys_handle handle;
--   struct pipe_resource *pres;
-+
-+   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
-+   if (!res)
-+      return NULL;
- 
-    struct pipe_resource scanout_templat = *templat;
-    scanout_templat.width0 = width;
-@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    if (!scanout)
-       return NULL;
- 
-+   res->base = *templat;
-+   res->base.screen = pscreen;
-+   pipe_reference_init(&res->base.reference, 1);
-+   res->levels[0].offset = handle.offset;
-+   res->levels[0].stride = handle.stride;
-+
-    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
--   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
--                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
-+   res->bo = lima_bo_import(screen, &handle);
-+   if (!res->bo) {
-+      FREE(res);
-+      return NULL;
-+   }
-+
-+   res->modifier_constant = true;
- 
-    close(handle.handle);
--   if (!pres) {
-+   if (!res->bo) {
-       renderonly_scanout_destroy(scanout, screen->ro);
-+      FREE(res);
-       return NULL;
-    }
- 
--   struct lima_resource *res = lima_resource(pres);
-    res->scanout = scanout;
- 
--   return pres;
-+   return &res->base;
- }
- 
- static uint32_t
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 132263d3599f..04d3a1dfe680 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.3.5
-revision=2
+version=23.1.1
+revision=1
 build_style=meson
+#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
+checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
 
 build_options="wayland"
 build_options_default="wayland"
@@ -48,8 +49,6 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# pre-gallium drivers are mostly for old ati + i915/965
-_dri_drivers=" -Ddri-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -156,9 +155,8 @@ fi
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}
-_dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes

From b5c9db830b3dd3a45d58cbef34ec49d9cd3071a5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 8 Jun 2023 09:38:16 -0400
Subject: [PATCH 0704/1854] subfinder: update to 2.6.0

---
 srcpkgs/subfinder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index 7a74a7e2e9de..b772ca6cff7d 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
-version=2.5.7
-revision=2
+version=2.6.0
+revision=1
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"
@@ -11,7 +11,7 @@ maintainer="w. fnintr <wfnintr@null.net>"
 license="MIT"
 homepage="https://github.com/projectdiscovery/subfinder"
 distfiles="https://github.com/projectdiscovery/subfinder/archive/refs/tags/v${version}.tar.gz"
-checksum=6ff2b05189727ab3bd8e3391b7c5c9c4ae2079a81e766f509fe21033c435134d
+checksum=a98dc92135ff462aa9e99f3bdfe079a14849c9f926028a7bb44af591ed18aa21
 
 post_install() {
 	vlicense ../LICENSE.md

From 408ac7b6171a8fcabdc2c2f63f4a7dfcc16e001e Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+github@gmail.com>
Date: Sat, 20 May 2023 15:54:27 -0500
Subject: [PATCH 0705/1854] python3-dpkt: update to 1.9.8

Closes: https://github.com/void-linux/void-packages/pull/43976
---
 srcpkgs/python3-dpkt/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-dpkt/template b/srcpkgs/python3-dpkt/template
index d2da82f8bf86..72b6a4081982 100644
--- a/srcpkgs/python3-dpkt/template
+++ b/srcpkgs/python3-dpkt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dpkt'
 pkgname=python3-dpkt
-version=1.9.7.2
-revision=3
+version=1.9.8
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -9,8 +9,9 @@ short_desc="Basic TCP/IP packet creation and parsing"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/kbandla/dpkt"
+changelog="https://raw.githubusercontent.com/kbandla/dpkt/master/docs/changelog.md"
 distfiles="${PYPI_SITE}/d/dpkt/dpkt-${version}.tar.gz"
-checksum=80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b
+checksum=43f8686e455da5052835fd1eda2689d51de3670aac9799b1b00cfd203927ee45
 
 post_install() {
 	vlicense LICENSE

From b5e47c1175dbcae41fefdaf84e22168b8daddb88 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 23 May 2023 22:16:53 +0530
Subject: [PATCH 0706/1854] qsv: update to 0.106.0.

---
 srcpkgs/qsv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index 98108a8addee..30448b946128 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.103.1
+version=0.106.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,4 +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=6c67f0eac5e011e94cd8d034c7e9d519a6eeddfad5dba53abc6d91aea55ccd99
+checksum=ce7c3eac35d495188ceda49536ce1997a78a319a42d715d3b0b1712b57c3267c

From 5e81b5d1084394e8eb1ccd3d341e53cb63e708e1 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 19 May 2023 17:35:37 +0300
Subject: [PATCH 0707/1854] gummi: update to 0.8.3

---
 srcpkgs/gummi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gummi/template b/srcpkgs/gummi/template
index b56271b07ca6..fe1ae455c552 100644
--- a/srcpkgs/gummi/template
+++ b/srcpkgs/gummi/template
@@ -1,18 +1,19 @@
 # Template file for 'gummi'
 pkgname=gummi
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config glib-devel gtk+3-devel gettext-devel"
 makedepends="gtksourceview-devel glib-devel gtk+3-devel poppler-glib-devel
  gtkspell3-devel gettext-devel texlive-devel"
+depends="virtual?tex"
 short_desc="Simple LaTeX editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/alexandervdm/gummi/"
 changelog="https://raw.githubusercontent.com/alexandervdm/gummi/master/ChangeLog"
 distfiles="https://github.com/alexandervdm/gummi/releases/download/$version/gummi-$version.tar.gz"
-checksum=5ad486da1f98407a806519f3a8b2b149b145af6f9cf0a438519dd1df8c066728
+checksum=c1769fea45c23bf892bdbf524c92ddf83eae21b1ddba358d4173155aadea898e
 
 pre_configure() {
 	autoreconf -fi

From 84f27dd094e849dbdf38b21f143bbde42e96c6e4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 10 May 2023 10:18:20 -0400
Subject: [PATCH 0708/1854] dhcpcd: update to 10.0.1

---
 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch |  23 ---
 srcpkgs/dhcpcd/patches/revert-eloop.patch    | 150 -------------------
 srcpkgs/dhcpcd/template                      |   8 +-
 3 files changed, 4 insertions(+), 177 deletions(-)
 delete mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
 delete mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch

diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
deleted file mode 100644
index 38a4264a59cd..000000000000
--- a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 156383a2ff84c01b347579ec8651a0a21384adf4
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date:   Sun Apr 3 20:18:51 2022 +0200
-
-    use correct SECCOMP_AUDIT_ARCH
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 9534fb0..b866bce 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- #elif defined(__or1k__)
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
- #elif defined(__powerpc64__)
--#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+#  ifdef __LITTLE_ENDIAN__
-+#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
-+#  else
-+#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+#  endif
- #elif defined(__powerpc__)
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
- #elif defined(__riscv)
diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
deleted file mode 100644
index e41beb84b62b..000000000000
--- a/srcpkgs/dhcpcd/patches/revert-eloop.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 12 Nov 2021 16:24:32 +0000
-Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
- poll(2)"
-
-This stops dumping leases when privsep is compiled out.
-This change works fine on master, but we also have eloop using
-more of a native poll(2) style interface.
-Easier for now to just revert this on the dhcpcd-9 branch.
-
-This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
----
- src/eloop.c | 56 ++++++++++++++++-------------------------------------
- 1 file changed, 17 insertions(+), 39 deletions(-)
-
-diff --git a/src/eloop.c b/src/eloop.c
-index a6ab43fb..c3330817 100644
---- a/src/eloop.c
-+++ b/src/eloop.c
-@@ -32,7 +32,6 @@
- #include <errno.h>
- #include <limits.h>
- #include <poll.h>
--#include <stdbool.h>
- #include <signal.h>
- #include <stdint.h>
- #include <stdlib.h>
-@@ -137,7 +136,6 @@ struct eloop {
- 	TAILQ_HEAD (event_head, eloop_event) events;
- 	size_t nevents;
- 	struct event_head free_events;
--	bool events_need_setup;
- 
- 	struct timespec now;
- 	TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
-@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
- static void
- eloop_event_setup_fds(struct eloop *eloop)
- {
--	struct eloop_event *e, *ne;
-+	struct eloop_event *e;
- 	struct pollfd *pfd;
- 
- 	pfd = eloop->fds;
--	TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
--		if (e->fd == -1) {
--			TAILQ_REMOVE(&eloop->events, e, next);
--			TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
--			continue;
--		}
-+	TAILQ_FOREACH(e, &eloop->events, next) {
- #ifdef ELOOP_DEBUG
- 		fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
- 		    __func__, getpid(), e->fd, e->read_cb, e->write_cb);
-@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
- 		pfd->revents = 0;
- 		pfd++;
- 	}
--	eloop->events_need_setup = false;
- }
- 
- size_t
-@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
- 	}
- 
- setup:
--	e->pollfd = NULL;
--	eloop->events_need_setup = true;
-+	eloop_event_setup_fds(eloop);
- 	return 0;
- }
- 
-@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- 	struct eloop_event *e;
- 
- 	assert(eloop != NULL);
--	if (fd == -1) {
--		errno = EINVAL;
--		return -1;
--	}
- 
- 	TAILQ_FOREACH(e, &eloop->events, next) {
- 		if (e->fd == fd)
-@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- 			goto remove;
- 		e->write_cb = NULL;
- 		e->write_cb_arg = NULL;
--		if (e->pollfd != NULL) {
--			e->pollfd->events &= ~POLLOUT;
--			e->pollfd->revents &= ~POLLOUT;
--		}
--		return 1;
-+		goto done;
- 	}
- 
- remove:
--	e->fd = -1;
-+	TAILQ_REMOVE(&eloop->events, e, next);
-+	TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
- 	eloop->nevents--;
--	eloop->events_need_setup = true;
-+
-+done:
-+	eloop_event_setup_fds(eloop);
- 	return 1;
- }
- 
-@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- 		} else
- 			tsp = NULL;
- 
--		if (eloop->events_need_setup)
--			eloop_event_setup_fds(eloop);
--
- 		n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
- 		if (n == -1) {
- 			if (errno == EINTR)
-@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- 			continue;
- 
- 		TAILQ_FOREACH(e, &eloop->events, next) {
--			/* Skip freshly added events */
--			if (e->pollfd == NULL)
--				continue;
--			if (e->pollfd->revents)
--				n--;
--			if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
--				if (e->write_cb != NULL)
-+			if (e->pollfd->revents & POLLOUT) {
-+				if (e->write_cb != NULL) {
- 					e->write_cb(e->write_cb_arg);
-+					break;
-+				}
- 			}
--			if (e->fd != -1 &&
--			    e->pollfd != NULL && e->pollfd->revents)
--			{
--				if (e->read_cb != NULL)
-+			if (e->pollfd->revents) {
-+				if (e->read_cb != NULL) {
- 					e->read_cb(e->read_cb_arg);
-+					break;
-+				}
- 			}
--			if (n == 0)
--				break;
- 		}
- 	}
- 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 93b3a8d66d9e..b30bb7c24af4 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=9.4.1
-revision=2
+version=10.0.1
+revision=1
 build_style=configure
 make_check_target=test
 configure_args="
@@ -13,8 +13,8 @@ short_desc="RFC2131 compliant DHCP client"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
-distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz"
+checksum=2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 

From 14240b009b648df18598bbf169bd11d71febf349 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sun, 21 May 2023 04:01:50 +0300
Subject: [PATCH 0709/1854] tlpui: update to 1.5.0-7

---
 srcpkgs/tlpui/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tlpui/template b/srcpkgs/tlpui/template
index d4d2aeae5852..84e1a213d238 100644
--- a/srcpkgs/tlpui/template
+++ b/srcpkgs/tlpui/template
@@ -1,7 +1,7 @@
 # Template file for 'tlpui'
 pkgname=tlpui
-version=1.5.0+5
-revision=3
+version=1.5.0+7
+revision=1
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="gtk+3 tlp python3-gobject"
@@ -10,11 +10,10 @@ maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/d4nj1/TLPUI"
 distfiles="https://github.com/d4nj1/TLPUI/archive/refs/tags/tlpui-${version/+/-}.tar.gz"
-checksum=563794d142acb79d5654aca70af52c5e8da4cf9677e5058d151474d0af47ea77
+checksum=1d82fe2d52d47c2888d07ba7e70840c06129bbd3f673166c861097cfb8e2ce52
 make_check=no #tests fail inside chroot
 
 post_install() {
-	vmkdir usr/share/icons
-	vcopy tlpui/icons/themeable/hicolor usr/share/icons
-	rm -r "$DESTDIR/$py3_sitelib/tlpui/icons/themeable"
+	vinstall tlpui/icons/themeable/hicolor/scalable/apps/tlpui.svg 644 \
+		usr/share/icons/hicolor/scalable/apps
 }

From 0b9f7937815db90b3f51a52987fc1191c7c4f9b9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 May 2023 09:04:43 -0400
Subject: [PATCH 0710/1854] OpenRCT2: update to 0.4.5.

---
 srcpkgs/OpenRCT2/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 774b45dda13c..87f68c27927a 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,12 +2,12 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-version=0.4.4
-revision=2
+version=0.4.5
+revision=1
 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
-_objects_version=1.3.8
+_objects_version=1.3.11
 _titles_version=0.4.0
-_replays_version=0.0.77
+_replays_version=0.0.78
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -35,8 +35,8 @@ changelog="https://openrct2.org/changelog"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="18970bfffe49c77fa81ea6c295119b173a613c7310d7762963458e3e77c24913
- 84a95590d13a753b1d239f7f06c8d121e36fd28694b21f33646518e2012904ae
+checksum="eb9e20dc0dcbf10b02b5f334a029983a0a2b43d931f95a2088a64e8b2657bab1
+ bf85d88e4fb11ca2e5915567390898747dc2459b3c7a057bdc32b829c91780b4
  6e7c7b554717072bfc7acb96fd0101dc8e7f0ea0ea316367a05c2e92950c9029"
 skip_extraction="objects.zip title-sequences.zip"
 
@@ -72,7 +72,7 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DWITH_TESTS=1 -DSYSTEM_GTEST=1"
 	# download replays, used in tests
 	distfiles+=" https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip"
-	checksum+=" 7e6c889368a3b266a2301dfcde9e2a52f9e84041dd6a9252d6201c555ea2cdb2"
+	checksum+=" a6bdfdcc7d916ce060961c5fe7beaf43679fbfad9838cfdbd067617ae0ac0ddf"
 	skip_extraction+=" replays.zip"
 fi
 

From bf250664d000b842cb43bdec2304c39c8b49c8ef Mon Sep 17 00:00:00 2001
From: unknowncartridge <violetnetwork@disroot.org>
Date: Sat, 6 May 2023 15:57:09 +0300
Subject: [PATCH 0711/1854] gimp: update to 2.10.34

---
 srcpkgs/gimp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8e68f2403d8f..d47a0f208542 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
-version=2.10.32
-revision=4
+version=2.10.34
+revision=1
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -19,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-3.0-only"
 homepage="https://www.gimp.org"
 distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25
+checksum=84004642d351b398a4293cd7fd3592044a944f05bb52850ee6068f247c657aa3
 python_version=2
 lib32disabled=yes
 no_generic_pkgconfig_link=yes
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+		vsed -i 's:^py_prefix=$(:py_prefix='"$XBPS_CROSS_BASE"'):' configure
 	fi
 	# don't allow configure to set DATADIRNAME=lib
 	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From ea37166835021a11a7adb290d2ffb03b50fd2b2d Mon Sep 17 00:00:00 2001
From: unknowncartridge <violetnetwork@disroot.org>
Date: Sun, 7 May 2023 03:39:15 +0300
Subject: [PATCH 0712/1854] gimp: update to 2.10.34

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d47a0f208542..336e33ae83cc 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i 's:^py_prefix=$(:py_prefix='"$XBPS_CROSS_BASE"'):' configure
+		vsed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
 	fi
 	# don't allow configure to set DATADIRNAME=lib
 	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From f844d981d2a1e2f1fc9df6f5533428094790ec3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=2E=20S=C3=A1nchez?= <o-sanchez@linuxmail.org>
Date: Wed, 12 Apr 2023 02:20:46 -0600
Subject: [PATCH 0713/1854] loksh: update to 7.3

---
 srcpkgs/loksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index d0d67241954e..b355627aee76 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=7.2
+version=7.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="custom:Public Domain"
 homepage="https://github.com/dimkr/loksh"
 distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=0083df24b3916c2f34ab63f8b4de6720ba9799e0e9d139c4b2d4ae41ad6aa53d
+checksum=e60bee39836432024569f44b499581ef8ebedbd8fe5b6172245e9a1af4304e9b
 register_shell="/bin/loksh"
 
 alternatives="

From e539db12b9a922b3c0acfce88839c44ca09194ae Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 May 2023 07:54:09 +0200
Subject: [PATCH 0714/1854] fwupd: update to 1.9.1.

---
 srcpkgs/fwupd/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 5533d2284f56..4389a718783e 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.8.8
+version=1.9.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -20,11 +20,11 @@ conf_files="
  /etc/fwupd/*.conf
  /etc/fwupd/remotes.d/*.conf"
 short_desc="Daemon to allow session software to update firmware"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
+maintainer="dataCobra <datacobra@thinkbot.de>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd"
 distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
-checksum=8a8f90680c1598407380ad57c15898bd48a903f2a74f3a97469a8e68b18f1fc1
+checksum=0fe2c371a17007af70034e5393f67a23008111f2a5d1fac96440966029a4e8eb
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -62,7 +62,6 @@ pre_build() {
 }
 
 post_install() {
-	vcompletion data/bash-completion/fwupdagent bash fwupdagent
 	vcompletion data/bash-completion/fwupdmgr bash fwupdmgr
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool
 }

From 567109169051d31a88d264b2c9ae7991d0454d2f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 13 Apr 2023 21:20:11 +0100
Subject: [PATCH 0715/1854] wayland: update to 1.22.0.

---
 srcpkgs/wayland/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 697663da10f8..8382afd36974 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'wayland'
 pkgname=wayland
-version=1.21.0
+version=1.22.0
 revision=1
 build_style=meson
 # "Tests must not be built with NDEBUG defined, they rely on assert()."
@@ -12,7 +12,13 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/wayland-${version}.tar.xz"
-checksum=6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac
+checksum=1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=true"
+else
+	configure_args+=" -Dtests=false"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 3be6e4ab5bd7da5f9c1a9588daadde3b10b4d24c Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 14 Apr 2023 08:18:15 +0200
Subject: [PATCH 0716/1854] qmidiarp: update to 0.6.7

---
 .../patches/add-missing-includes.patch        | 21 -------------------
 srcpkgs/qmidiarp/template                     |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/qmidiarp/patches/add-missing-includes.patch

diff --git a/srcpkgs/qmidiarp/patches/add-missing-includes.patch b/srcpkgs/qmidiarp/patches/add-missing-includes.patch
deleted file mode 100644
index 13cb6658aed0..000000000000
--- a/srcpkgs/qmidiarp/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -69,6 +69,8 @@
- #include "mainwindow.h"
- #include "main.h"
- 
-+#include <sys/types.h>
-+#include <unistd.h>
- 
- static struct option options[] = {
-     {"version", 0, 0, 'v'},
---- a/src/midiworker.h
-+++ b/src/midiworker.h
-@@ -28,6 +28,7 @@
- #include "main.h"
- #include <cstdlib>
- #include <cstdio>
-+#include <sys/types.h>
- 
- 
- /*! @brief MIDI worker base class for QMidiArp modules.
diff --git a/srcpkgs/qmidiarp/template b/srcpkgs/qmidiarp/template
index 04ada9038b07..964024906a6f 100644
--- a/srcpkgs/qmidiarp/template
+++ b/srcpkgs/qmidiarp/template
@@ -1,6 +1,6 @@
 # Template file for 'qmidiarp'
 pkgname=qmidiarp
-version=0.6.5
+version=0.6.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config qt5-host-tools"
@@ -9,8 +9,8 @@ short_desc="MIDI arpeggiator and LFO"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="http://qmidiarp.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=22a3a26d3dbe4bf215aa33c0fd4a79c088549328477840d00e72e50c6e807e10
+distfiles="${SOURCEFORGE_SITE}/project/qmidiarp/qmidiarp/${version}/qmidiarp-${version}.tar.bz2"
+checksum=1bc73896e33da0aa52e90f16f393acb437594b0a9ad8fc97d73b39e028589c2c
 CXXFLAGS="-D_GNU_SOURCE"
 
 pre_configure() {

From 06d536472ad14e5b256020ab74b6c5ab2262ee8c Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Fri, 14 Apr 2023 07:23:46 -0400
Subject: [PATCH 0717/1854] vit: update to 2.3.0

---
 srcpkgs/vit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template
index da2297d91eb5..0a38afbfe215 100644
--- a/srcpkgs/vit/template
+++ b/srcpkgs/vit/template
@@ -1,17 +1,17 @@
 # Template file for 'vit'
 pkgname=vit
-version=2.2.0
-revision=2
+version=2.3.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="task python3-urwid python3-tasklib"
 checkdepends="python3-pytest $depends"
 short_desc="Visual Interactive Taskwarrior full-screen terminal interface"
-maintainer="Cullen Ross <cullenrss@gmail.com>"
+maintainer="Cullen Ross <cullen.ross@proton.me>"
 license="MIT"
 homepage="https://github.com/vit-project/vit"
 distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz"
-checksum=e866c8739822b9e73152ab30c9a009c3aef947533c06f7a5cb244d15c4ea296f
+checksum=f3efd871c607f201251a5d1e0082e5e31e9161dde0df0c6d8b5a3447c76c87c6
 
 do_check() {
 	TERM=linux python3 -m pytest

From ca505d58b6ff29b8346f026b00e3038046f9e17a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Fri, 14 Apr 2023 14:45:09 +0200
Subject: [PATCH 0718/1854] tflint: update to 0.46.1.

---
 srcpkgs/tflint/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index b5b2c4af211b..256db9390a32 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
-version=0.45.0
-revision=2
+version=0.46.1
+revision=1
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"
@@ -9,7 +9,7 @@ maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
 license="MPL-2.0"
 homepage="https://github.com/terraform-linters/tflint"
 distfiles="https://github.com/terraform-linters/tflint/archive/v${version}.tar.gz"
-checksum=74d2852d7f20535458bad329c128c189183c8ba1944deed38c4b820798279b6e
+checksum=a37f2095765a7706e7c2dbdd7f2cd7a14f11b1ff2b7186c61f92c6414d729932
 
 post_install() {
 	vlicense LICENSE

From 9de45ed285dfba55125e0d9760ccd4e7fefc232d Mon Sep 17 00:00:00 2001
From: Justinas Grigas <jstn_as@protonmail.com>
Date: Fri, 14 Apr 2023 21:17:30 +0300
Subject: [PATCH 0719/1854] Bear: update to 3.1.2

Closes: #43445 [via git-merge-pr]
---
 srcpkgs/Bear/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fac8c45145e3..cebf51b64728 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,6 +1,6 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=3.1.0
+version=3.1.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz"
-checksum=33c1f4663d94508f11cbd999dd5571359be7d15b0f473f7cfbea2c0b3190a891
+checksum=5f94e98480bd8576a64cd1d59649f34b09b4e02a81f1d983c92af1113e061fc3
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DENABLE_FUNC_TESTS=OFF -DENABLE_UNIT_TESTS=OFF"

From a0e6824873991541534b7db50452afba6fba53a1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 21 Apr 2023 10:19:56 +0200
Subject: [PATCH 0720/1854] yarn-bin: update to 1.22.19

---
 srcpkgs/yarn-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 01ce68263ade..46ae0c0a1623 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.22.18
+version=1.22.19
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
@@ -8,7 +8,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=816e5c073b3d35936a398d1fe769ebbcd517298e3510b649e8fc67cd3a62e113
+checksum=732620bac8b1690d507274f025f3c6cfdc3627a84d9642e38a07452cc00e0f2e
 conflicts="yarn>=0"
 
 do_extract() {

From 1672f7df27ce1e0875a7735bffa089bb56d54a11 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 21 Apr 2023 10:22:49 +0200
Subject: [PATCH 0721/1854] yarn: update to 1.22.19

---
 srcpkgs/yarn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template
index 834d72024cc7..e63a97e9abca 100644
--- a/srcpkgs/yarn/template
+++ b/srcpkgs/yarn/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn'
 pkgname=yarn
-version=1.22.18
+version=1.22.19
 revision=1
 hostmakedepends="yarn-bin nodejs tar"
 depends="virtual?nodejs-runtime"
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz"
-checksum=accb0911b05329220a6fe7fd14d091add3b62535811ea97503e8579ae5812c2e
+checksum=50af0025d2ef942bf3e6cdd0587dc9c4dd8d6e6e69501b84935d09f2b2b5de8b
 
 conflicts="yarn-bin>=0"
 

From 621100e56ee4dc1cc3ae19ece392fcf1db708355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= <duje.mihanovic@skole.hr>
Date: Wed, 14 Jun 2023 11:52:04 +0200
Subject: [PATCH 0722/1854] srcpkgs: remove myself from maintainer fields

---
 srcpkgs/gwe/template               | 2 +-
 srcpkgs/python3-coveralls/template | 2 +-
 srcpkgs/python3-injector/template  | 2 +-
 srcpkgs/python3-nvml/template      | 2 +-
 srcpkgs/python3-rx/template        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template
index ea56c8f02967..edc4bff01f77 100644
--- a/srcpkgs/gwe/template
+++ b/srcpkgs/gwe/template
@@ -9,7 +9,7 @@ depends="python3 libayatana-appindicator libdazzle python3-matplotlib
  python3-peewee python3-gobject python3-xlib python3-xdg python3-requests python3-rx
  python3-nvml python3-injector"
 short_desc="Utility for overclocking NVIDIA cards"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/leinardi/gwe"
 changelog="https://gitlab.com/leinardi/gwe/-/raw/release/CHANGELOG.md"
diff --git a/srcpkgs/python3-coveralls/template b/srcpkgs/python3-coveralls/template
index 9a959168a468..6a1730e00366 100644
--- a/srcpkgs/python3-coveralls/template
+++ b/srcpkgs/python3-coveralls/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools python3-coverage"
 depends="python3"
 short_desc="Python API for coveralls.io"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/z4r/python-coveralls"
 distfiles="https://github.com/z4r/python-coveralls/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-injector/template b/srcpkgs/python3-injector/template
index b39d5c6992bd..a44b7907b6e5 100644
--- a/srcpkgs/python3-injector/template
+++ b/srcpkgs/python3-injector/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-typing_extensions python3-setuptools"
 depends="python3 python3-typing_extensions"
 checkdepends="python3-pytest python3-pytest-cov"
 short_desc="Python dependency injection framework"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/alecthomas/injector"
 distfiles="https://github.com/alecthomas/injector/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-nvml/template b/srcpkgs/python3-nvml/template
index 6b417b18728c..ef12edc578c7 100644
--- a/srcpkgs/python3-nvml/template
+++ b/srcpkgs/python3-nvml/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-xmltodict"
 short_desc="Python bindings for NVML library"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/fbcotter/py3nvml"
 distfiles="https://github.com/fbcotter/py3nvml/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-rx/template b/srcpkgs/python3-rx/template
index cc3306dfdfd6..067d6f40767d 100644
--- a/srcpkgs/python3-rx/template
+++ b/srcpkgs/python3-rx/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-pytest"
 depends="python3 python3-pytest"
 checkdepends="python3-gobject python3-gobject-devel gtk+3-devel"
 short_desc="Reactive Extensions for Python"
-maintainer="Duje Mihanovic <mihaduje@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://rxpy.rtfd.io/"
 distfiles="https://github.com/ReactiveX/RxPY/archive/v${version}.tar.gz"

From bff6ed48c5eab28fedbe27fe657238286b462410 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 13 Apr 2023 09:51:23 +0000
Subject: [PATCH 0723/1854] diffr: update to 0.1.5.

---
 ...51190affd4ce676bb184cd8cc52e20947bfc.patch | 78 -------------------
 srcpkgs/diffr/template                        | 13 ++--
 2 files changed, 7 insertions(+), 84 deletions(-)
 delete mode 100644 srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch

diff --git a/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch b/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch
deleted file mode 100644
index 60b9b2f86df9..000000000000
--- a/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From eca551190affd4ce676bb184cd8cc52e20947bfc Mon Sep 17 00:00:00 2001
-From: Nathan Moreau <nathan.moreau@m4x.org>
-Date: Thu, 19 Mar 2020 23:47:50 +0100
-Subject: [PATCH] Fix build on 32 bits plateforms.
-
----
- src/main.rs | 8 ++++----
- src/test.rs | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/main.rs b/src/main.rs
-index bccc6c4..333438f 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -574,7 +574,7 @@ struct HunkHeader {
-     plus_range: (usize, usize),
- }
- 
--const WIDTH: [usize; 20] = [
-+const WIDTH: [u64; 20] = [
-     0,
-     9,
-     99,
-@@ -597,7 +597,7 @@ const WIDTH: [usize; 20] = [
-     9999999999999999999,
- ];
- 
--fn width1(x: usize) -> usize {
-+fn width1(x: u64) -> usize {
-     let result = WIDTH.binary_search(&x);
-     match result {
-         Ok(i) | Err(i) => i,
-@@ -613,8 +613,8 @@ impl HunkHeader {
-     }
- 
-     fn width(&self) -> usize {
--        2 * width1(self.minus_range.0 + self.minus_range.1)
--            .max(width1(self.plus_range.0 + self.plus_range.1))
-+        2 * width1((self.minus_range.0 + self.minus_range.1) as u64)
-+            .max(width1((self.plus_range.0 + self.plus_range.1) as u64))
-             + 1
-     }
- }
-diff --git a/src/test.rs b/src/test.rs
-index d1254d3..5de7ba4 100644
---- a/src/test.rs
-+++ b/src/test.rs
-@@ -63,12 +63,12 @@ fn parse_line_number_test() {
- #[test]
- fn test_width() {
-     for (i, x) in WIDTH.iter().enumerate() {
--        if x < &usize::max_value() {
-+        if x < &u64::max_value() {
-             assert_eq!(format!("{}", x + 1).len(), i + 1);
-         }
-     }
-     assert_eq!(0, width1(0));
--    fn test(x: usize) {
-+    fn test(x: u64) {
-         assert_eq!(format!("{}", x).len(), width1(x));
-     }
-     for i in 1..=10000 {
-@@ -80,7 +80,7 @@ fn test_width() {
-     for i in 0..64 {
-         test(1 << i);
-     }
--    test(usize::max_value());
-+    test(u64::max_value());
- 
-     assert_eq!("123:456".len(), HunkHeader::new((123, 5), (456, 9)).width());
-     assert_eq!(
-@@ -88,5 +88,5 @@ fn test_width() {
-         HunkHeader::new((123, 999), (456, 9)).width()
-     );
-     assert_eq!("   :456".len(), HunkHeader::new((0, 0), (456, 9)).width());
--    assert_eq!(MAX_MARGIN, 2 * width1(usize::max_value()) + 1);
-+    assert_eq!(MAX_MARGIN, 2 * width1(u64::max_value()) + 1);
- }
diff --git a/srcpkgs/diffr/template b/srcpkgs/diffr/template
index 871bf6988fa6..5a8e3e744ce3 100644
--- a/srcpkgs/diffr/template
+++ b/srcpkgs/diffr/template
@@ -1,18 +1,19 @@
 # Template file for 'diffr'
 pkgname=diffr
-version=0.1.4
-revision=2
+version=0.1.5
+revision=1
 build_style=cargo
-short_desc="LCS based diff highlighting tool to ease code review from your terminal"
+# skip cli tests: fail to find executable
+make_check_args="-- --skip tests_cli"
+short_desc="Yet another diff highlighting tool"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="MIT"
 homepage="https://github.com/mookid/diffr"
 changelog="https://github.com/mookid/diffr/raw/master/CHANGELOG.md"
 distfiles="https://github.com/mookid/diffr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2613b57778df4466a20349ef10b9e022d0017b4aee9a47fb07e78779f444f8cb
+checksum=6c5861e5b8f5d798e027fe69cc186452848dc4ae5641326b41b5c160d3e91654
 
-do_install() {
-	vbin "target/${RUST_TARGET}/release/diffr"
+post_install() {
 	vlicense LICENSE.txt
 	vdoc README.md
 }

From cddc35bc44426c546dd81817a48dc9665365564b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:18:38 -0400
Subject: [PATCH 0724/1854] aide: update to 0.18.4.

---
 srcpkgs/aide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index cfd14f0d6d4a..32e90793100e 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.18.3
+version=0.18.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=d47da12c4bf085bfdf1828e087a1db5195a4d217ff4c89f40dbd94e2a887a6a2
+checksum=4f7e2c7f49f3ca25fdafad6170390a4d8c8334af17bbd48ad34dbd6dde4ee757
 
 export MHASH_CFLAGS="=I${XBPS_CROSS_BASE}/usr/include"
 export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"

From 3da465bbe9649a9e0b97bcce8b0f1463a6511732 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:19:46 -0400
Subject: [PATCH 0725/1854] python3-art: update to 6.0.

---
 srcpkgs/python3-art/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-art/template b/srcpkgs/python3-art/template
index 83be4113b138..0c07a817a57b 100644
--- a/srcpkgs/python3-art/template
+++ b/srcpkgs/python3-art/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-art'
 pkgname=python3-art
-version=5.9
+version=6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.ascii-art.site/"
 changelog="https://raw.githubusercontent.com/sepandhaghighi/art/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/a/art/art-${version}.tar.gz"
-checksum=6a311ec0a227c6554c6789e91e74c3f2c86453a2a8e76947788695b7a91ccff0
+checksum=884ef1c10e900387cce97789e8668125720cbf4459206641b91fc298c859cda9
 make_check=no # no tests available
 
 post_install() {

From e996eb67540dac99ab7f66d612f87ff62a47842d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:24:45 -0400
Subject: [PATCH 0726/1854] python3-google-i18n-address: update to 3.1.0.

---
 srcpkgs/python3-google-i18n-address/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-google-i18n-address/template b/srcpkgs/python3-google-i18n-address/template
index 81c5425c20e2..9e9e68a6c84b 100644
--- a/srcpkgs/python3-google-i18n-address/template
+++ b/srcpkgs/python3-google-i18n-address/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-google-i18n-address'
 pkgname=python3-google-i18n-address
-version=3.0.0
+version=3.1.0
 revision=1
 build_style=python3-pep517
 make_check_target="tests/"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mirumee/google-i18n-address"
 distfiles="https://github.com/mirumee/google-i18n-address/archive/refs/tags/${version}.tar.gz"
-checksum=387b4683936bbc19d1cf9a1dbf8f08610742f5ad3db72b681240b2e43a120c05
+checksum=96044d9a09fed1b7c5a289b4880bee23d7de26696a7908c4e6e7c07668f2b9af

From 5724c1da163b4e167e798e39142f775c8aadc35b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:26:00 -0400
Subject: [PATCH 0727/1854] python3-rich: update to 13.4.2.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 914fac194563..c3f2e7da0ff2 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=13.4.1
+version=13.4.2
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=76f6b65ea7e5c5d924ba80e322231d7cb5b5981aa60bfc1e694f1bc097fe6fe1
+checksum=d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898
 make_check=extended # some checks only work on windows
 
 post_install() {

From 5a4c0cf27b115bc0e05d9086449403900925178b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:27:35 -0400
Subject: [PATCH 0728/1854] yara: update to 4.3.2.

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index f593415a3385..fda4eee8dd0b 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.3.1
+version=4.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=f64538279c018bcf7cda368c51b9c660556108ab2e7eb24de043738df2271d92
+checksum=a9587a813dc00ac8cdcfd6646d7f1c172f730cda8046ce849dfea7d3f6600b15
 
 pre_configure() {
 	autoreconf -fi

From 66710696bcfb99d78d45583de1d39a0113f457f5 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Thu, 15 Jun 2023 10:46:35 +0100
Subject: [PATCH 0729/1854] dotool: orphan

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 2b86e31ad314..7503b8d71a5b 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"
 short_desc="Command to simulate input anywhere (X11, Wayland, TTYs)"
-maintainer="John Gebbie <me@johngebbie.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://sr.ht/~geb/dotool"
 changelog="https://git.sr.ht/~geb/dotool/blob/master/CHANGELOG.md"

From 3a6ee88305bbfa055a8056a9f592c853acdfbee1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Thu, 15 Jun 2023 10:46:51 +0100
Subject: [PATCH 0730/1854] openfst: orphan

---
 srcpkgs/openfst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..9449a7085279 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -24,7 +24,7 @@ configure_args="
 "
 hostmakedepends="autoconf automake libtool"
 short_desc="Finite-state transducers library"
-maintainer="John Gebbie <me@johngebbie.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.openfst.org"
 distfiles="https://www.openfst.org/twiki/pub/FST/FstDownload/openfst-$version.tar.gz"

From fa9102437a24a2d588ce4b432fe14b3b7ec62eaf Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Thu, 15 Jun 2023 10:47:07 +0100
Subject: [PATCH 0731/1854] vosk-api: orphan

---
 srcpkgs/vosk-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..5af846b55795 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -12,7 +12,7 @@ make_use_env=yes
 make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
 makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
 short_desc="Offline speech recognition toolkit"
-maintainer="John Gebbie <me@johngebbie.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://alphacephei.com/vosk"
 distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz

From f48d8e88551a65468d168e5307d7ef9ad6c67726 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 18:26:15 +0100
Subject: [PATCH 0732/1854] fuse3: update to 3.15.0.

---
 srcpkgs/fuse3/patches/804.patch | 38 +++++++++++++++++++++++++++++++++
 srcpkgs/fuse3/template          |  7 +++---
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/fuse3/patches/804.patch

diff --git a/srcpkgs/fuse3/patches/804.patch b/srcpkgs/fuse3/patches/804.patch
new file mode 100644
index 000000000000..6894337fe198
--- /dev/null
+++ b/srcpkgs/fuse3/patches/804.patch
@@ -0,0 +1,38 @@
+From 6d21930baa4379023414706ce1750e0d729b99f0 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 12 Jun 2023 12:15:35 +0000
+Subject: [PATCH] Wrapper around test applications for cross compiler
+ environment in meson.build
+
+This enhances commit 7be56c57f93e3436b1fbd9ecc320de5c03a3e4b8 to allow build
+fuse to be built using a cross compiler
+
+Fixes:
+../meson.build:180:12: ERROR: Can not run test applications in this cross environment.
+---
+https://github.com/libfuse/libfuse/pull/804
+
+ meson.build | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 7aa4e0d47..9707ea3e2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -177,10 +177,12 @@ int main()
+ }
+ '''
+ 
+-result = cc.run(detect_getmntent_needs_unescape)
+-if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping'
+-  message('getmntent does not unescape')
+-  add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c')
++if not meson.is_cross_build()
++  result = cc.run(detect_getmntent_needs_unescape)
++  if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping'
++    message('getmntent does not unescape')
++    add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c')
++  endif
+ endif
+ 
+ # Write private test results into fuse_config.h (stored in build directory)
diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index 5593044a0483..38e46546995c 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,9 +1,10 @@
 # Template file for 'fuse3'
 pkgname=fuse3
-version=3.14.1
+version=3.15.0
 revision=1
 build_style=meson
-configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false"
+configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false
+ -Dtests=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"
 short_desc="Filesystem in Userspace 3.x"
@@ -12,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/libfuse/libfuse"
 changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst"
 distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=126919d72b46b3e0eb58a9c6933a2a50c36f2ea69f61fe9e78bdba9f463ffa20
+checksum=70589cfd5e1cff7ccd6ac91c86c01be340b227285c5e200baa284e401eea2ca0
 conf_files="/etc/fuse.conf"
 # Tests require root
 make_check=no

From 52eaa40957b2836e94ee5a8c2c0a5d3ea13f7744 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 14 Jun 2023 11:39:54 -0400
Subject: [PATCH 0733/1854] pueue: update to 3.2.0

---
 srcpkgs/pueue/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index 39d676079257..a747b9c4557a 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -1,6 +1,6 @@
 # Template file for 'pueue'
 pkgname=pueue
-version=3.1.2
+version=3.2.0
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/Nukesor/pueue"
 changelog="https://raw.githubusercontent.com/Nukesor/pueue/main/CHANGELOG.md"
 distfiles="https://github.com/Nukesor/pueue/archive/refs/tags/v${version}.tar.gz"
-checksum=653eac9b7fc111cc4b9bddacbbf514932a8d273a059b20b1cc66af74e500eb5e
+checksum=0c3126579661f894fb02a0d8c0e138ab23b277e97cea2d85e48d3d2b9fb1c372
 make_check=no  # tests are nondeterministic
 
 case "$XBPS_TARGET_MACHINE" in

From 9b53e7c686b1276f52d34f746debeeeaef3278b0 Mon Sep 17 00:00:00 2001
From: toomyem <toomyem@gmail.com>
Date: Wed, 14 Jun 2023 11:55:13 +0200
Subject: [PATCH 0734/1854] moosefs: added mfscgiserv service

---
 srcpkgs/moosefs/files/mfscgiserv/run | 4 ++++
 srcpkgs/moosefs/template             | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/moosefs/files/mfscgiserv/run

diff --git a/srcpkgs/moosefs/files/mfscgiserv/run b/srcpkgs/moosefs/files/mfscgiserv/run
new file mode 100644
index 000000000000..4eee2a80277e
--- /dev/null
+++ b/srcpkgs/moosefs/files/mfscgiserv/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -e conf ] && . ./conf
+exec mfscgiserv -f $OPTS start
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index 0c14645f9b22..6903e7e07ec1 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -1,7 +1,7 @@
 # Template file for 'moosefs'
 pkgname=moosefs
 version=3.0.117
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib --with-default-user=_mfs
  --with-default-group=_mfs"
@@ -23,7 +23,7 @@ pre_configure() {
 
 post_install() {
 	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
-	for f in chunkserver master metalogger; do
+	for f in chunkserver master metalogger cgiserv; do
 		vsv mfs${f}
 	done
 }

From 9e7f16b5f58691cdf8b039229cacc9b3173fd5c2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 19:04:56 +0100
Subject: [PATCH 0735/1854] jack: update to 1.9.22.

---
 srcpkgs/jack/patches/python3.11.patch | 36 ---------------------------
 srcpkgs/jack/template                 | 14 +++++------
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/jack/patches/python3.11.patch

diff --git a/srcpkgs/jack/patches/python3.11.patch b/srcpkgs/jack/patches/python3.11.patch
deleted file mode 100644
index 5b52a9bfb43f..000000000000
--- a/srcpkgs/jack/patches/python3.11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-U is included by default and deprecated since 3.3 and an error since 3.11
-
-https://github.com/jackaudio/jack2/issues/898
-adapted from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
-
---- a/waflib/ConfigSet.py
-+++ b/waflib/ConfigSet.py
-@@ -312,7 +312,7 @@ class ConfigSet(object):
- 		:type filename: string
- 		"""
- 		tbl = self.table
--		code = Utils.readf(filename, m='rU')
-+		code = Utils.readf(filename, m='r')
- 		for m in re_imp.finditer(code):
- 			g = m.group
- 			tbl[g(2)] = eval(g(3))
---- a/waflib/Context.py
-+++ b/waflib/Context.py
-@@ -266,7 +266,7 @@ class Context(ctx):
- 				cache[node] = True
- 				self.pre_recurse(node)
- 				try:
--					function_code = node.read('rU', encoding)
-+					function_code = node.read('r', encoding)
- 					exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
- 				finally:
- 					self.post_recurse(node)
-@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
- 
- 	module = imp.new_module(WSCRIPT_FILE)
- 	try:
--		code = Utils.readf(path, m='rU', encoding=encoding)
-+		code = Utils.readf(path, m='r', encoding=encoding)
- 	except EnvironmentError:
- 		raise Errors.WafError('Could not read the file %r' % path)
- 
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 7e4de615e0ad..05c1ae08ce04 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,13 +1,12 @@
 # Template file for 'jack'
 pkgname=jack
-version=1.9.21
+version=1.9.22
 revision=1
 build_style=waf3
-configure_args="--alsa --classic --dbus --example-tools"
+configure_args="--alsa --classic --dbus"
 hostmakedepends="pkg-config"
-makedepends="eigen opus-devel libsamplerate-devel readline-devel
- dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel)
- $(vopt_if zalsa 'zita-alsa-pcmi-devel zita-resampler-devel')"
+makedepends="eigen opus-devel libsamplerate-devel dbus-devel db-devel celt-devel
+ $(vopt_if ffado libffado-devel)"
 depends="python3-dbus"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,13 +14,12 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://jackaudio.org/"
 changelog="https://raw.githubusercontent.com/jackaudio/jack2/master/ChangeLog.rst"
 distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d
+checksum=1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849
 python_version=3
 
 # Package build options
-build_options="ffado zalsa"
+build_options="ffado"
 desc_option_ffado="Enable support for FireWire audio devices"
-desc_option_zalsa="Enable support for internal zita-a2j/j2a clients"
 
 post_install() {
 	# pam_limits(8) support

From c1053c603434ee034b1b2f023f3d179dde2aaede Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 14 Jun 2023 20:57:34 +0200
Subject: [PATCH 0736/1854] treeline: update to 3.1.6

---
 srcpkgs/treeline/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/treeline/template b/srcpkgs/treeline/template
index c7357c76dce1..c500da127d46 100644
--- a/srcpkgs/treeline/template
+++ b/srcpkgs/treeline/template
@@ -1,7 +1,7 @@
 # Template file for 'treeline'
 pkgname=treeline
-version=3.1.5
-revision=2
+version=3.1.6
+revision=1
 pycompile_dirs="usr/share/treeline"
 hostmakedepends="python3"
 depends="python3-PyQt5"
@@ -10,7 +10,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://treeline.bellz.org/"
 distfiles="https://github.com/doug-101/TreeLine/archive/v${version}.tar.gz"
-checksum=8bef3c3819dab7968f8cd46e3a1e817a06259270d3d01f4eb9f22b1821094650
+checksum=c4f187797365ef224bb285ef5d7e90a64b0ae33573d27599fb18d7af54b42d4d
 python_version=3
 
 do_install() {

From 64ff34b22f26b92f03d5a45f5194d0abfb9fd5d4 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 14 Jun 2023 11:47:43 +0200
Subject: [PATCH 0737/1854] soundtouch: update to 2.3.2

---
 srcpkgs/soundtouch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template
index f2ed0f607fdf..f9a7c06bee7a 100644
--- a/srcpkgs/soundtouch/template
+++ b/srcpkgs/soundtouch/template
@@ -1,6 +1,6 @@
 # Template file for 'soundtouch'
 pkgname=soundtouch
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-openmp"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.surina.net/soundtouch"
 distfiles="https://www.surina.net/soundtouch/soundtouch-${version}.tar.gz"
-checksum=6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1
+checksum=3bde8ddbbc3661f04e151f72cf21ca9d8f8c88e265833b65935b8962d12d6b08
 
 pre_configure() {
 	./bootstrap

From 10f763a6052dcd677f75155068f052d0cf9d67d5 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 14 Jun 2023 11:40:42 +0200
Subject: [PATCH 0738/1854] parted: update to 3.6

---
 srcpkgs/parted/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 32c62d8e8072..0d2a4fff3a4e 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -1,6 +1,6 @@
 # Template file for 'parted'
 pkgname=parted
-version=3.5
+version=3.6
 revision=1
 build_style=gnu-configure
 # parted wants off_t as 64bit type
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/parted/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2
+checksum=3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612
 
 libparted_package() {
 	short_desc+=" - shared library"

From 6a284b860171c3dd3cd67456d7269bafaaad305d Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Wed, 14 Jun 2023 19:07:01 +0000
Subject: [PATCH 0739/1854] mesa: update to 23.1.2.

---
 srcpkgs/mesa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 04d3a1dfe680..2ebb1cff2013 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=23.1.1
+version=23.1.2
 revision=1
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -17,13 +17,13 @@ makedepends="elfutils-devel expat-devel libXdamage-devel
  libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
  libarchive-devel"
 depends="libglvnd"
-short_desc="Graphics library similar to SGI's OpenGL"
+short_desc="Open source implementation of OpenGL and Vulkan"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
+checksum=60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e
 
 build_options="wayland"
 build_options_default="wayland"

From f6a6a863a608bc8327314c86e66abf97c2991274 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:24:25 -0500
Subject: [PATCH 0740/1854] haproxy: update to 2.6.14.

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index fbf13377f601..635755fe4173 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.6.13
+version=2.6.14
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 changelog="https://www.haproxy.org/download/${version%.*}/src/CHANGELOG"
 distfiles="https://www.haproxy.org/download/${version%.*}/src/haproxy-${version}.tar.gz"
-checksum=d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243
+checksum=bd3dd9fa60391ca09e1225e1ac3163e45be83c3f54f2fd76a30af289cc6e4fd4
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From e1a661d5d3dd193c6f9842e0b81a7e0cac35a82f Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 4 May 2023 21:37:33 +0300
Subject: [PATCH 0741/1854] openrazer-meta: update to 3.6.1.

---
 srcpkgs/openrazer-meta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index e824d9f7d293..81300dbfddb5 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,6 +1,6 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
-version=3.5.1
+version=3.6.1
 revision=1
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -12,7 +12,7 @@ maintainer="Martin Dimov <martin@dmarto.com>"
 license="GPL-2.0-or-later"
 homepage="https://openrazer.github.io"
 distfiles="https://github.com/openrazer/openrazer/releases/download/v${version}/openrazer-${version}.tar.xz"
-checksum=0dd242fe95a804e437359f1730be8bbb1ffc19b9d60bc3f23d481e541eb25bec
+checksum=bbb33fc3fbe329d178793fe3e24e60cbe5369c5996b8e1546de2950669ef675b
 
 do_build() {
 	:

From 48317718b74b7de61bc6c888f56993aa7a654db3 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 15 Jun 2023 01:23:03 +0300
Subject: [PATCH 0742/1854] mate-tweak: update to 22.10.0

---
 srcpkgs/mate-tweak/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 511a09af4b39..256efec8ef71 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
-version=21.10.0
-revision=2
+version=22.10.0
+revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
 depends="mate-panel python3-gobject python3-psutil python3-setproctitle
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ubuntu-mate/mate-tweak"
 distfiles="https://github.com/ubuntu-mate/mate-tweak/archive/${version}.tar.gz"
-checksum=1bacc9b92960c712697e0c44fbcaaebed9683b4ff899af5af88506f7e13e1aff
+checksum=c33c092b0151b50d8a5706825f1bcef57f1738f8f5cf22af49c11f45bc14e84a

From 20648e54fff25231992d467371dbd167c88ad59d Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 14 Jun 2023 19:50:22 -0500
Subject: [PATCH 0743/1854] Signal-Desktop: update to 6.21.0.

---
 srcpkgs/Signal-Desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 88a862a26a14..6bd0160a886c 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,20 +1,20 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.20.2
+version=6.21.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
 # https://git.alpinelinux.org/aports/tree/testing/signal-desktop
 # ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
 archs="x86_64"
-hostmakedepends="git git-lfs nodejs python3 tar"
+hostmakedepends="git git-lfs nodejs-lts python3 tar"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
 maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=8cca38e0ce70bec39a9d3f4c1d51bfec95a1455187c5ec1001ce98ec55f9c3e5
+checksum=fea24e57de48cf60f42f40764429176cd236a0a765bb18e1815e2d56511923f7
 nostrip_files="signal-desktop"
 
 post_extract() {

From 579fa2eba411187ccf7bde7806b869e127370492 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 17 May 2023 09:56:01 +0200
Subject: [PATCH 0744/1854] curl: update to 8.1.2

---
 srcpkgs/curl/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index b43961934747..df7d4ed01555 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=8.0.1
-revision=2
+version=8.1.2
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  --enable-websockets --with-random=/dev/urandom
@@ -22,10 +22,10 @@ checkdepends="python3 stunnel nghttp2 impacket"
 short_desc="Client that groks URLs"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
-homepage="https://curl.haxx.se"
-changelog="https://curl.haxx.se/changes.html#${version//./_}"
-distfiles="${homepage}/download/curl-${version}.tar.bz2"
-checksum=9b6b1e96b748d04b968786b6bdf407aa5c75ab53a3d37c1c8c81cdb736555ccf
+homepage="https://curl.se"
+changelog="https://curl.se/changes.html"
+distfiles="https://curl.se/download/curl-${version}.tar.gz"
+checksum=2e5a9b8fcdc095bdd2f079561f369de71c5eb3b80f00a702fbe9a8b8d9897891
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssl zstd"
 vopt_conflict ssl gnutls

From 85fa2fa0c7fa2c4f1c158c497b3b7784ad1086b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 15 Jun 2023 14:59:44 +0200
Subject: [PATCH 0745/1854] openbsd-netcat: update to 1.225.

---
 srcpkgs/openbsd-netcat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 4b09dfe9a28b..ed569eadb2d4 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.219
+version=1.225
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="576487c3a4930987a5dc7b369340f07f3ef15abe7cd743d88036990bd8d89dca
- 3f5f801bacd740075d563137387004a6e651d56801e369026c2387a041b4d357"
+checksum="ab3f2e789160e3f46a1fdff6465d20efa1e40c505a8262e1121adbf1adf79d65
+ 8ddff3d8567e24c3886dceda6ae70d21d21df2d4c23c6e78bf69bdd72c81f26a"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From 8d093212d4a98faa42320932631bf1c549c13269 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 19:22:15 +0100
Subject: [PATCH 0746/1854] intel-ucode: update to 20230613, adopt.

---
 srcpkgs/intel-ucode/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index f6673a50ae32..090c0c57a1ff 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,14 +1,14 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20230516
+version=20230613
 revision=1
 archs="i686* x86_64*"
 short_desc="Microcode update files for Intel CPUs"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${version}.tar.gz"
-checksum=ad8cbc5a273f4640003f6a3f1b129ac6a046f3498ce037921ebac1adf267e55d
+checksum=894d822d2347222a2595d4fc47d358e01d35a54780123100c317dfc31b1b0cc9
 repository=nonfree
 
 do_install() {

From c8942ce3e38aed7657ef33f3f0ac276ac38ff673 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 8 Jun 2023 17:41:04 +0200
Subject: [PATCH 0747/1854] New package: linux-wifi-hotspot-4.5.0

---
 .../linux-wifi-hotspot/patches/makefile.patch | 24 +++++++++++++++++++
 srcpkgs/linux-wifi-hotspot/template           | 19 +++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/linux-wifi-hotspot/patches/makefile.patch
 create mode 100644 srcpkgs/linux-wifi-hotspot/template

diff --git a/srcpkgs/linux-wifi-hotspot/patches/makefile.patch b/srcpkgs/linux-wifi-hotspot/patches/makefile.patch
new file mode 100644
index 000000000000..7f1eecea7b75
--- /dev/null
+++ b/srcpkgs/linux-wifi-hotspot/patches/makefile.patch
@@ -0,0 +1,24 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,7 +1,7 @@
+ CC=gcc
+ PKGCONFIG = $(shell which pkg-config)
+
+-CFLAGS=`pkg-config --cflags gtk+-3.0`
++CFLAGS_PKGCONF=`pkg-config --cflags gtk+-3.0`
+ LIBS=`pkg-config --libs gtk+-3.0 --libs x11` -lstdc++ -lpng -lqrencode
+
+ APP_NAME="wihotspot"
+@@ -32,10 +32,10 @@ resources.c: ui/glade/wifih.gresource.xml ui/glade/wifih.ui
+ 	@$(MAKE) -f $(THIS_FILE) wihotspot-gui
+
+ $(ODIR)/%.o: ui/%.c
+-	$(CC) -c -o $@ $< $(CFLAGS)
++	$(CC) -c -o $@ $< $(CFLAGS) $(CFLAGS_PKGCONF)
+
+ $(ODIR)/%.o: ui/%.cpp
+-	g++ -c -o $@ $<
++	$(CXX) -c -o $@ $< $(CXXFLAGS)
+
+ wihotspot-gui: $(OBJ)
+ 	$(CC) -o $(ODIR)/$@ $^ $(CFLAGS) $(LIBS)
\ No newline at end of file
diff --git a/srcpkgs/linux-wifi-hotspot/template b/srcpkgs/linux-wifi-hotspot/template
new file mode 100644
index 000000000000..a2c03b268264
--- /dev/null
+++ b/srcpkgs/linux-wifi-hotspot/template
@@ -0,0 +1,19 @@
+# Template file for 'linux-wifi-hotspot'
+pkgname=linux-wifi-hotspot
+version=4.5.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config which glib-devel"
+makedepends="gtk+3-devel libpng-devel qrencode-devel"
+depends="bash dnsmasq hostapd iproute2 iptables iw procps-ng util-linux"
+short_desc="Feature-rich wifi hotspot creator"
+maintainer="Bnyro <bnyro@tutanota.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/lakinduakash/linux-wifi-hotspot"
+distfiles="https://github.com/lakinduakash/linux-wifi-hotspot/archive/refs/tags/v${version}.tar.gz"
+checksum=9e4222b7d3129347b01eef711911ec87c9a04e20efd12d88565f682a14eb91da
+conflicts="create_ap"
+
+post_install() {
+	vlicense LICENSE
+}

From 8d64b4511946e040b30afc5c873f36f23b8e6598 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 15 Jun 2023 16:05:02 +0200
Subject: [PATCH 0748/1854] vpm: fix deleted source repo

---
 srcpkgs/vpm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vpm/template b/srcpkgs/vpm/template
index 39ee867e1306..e17df504af7f 100644
--- a/srcpkgs/vpm/template
+++ b/srcpkgs/vpm/template
@@ -5,9 +5,9 @@ revision=3
 short_desc="XBPS package management helper for VoidLinux"
 maintainer="Armin Jenewein <github@m2m.pm>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/netzverweigerer/vpm"
-distfiles="https://github.com/netzverweigerer/${pkgname}/archive/${version}.tar.gz"
-checksum=56994ba90aaf9055d0c20a7fbbce7faf6b6d245fba551a427312114f7cb78ae4
+homepage="https://codeberg.org/armin/vpm"
+distfiles="https://codeberg.org/armin/${pkgname}/archive/${version}.tar.gz"
+checksum=ba5349344de9c9b3e2e0f1553792b1f8d6939d9f82d77b76b494d16a482ceb13
 
 do_install() {
 	vbin vpm

From e9c41563ca975fe264c39c3a4718072c2ad8f47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 01:01:14 -0300
Subject: [PATCH 0749/1854] python3-argcomplete: update to 3.1.1.

---
 srcpkgs/python3-argcomplete/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index abe32205b908..62593c46ff10 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,13 +1,20 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
-version=3.0.5
+version=3.1.1
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-wheel"
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3"
+checkdepends="python3-pexpect python3-pip zsh"
 short_desc="Bash tab completion for argparse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/argcomplete"
+changelog="https://raw.githubusercontent.com/kislyuk/argcomplete/develop/Changes.rst"
 distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz"
-checksum=fe3ce77125f434a0dd1bffe5f4643e64126d5731ce8d173d36f62fa43d6eb6f7
+checksum=6c4c563f14f01440aaffa3eae13441c5db2357b5eec639abe7c0b15334627dff
+
+do_check() {
+	# pytest is not supported
+	python3 -m unittest -b test/test.py
+}

From d133c0169b495a8c8feb5a0dd56b159504307694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 12:59:09 -0300
Subject: [PATCH 0750/1854] python3-BeautifulSoup4: update to 4.12.2.

---
 srcpkgs/python3-BeautifulSoup4/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 882ea8a33214..25d104f6d0d4 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-BeautifulSoup4'
 pkgname=python3-BeautifulSoup4
-version=4.11.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3 python3-soupsieve"
-checkdepends="python3-pytest $depends"
+version=4.12.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-soupsieve"
+checkdepends="$depends python3-pytest python3-html5lib python3-lxml"
 short_desc="Python3 HTML/XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.crummy.com/software/BeautifulSoup"
-changelog="https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/CHANGELOG"
+changelog="https://git.launchpad.net/beautifulsoup/plain/CHANGELOG"
 distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693
+checksum=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da
 
 post_install() {
 	vlicense LICENSE

From d829f339769a1da84338342b62529b2fd8b43bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 12:25:30 -0300
Subject: [PATCH 0751/1854] python3-bleach: update to 6.0.0.

---
 srcpkgs/python3-bleach/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index aea09c368c1f..1a14acbfc21f 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-bleach'
 pkgname=python3-bleach
-version=4.1.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-six python3-webencodings python3-packaging"
+version=6.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-six python3-webencodings"
 checkdepends="python3-pytest $depends"
 short_desc="Easy safelist-based HTML-sanitizing tool (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/mozilla/bleach"
 changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
 distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da
+checksum=1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414

From caf090d391d0d3148abd7e264faf0a54e9ca548c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 10:28:43 -0300
Subject: [PATCH 0752/1854] python3-fastjsonschema: update to 2.17.1.

---
 srcpkgs/python3-fastjsonschema/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
index 7e4495b9456b..54fbdb6dde10 100644
--- a/srcpkgs/python3-fastjsonschema/template
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-fastjsonschema'
 pkgname=python3-fastjsonschema
-version=2.16.3
+version=2.17.1
 revision=1
-build_style=python3-module
-make_check_args="--deselect tests/benchmarks/test_benchmark.py"
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-benchmark"
 short_desc="Fastest Python implementation of JSON schema"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://github.com/horejsek/python-fastjsonschema"
 changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
 distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
-checksum=f9834e4994830942d58949043820024261dc22e2640bcf787391deb607cc91c6
+checksum=9295090b468152cea7a53c651a46d6a1afb83f0124f86c9a64da43fd3453a9f4
 
 post_install() {
 	vlicense LICENSE

From 8b6319a345c22220606d165f192551d8ee9a2a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Jun 2023 23:00:05 -0300
Subject: [PATCH 0753/1854] python3-jsonpointer: update to 2.3.

---
 srcpkgs/python3-jsonpointer/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
index 1da8295d63fc..59b38c2228d6 100644
--- a/srcpkgs/python3-jsonpointer/template
+++ b/srcpkgs/python3-jsonpointer/template
@@ -1,18 +1,23 @@
 # Template file for 'python3-jsonpointer'
 pkgname=python3-jsonpointer
-version=2.0
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=2.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 short_desc="Resolve JSON Pointers according to RFC 6901 (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/stefankoegl/python-json-pointer"
 distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
-checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
+checksum=97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a
 conflicts="python-jsonpointer>=0"
 
+do_check() {
+	# pytest is not supported
+	python3 tests.py
+}
+
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }

From 7936acd7afa2e1a6074a3b523baac95073ed8db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 00:30:38 -0300
Subject: [PATCH 0754/1854] python3-nest_asyncio: update to 1.5.6.

---
 srcpkgs/python3-nest_asyncio/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index 41981f82fc19..d0165041eb17 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-nest_asyncio'
 pkgname=python3-nest_asyncio
-version=1.5.4
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+version=1.5.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Python asyncio patch to allow nested event loops"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/erdewit/nest_asyncio"
 distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
-checksum=f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd
+checksum=d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290
 
 post_install() {
 	vlicense LICENSE

From 9fd409954ef5e9d089f9df5649af4419a5758bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Jun 2023 23:08:30 -0300
Subject: [PATCH 0755/1854] python3-pyrsistent: update to 0.19.3.

---
 srcpkgs/python3-pyrsistent/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index 50ead293041f..d8e8578064ae 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.1
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel"
+version=0.19.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-devel"
 depends="python3"
 checkdepends="python3-pytest python3-hypothesis"
 short_desc="Python persistent immutable data structures"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
+changelog="https://raw.githubusercontent.com/tobgu/pyrsistent/master/CHANGES.txt"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96
+checksum=1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440
 
 post_install() {
 	vlicense LICENSE.mit LICENSE

From f06aa95b4416b3d9a197d9ecb9a1d58b9ca0552d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 00:32:26 -0300
Subject: [PATCH 0756/1854] python3-tornado: update to 6.3.2.

---
 srcpkgs/python3-tornado/template | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index 48c9e57b0bdb..bd8a8803689f 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,20 +1,32 @@
 # Template file for 'python3-tornado'
 pkgname=python3-tornado
-version=6.2
+version=6.3.2
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 makedepends="python3-devel"
 depends="python3 ca-certificates"
+checkdepends="python3-curl python3-pycares python3-Twisted"
 short_desc="Python3 web framework and asynchronous networking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://www.tornadoweb.org/"
+changelog="https://www.tornadoweb.org/en/stable/releases.html"
 distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13
-make_check=no # tests failing, already with 6.1
+checksum=4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba
 
-pre_build() {
-	# use system ca-certificates
-	sed -i "/install_requires.append('certifi')/d" setup.py
+do_check() {
+	# There is one instance of test_bind_source_ip (the one for
+	# curl_httpclient_test.CurlHTTPClientCommonTestCase)
+	# which for some reason is taking a little bit over 5s
+	# (but only on x86_64-musl and only on CI).
+	#
+	# The default test timeout is 5s so the test times out and fails.
+	# See: https://github.com/void-linux/void-packages/pull/44312#issuecomment-1582361791
+	#
+	# Setting the timeout to 6 works around it.
+	local -x ASYNC_TEST_TIMEOUT=6
+
+	# pytest is not supported
+	python3 -m tornado.test
 }

From d0ac546b33326c21d8df2d7e65758a32cb6ca2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 14 Jun 2023 22:52:21 -0300
Subject: [PATCH 0757/1854] python3-terminado: update to 0.17.1.

---
 srcpkgs/python3-terminado/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-terminado/template b/srcpkgs/python3-terminado/template
index e31129323a30..5d524d3e803a 100644
--- a/srcpkgs/python3-terminado/template
+++ b/srcpkgs/python3-terminado/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-terminado'
 pkgname=python3-terminado
-version=0.17.0
+version=0.17.1
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-flit_core python3-tornado hatchling"
+hostmakedepends="hatchling"
 depends="python3-ptyprocess python3-tornado"
 checkdepends="python3-pytest $depends"
-short_desc="Terminals served to term.js using Tornado websockets (Python3)"
+short_desc="Terminals served to term.js using Tornado websockets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/takluyver/terminado"
 distfiles="${PYPI_SITE}/t/terminado/terminado-${version}.tar.gz"
-checksum=520feaa3aeab8ad64a69ca779be54be9234edb2d0d6567e76c93c2c9a4e6e43f
+checksum=6ccbbcd3a4f8a25a5ec04991f39a0b8db52dfcd487ea0e578d977e6752380333
 
 post_install() {
 	vlicense LICENSE

From 631917a22252b57954f72c5ee353b15c2e04d3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 May 2023 20:46:40 -0300
Subject: [PATCH 0758/1854] python3-traitlets: cleanup dependencies, adopt.

---
 srcpkgs/python3-traitlets/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 7b4e13ff871b..a8ed6611188c 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-traitlets'
 pkgname=python3-traitlets
 version=5.9.0
-revision=1
+revision=2
 build_style=python3-pep517
-hostmakedepends="python3-flit_core hatchling"
-depends="python3-decorator python3-ipython_genutils python3-six"
-checkdepends="$depends python3-pytest"
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-argcomplete python3-pytest-mock"
 short_desc="Configuration system for Python applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://github.com/ipython/traitlets"
 changelog="https://github.com/ipython/traitlets/raw/main/CHANGELOG.md"

From 0b960ac24242a9acf37367eb3bdd6606dab989d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 May 2023 00:25:45 -0300
Subject: [PATCH 0759/1854] python3-comm: update to 0.1.3.

---
 srcpkgs/python3-comm/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-comm/template b/srcpkgs/python3-comm/template
index 0bbba8dc0eda..29ebd5afd772 100644
--- a/srcpkgs/python3-comm/template
+++ b/srcpkgs/python3-comm/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-comm'
 pkgname=python3-comm
-version=0.1.1
+version=0.1.3
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling"
@@ -10,8 +10,9 @@ short_desc="Python comm implementation for the Jupyter kernel protocol"
 maintainer="dkwo <npiazza@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ipython/comm/"
-distfiles="https://github.com/ipython/comm/archive/refs/tags/$version.tar.gz"
-checksum=2868dfd1e482b821a929d662bf3d89adeb8a091239bf1497187797fe9e4c12fa
+changelog="https://raw.githubusercontent.com/ipython/comm/main/CHANGELOG.md"
+distfiles="https://github.com/ipython/comm/archive/refs/tags/v$version.tar.gz"
+checksum=9bdea650a6194bf1628b17c2668bf74bf5295c87a7528a8aa4fe4472904b26f2
 
 post_install() {
 	vlicense LICENSE

From 13b44feb39cad4e8042995a430393291d82a141f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 26 May 2023 20:03:16 -0300
Subject: [PATCH 0760/1854] New package: python3-strict-rfc3339-0.7

---
 srcpkgs/python3-strict-rfc3339/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-strict-rfc3339/template

diff --git a/srcpkgs/python3-strict-rfc3339/template b/srcpkgs/python3-strict-rfc3339/template
new file mode 100644
index 000000000000..411d2e93535a
--- /dev/null
+++ b/srcpkgs/python3-strict-rfc3339/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-strict-rfc3339'
+pkgname=python3-strict-rfc3339
+version=0.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Strict, simple, lightweight RFC3339 functions"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/strict-rfc3339/"
+distfiles="${PYPI_SITE}/s/strict-rfc3339/strict-rfc3339-${version}.tar.gz"
+checksum=5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277
+make_check=no  # no tests available

From 0eecc4303944d4f143643a0699f4f0c44215f519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:09:32 -0300
Subject: [PATCH 0761/1854] New package: python3-rfc3339-validator-0.1.4

---
 srcpkgs/python3-rfc3339-validator/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3339-validator/template

diff --git a/srcpkgs/python3-rfc3339-validator/template b/srcpkgs/python3-rfc3339-validator/template
new file mode 100644
index 000000000000..bc572b2f301a
--- /dev/null
+++ b/srcpkgs/python3-rfc3339-validator/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-rfc3339-validator'
+pkgname=python3-rfc3339-validator
+version=0.1.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-six"
+checkdepends="$depends python3-hypothesis python3-pytest python3-strict-rfc3339"
+short_desc="Pure python RFC3339 validator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/naimetti/rfc3339-validator"
+distfiles="${PYPI_SITE}/r/rfc3339-validator/rfc3339_validator-${version}.tar.gz"
+checksum=138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b
+
+post_install() {
+	vlicense LICENSE
+}

From 6b278063cb9ede2ab8ecd13357fb462a6ae71b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Jun 2023 23:34:03 -0300
Subject: [PATCH 0762/1854] New package: python3-rfc3987-1.3.8

---
 srcpkgs/python3-rfc3987/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3987/template

diff --git a/srcpkgs/python3-rfc3987/template b/srcpkgs/python3-rfc3987/template
new file mode 100644
index 000000000000..f25379e582b7
--- /dev/null
+++ b/srcpkgs/python3-rfc3987/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rfc3987'
+pkgname=python3-rfc3987
+version=1.3.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="http://pypi.python.org/pypi/rfc3987"
+distfiles="${PYPI_SITE}/r/rfc3987/rfc3987-${version}.tar.gz"
+checksum=d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733
+make_check=no  # no tests available

From 2e5445d569f1a848aebb9c6b96fa853eebcd6e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:22:20 -0300
Subject: [PATCH 0763/1854] New package: python3-rfc3986-validator-0.1.1

---
 .../python3-rfc3986-validator/patches/3.patch | 40 +++++++++++++++++++
 srcpkgs/python3-rfc3986-validator/template    | 18 +++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 srcpkgs/python3-rfc3986-validator/patches/3.patch
 create mode 100644 srcpkgs/python3-rfc3986-validator/template

diff --git a/srcpkgs/python3-rfc3986-validator/patches/3.patch b/srcpkgs/python3-rfc3986-validator/patches/3.patch
new file mode 100644
index 000000000000..991662d5fb52
--- /dev/null
+++ b/srcpkgs/python3-rfc3986-validator/patches/3.patch
@@ -0,0 +1,40 @@
+From f34f482530170972947b259844d00830a15f81a4 Mon Sep 17 00:00:00 2001
+From: chedi toueiti <chedi.toueiti@gmail.com>
+Date: Tue, 12 Jul 2022 21:01:31 +0100
+Subject: [PATCH] Removing deprecated pytest-runner and adding missing test
+ dependencies
+
+---
+ setup.cfg | 5 +++++
+ setup.py  | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 21c0a34..db0c26b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -23,3 +23,8 @@ test = pytest
+ [tool:pytest]
+ collect_ignore = ['setup.py']
+ 
++[options.extras_require]
++test =
++    pytest >= 3
++    rfc3987
++    hypothesis
+diff --git a/setup.py b/setup.py
+index 53ebea7..1652285 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,9 +10,9 @@
+ 
+ requirements = []
+ 
+-setup_requirements = ['pytest-runner', ]
++setup_requirements = []
+ 
+-test_requirements = ['pytest>=3', ]
++test_requirements = []
+ 
+ setup(
+     author="Nicolas Aimetti",
diff --git a/srcpkgs/python3-rfc3986-validator/template b/srcpkgs/python3-rfc3986-validator/template
new file mode 100644
index 000000000000..fc402d543d14
--- /dev/null
+++ b/srcpkgs/python3-rfc3986-validator/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-rfc3986-validator'
+pkgname=python3-rfc3986-validator
+version=0.1.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest python3-hypothesis python3-rfc3987"
+short_desc="Pure python RFC3986 validator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/naimetti/rfc3986-validator"
+distfiles="${PYPI_SITE}/r/rfc3986-validator/rfc3986_validator-${version}.tar.gz"
+checksum=3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055
+
+post_install() {
+	vlicense LICENSE
+}

From 0dbcc37e4caee1344594cef4a5bc4a109f57c554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 18:34:09 -0300
Subject: [PATCH 0764/1854] python3-jsonschema: add rfc3339 and rfc3986
 validators.

---
 srcpkgs/python3-jsonschema/template | 10 +++-------
 srcpkgs/python3-jsonschema/update   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 8ec7cef8d755..272eb06edbdd 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 version=4.17.3
-revision=1
+revision=2
 build_style=python3-pep517
-make_check_args="--deselect jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug"
 hostmakedepends="hatchling hatch-vcs"
-depends="python3-attrs python3-pyrsistent"
+depends="python3-attrs python3-idna python3-jsonpointer python3-pyrsistent
+ python3-rfc3339-validator python3-rfc3986-validator"
 checkdepends="${depends} python3-pytest python3-pip"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -15,10 +15,6 @@ changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
 checksum=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d
 
-pre_build() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
-}
-
 post_install() {
 	vlicense COPYING LICENSE
 }
diff --git a/srcpkgs/python3-jsonschema/update b/srcpkgs/python3-jsonschema/update
index c94d83e1b1b5..12175d032c85 100644
--- a/srcpkgs/python3-jsonschema/update
+++ b/srcpkgs/python3-jsonschema/update
@@ -1 +1 @@
-ignore="*a[1-9]"
+ignore="*a[1-9]*"

From 839ea653fe592d1c26ebf2e11c7058b7355c4c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 10:31:37 -0300
Subject: [PATCH 0765/1854] New package: hatch-jupyter-builder-0.8.3

---
 srcpkgs/hatch-jupyter-builder/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/hatch-jupyter-builder/template

diff --git a/srcpkgs/hatch-jupyter-builder/template b/srcpkgs/hatch-jupyter-builder/template
new file mode 100644
index 000000000000..674c221e1ebb
--- /dev/null
+++ b/srcpkgs/hatch-jupyter-builder/template
@@ -0,0 +1,19 @@
+# Template file for 'hatch-jupyter-builder'
+pkgname=hatch-jupyter-builder
+version=0.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="hatchling"
+checkdepends="python3-pytest-mock python3-tomli"
+short_desc="Hatch plugin to help build Jupyter packages"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyterlab/hatch-jupyter-builder"
+changelog="https://raw.githubusercontent.com/jupyterlab/hatch-jupyter-builder/main/CHANGELOG.md"
+distfiles="https://github.com/jupyterlab/hatch-jupyter-builder/archive/refs/tags/v${version}.tar.gz"
+checksum=b167709e9bd196b3b92fe13a20b10c09cd30ca550759a9f06834378eb371af96
+
+post_install() {
+	vlicense LICENSE.txt
+}

From d365a7a985e164d6bc335efb4619b690752585bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 18:18:06 -0300
Subject: [PATCH 0766/1854] New package: hatch-nodejs-version-0.3.1

---
 srcpkgs/hatch-nodejs-version/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/hatch-nodejs-version/template

diff --git a/srcpkgs/hatch-nodejs-version/template b/srcpkgs/hatch-nodejs-version/template
new file mode 100644
index 000000000000..389c85500bf2
--- /dev/null
+++ b/srcpkgs/hatch-nodejs-version/template
@@ -0,0 +1,19 @@
+# Template file for 'hatch-nodejs-version'
+pkgname=hatch-nodejs-version
+version=0.3.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="hatchling"
+checkdepends="python3-pytest"
+short_desc="Hatch plugin to read pyproject.toml metadata from package.json"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/agoose77/hatch-nodejs-version"
+changelog="https://github.com/agoose77/hatch-nodejs-version/releases"
+distfiles="https://github.com/agoose77/hatch-nodejs-version/archive/refs/tags/v${version}.tar.gz"
+checksum=9959efbee3021dba4da7f8c152cacf104c746341ed176cd0488cbf3b45deba4d
+
+post_install() {
+	vlicense LICENSE.txt
+}

From f130aafc275d38d4e7a174bd53f4144e9e48b65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 28 May 2023 00:07:40 -0300
Subject: [PATCH 0767/1854] New package: python3-async-lru-2.0.2

---
 srcpkgs/python3-async-lru/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-async-lru/template

diff --git a/srcpkgs/python3-async-lru/template b/srcpkgs/python3-async-lru/template
new file mode 100644
index 000000000000..130589174c1c
--- /dev/null
+++ b/srcpkgs/python3-async-lru/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-async-lru'
+pkgname=python3-async-lru
+version=2.0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-typing_extensions"
+checkdepends="$depends python3-pytest-asyncio python3-pytest-cov
+ python3-pytest-timeout"
+short_desc="Simple LRU cache for asyncio"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/aio-libs/async-lru"
+changelog="https://github.com/aio-libs/async-lru/blob/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/a/async-lru/async-lru-${version}.tar.gz"
+checksum=3b87ec4f2460c52cc7916a0138cc606b584c75d1ef7d661853c95d1d3acb869a
+
+post_install() {
+	vlicense LICENSE
+}

From b1b5063360264d25fbb911aac6cfb3db97dbde48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 24 May 2023 10:56:29 -0300
Subject: [PATCH 0768/1854] New package: python3-json-logger-2.0.7

---
 srcpkgs/python3-json-logger/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-json-logger/template

diff --git a/srcpkgs/python3-json-logger/template b/srcpkgs/python3-json-logger/template
new file mode 100644
index 000000000000..747a925d56f0
--- /dev/null
+++ b/srcpkgs/python3-json-logger/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-json-logger'
+pkgname=python3-json-logger
+version=2.0.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Json Formatter for the standard python logger"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/madzak/python-json-logger"
+changelog="https://raw.githubusercontent.com/madzak/python-json-logger/master/CHANGELOG.md"
+distfiles="https://github.com/madzak/python-json-logger/archive/refs/tags/v${version}.tar.gz"
+checksum=1d743e5573642bed1a5698dbfa5fc1c2a8e076fea95212e67518bec940e43ec1
+
+post_install() {
+	vlicense LICENSE
+}

From 6b9999e356311b9fecfa9261d85316ed299f6ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 23:58:52 -0300
Subject: [PATCH 0769/1854] New package: python3-jupyter_packaging-0.12.3

---
 .../patches/178.patch                         | 23 +++++++++++++++++++
 srcpkgs/python3-jupyter_packaging/template    | 20 ++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/python3-jupyter_packaging/patches/178.patch
 create mode 100644 srcpkgs/python3-jupyter_packaging/template

diff --git a/srcpkgs/python3-jupyter_packaging/patches/178.patch b/srcpkgs/python3-jupyter_packaging/patches/178.patch
new file mode 100644
index 000000000000..a158454dbb73
--- /dev/null
+++ b/srcpkgs/python3-jupyter_packaging/patches/178.patch
@@ -0,0 +1,23 @@
+From e963fb27aa3b58cd70c5ca61ebe68c222d803b7e Mon Sep 17 00:00:00 2001
+From: Steven Silvester <steven.silvester@ieee.org>
+Date: Tue, 7 Mar 2023 10:47:22 -0600
+Subject: [PATCH] Ignore warning raised when importing
+ setuptools.command.develop
+
+---
+ pyproject.toml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index e4c1e27..b316257 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -81,5 +81,7 @@ filterwarnings= [
+   # Fail on warnings
+   "error",
+   # Ignore our own deprecation warnings.
+-  "ignore:.*:deprecation.DeprecatedWarning"
++  "ignore:.*:deprecation.DeprecatedWarning",
++  # Ignore warning raised when importing setuptools.command.develop.
++  "ignore:pkg_resources is deprecated as an API:DeprecationWarning"
+ ]
diff --git a/srcpkgs/python3-jupyter_packaging/template b/srcpkgs/python3-jupyter_packaging/template
new file mode 100644
index 000000000000..8c064fb464c6
--- /dev/null
+++ b/srcpkgs/python3-jupyter_packaging/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-jupyter_packaging'
+pkgname=python3-jupyter_packaging
+version=0.12.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-deprecation python3-packaging python3-setuptools
+ python3-tomlkit python3-wheel"
+checkdepends="$depends python3-pytest-timeout python3-pytest-mock"
+short_desc="Tools to help build and install Jupyter Python packages"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/jupyter/jupyter-packaging"
+changelog="https://raw.githubusercontent.com/jupyter/jupyter-packaging/main/CHANGELOG.md"
+distfiles="https://github.com/jupyter/jupyter-packaging/archive/refs/tags/v${version}.tar.gz"
+checksum=3a326f3b4e8b7fea8b7abf775741996095a4caf13767a9c017e9f17043e591e0
+
+post_install() {
+	vlicense LICENSE
+}

From a34157d7674bc5075b6ffdc191dc84f6cc2ecc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 25 May 2023 19:19:18 -0300
Subject: [PATCH 0770/1854] New package: python3-overrides-7.3.1

---
 srcpkgs/python3-overrides/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-overrides/template

diff --git a/srcpkgs/python3-overrides/template b/srcpkgs/python3-overrides/template
new file mode 100644
index 000000000000..9c1b507e9240
--- /dev/null
+++ b/srcpkgs/python3-overrides/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-overrides'
+pkgname=python3-overrides
+version=7.3.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Decorator to automatically detect mismatch when overriding a method"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/mkorpela/overrides"
+changelog="https://github.com/mkorpela/overrides/releases"
+distfiles="https://github.com/mkorpela/overrides/archive/refs/tags/${version}.tar.gz"
+checksum=ff904c45a8a664aaeeac0a849f5097567d52a88c2324b12ad002c8b58e83625c

From 2632740ac3f6d5fd38436da89f20d1cbdfe23e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 26 May 2023 21:18:00 -0300
Subject: [PATCH 0771/1854] New package: python3-pathable-0.4.3

---
 srcpkgs/python3-pathable/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-pathable/template

diff --git a/srcpkgs/python3-pathable/template b/srcpkgs/python3-pathable/template
new file mode 100644
index 000000000000..70892d570eaa
--- /dev/null
+++ b/srcpkgs/python3-pathable/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pathable'
+pkgname=python3-pathable
+version=0.4.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest-cov python3-toml"
+short_desc="Object-oriented paths"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/p1c2u/pathable"
+changelog="https://github.com/p1c2u/pathable/releases"
+distfiles="https://github.com/p1c2u/pathable/archive/refs/tags/${version}.tar.gz"
+checksum=eea76120e5fdc54f4e9b7bc5e24748d163cef61c3e60ed32675828ade141cf4b

From d3a2b518dd6d424ceeca5fa100721e6502765f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 26 May 2023 20:52:44 -0300
Subject: [PATCH 0772/1854] New package: python3-jsonschema-spec-0.1.6

---
 srcpkgs/python3-jsonschema-spec/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-jsonschema-spec/template

diff --git a/srcpkgs/python3-jsonschema-spec/template b/srcpkgs/python3-jsonschema-spec/template
new file mode 100644
index 000000000000..6caba5a29370
--- /dev/null
+++ b/srcpkgs/python3-jsonschema-spec/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-jsonschema-spec'
+pkgname=python3-jsonschema-spec
+version=0.1.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-jsonschema python3-pathable python3-yaml"
+checkdepends="$depends python3-pytest-cov python3-toml"
+short_desc="JSONSchema Spec with object-oriented paths"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/p1c2u/jsonschema-spec"
+changelog="https://github.com/p1c2u/jsonschema-spec/releases"
+distfiles="https://github.com/p1c2u/jsonschema-spec/archive/refs/tags/${version}.tar.gz"
+checksum=ab1d01d3ed40f83c3e272ffc86505830085a5306ad43db04a6e8edf560fedd1d

From ac63f7cc4a4cf27b357489526fda9e4ea56538b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 00:39:45 -0300
Subject: [PATCH 0773/1854] New package: python3-openapi-schema-validator-0.4.4

---
 .../python3-openapi-schema-validator/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-openapi-schema-validator/template

diff --git a/srcpkgs/python3-openapi-schema-validator/template b/srcpkgs/python3-openapi-schema-validator/template
new file mode 100644
index 000000000000..bb26e4a7d603
--- /dev/null
+++ b/srcpkgs/python3-openapi-schema-validator/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-openapi-schema-validator'
+pkgname=python3-openapi-schema-validator
+version=0.4.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-jsonschema"
+checkdepends="$depends python3-pytest-cov python3-toml"
+short_desc="OpenAPI schema validation for Python"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-openapi/openapi-schema-validator"
+changelog="https://github.com/python-openapi/openapi-schema-validator/releases"
+distfiles="${PYPI_SITE}/o/openapi-schema-validator/openapi_schema_validator-${version}.tar.gz"
+checksum=c573e2be2c783abae56c5a1486ab716ca96e09d1c3eab56020d1dc680aa57bf8
+
+post_install() {
+	vlicense LICENSE
+}

From a2372cf0c7e64e8a2f2fcbb0ab69f96e79ddf8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 00:40:13 -0300
Subject: [PATCH 0774/1854] New package: python3-openapi-spec-validator-0.5.7

---
 srcpkgs/python3-openapi-spec-validator/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-openapi-spec-validator/template

diff --git a/srcpkgs/python3-openapi-spec-validator/template b/srcpkgs/python3-openapi-spec-validator/template
new file mode 100644
index 000000000000..f75c24694c30
--- /dev/null
+++ b/srcpkgs/python3-openapi-spec-validator/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-openapi-spec-validator'
+pkgname=python3-openapi-spec-validator
+version=0.5.7
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-jsonschema-spec python3-lazy-object-proxy
+ python3-openapi-schema-validator"
+checkdepends="$depends python3-pytest-cov python3-toml"
+short_desc="OpenAPI spec validator"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="Apache-2.0"
+homepage="https://github.com/python-openapi/openapi-spec-validator"
+changelog="https://github.com/python-openapi/openapi-spec-validator/releases"
+distfiles="${PYPI_SITE}/o/openapi-spec-validator/openapi_spec_validator-${version}.tar.gz"
+checksum=6c2d42180045a80fd6314de848b94310bdb0fa4949f4b099578b69f79d9fa5ac

From 73e5a711bfb9cb0311488b2044e1b06875e0f200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 27 May 2023 01:38:55 -0300
Subject: [PATCH 0775/1854] New package: python3-openapi-core-0.17.1

---
 srcpkgs/python3-openapi-core/template | 28 +++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-openapi-core/template

diff --git a/srcpkgs/python3-openapi-core/template b/srcpkgs/python3-openapi-core/template
new file mode 100644
index 000000000000..2dd5dceab1d6
--- /dev/null
+++ b/srcpkgs/python3-openapi-core/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-openapi-core'
+pkgname=python3-openapi-core
+version=0.17.1
+revision=1
+build_style=python3-pep517
+# disable tests requiring unpackaged dependencies
+make_check_args="
+ --ignore=tests/unit/contrib/django
+ --ignore=tests/integration/contrib/django
+ --ignore=tests/integration/contrib/falcon
+ --ignore=tests/integration/contrib/starlette
+ "
+hostmakedepends="python3-poetry-core"
+depends="python3-isodate python3-more-itertools python3-openapi-spec-validator
+ python3-parse python3-Werkzeug"
+checkdepends="$depends python3-pytest-cov python3-Flask python3-requests
+ python3-responses python3-toml python3-WebOb"
+short_desc="Support for the OpenAPI Specification v3"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-openapi/openapi-core"
+changelog="https://github.com/python-openapi/openapi-core/releases"
+distfiles="${PYPI_SITE}/o/openapi-core/openapi_core-${version}.tar.gz"
+checksum=561b7e2b37b336e9c62d4634b9059d12d9bb2e1859062a39d3a0fa6afc8c9de6
+
+post_install() {
+	vlicense LICENSE
+}

From 7c7004cec7bb471be0fbf00ca8efb65ca0ad1e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 23 May 2023 21:11:54 -0300
Subject: [PATCH 0776/1854] New package: python3-pep440-0.1.2

Closes: #44312 [via git-merge-pr]
---
 srcpkgs/python3-pep440/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pep440/template

diff --git a/srcpkgs/python3-pep440/template b/srcpkgs/python3-pep440/template
new file mode 100644
index 000000000000..3048d03ae671
--- /dev/null
+++ b/srcpkgs/python3-pep440/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pep440'
+pkgname=python3-pep440
+version=0.1.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+checkdepends="python3-pytest-console-scripts"
+short_desc="Utils to check whether version numbers match PEP 440"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/Carreau/pep440"
+distfiles="https://github.com/Carreau/pep440/archive/refs/tags/${version}.tar.gz"
+checksum=4f38145d7b71aad9743b3f4aec6338a2dad4010a14a223493bf0b3b7b99027ef
+
+post_install() {
+	vlicense LICENSE
+}

From 71867396ef7ae870e14f2074e9523ccd151e6ccf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 18:05:19 -0500
Subject: [PATCH 0777/1854] ghidra: update to 10.3.1.

---
 srcpkgs/ghidra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index dcf99743570a..6a2b9cb6b37f 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,7 +1,7 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.3
-revision=2
+version=10.3.1
+revision=1
 _dex_ver=2.1
 _yajsw_ver=13.09
 archs="x86_64* aarch64*"
@@ -29,7 +29,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2019_x86.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x64.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x86.fidb"
-checksum="28efb03692d67292711e559541545118182e58051064edaf48ba77a37eaf9796
+checksum="b1e07e4224473db71129f48c4ebf59c69dbfcb78b3e0464f9d063f54e4c371de
  7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08
  4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d

From 48591a825395a0ed3ec36e8dad2f1e1bf5f12ae4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 13:44:32 +0200
Subject: [PATCH 0778/1854] python: update to 2.7.18.7.

---
 srcpkgs/python/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index a1abf2c8772c..db6977233517 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
 #
 pkgname=python
-version=2.7.18.6
+version=2.7.18.7
 revision=1
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
+checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
 
 alternatives="
  python:idle:/usr/bin/idle2.7

From 1f226b5db4faf8947362ee5ff7bab017ae85dde8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 13:46:09 +0200
Subject: [PATCH 0779/1854] python-tkinter: update to 2.7.18.7.

---
 srcpkgs/python-tkinter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 274efb18c7ac..858a70a97c9a 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,7 +7,7 @@
 _desc="Interpreted, interactive, object-oriented programming language"
 
 pkgname=python-tkinter
-version=2.7.18.6
+version=2.7.18.7
 revision=1
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
+checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
 
 pre_configure() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.

From bccb97cc5f451bbd858751cc2e53879ed2343ffb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 13:53:29 +0200
Subject: [PATCH 0780/1854] openssh: add /usr/local/bin,sbin to default PATH.

Most Linux distros do this, and there are cases where our profile isn't
applied in all cases.

Closes #43338.
---
 srcpkgs/openssh/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 88f39d31fbb3..c74b56e08ac3 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,12 +1,13 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.3p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
  --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth
  --disable-strip --with-privsep-path=/var/chroot/ssh
+ --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
  --with-pid-dir=/run --with-pam
  --with-libedit --with-Werror
  $(vopt_if ldns --with-ldns=$XBPS_CROSS_BASE/usr)

From 67d7e40181d5046302445ad5f03b7d72c624100e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 1 Apr 2023 13:57:27 +0100
Subject: [PATCH 0781/1854] runit: remove zsh completions.

Fixes #36593.
---
 srcpkgs/runit/files/_sv | 44 -----------------------------------------
 srcpkgs/runit/template  |  9 ++++-----
 2 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/runit/files/_sv

diff --git a/srcpkgs/runit/files/_sv b/srcpkgs/runit/files/_sv
deleted file mode 100644
index 465fbfde640c..000000000000
--- a/srcpkgs/runit/files/_sv
+++ /dev/null
@@ -1,44 +0,0 @@
-#compdef sv
-
-# completion for runit sv(1)
-# Leah Neukirchen <leah@vuxu.org>
-# runit 2.1.1, services in /var/service are completed by default
-
-local ret=1 services
-
-_arguments \
-    '-v[verbose]' \
-    '-w[wait]:seconds' \
-    '1: :->cmds' \
-    '*:: :->args' && ret=0
-
-case $state in
-cmds)
-    _values "sv command" \
-        status \
-        up \
-        down \
-        once \
-        pause cont hup alarm interrupt quit 1 2 term kill \
-        exit
-    # above allow one-character shortcuts, complete these
-    [[ $words[CURRENT] = [sudopchaiq12tke] ]] ||
-    _values "sv command" \
-        start \
-        stop \
-        restart \
-        shutdown \
-        force-stop \
-        force-reload \
-        force-restart \
-        force-shutdown \
-        check
-    ret=0;;
-args)
-    services=( /var/service/*(-/N:t) )
-    (( $#services )) && _values services $services && ret=0
-    [[ $words[CURRENT] = */* ]] && _directories && ret=0
-    ;;
-esac
-
-return $ret
diff --git a/srcpkgs/runit/template b/srcpkgs/runit/template
index 661d141f1ec7..eb436f5bae0b 100644
--- a/srcpkgs/runit/template
+++ b/srcpkgs/runit/template
@@ -8,7 +8,7 @@ short_desc="UNIX init scheme with service supervision"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://smarden.org/runit/"
-distfiles="http://smarden.org/runit/runit-$version.tar.gz"
+distfiles="http://smarden.org/runit/runit-${version}.tar.gz"
 checksum=6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
 patch_args=-Np0
 # FIXME: this is caused by some bonk tests that should be fixed in void-linux/runit at some point
@@ -22,14 +22,14 @@ if [ "$build_option_static" ]; then
 fi
 
 pre_build() {
-	sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
+	vsed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
 
 	echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc
 	echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld
 	# set default service path to /var/service
-	sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c
+	vsed -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' -i sv.c
 	# change type short to gid_t for getgroups(2) and setgroups(2)
-	sed -i -e 's:short x\[4\];$:gid_t x[4];:' chkshsgr.c
+	vsed -e 's:short x\[4\];$:gid_t x[4];:' -i chkshsgr.c
 }
 
 do_install() {
@@ -50,6 +50,5 @@ do_install() {
 		vman $f
 	done
 
-	vinstall ${FILESDIR}/_sv 644 usr/share/zsh/site-functions
 	vinstall ${FILESDIR}/sv  644 usr/share/bash-completion/completions
 }

From 57543fb2f67801f13f86743768ba1fd6afaf68c7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 14:25:15 +0200
Subject: [PATCH 0782/1854] zsh: default runit completion to /var/service

---
 srcpkgs/zsh/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index ae3b90fbca30..e24837f88aab 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,7 +1,7 @@
 # Template file for 'zsh'
 pkgname=zsh
 version=5.9
-revision=2
+revision=3
 build_style=gnu-configure
 make_build_target="all info"
 make_install_args="install.info"
@@ -41,6 +41,8 @@ post_patch() {
 	rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
 	rm -f Completion/Unix/Command/_{notmuch,osc,systemd}
 
+	vsed -i -e 's,/etc/service,/var/service,g' Completion/Unix/Command/_runit
+
 	vsed -i -e 's,/etc/z,/etc/zsh/z,g' \
 		Doc/zsh.texi Doc/{zsh,zshall,zshoptions,zshmodules}.1
 }

From 56fffb323604155533ebca89afc3949e4f464c89 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:17:12 +0200
Subject: [PATCH 0783/1854] xsetmode: removed, upstream retired.

Replaced by: xinput --set-mode "device name" ABSOLUTE
---
 srcpkgs/xsetmode/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/xsetmode/template

diff --git a/srcpkgs/xsetmode/template b/srcpkgs/xsetmode/template
deleted file mode 100644
index 01bfa7e6e8df..000000000000
--- a/srcpkgs/xsetmode/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'xsetmode'
-pkgname=xsetmode
-version=1.0.0
-revision=5
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel libXi-devel"
-short_desc="Switch mode of XInput devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
-
-post_install() {
-	vlicense COPYING
-}

From 20bf9607fe45b677979324946516d201afff6b57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:18:06 +0200
Subject: [PATCH 0784/1854] xsetpointer: removed, upstream retired.

Doesn't work with xorg-server 1.4 (Sept. 2007) and later.
---
 srcpkgs/xsetpointer/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/xsetpointer/template

diff --git a/srcpkgs/xsetpointer/template b/srcpkgs/xsetpointer/template
deleted file mode 100644
index 19d882cca94a..000000000000
--- a/srcpkgs/xsetpointer/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template build file for 'xsetpointer'.
-pkgname=xsetpointer
-version=1.0.1
-revision=4
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libXi-devel"
-short_desc="Set an X Input device as the main pointer"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571
-
-post_install() {
-	vlicense COPYING
-}

From 8476f3ff1bc7d327eb2f5903b7e8da17f17c4cb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:21:05 +0200
Subject: [PATCH 0785/1854] libXevie: removed, upstream retired.

The server side of XEvIE was removed in xorg-server 1.6 (Feb. 2009).
GNOME's at-spi2-core used libXevie starting in August 2003, but that
code was disabled by default in 2015 for the 2.20.0 release, and then
removed altogether in the 2.26.0 release in 2017.
---
 common/shlibs             |  1 -
 srcpkgs/libXevie-devel    |  1 -
 srcpkgs/libXevie/template | 29 -----------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/libXevie-devel
 delete mode 100644 srcpkgs/libXevie/template

diff --git a/common/shlibs b/common/shlibs
index 005700403d0d..e55083cc0d8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -836,7 +836,6 @@ libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
 libshumate-1.0.so.1 libshumate-1.0.0_1
 libvpx.so.6 libvpx6-1.8.0_1
 libvpx.so.7 libvpx7-1.11.0_1
-libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
 libvte-2.91.so.0 vte3-0.68.0_1
diff --git a/srcpkgs/libXevie-devel b/srcpkgs/libXevie-devel
deleted file mode 120000
index 6db64925021f..000000000000
--- a/srcpkgs/libXevie-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXevie
\ No newline at end of file
diff --git a/srcpkgs/libXevie/template b/srcpkgs/libXevie/template
deleted file mode 100644
index 29b0a7340840..000000000000
--- a/srcpkgs/libXevie/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libXevie'
-pkgname=libXevie
-version=1.0.3
-revision=8
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="xorgproto libX11-devel libXext-devel"
-short_desc="X Event Interceptor Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73
-
-post_install() {
-	vlicense COPYING
-}
-
-libXevie-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}

From 68bd6fee5d44269826415df807a579a4065669cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:24:19 +0200
Subject: [PATCH 0786/1854] libXfontcache: removed, retired upstream.

The server side of the FontCache extension was disabled by default in
X11R6.8.0 (Sep. 2004) and was removed in xorg-server 1.6 (Feb. 2009).
---
 common/shlibs                  |  1 -
 srcpkgs/libXfontcache-devel    |  1 -
 srcpkgs/libXfontcache/template | 29 -----------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/libXfontcache-devel
 delete mode 100644 srcpkgs/libXfontcache/template

diff --git a/common/shlibs b/common/shlibs
index e55083cc0d8a..bd38bd396d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -303,7 +303,6 @@ libXcursor.so.1 libXcursor-1.1.9_1
 libXxf86dga.so.1 libXxf86dga-1.0.2_1
 libXxf86misc.so.1 libXxf86misc-1.0.1_1
 libXp.so.6 libXp-1.0.0_1
-libXfontcache.so.1 libXfontcache-1.0.4_1
 libXv.so.1 libXv-1.0.4_1
 libXvMC.so.1 libXvMC-1.0.4_1
 libXvMCW.so.1 libXvMC-1.0.4_1
diff --git a/srcpkgs/libXfontcache-devel b/srcpkgs/libXfontcache-devel
deleted file mode 120000
index 515a1a9705e4..000000000000
--- a/srcpkgs/libXfontcache-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXfontcache
\ No newline at end of file
diff --git a/srcpkgs/libXfontcache/template b/srcpkgs/libXfontcache/template
deleted file mode 100644
index 58cfcce12cf7..000000000000
--- a/srcpkgs/libXfontcache/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template build file for 'libXfontcache'.
-pkgname=libXfontcache
-version=1.0.5
-revision=2
-build_style=gnu-configure
-configure_args="--enable-malloc0returnsnull"
-hostmakedepends="pkg-config"
-makedepends="xorgproto libXext-devel"
-short_desc="X-TrueType font cache extension client library"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce
-
-post_install() {
-	vlicense COPYING
-}
-
-libXfontcache-devel_package() {
-	depends="xorgproto ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-		vmove usr/share
-	}
-}

From 4adebb435d029781c1edba4e8675d2646d360830 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:26:00 +0200
Subject: [PATCH 0787/1854] libXxf86misc: removed, upstream retired.

The server side of the XFree86-Misc extension was removed in
xorg-server 1.6 (Feb. 2009).
---
 common/shlibs                 |  1 -
 srcpkgs/libXxf86misc-devel    |  1 -
 srcpkgs/libXxf86misc/template | 29 -----------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/libXxf86misc-devel
 delete mode 100644 srcpkgs/libXxf86misc/template

diff --git a/common/shlibs b/common/shlibs
index bd38bd396d20..16bac9228706 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -301,7 +301,6 @@ libXaw7.so.7 libXaw-1.0.5_1
 libXft.so.2 libXft-2.1.13_1
 libXcursor.so.1 libXcursor-1.1.9_1
 libXxf86dga.so.1 libXxf86dga-1.0.2_1
-libXxf86misc.so.1 libXxf86misc-1.0.1_1
 libXp.so.6 libXp-1.0.0_1
 libXv.so.1 libXv-1.0.4_1
 libXvMC.so.1 libXvMC-1.0.4_1
diff --git a/srcpkgs/libXxf86misc-devel b/srcpkgs/libXxf86misc-devel
deleted file mode 120000
index 19541ac9080b..000000000000
--- a/srcpkgs/libXxf86misc-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXxf86misc
\ No newline at end of file
diff --git a/srcpkgs/libXxf86misc/template b/srcpkgs/libXxf86misc/template
deleted file mode 100644
index d30982b777c1..000000000000
--- a/srcpkgs/libXxf86misc/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libXxf86misc'
-pkgname=libXxf86misc
-version=1.0.4
-revision=1
-build_style=gnu-configure
-configure_args="--enable-malloc0returnsnull"
-hostmakedepends="pkg-config"
-makedepends="xorgproto libX11-devel libXext-devel"
-short_desc="Library for the XFree86-Misc X extension"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380
-
-post_install() {
-	vlicense COPYING
-}
-
-libXxf86misc-devel_package() {
-	depends="xorgproto libX11-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}

From fbe5752ced7fe73b1a694313dfde2fad5809294a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:28:41 +0200
Subject: [PATCH 0788/1854] qt6-base: remove libXevie-devel.

This is mentioned nowhere in the source code, what is it good for?
---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 26c3274641e5..c6d790e64226 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -26,7 +26,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  libmariadbclient-devel postgresql-libs-devel libatomic-devel
  unixodbc-devel cups-devel libproxy-devel brotli-devel
  sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel
- libXevie-devel xcb-util-cursor-devel"
+ xcb-util-cursor-devel"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"

From 475d9610366e4891605a2dda59dad4ce66c03cdf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:29:14 +0200
Subject: [PATCH 0789/1854] xset: rebuild without libXxf86misc-devel
 libXfontcache-devel.

---
 srcpkgs/xset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template
index 9cfd80589a76..27395536b4c3 100644
--- a/srcpkgs/xset/template
+++ b/srcpkgs/xset/template
@@ -1,11 +1,11 @@
 # Template file for 'xset'
 pkgname=xset
 version=1.2.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xf86misc"
 hostmakedepends="pkg-config"
-makedepends="libXmu-devel libXext-devel libXxf86misc-devel libXfontcache-devel"
+makedepends="libXmu-devel libXext-devel"
 short_desc="X11 user preferences utility"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"

From 5bafcc6994b05bdd9f492cb30e70922ef72df928 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:30:22 +0200
Subject: [PATCH 0790/1854] light-locker: rebuild without libXxf86vm-devel.

---
 srcpkgs/light-locker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index d50c71480a33..6daca02ba357 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,11 +1,11 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel libXxf86vm-devel elogind-devel"
+ libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"

From fcad4cbcdc6c94205eb5e79e6feaf8d7b19fb9f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:30:51 +0200
Subject: [PATCH 0791/1854] cinnamon-screensaver: rebuild without
 libXxf86vm-devel.

---
 srcpkgs/cinnamon-screensaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 36e3fc2edd85..2c29d7744e89 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,12 +1,12 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
 version=5.4.2
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel gobject-introspection
  pkg-config python3-devel"
-makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
+makedepends="cinnamon-desktop-devel dbus-glib-devel
  xdotool-devel gtk+3-devel libglib-devel dbus-devel libXinerama-devel
  libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject

From 49795f8e93be40713035d455b7bdccae65398ca3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:15 +0200
Subject: [PATCH 0792/1854] mate-settings-daemon: rebuild without
 libXxf86vm-devel.

---
 srcpkgs/mate-settings-daemon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 87b825cbe013..7b2d60a8138b 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,11 +1,11 @@
 # Template file for 'mate-settings-daemon'
 pkgname=mate-settings-daemon
 version=1.26.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
 hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit"
-makedepends="dbus-glib-devel libXt-devel libXxf86misc-devel libcanberra-devel
+makedepends="dbus-glib-devel libXt-devel libcanberra-devel
  libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel
  polkit-devel"
 short_desc="MATE Settings daemon (pulseaudio)"

From e84be2070789df4436028c9ca09b7d56f9ab7086 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:34 +0200
Subject: [PATCH 0793/1854] xdpyinfo: rebuild without libXxf86vm-devel.

---
 srcpkgs/xdpyinfo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 71bf9a858dc9..6232e3860ff2 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,12 +1,12 @@
 # Template file for 'xdpyinfo'
 pkgname=xdpyinfo
 version=1.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xf86misc"
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXtst-devel libXxf86vm-devel
- libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
+makedepends="libXext-devel libXtst-devel
+ libXrender-devel libXcomposite-devel libXinerama-devel"
 short_desc="Display information utility for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 08876c6b311bde044e0ff989fe5d004a2524b3be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:49 +0200
Subject: [PATCH 0794/1854] mate-control-center: rebuild without
 libXxf86vm-devel.

---
 srcpkgs/mate-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template
index 697e1dff2492..bcd986ab0c8f 100644
--- a/srcpkgs/mate-control-center/template
+++ b/srcpkgs/mate-control-center/template
@@ -1,12 +1,12 @@
 # Template file for 'mate-control-center'
 pkgname=mate-control-center
 version=1.26.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb"
 hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel intltool itstool pkg-config"
 makedepends="dbus-glib-devel desktop-file-utils libXScrnSaver-devel libXt-devel
- libXxf86misc-devel libcanberra-devel libgtop-devel libmarco-devel
+ libcanberra-devel libgtop-devel libmarco-devel
  libmatekbd-devel librsvg-devel mate-desktop-devel mate-menus-devel
  mate-settings-daemon-devel polkit-devel"
 depends="marco mate-icon-theme mate-settings-daemon"

From 7eb37641e9b33cfc86755748c17ee4335eca3b33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:03 +0200
Subject: [PATCH 0795/1854] cinnamon-control-center: rebuild without
 libXxf86vm-devel.

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index db1e4ea6d7ba..d7c330972a1a 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,14 +1,14 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
 version=5.4.7
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel
  gobject-introspection intltool libtool pkg-config libxslt"
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
- libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
+ libSM-devel libcanberra-devel libgnomekbd-devel
  libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4

From 30187651fd1280bdb192bc4d9c24df5c738c42a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:18 +0200
Subject: [PATCH 0796/1854] xsecurelock: rebuild without libXxf86vm-devel.

---
 srcpkgs/xsecurelock/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index 3494b298ad64..e32f1d71cdd3 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,7 +1,7 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
 version=1.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login
  --with-xscreensaver=/usr/libexec/xscreensaver
@@ -10,8 +10,7 @@ configure_args="--with-pam-service-name=system-local-login
  --with-htpasswd=/usr/bin/htpasswd"
 hostmakedepends="pkg-config automake"
 makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel
- libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel
- libXxf86misc-devel pam-devel"
+ libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel pam-devel"
 short_desc="X11 screen locker designed with the primary goal of security"
 maintainer="Sean R. Lang <srlang@ncsu.edu>"
 license="Apache-2.0"

From 80ad33ec3a013a324352fd408d2d56d9f7b30dbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:46 +0200
Subject: [PATCH 0797/1854] gnome-control-center: rebuild without
 libXxf86vm-devel.

---
 srcpkgs/gnome-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 849763d23c1e..3c8a1fe43e96 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=43.2
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -9,7 +9,7 @@ hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
- libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel
+ libSM-devel libgnomekbd-devel libgtop-devel
  libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel
  libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel

From f103033c37b13add4ffa1cc55c1a4cb35de6ced8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:05:38 +0200
Subject: [PATCH 0798/1854] libXfont: remove, obsoleted by libXfont2.

---
 common/shlibs             |  1 -
 srcpkgs/libXfont-devel    |  1 -
 srcpkgs/libXfont/template | 28 ----------------------------
 3 files changed, 30 deletions(-)
 delete mode 120000 srcpkgs/libXfont-devel
 delete mode 100644 srcpkgs/libXfont/template

diff --git a/common/shlibs b/common/shlibs
index 16bac9228706..494e99b89550 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -240,7 +240,6 @@ libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1
 liblvm2cmd.so.2.02 device-mapper-2.02.54_1
 libprop.so.0 proplib-0.1_1
 libfontenc.so.1 libfontenc-1.0.4_1
-libXfont.so.1 libXfont-1.4.0_1
 libx86.so.1 libx86-1.1_1
 libxcb-render.so.0 libxcb-1.2_1
 libxcb-glx.so.0 libxcb-1.2_1
diff --git a/srcpkgs/libXfont-devel b/srcpkgs/libXfont-devel
deleted file mode 120000
index 73e43fe94757..000000000000
--- a/srcpkgs/libXfont-devel
+++ /dev/null
@@ -1 +0,0 @@
-libXfont
\ No newline at end of file
diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template
deleted file mode 100644
index bc1d63c92419..000000000000
--- a/srcpkgs/libXfont/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template build file for 'libXfont'.
-pkgname=libXfont
-version=1.5.4
-revision=2
-hostmakedepends="pkg-config"
-makedepends="xorgproto xtrans freetype-devel libfontenc-devel"
-build_style=gnu-configure
-short_desc="X font Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xorg.freedesktop.org/"
-license="MIT"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242
-
-post_install() {
-	vlicense COPYING
-}
-
-libXfont-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}

From 98d794f1e59ca5fce4760f62234f8ee5473c0abd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:06:06 +0200
Subject: [PATCH 0799/1854] xorg-server: build without libXfont-devel.

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index d7514f2735bf..3ae74c71b005 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=21.1.8
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -10,7 +10,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
  -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true"
 hostmakedepends="pkg-config xkbcomp flex"
-makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
+makedepends="MesaLib-devel libXaw-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel libxshmfence-devel pixman-devel xcb-util-image-devel

From 4d48d4d74a2b76676ecd11e6c3c5f48d7b37d1d4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:08:54 +0200
Subject: [PATCH 0800/1854] bdftopcf: build without libXfont-devel.

---
 srcpkgs/bdftopcf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template
index d172987b7976..7e24036b03ed 100644
--- a/srcpkgs/bdftopcf/template
+++ b/srcpkgs/bdftopcf/template
@@ -1,10 +1,10 @@
 # Template build file for 'bdftopcf'.
 pkgname=bdftopcf
 version=1.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libXfont-devel"
+makedepends="xorgproto"
 short_desc="BDF to PCF font converter for X11"
 homepage="http://xorg.freedesktop.org"
 license="MIT"

From 013943f5f35d8c67b7fa646a1586dec93930873b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 14:08:00 +0200
Subject: [PATCH 0801/1854] font-bitstream-speedo: removed, upstream retired.

---
 srcpkgs/font-bitstream-speedo/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/font-bitstream-speedo/template

diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
deleted file mode 100644
index 387e883defb2..000000000000
--- a/srcpkgs/font-bitstream-speedo/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'font-bitstream-speedo'
-pkgname=font-bitstream-speedo
-version=1.0.2
-revision=5
-build_style=gnu-configure
-hostmakedepends="pkg-config bdftopcf mkfontscale"
-depends="font-util xbps-triggers"
-short_desc="Standard Speedo Bitstream PCF fonts"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/${pkgname}-${version}.tar.gz"
-checksum=aeea5f130480a3f05149bde13d240e668d8fb4b32c02b18914fcccd1182abe72
-
-font_dirs="/usr/share/fonts/X11/Speedo"
-
-post_install() {
-	rm -f ${DESTDIR}/${font_dirs}/fonts.*
-	vlicense COPYING
-}

From 8b74878c7329d8ef87fec13ef4e2da2d60264869 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 14:10:12 +0200
Subject: [PATCH 0802/1854] removed-packages: add retired X.org packages.

---
 srcpkgs/removed-packages/template | 40 ++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 20fce6e997ee..2e2535fa1cc3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230506
+version=0.1.20230516
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -109,6 +109,7 @@ replaces="
  flickcurl-devel<=1.26_4
  flickcurl-doc<=1.26_4
  flickcurl<=1.26_4
+ font-bitstream-speedo<=1.0.2_5
  fontmatrix<=0.6.0.20171228_2
  freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7
@@ -253,8 +254,8 @@ replaces="
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
  icecat<=78.6.1_1
- ilmbase<=2.4.2_2
  ilmbase-devel<=2.4.2_2
+ ilmbase<=2.4.2_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -266,34 +267,37 @@ replaces="
  keepassx<=0.4.4_2
  key-mon<=1.17_5
  laditools<=1.1.0_3
+ libXevie<=1.0.3_8
+ libXfontcache<=1.0.5_2
+ libXxf86misc<=1.0.4_1
  libantimicrox-devel<=3.1.3_1
  libantimicrox<=3.1.3_1
  libapp<=20140527_2
- libbitcoin-blockchain<=3.6.0_10
  libbitcoin-blockchain-devel<=3.6.0_10
- libbitcoin-client<=3.6.0_10
+ libbitcoin-blockchain<=3.6.0_10
  libbitcoin-client-devel<=3.6.0_10
- libbitcoin-consensus<=3.6.0_1
+ libbitcoin-client<=3.6.0_10
  libbitcoin-consensus-devel<=3.6.0_1
- libbitcoin-database<=3.6.0_10
+ libbitcoin-consensus<=3.6.0_1
  libbitcoin-database-devel<=3.6.0_10
- libbitcoin-explorer<=3.6.0_10
+ libbitcoin-database<=3.6.0_10
  libbitcoin-explorer-devel<=3.6.0_10
- libbitcoin-network<=3.6.0_10
+ libbitcoin-explorer<=3.6.0_10
  libbitcoin-network-devel<=3.6.0_10
- libbitcoin-node<=3.6.0_10
+ libbitcoin-network<=3.6.0_10
  libbitcoin-node-devel<=3.6.0_10
- libbitcoin-protocol<=3.6.0_10
+ libbitcoin-node<=3.6.0_10
  libbitcoin-protocol-devel<=3.6.0_10
- libbitcoin-server<=3.6.0_10
+ libbitcoin-protocol<=3.6.0_10
  libbitcoin-server-devel<=3.6.0_10
- libbitcoin-system<=3.6.0_10
+ libbitcoin-server<=3.6.0_10
  libbitcoin-system-devel<=3.6.0_10
+ libbitcoin-system<=3.6.0_10
  libco-devel<=20_1
  libco<=20_1
- libechonest-qt5<=2.3.1_2
- libechonest-qt5-devel<=2.3.1_2
  libdbusmenu-qt<=0.9.2_4
+ libechonest-qt5-devel<=2.3.1_2
+ libechonest-qt5<=2.3.1_2
  libfcitx-qt-devel<=4.2.9.8_1
  libfcitx-qt<=4.2.9.8_1
  libgksu<=2.0.12_5
@@ -327,9 +331,9 @@ replaces="
  libunique1-devel<=1.1.6_12
  libunique1<=1.1.6_12
  libunique<=3.0.2_11
- libvpx<=1.7.0_4
- libvpx5<=1.7.0_4
  libvpx5-devel<=1.7.0_4
+ libvpx5<=1.7.0_4
+ libvpx<=1.7.0_4
  libwebkit2gtk50-devel<=2.38.3_1
  libwebkit2gtk50<=2.38.3_1
  libwnck2-devel<=2.30.7_8
@@ -361,8 +365,8 @@ replaces="
  mozjs91-devel<=91.7.1_3
  mozjs91<=91.7.1_3
  mp3gain<=1.6.2_2
- mpir<=3.0.0_1
  mpir-devel<=3.0.0_1
+ mpir<=3.0.0_1
  mutagen<=1.43.0_3
  nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
@@ -574,6 +578,8 @@ replaces="
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  xnp2<=0.86_2
+ xsetmode<=1.0.0_5
+ xsetpointer<=1.0.1_4
  yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  ytop<=0.6.2_1

From 9a6f587c8f88646be49142676c3a5185c514602e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:08 +0200
Subject: [PATCH 0803/1854] attica: update to 5.107.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 5d4cdf9951aa..e7f69e2841a3 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f1c4fcd74435f387a2a8cccd1ac7434292f3c65d221b84fab4b44e2373109b9
+checksum=fdcb3cca97c3705eef360e483d25eec887e1d42c43c77c815ad42a0972ee13f8
 
 do_check() {
 	cd build

From 7313c1ed1c7efef49c7b93c78127d4eda946e292 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:09 +0200
Subject: [PATCH 0804/1854] baloo5: update to 5.107.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 91dbc65410a1..741228362328 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=8d3f7e1acabf6993d2e724b8318c270d66812f5295ae66047c19b3ec5ab1f4c5
+checksum=e2434e75afeabd260dea3b32b474f09bbc9dd91c215924f8fdd76b98fa777a44
 
 do_check() {
 	cd build

From fc6e9e9ec27cbdd32f41ef42039b185f34546547 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:11 +0200
Subject: [PATCH 0805/1854] bluez-qt5: update to 5.107.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7ec1ba655172..4c690e127e56 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args=" -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c6ed49324afd7a5c7c1668bfdf2b2accec748fdd867d8c893881b59ff413d583
+checksum=2f2ab08681e9014d7884fc345b72a91611d98e9b453df95c9be627aaf7b9ce71
 
 do_check() {
 	cd build

From 743576109d92a25789a7e0dc7e2fa59fa278e189 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:12 +0200
Subject: [PATCH 0806/1854] breeze-icons: update to 5.107.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index b93357dee086..96f9f7622453 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2328b09ca0a9d4ca1efb13132995f837d3d30452b50646cbf5d91f6584d8a679
+checksum=67b25fefb3ba0864e6c1293397bda16c31d5a04aecc7332deaaf004d86bf103a
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 5fcb9c9a92d8e52b1921b5c1d2a2f79edbf72b89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:13 +0200
Subject: [PATCH 0807/1854] extra-cmake-modules: update to 5.107.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 06f469951f25..2e6b7c717bf9 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bbf7ae5f8f2a3addb821c6d9962d3d0f0085f3ccd55f18128763d88e31365b
+checksum=3969aad56d1e6a5901e926aaf7a73510d98c4b363564ed3f1222d4135da633ed
 python_version=3
 
 do_check() {

From adf511b7155403718c0b7961f83729b1159ba0bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:15 +0200
Subject: [PATCH 0808/1854] frameworkintegration: update to 5.107.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 3f7690be7e45..2279c47afcec 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253a7733505aa99db7dfa7accd3ed416582251b39aeead136a943945619aaf71
+checksum=f81816aa86002d9d7053040241faab153873278c89588032eab1954d2451aa48
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 967285c80face09a8c9a07846ce94ebd995f94b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:16 +0200
Subject: [PATCH 0809/1854] kactivities5-stats: update to 5.107.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 5616f270ad2a..dabe263c5fc3 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=ce513abd4715c2dd3ed7da699c6596dddc9cfb46526aed54c6399505ecad420a
+checksum=678c424b2feb507908eb9b6e73dc5d8c6978dc22276d4169eabf4299eb64e1c2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From a6c53bf5f19a03d23877f4dcdf92102ba553d880 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:17 +0200
Subject: [PATCH 0810/1854] kactivities5: update to 5.107.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index d541ea066791..7f0ac5a84e5a 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=8fd4033c288fd03953a39f43d7d3967024252d29265bc6803adfa9ac166cf0b2
+checksum=19b79539a72e5a8b13f7eb94789eb61a5d5945003a86aa121203017cf3139b29
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 5792dccdb43b5a59b3b4c3f4db896a41e8598696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:18 +0200
Subject: [PATCH 0811/1854] kapidox: update to 5.107.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index f7e896122104..91c2d6dd789f 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68f1e1d617c9d9a661dd630bdf3f1659c4619e6f08c7e0afbbb37270fa52a125
+checksum=5729441f2d67870a814aad6d3edc75ab84b35bd97413fc6783e0436af6edbfbf
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From d31826844da1fe3de4d7b09bd29e3a04573bde04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:20 +0200
Subject: [PATCH 0812/1854] karchive: update to 5.107.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 6891f1581d49..804ecfb4aa7b 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77ef95cf4c525fe74261c7dd817564a35e726e5c1c4d1e1479fdfec187da9749
+checksum=e88cb94b9af8a88f360e627b3ae7a2b99ccdfe3fe9e1961452056b2a00f04a7f
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 4b3158bccedb01c49ce0c193641bcba591dce48f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:21 +0200
Subject: [PATCH 0813/1854] kauth: update to 5.107.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 26afcb83c4df..acd8b8d3c08c 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c660838a2ca9a226f180e0ab654fbb15eee2fc7140a7157e6a2209e9b6c2833
+checksum=06bd7f9b3b9c57ff8f169ba09ee0c160aef8dceb651caa28d154448883db8fff
 
 do_check() {
 	cd build

From b1a5acf339761a38f993417379012f114ec30d3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:23 +0200
Subject: [PATCH 0814/1854] kbookmarks: update to 5.107.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 2f3ed765bc68..6b44ee7aacd7 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb0f625bef48d139f4207c9e18327ad0a64cbba66d312798b291b1090430a183
+checksum=50d1fad05c98c14970ef7fd4b12103bda5bf9a477d99b97f2e7acfeb641ced99
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 56b69d504817758bb15f6b79da8bbf258065ee2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:24 +0200
Subject: [PATCH 0815/1854] kcalendarcore: update to 5.107.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index a391d6f6e091..be95ea9456f5 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fed213d9b3243721cfdd8deca2036d478d3211268c6f8e26abfa37e2ef28abdc
+checksum=54d742bad1ccc5c4b03d0985c1b4b202714af3b0c92efe6631c4c671e8b25c47
 replaces="kcalcore>=0"
 
 do_check() {

From 7b435e8592cd1cc8975b34e52c3e7fba08e4cb59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:25 +0200
Subject: [PATCH 0816/1854] kcmutils: update to 5.107.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index edd10c4a97a8..92d4e936ff98 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2e37e437e547a24beca24546aa2bf76f13b43f762e5f43960d0cd6f5d89b2929
+checksum=4698d6ccdbfb1a58103b5e23f330c0aa3cf265e78f5a1f0ba9c88dd8bf8850d5
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From a32bbf651d17b8fb8712ae4842f4f69323f7e88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:27 +0200
Subject: [PATCH 0817/1854] kcodecs: update to 5.107.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index d9f47b8e3afa..36bed6de910e 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e3c65d4fbac9fa3d47aa382764066ff875de0e3d8ff2bb87cf567f4e50e572
+checksum=07b08563c0a4b29bbf08ea7a36c410d64936ab5e27cc772b8ca4f27a75a11221
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 00e08dff3be67f2e4eb56fd005cc6a81559956b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:28 +0200
Subject: [PATCH 0818/1854] kcompletion: update to 5.107.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 6c87fe8def18..771278ab6e77 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6e76e822a8b4e49d3357958fd3880858a59ccf4defd45a0e248c57535788b981
+checksum=50ab6473d2092bf98fc6d0ed7000566e9bb490f1139e1a502dabc39dfe6449f5
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From 01da3b89648a71607dde0357de54271853639a3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:30 +0200
Subject: [PATCH 0819/1854] kconfig: update to 5.107.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 10c98e2802f8..4824fe81fe4b 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3e95f516a1e939067550a243a46cc33961d1c9b116330913176e6ea55760e152
+checksum=9697d4bca5255e62df99f7e80b4d0f22d532317b4bff3d67e81c4f7641ee5b13
 
 do_check() {
 	cd build

From 387e870a86e953d890c5baa3f7fdcc013b7a8a24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:31 +0200
Subject: [PATCH 0820/1854] kconfigwidgets: update to 5.107.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 4c50958906a1..b6bf594f6407 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=068f4d3810a07dcc7b69115584d7948e9252b4bb3fc381ec48b71798e2c4d94a
+checksum=f16d8578ab311b46bdbdac11beaeca6b70a19417622d70c7b07fb6d71545c068
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From f3bdd118c5581dbc32cab4459d6a59e08fe7928d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:32 +0200
Subject: [PATCH 0821/1854] kcontacts: update to 5.107.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 8704720b6959..e173b89a1ee2 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6dedd11f5327ee0522edd3538045084050c9e680ad4df4bd1e17342550bab338
+checksum=3bcaccf93e6cd0d283398c789a5975f2a9fc24724a73e2f07865e31fdf5fb09d
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 789f4c7fe8ce6b4243fd5b677484e35b9f3870d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:34 +0200
Subject: [PATCH 0822/1854] kcoreaddons: update to 5.107.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 92deb84ff859..b34ee6d24d71 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=915cd3ac5bb3963fe79a643d70f109a9aa198f97e6a2b5c72f09cd955238daa2
+checksum=64baee484852ab2798aba18cc4780a1caafb688a5e0a0524de3bc7eb2a1eaf84
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From d3b2a63393e6d85338b83a0e22d086af462d0a8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:35 +0200
Subject: [PATCH 0823/1854] kcrash: update to 5.107.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 0bb79ada5c3b..bde970554302 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee087799922c9a74a7a8f523c75e8af61c27c3ded81b108c51e86faa2921e1c8
+checksum=5417cdd49ba0a54ef3e549eaf153c425d15158e2b91247c0ffddb6985f7df695
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 92dc491d27eaf2f5a22e2278db5a785f346a05ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:36 +0200
Subject: [PATCH 0824/1854] kdav: update to 5.107.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 25af83b44494..754b41320e83 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3de27547f16a32074387e049c17da94b13d82b0f5f86fb6abf06100a828be335
+checksum=579da54db79d360e17c500c62a9ada81cdf5db84a40799f98f2f7cbac70a9b6f
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 05b4f720ebdaa7524fa54f272dcb9fff8fc3ec91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:38 +0200
Subject: [PATCH 0825/1854] kdbusaddons: update to 5.107.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 9866507523a2..e715c97d2843 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a257b294d85ef3485dcf05a23d94769bf0d70a8689508e24cb209a8c25ffedd
+checksum=4e96e3c31eb254b6a48aad20b86c8fa4806a45f6c0644b672413a3ca88eb09b8
 
 do_check() {
 	cd build

From 0c04853d4c055ceef1b34c67f81d2ebaf35dd59b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:39 +0200
Subject: [PATCH 0826/1854] kdeclarative: update to 5.107.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 1bfb390ac47a..d5cf8cbfa26c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44ce2dc69f9bc93f5a039cb14f3043e4a9d98fbed5e031bf8d6fd6778b958ae4
+checksum=df50ed868176fc2b138ac2a24148de7d73165ebe1cfd4f3740953069ce880855
 
 do_check() {
 	cd build

From 9107dc11903fd706d314e8893cb19a5bd6fe2fef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:41 +0200
Subject: [PATCH 0827/1854] kded: update to 5.107.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 3e77a6ee5580..b26a367461f5 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac588d6ee850ce60b5128043617c6986cd04122e792052b1d515c4343ed851fb
+checksum=cf2f08cfc411bb6b2a60906999fe94bddd8df4a9497e8d37cfb62399e6e8b73b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 021d4b5182c4eeedb58080ad3f170e54d332ef93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:42 +0200
Subject: [PATCH 0828/1854] kdelibs4support: update to 5.107.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index e7de263131b4..6cbadf3535ac 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4d5051221c293aeec014ced6547df6fbfcaf0111dc732a48eadc55f72c8f87ed
+checksum=ef94568b687230734725d2a74108ff869c0beeb6d3476503265719e182660c8f
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From a4dbfdf151ef02d90172b9ba4d6e5d712bd122b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:43 +0200
Subject: [PATCH 0829/1854] kdesignerplugin: update to 5.107.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 4fd0478bdaf3..5e6180c0b4ee 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e7482e698c2b2d8550ab8fb54b30f72ec363ff92e082f20a856e02b337d4aa66
+checksum=688dc43ec37de6a24848410593f17034e56be1659efe00c46fd31fedbc77be53
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools kgendesignerplugin kdoctools"

From 67558c9d4f6410eed6b902a5fc55164b12fe8ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:45 +0200
Subject: [PATCH 0830/1854] kdesu: update to 5.107.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 6ba72c0f4251..ebbcb7eff5fd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=12a64ddb93c30ec299befd23e9c32eae340437ea3d97d18a21865778de078655
+checksum=7d1017e508561e66af1fd2df32b340696d64f48b86a98d085a2e47ac0352158a
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 9b43f5d60c3c9426c2cd009847848a61f58405d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:46 +0200
Subject: [PATCH 0831/1854] kdewebkit: update to 5.107.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 065a1207b82d..c6062441f4a3 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=38760d18d7e1938d278d0f3bd5897602d1e673a1e93616d4ad9f9a96e6a4b698
+checksum=65502819b5cd0056cc0fe041b8fa7da3a703fc3222f8785f035f25613ad4b637
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From fe8e1a6c09125552d8620380f163f23b285e4ca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:47 +0200
Subject: [PATCH 0832/1854] kdnssd: update to 5.107.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 02c5d9f875de..06905b3e5d72 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c565de37584666d0c786b9422efbf6134c6c43dd8940875d7dc3f3a1fc7828d4
+checksum=155cb54351d76299c295ef859695fb280d7b74fd4daa9ac0bfc9752f7a1bd0ca
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From e0c2fabbc23637a1a8e38cf4e21c9842344b4c42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:49 +0200
Subject: [PATCH 0833/1854] kdoctools: update to 5.107.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 00f80fc02995..de12091ad810 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b4e4b71914c46684219ba84fb4f8364809aeb43d74cfbe8f18ad53c728b0922
+checksum=9d56a0493f5fe10e7419ff97be56e4afbbc011eb19c379a42f5a58a860711550
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From fa84e5878781b1de9ef8dfa3560e142bcbd115dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:50 +0200
Subject: [PATCH 0834/1854] kemoticons: update to 5.107.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index b7e445ddeba5..93bf78bf08f8 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c028b73b2970cfaeef1c9fff2826eed92cd8dac1870f70d96e541f36dac54644
+checksum=56f8748232d08527e535cc678d30241033c20c14141a027b2915aee551953e4c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From a671a937b173b6da98186c91b0101c931f71dc32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:51 +0200
Subject: [PATCH 0835/1854] kfilemetadata5: update to 5.107.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8980121fbc69..4b91cf19f298 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c64ef2bab192c779cafe471354a2125fff858ba8e8a65d2193965ee520b02e2b
+checksum=edb4f34d45b7c898bc349833dfde7e82cc9ba9f2d1af53a89d8b7ef0ebbc8aad
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 2059a35130c6f0ed2e83a8ccc6f241bf6d667020 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:53 +0200
Subject: [PATCH 0836/1854] kglobalaccel: update to 5.107.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index bcc5b51fd28c..863bde13cfc0 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8b0f8d6857d86d47fa64ac9853b8d397e6c7bea39dda8b5d99a61cd5dfba494
+checksum=a874824335b811ce1ad7b08f37e0ae992e813ea2fad34de252ea8e9239349ed8
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From dc345f1737f133cfd45757b9b43e6e9c2bce37ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:55 +0200
Subject: [PATCH 0837/1854] kguiaddons: update to 5.107.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 449d0583c308..9efb4aa02a34 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=66318ce05ce96fc69533adae525a8aa7e11ee675646fc395b46de30fafa31af1
+checksum=ad2f6e6ca7dd3c230de54bab357e33a9c21e85a2836f63565e3b77ebf79984c1
 
 build_options="wayland x11"
 build_options_default="wayland x11"

From 7923818d465c27cf4125bf50ab210f27c44f17e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:56 +0200
Subject: [PATCH 0838/1854] kholidays: update to 5.107.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 578f4d1b3d84..17c20de78249 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ba80c218e3db9432a6625e9ae376ce4b4605a73e6081fd23211f07b47a28c0a
+checksum=ca5670e9d1d7e979c139d07936f00826e06cbe902ba93bf28fd342dcc4a2432c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From dad9807511ffc0d97b29f3e20249820835ad7891 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:57 +0200
Subject: [PATCH 0839/1854] khtml: update to 5.107.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index d79eeaed735a..9c3e0275512b 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=14381ec7008fac941a4b37c8cc6a40e5faad961ced6a6aedf53be855bc12b920
+checksum=3b4597da6f28257cba8381283f8218ab7a83bbac1418a8926180597460d195fd
 
 khtml-devel_package() {
 	short_desc+=" - development"

From c776383204737403706b37c79e4df43a398780a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:24:59 +0200
Subject: [PATCH 0840/1854] ki18n: update to 5.107.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 47f7d8625229..175b07bbafaa 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba26cd1fc188ab305293f8f1276ab7871f57f4ab1309bb8d2adf42fb20958f3a
+checksum=17dd8fe31b75367f6a8cfd73e1a8a9676031ff9acf86dcd9456fab46c25e8be0
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 28874eeb8c2aae4db98b96c5974cc21efe622347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:00 +0200
Subject: [PATCH 0841/1854] kiconthemes: update to 5.107.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 86538e1a3a55..d716822dc201 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=15178a35da23f78cbbac1a9d40554c9ed46f4426f7669f463260061f463f23bf
+checksum=5d17db48bc9d54e0060cc48f77354b2732ec2fc553266a00907c16345426c42f
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 116fb06ead30a9d88fb99c3be6c012a80958a317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:01 +0200
Subject: [PATCH 0842/1854] kidletime: update to 5.107.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 4548d31029a6..80c07919afb7 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8be6497cb52c6240f4d77d47457ec4f224fbc9aebf525330d7045981d033fb2e
+checksum=3b409a281b1212f01bd1ce99cf75b8a6a73397abe96c3a278a80f709c1a7772c
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From f5044b5dbb911539c1a4876b99666ca05754b112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:03 +0200
Subject: [PATCH 0843/1854] kimageformats: update to 5.107.0.

---
 srcpkgs/kimageformats/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 4e4a02383fd3..21dd21420fac 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.105.0
-revision=2
+version=5.107.0
+revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kimageformats-${version}.tar.xz"
-checksum=4ea6ead739f9e850aa8908e246ff2f45f505bbadba20205fb580667bab87d0fc
+checksum=97258ad36bf98cd1aaeeb29c49946031f5051d9984bda9f41fda5a35ccd4d1c1
 
 if [ "$XBPS_MACHINE" = i686 ]; then
 	# FIXME: some tests fail on i686.

From c127607f01387d0ce3ff4de52844f174c721212c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:04 +0200
Subject: [PATCH 0844/1854] kinit: update to 5.107.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 7188dc8d7303..bdc9c3f5218c 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40dcd052f99cffc3588593495f971a6fb580e82804cbbdf43bf4bd9f2f9ed4ce
+checksum=cefe344456222c63bbc1738192a11f68e0eff7eac5e32f73e0edb9b8d9a848dc
 
 kinit-devel_package() {
 	short_desc+=" - development"

From e739c01aaa165f57a9e2ed2f15124ef842d231cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:06 +0200
Subject: [PATCH 0845/1854] kio: update to 5.107.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 6d458b506368..341854f06482 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f971115d3cc488973f74222c9ae3722ac630fa8c02c00d4ba22eb03ceb8677d
+checksum=456a1856830c21e9a61181c22c0e14510ad6a4498da0684afc05761142ac48ae
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 4bb8ca2813f2519c55679392c43cc04eed549112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:07 +0200
Subject: [PATCH 0846/1854] kirigami2: update to 5.107.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 9f86b7fff809..ec5a8dabcddd 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=36c2fe1662f4bdb82e2e709777aad82576724612dc35bfd1ecbb507d20f585dc
+checksum=f5c3d1363ddde13c977f6f6c747cb0b34ac6fb647134ef9e9c1c24474e0cb9c9
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From d9628747a383a07ccd33abe9d9c89b20a178857b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:09 +0200
Subject: [PATCH 0847/1854] kitemmodels: update to 5.107.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 4da393bb9be5..5266053a4cc5 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d28798439e4f6a1de3388e1fa0b7aefa0002b1902b62841e70551fcba3791523
+checksum=b7f5aae6a5d0605f737ab3e993f9a195ba164f6f89672013e26b1276808a11af
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 5035df1eaf6769494a1069f8eebd4a3d3ed8ef81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:10 +0200
Subject: [PATCH 0848/1854] kitemviews: update to 5.107.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 969bb97825f7..2b5b73c7988f 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=25dac0803149156e088b51db1fc717b2c95bf373becc2625b031d0aca06235cd
+checksum=d5460cee8e9b08c1c0472e88e07bbe04d33cf69da6faf45febd9680972a00b17
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From 2ea1799c77547dcf553e7b0590988583361b8f61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:12 +0200
Subject: [PATCH 0849/1854] kjobwidgets: update to 5.107.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 56ee66e2901f..d3f5005d0dde 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b7edaccfa5d17b4bd9c6c4ebbb77cb951719fa405ca0b31da5af316acf7edee6
+checksum=26e1ab6bdec59890be9155841f74bb79d1fedddcafb674a8e6a257f8c2906b92
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 05e94c75a756eed85a4faba3d782681f154d3dd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:13 +0200
Subject: [PATCH 0850/1854] kjs: update to 5.107.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index a7e4e495f392..95d70cde0d05 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=93f87d367ceb0038c622d6c41a54d8fec04014f2e8a76732174074dec77cd31c
+checksum=6a36b4e812681088cf1dd3d44f7e37352da3c01f510f8a0c906ee1bcf52a2835
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From afb076ab2d05bac6920da8f9496f03b4cf6f7074 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:15 +0200
Subject: [PATCH 0851/1854] kjsembed: update to 5.107.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index c02cc4a02d40..1dcfd1d8338e 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8a8af23563345649c19adec044a86ee5f37d64c90444d51058cd1c271d1b23b5
+checksum=726e499a415d9967096c81584478a1114128152ca7a062359e2a2ae0976f31ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 635d06d171cf2ae834eb58fd76a09fca6b32b4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:16 +0200
Subject: [PATCH 0852/1854] kmediaplayer: update to 5.107.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index f3bf76eaa836..d662e169c7f4 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7db3b021751f8d874c38de318ef7f20c3a44c66aa24d5c0d5205765decb55fd8
+checksum=b2e66ebfecc002a644edada997ccf79dd7bb911b36c779b71f43453cce8c11d4
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 8804cd9abf6a566e39b2827d1e0cdecc5c34baf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:17 +0200
Subject: [PATCH 0853/1854] knewstuff: update to 5.107.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 0f2e989b8fb1..e7aeb28a4f53 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8758cbbae12cd0405614cb9a0ff57fa66899e31187fb7a027cfca91b48f5fc7e
+checksum=78d935ba41d525a803bc6335f9f5cbe7c2972000d3544e7621cb5771ab92f29b
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 47f5e48d551b07cf8f06be88c33b59a57d9849be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:18 +0200
Subject: [PATCH 0854/1854] knotifications: update to 5.107.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 1999229aa387..f01266def0e1 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b24ed1f92be045c8f6d2c7c39c9f3c7948a8bcbdb35f7af6f61f076cd845535
+checksum=ee1d477046c54d03d7704bc76a7d583393e8ba316e5c622d39ca35fd98a92f76
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 4d89dcd5bc2c12bd39b80d7d82a86f466fbbe2a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:20 +0200
Subject: [PATCH 0855/1854] knotifyconfig: update to 5.107.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 4789bbaac9c2..b113d8d1b9cd 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2ba0087bf8bb80c4d5d15da4b6f0519d643da5ac990e7bd757214118b9477c3
+checksum=e8f1568fca948ca4573c4e86b808aea18ce53f54b8b6282a3183f44a95efb279
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 1251ded261ee711287fa81782ee48f0d12c71066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:21 +0200
Subject: [PATCH 0856/1854] kpackage: update to 5.107.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 8d2de04a9f04..cd1e7c9ffc25 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccae4d5556ddb6392b5c9f2423ef4b170adc7d2e5c4764a44b73a21b1c4a6765
+checksum=f0ae60c1556ab7156f39191609386b84d103d44cda3eccbd294e73a983c404b2
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From be27cab5358ce6065681ff6c100ba23a16084910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:22 +0200
Subject: [PATCH 0857/1854] kparts: update to 5.107.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index a5e401478866..2a390a16bab0 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab0033760fcd76d0d156481e026de3b545191b9a3c6cc7e2316fa8c50d95b79c
+checksum=00b8558644928e4cc1f43de64a74696d038add33895522e085809c9c9a8fa9fb
 
 do_check() {
 	: # test can not find packages assets?!

From b55a90770dd5b7caa0e9f645350948283d52147f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:24 +0200
Subject: [PATCH 0858/1854] kpeople: update to 5.107.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 71a80c6129c5..cdddd8b78826 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac098e548cdb9be91e035e15ad9b923bb7d0fe490562bbed16245a6cf40d4706
+checksum=925e6eb326846b01c31eb013be0858e1c48e590fdb4e4274e3f92d9c224b19a2
 
 do_check() {
 	cd build

From a8667e3a0f684827d65f280b7ef1ebaafb15c129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:25 +0200
Subject: [PATCH 0859/1854] kplotting: update to 5.107.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index c53f74007e3d..0ed037b0b8db 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c9ce3514dfff5bc1432c26e5b9b0f9a4727edd18979a5745e8537a3c0edf100b
+checksum=4c6c3dba2242e2a0ed053db8083dd35fa7e5de2d31e5e142c0beda9f750ed33e
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From d5072033d5f962c232c13e908c7670d0dca2136c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:27 +0200
Subject: [PATCH 0860/1854] kpty: update to 5.107.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 54ff29837d3a..a549a8e0cae2 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba2ceac1b9678b6e926119c3e040e2f9cf277dca8c9ecf0f9ca5f58fdfd0616a
+checksum=907ec5f4108d42fcfc7013c38e97c71ced2002dc14d311b589170e89ae4813f8
 
 kpty-devel_package() {
 	short_desc+=" - development"

From e44a78bd66b80eab96c2dc8a45d2409604a240d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:28 +0200
Subject: [PATCH 0861/1854] kquickcharts: update to 5.107.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index f5508f9c0c1f..90d3e44608d4 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=8a24080bcbe3d74e65c4d64e3cf51255fc9d41d677ba78360e1a0f8684b2c903
+checksum=942c737225470787baa25dc9b3e231eebbcce373e3b65f82df3223d6fbb4b9f7
 
 do_check() {
 	cd build

From 0bcfe39809d61ec99babd8f4102875f9217c7a97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:29 +0200
Subject: [PATCH 0862/1854] kross: update to 5.107.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 3b6f1e51aa1f..49bc5f603ed8 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e54b1ec87296d7cf4ecabe82124be33a1704de370545dbc103c47df9434337fa
+checksum=3f0eac7ceaf22fae6202efb66b73e192b781e5733566cbf3362d82be8e8cbe8e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 215bc9ac579f24839234ec3111e3d5fe9720125d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:30 +0200
Subject: [PATCH 0863/1854] krunner: update to 5.107.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index d41b30fb065e..d1b69827c9f9 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=785b8ad02cb61452c6f82a1ff632539b492399c1832c153fa6eb1fd35b6daf08
+checksum=75c8e8022c131b339426c38a5fdfc7c33ddf30b211fae9cebe2e4a0cab3c221b
 
 do_check() {
 	cd build

From 7ca64eb3eaf2c44bb25a6900e197a1154ac5944d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:32 +0200
Subject: [PATCH 0864/1854] kservice: update to 5.107.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index c7efcb99097a..8d2c986523d9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b1010940954040f4a0ed096901e7393f26f262d79b5e904da2247b2602e3c70c
+checksum=063f6d41921d797553204fe625c1c4720e1b7b1a71163c5d594eb210b614f92d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From cdace58c26fe9733c11ccef5fedf9c27a6926495 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:33 +0200
Subject: [PATCH 0865/1854] ksolid: update to 5.107.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d021468e767d..b40cac513b34 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config flex extra-cmake-modules qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=fdcd5c0ee1060204f46ff88a0ab25403b6d83676d0d9f407209ce3bc6629aab5
+checksum=4245115d411b9890ca811835e3e8aba4b6e915acc04e3839fa9245d4a130abf0
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From caef0b889f4e1d879bf317a93487b7b296c18e8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:35 +0200
Subject: [PATCH 0866/1854] ktexteditor: update to 5.107.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 914472ab602d..cd91891f2007 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96e9dec29a59a6f0fc939b4496dc36138b9d5221e8d1b6c3645ca3d93fd85106
+checksum=8f91c74da11b856b0a228d080c592e360ce80c9020cbe0d8673dd6b6cacebc98
 
 do_check() {
 	cd build

From 5edf9cdf6e5d8231d9d0ee44013f10a9c60b1087 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:36 +0200
Subject: [PATCH 0867/1854] ktextwidgets: update to 5.107.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 2fa40573c0f6..0197e46f3f50 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e5fb51544ef0ec3435a855e870143359a57b6a7a9a1ee51c36a56dd576e68fd
+checksum=5e66b07f271a9aae03795ed1baef542460d77ede06987e312f56ebf2376da0fb
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 825171298eac884c4540f20bdfb9057fa558b8aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:38 +0200
Subject: [PATCH 0868/1854] kunitconversion: update to 5.107.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 9136ac1e2325..f366205bf7a7 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f69545481bebf0dc69fcad43defb429e1b0306550380115edaf41a84086144e
+checksum=5cf5beed75848efbec729eedee337b340a273a660f38b2e6197ae303277e26f9
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From a42d8d948d8e79967adf1a550383565276b5522e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:39 +0200
Subject: [PATCH 0869/1854] kwallet: update to 5.107.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index b3616992b278..129ebf405131 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0deb1f27398c41caef6ad56ff151d2c1a59740abc1d6c578b502d31522249ef9
+checksum=2e796a011f337ea3305a11bfe2c0e49b71720569207361c65d5bbe85f71b1d77
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 05daaf632b21add75f54b87af7117bcc130bb3ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:40 +0200
Subject: [PATCH 0870/1854] kwayland: update to 5.107.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 090cf8a40d7e..8b144014c874 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=017de24dc140541690b80cbd4b34d5f4b14c9ff5a2b355a08d5657af1a52348e
+checksum=855c21176788ea418603500dfd0547c5b01340a79d86d68548b67bb1d3961049
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 11c9133cb9367ab0a673a01b01cb663cc83e850b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:42 +0200
Subject: [PATCH 0871/1854] kwidgetsaddons: update to 5.107.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 781ea9772982..853fcc33bf8d 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adc8c9dedc790b9ee615295c18345efddc66ab0a69d6c0cbcc8bd5df9d6a7f1e
+checksum=0fa19b9933c3f5553d16bb38b0d9f6fe0a290d58b70e7debf45714102ce887c9
 
 do_check() {
 	cd build

From e59b58b3245304d3ae8957740e3c1ba571171c1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:43 +0200
Subject: [PATCH 0872/1854] kwindowsystem: update to 5.107.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index ac0ad18ae374..1e007b0f2338 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40f8032edda348ce2a1ecb5dfe61a8493bec0f68ce93141c3721b72090a6f44a
+checksum=a3aa7c3c82f70f6d347c489af45e0e4277fb792fb1b1fc1dd9a6dbb73ec6931e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 942e4c7a10de3eb44225cfe142f4311914572bda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:45 +0200
Subject: [PATCH 0873/1854] kxmlgui: update to 5.107.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 36db176096be..ce4021a8fc72 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c17b9abed247728399bf4f1be599e9d33c3aeda41ced9590ec0eab0e4d1b4f68
+checksum=4b4821804c3b3cd58dfe3cee474ee2999501d04f9936003a593bc64a3f1084e5
 
 do_check() {
 	cd build

From 4145165bbfc48481dab98fdebfcddd15e67fd633 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:46 +0200
Subject: [PATCH 0874/1854] kxmlrpcclient: update to 5.107.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index d0da6379f8e9..b4edbd191bae 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=578dde6eaf873b7c6f554a5a8de2ae04a8e577cdf5a09b0e2e1867877d9c2cd0
+checksum=0cb214266c5a715c78f9b676ae4ff0f4fa1e502bf04ee0b855dae5c5275ecb79
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 6e01bde1d2a82058a06e31a1cff808cf9d9450f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:47 +0200
Subject: [PATCH 0875/1854] modemmanager-qt5: update to 5.107.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index e2c1b1fc0dcd..77163be6313f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=5cb26fad66b70216c5e3d406e98769d0c90704c1d9a36b2bceac6d0a6efe5ce4
+checksum=c1df6ec05e104a80c340fb4e4317725931a69bb48b8fb2666e5804cc09d6c439
 
 do_check() {
 	cd build

From c7f6830e3ce8c360ad4a9d8ee0c623306507e925 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:49 +0200
Subject: [PATCH 0876/1854] networkmanager-qt5: update to 5.107.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index f51c54314992..a7cb965b1232 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=bdf74d4a3d945837696e639742cbdc8aefdea03c4ceb9b2fed4cf74685ca14c3
+checksum=695ffd3ef62023389f99363622320dc4af61e6d3e5606d006fbc5864f0d3197f
 
 do_check() {
 	cd build

From 4a6162663b83d270b748b2411e2cdae900f2d010 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:52 +0200
Subject: [PATCH 0877/1854] oxygen-icons5: update to 5.107.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 90ea3f51085c..5d9b467d993e 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=82568b106969f4b1e79f24b97a201ddcb82f59fce685a16d56e1fbf97ac13b49
+checksum=3afd9a59b37dd558f45a92db64783adc49b2fab01c6f68f2bf9f0a8367a7cfd0
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 94d6756d87b48dda96a10a7befd276656aeb1919 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:54 +0200
Subject: [PATCH 0878/1854] plasma-framework: update to 5.107.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 070eb153025c..c9fc4a584c5b 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5311778e9b3ea896a245d9a80554a94b30b5e1d130732d2f4a912c0f27243ca7
+checksum=6053a55a498ebefd4cd468365acc46e1287066bb17398ec9f3d68aaf2abf0f2a
 
 do_check() {
 	cd build

From 7b4be7e0cf19aee1bed1c2ff00234976a24572fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:55 +0200
Subject: [PATCH 0879/1854] prison: update to 5.107.0.

---
 srcpkgs/prison/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 249e136c3b11..1520139c4d82 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,7 +1,7 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.105.0
-revision=2
+version=5.107.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
  qt5-declarative-devel qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=6e05ec6085df7a33e74e450286f596fe7368bbec6ef46e67efd1738966784261
+checksum=cc702edf7fd3f36b567ca2d1bfc315e80312e7e33fb6a0db49cc4a3b6fa64a9c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DBUILD_TESTING=ON"

From 69d5132f655c8c19521e39264d6979652e75cdd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:56 +0200
Subject: [PATCH 0880/1854] purpose: update to 5.107.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 4565a81e4d2d..a17583b681b3 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b89fca5d4ea18b6c9323a90c0cacc85d7f2c95a5ef087de0d69154f698104f16
+checksum=99cdf31a52b606ff6ee25acec1ee030e52e0c004d3fd3a42b2bba838473f9d2c
 
 do_check() {
 	cd build

From fc8aa0a9d071ab378fe786f00fac0f839e146444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:58 +0200
Subject: [PATCH 0881/1854] qqc2-desktop-style: update to 5.107.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 7e9a776380ec..49e3e012cbea 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=de8f6c8b6a9af2caecfea20f71d84a791e6f685b8b6048668ed22a0d25121a92
+checksum=5cb96c9799f0fb46b9bf3826121ae00e31955591b255e50e83f1437178f1f242
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9b3e8bb6fb6807ed03f3de1939821f7f1be1ac38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:25:59 +0200
Subject: [PATCH 0882/1854] sonnet: update to 5.107.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 7077c72a2f73..52ca653bb4e5 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28ef6a2da7f2321975d902e123c616811e1c19ef7bddd8550c1ac7294900e08f
+checksum=aa3dca0a1cf58ae7914b75f67bb4a42202ba2ee4c5bf9df594a431da2496a747
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From e13cd29d75355947a505494c21f8875e767d9032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:26:01 +0200
Subject: [PATCH 0883/1854] syndication: update to 5.107.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 2f75b920ac70..810687b9b36e 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=6b626f094569a3069856239933e3602c96652c03e3add04743bb7b793714c5e3
+checksum=254d38c51f77e3e98b78761490258d394151f07b5e5ad19113061ff5c9b0f84a
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 86663b900dd0ca986071686942b9e51202e7ead3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:26:02 +0200
Subject: [PATCH 0884/1854] syntax-highlighting: update to 5.107.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index a8895c179d0a..70375ffe0b84 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f558b8203359911fef33701e9bebbfaa7eb7cddcd34440d4d886fb5709d0114c
+checksum=672ed1e9eebbf13d012f027e729b1b9820c351d4a4b2ca57ffd0be4a71ac59d9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 410893c136c95dac29e5e91e4ad6a3f3dd112428 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Jun 2023 17:26:03 +0200
Subject: [PATCH 0885/1854] threadweaver: update to 5.107.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 667142e0db35..0866ac34926f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.105.0
+version=5.107.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97c64a0bbdcc40cf9e374342db5062b657a18dbcf097976d94c2eb31955186e1
+checksum=c6c4faaf3c2b2197d43fddae39d752c4ad32febee039eb8048f8d705c1393af2
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 999d9f18c1b15ae891a197653d549cf0cdb49edc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jun 2023 22:43:06 +0200
Subject: [PATCH 0886/1854] python: fix building _io.so

---
 srcpkgs/python/patches/fix-pr-21.patch | 17 +++++++++++++++++
 srcpkgs/python/template                |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python/patches/fix-pr-21.patch

diff --git a/srcpkgs/python/patches/fix-pr-21.patch b/srcpkgs/python/patches/fix-pr-21.patch
new file mode 100644
index 000000000000..e1e5b771e79a
--- /dev/null
+++ b/srcpkgs/python/patches/fix-pr-21.patch
@@ -0,0 +1,17 @@
+--- a/Include/pyport.h
++++ b/Include/pyport.h
+@@ -947,7 +947,6 @@
+ #define Py_ULL(x) Py_LL(x##U)
+ #endif
+ 
+-#ifdef Py_BUILD_CORE 
+ /*
+  * Macros to protect CRT calls against instant termination when passed an
+  * invalid parameter (issue23524).
+@@ -965,6 +964,5 @@
+ #define _Py_END_SUPPRESS_IPH
+ 
+ #endif /* _MSC_VER >= 1900 */
+-#endif /* Py_BUILD_CORE */
+ 
+ #endif /* Py_PYPORT_H */
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index db6977233517..21566f3e9733 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,7 +4,7 @@
 #
 pkgname=python
 version=2.7.18.7
-revision=1
+revision=2
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel

From 791cfc75e86cbe92ca30ba61c1319c941438fc86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:53:28 +0200
Subject: [PATCH 0887/1854] xorgproto: update to 2023.2.

---
 srcpkgs/xorgproto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 02905d7aabb0..cc20b29fadaf 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
-version=2023.1
+version=2023.2
 revision=1
 build_style=meson
 configure_args="-Dlegacy=true"
@@ -8,9 +8,9 @@ hostmakedepends="xorg-util-macros"
 short_desc="Combined X.Org X11 Protocol headers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="https://xorg.freedesktop.org"
+homepage="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.xz"
-checksum=6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13
+checksum=b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c
 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
  dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
  printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0

From 16105e71bd2ab1c33d5809212a6b4018722a9671 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:54:18 +0200
Subject: [PATCH 0888/1854] fzf: update to 0.42.0.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 678f11097119..2236d90f5cd3 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.41.1
+version=0.42.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=982682eaac377c8a55ae8d7491fcd0e888d6c13915d01da9ebb6b7c434d7f4b5
+checksum=743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2
 
 post_install() {
 	cd ${wrksrc}

From e53d19340b713a37e005b0ea88fbce7632717d8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 15:56:15 +0200
Subject: [PATCH 0889/1854] open-iscsi: update to 2.1.9.

---
 srcpkgs/open-iscsi/patches/libressl.patch | 60 -----------------------
 srcpkgs/open-iscsi/template               |  8 +--
 2 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/open-iscsi/patches/libressl.patch

diff --git a/srcpkgs/open-iscsi/patches/libressl.patch b/srcpkgs/open-iscsi/patches/libressl.patch
deleted file mode 100644
index 5fce5bf341d4..000000000000
--- a/srcpkgs/open-iscsi/patches/libressl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/usr/auth.c
-+++ b/usr/auth.c
-@@ -182,9 +182,11 @@
- 	case AUTH_CHAP_ALG_SHA256:
- 		digest = EVP_sha256();
- 		break;
-+#if 0
- 	case AUTH_CHAP_ALG_SHA3_256:
- 		digest = EVP_sha3_256();
- 		break;
-+#endif
- 	}
- 
- 	if (*context == NULL)
-@@ -335,7 +337,7 @@
- acl_chk_chap_alg_optn(int chap_algorithm)
- {
- 	if (chap_algorithm == AUTH_OPTION_NONE ||
--	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
-+//	    chap_algorithm == AUTH_CHAP_ALG_SHA3_256 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_SHA256 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_SHA1 ||
- 	    chap_algorithm == AUTH_CHAP_ALG_MD5)
-@@ -748,9 +750,11 @@
- 				case AUTH_CHAP_ALG_SHA256:
- 					client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN;
- 					break;
-+#if 0
- 				case AUTH_CHAP_ALG_SHA3_256:
- 					client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN;
- 					break;
-+#endif
- 				}
- 				return;
- 			}
-@@ -899,7 +903,7 @@
- 			client->local_state = AUTH_LOCAL_STATE_ERROR;
- 			client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT;
- 			break;
--		} else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
-+		} else if (// (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) &&
- 			   (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) {
-@@ -1849,6 +1853,7 @@
- 				            "SHA256 due to crypto lib configuration");
- 			}
- 			break;
-+#if 0
- 		case AUTH_CHAP_ALG_SHA3_256:
- 			if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
- 				value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
-@@ -1857,6 +1862,7 @@
- 				            "SHA3-256 due to crypto lib configuration");
- 			}
- 			break;
-+#endif
- 		case ~0:
- 			/* unset value in array, just ignore */
- 			break;
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..f3de701055fc 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,6 +1,6 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.1.8
+version=2.1.9
 revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
@@ -10,11 +10,11 @@ short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
+distfiles="https://github.com/open-iscsi/open-iscsi/archive/${version}.tar.gz"
+checksum=60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
+	*-musl) CFLAGS+=" -DGLOB_ONLYDIR=0 -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile

From 2edcfacb8b771c13202df65ec92214504e391175 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 17:01:38 +0200
Subject: [PATCH 0890/1854] libX11: update to 1.8.6.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index c87251bc7f32..16c3e47ab1d9 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.8.5
+version=1.8.6
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libx11"
 distfiles="${XORG_SITE}/lib/libX11-${version}.tar.xz"
-checksum=e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561
+checksum=59535b7cc6989ba806a022f7e8533b28c4397b9d86e9d07b6df0c0703fa25cc9
 
 post_install() {
 	vlicense COPYING

From 5359e564109f18a8d924ab1ca1ea39f1859bfe80 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 17:36:42 +0200
Subject: [PATCH 0891/1854] opensmtpd: update to 7.3.0p0.

---
 srcpkgs/opensmtpd/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index ab0b2e6a10ab..2878481668df 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=6.8.0p2
-revision=4
+version=7.3.0p0
+revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -22,18 +22,18 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=51bf05312fe56764748faab9e63170bfbb7c7d84a37c4117b62b2681eb3a4d17
+checksum=2dd7a5a8ca127be7eb491540405684acb3dd04d93ad23d7709accd2b0450cae6
 provides="smtp-forwarder-0_1 smtp-server-0_1"
 replaces="smtp-forwarder>=0 smtp-server>=0"
 system_accounts="_smtpd _smtpq"
 
 CFLAGS=-D_DEFAULT_SOURCE
 
-
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --with-libfts=${XBPS_CROSS_BASE}/usr"
-		makedepends+=" musl-fts-devel"
-		;;
+*-musl)
+	configure_args+=" --with-libfts=${XBPS_CROSS_BASE}/usr"
+	makedepends+=" musl-fts-devel"
+	;;
 esac
 
 pre_configure() {

From bbdf74f7496c5ab62ba4ea9a5d96123ceed82545 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Jun 2023 18:28:16 +0200
Subject: [PATCH 0892/1854] New package: bcachefs-tools-24

---
 srcpkgs/bcachefs-tools/patches/musl.patch | 40 +++++++++++++++++++++++
 srcpkgs/bcachefs-tools/template           | 19 +++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 srcpkgs/bcachefs-tools/patches/musl.patch
 create mode 100644 srcpkgs/bcachefs-tools/template

diff --git a/srcpkgs/bcachefs-tools/patches/musl.patch b/srcpkgs/bcachefs-tools/patches/musl.patch
new file mode 100644
index 000000000000..88761f3d2d44
--- /dev/null
+++ b/srcpkgs/bcachefs-tools/patches/musl.patch
@@ -0,0 +1,40 @@
+--- a/include/linux/log2.h
++++ b/include/linux/log2.h
+@@ -194,7 +194,7 @@
+ 	__rounddown_pow_of_two(n)		\
+  )
+ 
+-static inline __attribute_const__
++static inline __attribute__((const))
+ int __order_base_2(unsigned long n)
+ {
+ 	return n > 1 ? ilog2(n - 1) + 1 : 0;
+@@ -274,7 +274,7 @@
+  *
+  * The result is undefined if the size is 0.
+  */
+-static inline __attribute_const__ int get_order(unsigned long size)
++static inline __attribute__((const)) int get_order(unsigned long size)
+ {
+ 	if (__builtin_constant_p(size)) {
+ 		if (!size)
+--- a/libbcachefs/bcachefs_format.h
++++ b/libbcachefs/bcachefs_format.h
+@@ -72,6 +72,7 @@
+  * inode number, 64 bit offset, 96 bit version field, etc.) for negligible cost.
+  */
+ 
++#include <linux/compiler.h>
+ #include <asm/types.h>
+ #include <asm/byteorder.h>
+ #include <linux/kernel.h>
+--- a/libbcachefs/siphash.c
++++ b/libbcachefs/siphash.c
+@@ -44,6 +44,7 @@
+  * https://131002.net/siphash/
+  */
+ 
++#include <linux/compiler.h>
+ #include <asm/byteorder.h>
+ #include <asm/unaligned.h>
+ #include <linux/bitops.h>
diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template
new file mode 100644
index 000000000000..63ae509da080
--- /dev/null
+++ b/srcpkgs/bcachefs-tools/template
@@ -0,0 +1,19 @@
+# Template file for 'bcachefs-tools'
+pkgname=bcachefs-tools
+version=24
+revision=1
+build_style=gnu-makefile
+make_install_args="ROOT_SBINDIR=/usr/bin"
+make_use_env=yes
+hostmakedepends="pkg-config"
+makedepends="attr-devel keyutils-devel libaio-devel libblkid-devel
+ liblz4-devel libscrypt-devel libsodium-devel libudev-devel liburcu-devel
+ libuuid-devel libzstd-devel zlib-devel"
+short_desc="Userspace tools for bcachefs"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-only"
+homepage="https://bcachefs.org/"
+distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=4631f8ba752c562f0e7d74a8052bace39abefa98421e4a2989069d988892c264
+
+export VERSION=v${version}

From 6c0c1fdcebf883910be1ac6ef08f323d94b4b85a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 13:23:16 +0100
Subject: [PATCH 0893/1854] man-pages: update to 6.04.

---
 srcpkgs/man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 6bfb953436e8..8bf17f8ec354 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,13 +1,13 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=6.03
+version=6.04
 revision=1
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/doc/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/man-pages-${version}.tar.xz"
-checksum=5f7f289d30b296b78116a08e7703df9375aa846b332b57dca47ddcbb7809fbbd
+checksum=c2c0b9329955df81af45ee80ebc84c47291f95df5157db1fab988199f9371af1
 
 do_install() {
 	make install prefix=/usr DESTDIR=${DESTDIR}

From 093a36d5e469be25b272e52b06a686ab5fa264a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 22:23:41 +0200
Subject: [PATCH 0894/1854] python-cffi: split python3-cffi to a new package

---
 srcpkgs/python-cffi/template  | 29 +++--------------------------
 srcpkgs/python3-cffi          |  1 -
 srcpkgs/python3-cffi/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 27 deletions(-)
 delete mode 120000 srcpkgs/python3-cffi
 create mode 100644 srcpkgs/python3-cffi/template

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 2d0c4c50832f..911adc8f8c85 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -2,11 +2,10 @@
 pkgname=python-cffi
 version=1.15.1
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libffi-devel"
-makedepends="python-devel python3-devel libffi-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools libffi-devel"
+makedepends="python-devel libffi-devel"
 depends="python-pycparser"
-checkdepends="python3-pytest python3-pycparser"
 short_desc="C foreign function interface for Python2"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
@@ -15,28 +14,6 @@ changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
 distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
 checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
 
-do_check() {
-	# glibc libm.so is a GNU ld script that isn't properly handled
-	# on dlopen; libm symbols required in these tests are missing
-	local excludes='not sin'
-	excludes+=' and not test_dlopen'
-	excludes+=' and not test_function_typedef'
-	excludes+=' and not test_wraps_from_stdlib'
-	excludes+=' and not test_stdcall_only_on_windows'
-
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest c/ testing/ -x -k "$excludes"
-}
-
 post_install() {
 	vlicense LICENSE
 }
-
-python3-cffi_package() {
-	depends="python3-pycparser"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cffi b/srcpkgs/python3-cffi
deleted file mode 120000
index 8d25d17c4b33..000000000000
--- a/srcpkgs/python3-cffi
+++ /dev/null
@@ -1 +0,0 @@
-python-cffi
\ No newline at end of file
diff --git a/srcpkgs/python3-cffi/template b/srcpkgs/python3-cffi/template
new file mode 100644
index 000000000000..9be8775ca6d5
--- /dev/null
+++ b/srcpkgs/python3-cffi/template
@@ -0,0 +1,33 @@
+# Template file for 'python3-cffi'
+pkgname=python3-cffi
+version=1.15.1
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools libffi-devel"
+makedepends="python3-devel libffi-devel"
+depends="python3-pycparser"
+checkdepends="python3-pytest ${depends}"
+short_desc="C foreign function interface for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://cffi.readthedocs.io/"
+changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
+distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
+checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
+
+do_check() {
+	# glibc libm.so is a GNU ld script that isn't properly handled
+	# on dlopen; libm symbols required in these tests are missing
+	local excludes='not sin'
+	excludes+=' and not test_dlopen'
+	excludes+=' and not test_function_typedef'
+	excludes+=' and not test_wraps_from_stdlib'
+	excludes+=' and not test_stdcall_only_on_windows'
+
+	PYTHONPATH="$(cd build/lib* && pwd)" \
+		python3 -m pytest c/ testing/ -x -k "$excludes"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From b95ffccfa8c9b580362872e8b1bb4dbac616f798 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Jun 2023 22:24:06 +0200
Subject: [PATCH 0895/1854] python-Cython: split python3-Cython to a new
 package

---
 srcpkgs/python-Cython/template  | 23 ++++++++---------------
 srcpkgs/python3-Cython          |  1 -
 srcpkgs/python3-Cython/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-Cython
 create mode 100644 srcpkgs/python3-Cython/template

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 5248a14c8bca..06d15eb26f45 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -2,11 +2,11 @@
 pkgname=python-Cython
 version=0.29.35
 revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 depends="python-setuptools"
-short_desc="C-Extensions for Python2"
+short_desc="C-Extensions for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://cython.org/"
@@ -21,15 +21,8 @@ alternatives="
  cython:cython:/usr/bin/cython2
  cython:cythonize:/usr/bin/cythonize2"
 
-python3-Cython_package() {
-	alternatives="
-	 cython:cygdb:/usr/bin/cygdb3
-	 cython:cython:/usr/bin/cython3
-	 cython:cythonize:/usr/bin/cythonize3"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-	}
+post_install() {
+	mv ${DESTDIR}/usr/bin/cygdb{,2}
+	mv ${DESTDIR}/usr/bin/cython{,2}
+	mv ${DESTDIR}/usr/bin/cythonize{,2}
 }
diff --git a/srcpkgs/python3-Cython b/srcpkgs/python3-Cython
deleted file mode 120000
index 61695ff83c3b..000000000000
--- a/srcpkgs/python3-Cython
+++ /dev/null
@@ -1 +0,0 @@
-python-Cython
\ No newline at end of file
diff --git a/srcpkgs/python3-Cython/template b/srcpkgs/python3-Cython/template
new file mode 100644
index 000000000000..8882f11729e4
--- /dev/null
+++ b/srcpkgs/python3-Cython/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-Cython'
+pkgname=python3-Cython
+version=0.29.35
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="C-Extensions for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://cython.org/"
+changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
+checksum=6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527
+# Tests are flaky
+make_check=no
+
+alternatives="
+ cython:cygdb:/usr/bin/cygdb3
+ cython:cython:/usr/bin/cython3
+ cython:cythonize:/usr/bin/cythonize3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/cygdb{,3}
+	mv ${DESTDIR}/usr/bin/cython{,3}
+	mv ${DESTDIR}/usr/bin/cythonize{,3}
+}

From f43f609d6fba0d93bb764da2d34238d9750fbf83 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 22:57:50 +0200
Subject: [PATCH 0896/1854] python-dateutil: split python3-dateutil to a new
 package

---
 srcpkgs/python-dateutil/template              | 15 ++----
 srcpkgs/python3-dateutil                      |  1 -
 .../python3-dateutil/patches/pytest8.patch    | 46 +++++++++++++++++++
 srcpkgs/python3-dateutil/template             | 18 ++++++++
 4 files changed, 67 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/python3-dateutil
 create mode 100644 srcpkgs/python3-dateutil/patches/pytest8.patch
 create mode 100644 srcpkgs/python3-dateutil/template

diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index 0cbcb25fe8ab..cf8ce771084d 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -2,14 +2,14 @@
 pkgname=python-dateutil
 version=2.8.2
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-six tzdata"
 short_desc="Extensions to the standard Python2 datetime module"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
 checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
 
 post_patch() {
@@ -19,12 +19,3 @@ post_patch() {
 post_install() {
 	vlicense LICENSE
 }
-
-python3-dateutil_package() {
-	depends="python3-six tzdata"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-dateutil b/srcpkgs/python3-dateutil
deleted file mode 120000
index 4ea05edb0982..000000000000
--- a/srcpkgs/python3-dateutil
+++ /dev/null
@@ -1 +0,0 @@
-python-dateutil
\ No newline at end of file
diff --git a/srcpkgs/python3-dateutil/patches/pytest8.patch b/srcpkgs/python3-dateutil/patches/pytest8.patch
new file mode 100644
index 000000000000..7372d568fd3a
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/pytest8.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ tests/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/test_internals.py b/tests/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@ code that may be difficult to reach through the standard API calls.
+ 
+ import sys
+ import pytest
++import warnings
+ 
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+     from dateutil.parser._parser import _timelex, _tzparser
+     from dateutil.parser._parser import _parsetz
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _tzparser()
+-        assert len(recorder) == 0
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _timelex('2014-03-03')
+ 
+-        assert len(recorder) == 0
+-
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _parsetz('+05:00')
+-        assert len(recorder) == 0
+ 
+ 
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..ace3398432f9
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="python3-pytest-cov python3-hypothesis python3-freezegun ${depends}"
+short_desc="Extensions to the standard Python3 datetime module"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/dateutil/dateutil"
+distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
+checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
+
+post_install() {
+	vlicense LICENSE
+}

From 12728106a4c21bffe357ed595f298307fa9d6696 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 22:24:08 +0200
Subject: [PATCH 0897/1854] python-constantly: split python3-constantly to a
 new package

---
 srcpkgs/python-constantly/template  | 15 ++-------------
 srcpkgs/python3-constantly          |  1 -
 srcpkgs/python3-constantly/template | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/python3-constantly
 create mode 100644 srcpkgs/python3-constantly/template

diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
index 386180075600..2baccb9c9c5e 100644
--- a/srcpkgs/python-constantly/template
+++ b/srcpkgs/python-constantly/template
@@ -2,27 +2,16 @@
 pkgname=python-constantly
 version=15.1.0
 revision=7
-build_style=python-module
-pycompile_module="constantly"
+build_style=python2-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Symbolic constants in Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/twisted/constantly"
 license="MIT"
+homepage="https://github.com/twisted/constantly"
 distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
 checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-constantly_package() {
-	depends="python3"
-	pycompile_module="constantly"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-constantly b/srcpkgs/python3-constantly
deleted file mode 120000
index 9f28e618569d..000000000000
--- a/srcpkgs/python3-constantly
+++ /dev/null
@@ -1 +0,0 @@
-python-constantly
\ No newline at end of file
diff --git a/srcpkgs/python3-constantly/template b/srcpkgs/python3-constantly/template
new file mode 100644
index 000000000000..c1cca160e7fb
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Symbolic constants in Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/twisted/constantly"
+distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
+checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
+
+post_install() {
+	vlicense LICENSE
+}

From 336964bf222c81725b4dcc74741655d28d80aefc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 21:53:18 +0200
Subject: [PATCH 0898/1854] python-automat: split python3-automat to a new
 package

---
 srcpkgs/python-automat/template  | 23 ++++-------------------
 srcpkgs/python3-automat          |  1 -
 srcpkgs/python3-automat/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-automat
 create mode 100644 srcpkgs/python3-automat/template

diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index bc9ea242cfe2..cf564d324fc9 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -2,10 +2,9 @@
 pkgname=python-automat
 version=22.10.0
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools python-attrs python-six"
-checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
 short_desc="Finite-state machines in Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -13,6 +12,7 @@ homepage="https://github.com/glyph/Automat"
 distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
 checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
 alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+make_check=no # python2
 
 pre_build() {
 	sed -i setup.py \
@@ -21,22 +21,7 @@ pre_build() {
 		-e "s/use_scm_version=True/version='${version}'/"
 }
 
-do_check() {
-	PYTHONPATH="$(cd build/lib* && pwd)" \
-		python3 -m pytest ${testjobs} automat/_test
-}
-
 post_install() {
+	mv ${DESTDIR}/usr/bin/automat-visualize{,2}
 	vlicense LICENSE
 }
-
-python3-automat_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools python3-attrs python3-six"
-	alternatives="automat:automat-visualize:/usr/bin/automat-visualize3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-automat b/srcpkgs/python3-automat
deleted file mode 120000
index 2df0fb5b1fc3..000000000000
--- a/srcpkgs/python3-automat
+++ /dev/null
@@ -1 +0,0 @@
-python-automat
\ No newline at end of file
diff --git a/srcpkgs/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..5d3f0b26d88a
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,32 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=22.10.0
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark python3-graphviz"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize3"
+
+pre_build() {
+	sed -i setup.py \
+		-e '/print(/d' \
+		-e '/setup_requires=/,+3d' \
+		-e "s/use_scm_version=True/version='${version}'/"
+}
+
+# do_check() {
+#     PYTHONPATH="$(cd build/lib* && pwd)" \
+#         python3 -m pytest ${testjobs} automat/_test
+# }
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/automat-visualize{,3}
+	vlicense LICENSE
+}

From 8b72d9c5eb3a2967100147c4b924d4a939290a97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 21:52:46 +0200
Subject: [PATCH 0899/1854] python-SQLAlchemy: split python3-SQLAlchemy to a
 new package

---
 srcpkgs/python-SQLAlchemy/template  | 15 +++------------
 srcpkgs/python3-SQLAlchemy          |  1 -
 srcpkgs/python3-SQLAlchemy/template | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/python3-SQLAlchemy
 create mode 100644 srcpkgs/python3-SQLAlchemy/template

diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 13f5afb75017..f377aa8bf5ac 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -2,9 +2,9 @@
 pkgname=python-SQLAlchemy
 version=1.3.18
 revision=5
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 short_desc="SQL Toolkit and Object Relational Mapper for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -17,12 +17,3 @@ make_check=no
 post_install() {
 	vlicense LICENSE
 }
-
-python3-SQLAlchemy_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-SQLAlchemy b/srcpkgs/python3-SQLAlchemy
deleted file mode 120000
index 7236787d1960..000000000000
--- a/srcpkgs/python3-SQLAlchemy
+++ /dev/null
@@ -1 +0,0 @@
-python-SQLAlchemy
\ No newline at end of file
diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
new file mode 100644
index 000000000000..11d3b30242c0
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=5
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="SQL Toolkit and Object Relational Mapper for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.sqlalchemy.org"
+distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
+checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no # FIXME
+
+post_install() {
+	vlicense LICENSE
+}

From 18178f2500fb62a5a585c8a21151fa63128dbbd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:29:31 +0200
Subject: [PATCH 0900/1854] python-hyperlink: split python3-hyperlink

---
 srcpkgs/python-hyperlink/template  | 20 +++-----------------
 srcpkgs/python3-hyperlink          |  1 -
 srcpkgs/python3-hyperlink/template | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 120000 srcpkgs/python3-hyperlink
 create mode 100644 srcpkgs/python3-hyperlink/template

diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index fb2741234530..933b23f91da7 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -2,31 +2,17 @@
 pkgname=python-hyperlink
 version=21.0.0
 revision=3
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-idna"
-checkdepends="python3-idna python3-pytest"
 short_desc="Pure-Python implementation of immutable URLs (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/python-hyper/hyperlink"
 distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
 checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-
-do_check() {
-	python3 -m pytest build-${py3_ver}
-	# python 2 tests fail
-}
+make_check=no # python2
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-hyperlink_package() {
-	depends="python3-idna"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-hyperlink b/srcpkgs/python3-hyperlink
deleted file mode 120000
index bd21bced19d0..000000000000
--- a/srcpkgs/python3-hyperlink
+++ /dev/null
@@ -1 +0,0 @@
-python-hyperlink
\ No newline at end of file
diff --git a/srcpkgs/python3-hyperlink/template b/srcpkgs/python3-hyperlink/template
new file mode 100644
index 000000000000..791b24f58444
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-idna"
+checkdepends="python3-pytest ${depends}"
+short_desc="Pure-Python implementation of immutable URLs (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/hyperlink"
+distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
+checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
+
+post_install() {
+	vlicense LICENSE
+}

From 36f7899b1a634c5396643d627a490781f41b049b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:29:47 +0200
Subject: [PATCH 0901/1854] python-incremental: split python3-incremental

---
 srcpkgs/python-incremental/template  | 13 ++-----------
 srcpkgs/python3-incremental          |  1 -
 srcpkgs/python3-incremental/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-incremental
 create mode 100644 srcpkgs/python3-incremental/template

diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
index 1af94a6b6b76..0b50d35cfd15 100644
--- a/srcpkgs/python-incremental/template
+++ b/srcpkgs/python-incremental/template
@@ -2,8 +2,8 @@
 pkgname=python-incremental
 version=21.3.0
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Small library that versions your Python projects (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,3 @@ checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
 post_install() {
 	vlicense LICENSE
 }
-
-python3-incremental_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-incremental b/srcpkgs/python3-incremental
deleted file mode 120000
index ce274896aad5..000000000000
--- a/srcpkgs/python3-incremental
+++ /dev/null
@@ -1 +0,0 @@
-python-incremental
\ No newline at end of file
diff --git a/srcpkgs/python3-incremental/template b/srcpkgs/python3-incremental/template
new file mode 100644
index 000000000000..03b946e93742
--- /dev/null
+++ b/srcpkgs/python3-incremental/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-incremental'
+pkgname=python3-incremental
+version=21.3.0
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-Twisted python3-click"
+short_desc="Small library that versions your Python projects (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/twisted/incremental"
+changelog="https://raw.githubusercontent.com/twisted/incremental/trunk/NEWS.rst"
+distfiles="${PYPI_SITE}/i/incremental/incremental-${version}.tar.gz"
+checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
+
+post_install() {
+	vlicense LICENSE
+}

From e50b44860a06923269f9be1b52fba0e308017f19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:30:09 +0200
Subject: [PATCH 0902/1854] python-pbr: split python3-pbr

---
 srcpkgs/python-pbr/template  | 13 +++----------
 srcpkgs/python3-pbr          |  1 -
 srcpkgs/python3-pbr/template | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/python3-pbr
 create mode 100644 srcpkgs/python3-pbr/template

diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
index b9d91f99c13c..b49a0fe67b8f 100644
--- a/srcpkgs/python-pbr/template
+++ b/srcpkgs/python-pbr/template
@@ -2,7 +2,7 @@
 pkgname=python-pbr
 version=5.6.0
 revision=2
-build_style=python-module
+build_style=python2-module
 pycompile_module="pbr"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
@@ -14,13 +14,6 @@ distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
 checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
 alternatives="pbr:pbr:/usr/bin/pbr2"
 
-python3-pbr_package() {
-	depends="python3"
-	pycompile_module="pbr"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pbr:pbr:/usr/bin/pbr3"
-	pkg_install() {
-		vmove usr/bin/pbr3
-		vmove usr/lib/python3*
-	}
+post_install() {
+	mv ${DESTDIR}/usr/bin/pbr{,2}
 }
diff --git a/srcpkgs/python3-pbr b/srcpkgs/python3-pbr
deleted file mode 120000
index 7d5e74920c1c..000000000000
--- a/srcpkgs/python3-pbr
+++ /dev/null
@@ -1 +0,0 @@
-python-pbr
\ No newline at end of file
diff --git a/srcpkgs/python3-pbr/template b/srcpkgs/python3-pbr/template
new file mode 100644
index 000000000000..328011387cfa
--- /dev/null
+++ b/srcpkgs/python3-pbr/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pbr'
+pkgname=python3-pbr
+version=5.6.0
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 build reasonableness"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://docs.openstack.org/developer/pbr/"
+distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
+checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
+alternatives="pbr:pbr:/usr/bin/pbr3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/pbr{,3}
+}

From 77a082e1ae8ea894809bacf494929ea49b21ba86 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:33:41 +0200
Subject: [PATCH 0903/1854] python-ply: split python3-ply

---
 srcpkgs/python-ply/template  | 13 ++-----------
 srcpkgs/python3-ply          |  1 -
 srcpkgs/python3-ply/template | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-ply
 create mode 100644 srcpkgs/python3-ply/template

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
index 99d5927d9756..06e791516692 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python-ply/template
@@ -2,8 +2,8 @@
 pkgname=python-ply
 version=3.11
 revision=7
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="Lex and Yacc for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,3 @@ post_install() {
 	sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
 	vlicense LICENSE
 }
-
-python3-ply_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-ply b/srcpkgs/python3-ply
deleted file mode 120000
index 805861f2f7af..000000000000
--- a/srcpkgs/python3-ply
+++ /dev/null
@@ -1 +0,0 @@
-python-ply
\ No newline at end of file
diff --git a/srcpkgs/python3-ply/template b/srcpkgs/python3-ply/template
new file mode 100644
index 000000000000..5f633447984d
--- /dev/null
+++ b/srcpkgs/python3-ply/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-ply'
+pkgname=python3-ply
+version=3.11
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Lex and Yacc for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://www.dabeaz.com/ply/"
+distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
+checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
+
+post_install() {
+	sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
+	vlicense LICENSE
+}

From 9c807c17acb0669e68edda42da6f9fd98c30a362 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:38:39 +0200
Subject: [PATCH 0904/1854] python-pyasn1-modules: split python3-pyasn1-modules

---
 srcpkgs/python-pyasn1-modules/template  | 17 +++--------------
 srcpkgs/python3-pyasn1-modules          |  1 -
 srcpkgs/python3-pyasn1-modules/template | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 120000 srcpkgs/python3-pyasn1-modules
 create mode 100644 srcpkgs/python3-pyasn1-modules/template

diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
index b4de2ca5f5e3..fde6b7aa8ae8 100644
--- a/srcpkgs/python-pyasn1-modules/template
+++ b/srcpkgs/python-pyasn1-modules/template
@@ -2,11 +2,11 @@
 pkgname=python-pyasn1-modules
 version=0.2.8
 revision=6
-build_style=python-module
+build_style=python2-module
 pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-pyasn1"
-checkdepends="python-pyasn1 python3-pyasn1"
+checkdepends="python-pyasn1"
 short_desc="Collection of ASN.1-based protocols modules (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -16,19 +16,8 @@ checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
 
 do_check() {
 	python setup.py test
-	python3 setup.py test
 }
 
 post_install() {
 	vlicense LICENSE.txt
 }
-
-python3-pyasn1-modules_package() {
-	depends="python3-pyasn1"
-	pycompile_module="pyasn1_modules"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-pyasn1-modules b/srcpkgs/python3-pyasn1-modules
deleted file mode 120000
index 582f164b8afc..000000000000
--- a/srcpkgs/python3-pyasn1-modules
+++ /dev/null
@@ -1 +0,0 @@
-python-pyasn1-modules
\ No newline at end of file
diff --git a/srcpkgs/python3-pyasn1-modules/template b/srcpkgs/python3-pyasn1-modules/template
new file mode 100644
index 000000000000..645ef9d4bbe5
--- /dev/null
+++ b/srcpkgs/python3-pyasn1-modules/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyasn1-modules'
+pkgname=python3-pyasn1-modules
+version=0.2.8
+revision=6
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pyasn1"
+checkdepends="python3-pytest ${depends}"
+short_desc="Collection of ASN.1-based protocols modules (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/etingof/pyasn1-modules"
+distfiles="https://github.com/etingof/pyasn1-modules/archive/v${version}.tar.gz"
+checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
+
+post_install() {
+	vlicense LICENSE.txt
+}

From ba728a4bfbea119f24353873ec9727814b44f7d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 19:43:42 +0200
Subject: [PATCH 0905/1854] python-pyasn1: split python3-pyasn1

---
 srcpkgs/python-pyasn1/template  | 13 ++-----------
 srcpkgs/python3-pyasn1          |  1 -
 srcpkgs/python3-pyasn1/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/python3-pyasn1
 create mode 100644 srcpkgs/python3-pyasn1/template

diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
index f2c422dfdf5f..e211f6c26ae2 100644
--- a/srcpkgs/python-pyasn1/template
+++ b/srcpkgs/python-pyasn1/template
@@ -2,8 +2,8 @@
 pkgname=python-pyasn1
 version=0.4.8
 revision=5
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
 short_desc="ASN.1 library for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,3 @@ checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
 post_install() {
 	vlicense LICENSE.rst
 }
-
-python3-pyasn1_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-pyasn1 b/srcpkgs/python3-pyasn1
deleted file mode 120000
index 4e5965485530..000000000000
--- a/srcpkgs/python3-pyasn1
+++ /dev/null
@@ -1 +0,0 @@
-python-pyasn1
\ No newline at end of file
diff --git a/srcpkgs/python3-pyasn1/template b/srcpkgs/python3-pyasn1/template
new file mode 100644
index 000000000000..dafa225912cc
--- /dev/null
+++ b/srcpkgs/python3-pyasn1/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyasn1'
+pkgname=python3-pyasn1
+version=0.4.8
+revision=5
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="ASN.1 library for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/etingof/pyasn1"
+changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
+checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 23fcaeaee772adf92a24eb54100ced4d817820a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:24:21 +0200
Subject: [PATCH 0906/1854] python-pycparser: split python3-pycparser

---
 srcpkgs/python-pycparser/template  | 25 ++++---------------------
 srcpkgs/python3-pycparser          |  1 -
 srcpkgs/python3-pycparser/template | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/python3-pycparser
 create mode 100644 srcpkgs/python3-pycparser/template

diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
index 41049836c9f8..9986b23c06f4 100644
--- a/srcpkgs/python-pycparser/template
+++ b/srcpkgs/python-pycparser/template
@@ -2,10 +2,9 @@
 pkgname=python-pycparser
 version=2.21
 revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-ply"
-checkdepends="python3-ply python3-pytest"
 short_desc="Complete C99 parser in pure Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://github.com/eliben/pycparser"
@@ -13,24 +12,8 @@ license="BSD-3-Clause"
 distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
 checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
 
-do_check() {
-	python3 -m pytest
-}
-
 post_install() {
-	# replace bundled copy of ply
-	for pyver in $py2_ver $py3_ver; do
-		rm -rf ${DESTDIR}/usr/lib/python${pyver}/site-packages/pycparser/ply
-		ln -sf ../ply ${DESTDIR}/usr/lib/python${pyver}/site-packages/pycparser/ply
-	done
+	rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
+	ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
 	vlicense LICENSE
 }
-
-python3-pycparser_package() {
-	depends="python3-ply"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pycparser b/srcpkgs/python3-pycparser
deleted file mode 120000
index 00a864b2cf51..000000000000
--- a/srcpkgs/python3-pycparser
+++ /dev/null
@@ -1 +0,0 @@
-python-pycparser
\ No newline at end of file
diff --git a/srcpkgs/python3-pycparser/template b/srcpkgs/python3-pycparser/template
new file mode 100644
index 000000000000..6bd85a552b3f
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.21
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ply"
+checkdepends="python3-pytest ${depends}"
+short_desc="Complete C99 parser in pure Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/eliben/pycparser"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
+checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
+
+post_install() {
+	rm -rf ${DESTDIR}/${py3_sitelib}/pycparser/ply
+	ln -sf ../ply ${DESTDIR}/${py3_sitelib}/pycparser/ply
+	vlicense LICENSE
+}

From 7877eb3dd3557d2c4f72d5dea212056b8cd4a5b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:32:55 +0200
Subject: [PATCH 0907/1854] python-pyserial: split python3-pyserial

---
 srcpkgs/python-pyserial/template  | 20 ++++----------------
 srcpkgs/python3-pyserial          |  1 -
 srcpkgs/python3-pyserial/template | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 120000 srcpkgs/python3-pyserial
 create mode 100644 srcpkgs/python3-pyserial/template

diff --git a/srcpkgs/python-pyserial/template b/srcpkgs/python-pyserial/template
index 235ad01c9cdb..198d118b255c 100644
--- a/srcpkgs/python-pyserial/template
+++ b/srcpkgs/python-pyserial/template
@@ -2,30 +2,18 @@
 pkgname=python-pyserial
 version=3.4
 revision=7
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
-pycompile_module="serial"
 short_desc="Python2 module providing access for the serial port"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="https://github.com/pyserial/pyserial"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/p/pyserial/pyserial-${version}.tar.gz"
 checksum=6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627
 alternatives="pyserial:miniterm:/usr/bin/miniterm.py2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/miniterm.py{,2}
 	vlicense LICENSE.txt LICENSE
 }
-
-python3-pyserial_package() {
-	depends="python3"
-	pycompile_module="serial"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pyserial:miniterm:/usr/bin/miniterm.py3"
-	pkg_install() {
-		vmove usr/bin/miniterm.py3
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pyserial b/srcpkgs/python3-pyserial
deleted file mode 120000
index b32b82bb9660..000000000000
--- a/srcpkgs/python3-pyserial
+++ /dev/null
@@ -1 +0,0 @@
-python-pyserial
\ No newline at end of file
diff --git a/srcpkgs/python3-pyserial/template b/srcpkgs/python3-pyserial/template
new file mode 100644
index 000000000000..d90fedaba5ad
--- /dev/null
+++ b/srcpkgs/python3-pyserial/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyserial'
+pkgname=python3-pyserial
+version=3.4
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python3 module providing access for the serial port"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/pyserial/pyserial"
+distfiles="${PYPI_SITE}/p/pyserial/pyserial-${version}.tar.gz"
+checksum=6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627
+alternatives="pyserial:miniterm:/usr/bin/miniterm.py3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/miniterm.py{,3}
+	vlicense LICENSE.txt LICENSE
+}

From 984c0914498aba3e6f686a5738c156d0f963063e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:38:13 +0200
Subject: [PATCH 0908/1854] python-service_identity: split
 python3-service_identity

---
 srcpkgs/python-service_identity/template  | 14 ++------------
 srcpkgs/python3-service_identity          |  1 -
 srcpkgs/python3-service_identity/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/python3-service_identity
 create mode 100644 srcpkgs/python3-service_identity/template

diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
index 4e574ed3443a..87e64c770307 100644
--- a/srcpkgs/python-service_identity/template
+++ b/srcpkgs/python-service_identity/template
@@ -2,9 +2,9 @@
 pkgname=python-service_identity
 version=18.1.0
 revision=7
-build_style=python-module
+build_style=python2-module
 pycompile_module="service_identity"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
 short_desc="Service identity verification for Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -17,13 +17,3 @@ checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
 post_install() {
 	vlicense LICENSE
 }
-
-python3-service_identity_package() {
-	depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six"
-	pycompile_module="service_identity"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-service_identity b/srcpkgs/python3-service_identity
deleted file mode 120000
index d6ce3b6c55a3..000000000000
--- a/srcpkgs/python3-service_identity
+++ /dev/null
@@ -1 +0,0 @@
-python-service_identity
\ No newline at end of file
diff --git a/srcpkgs/python3-service_identity/template b/srcpkgs/python3-service_identity/template
new file mode 100644
index 000000000000..a37cbbde67c5
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=7
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six"
+checkdepends="${depends}"
+short_desc="Service identity verification for Python (Python3)"
+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
+
+post_install() {
+	vlicense LICENSE
+}

From dbde986046fc5a270a13ee1f1c428d7b2664d394 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:50:18 +0200
Subject: [PATCH 0909/1854] python-six: split python3-six

---
 srcpkgs/python-six/template  | 18 ++----------------
 srcpkgs/python3-six          |  1 -
 srcpkgs/python3-six/template | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 120000 srcpkgs/python3-six
 create mode 100644 srcpkgs/python3-six/template

diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index 9c02f224a866..dbf1e2280b1e 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -2,10 +2,9 @@
 pkgname=python-six
 version=1.16.0
 revision=3
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
-checkdepends="python3-pytest"
 short_desc="Python 2 and 3 compatibility utilities (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -17,16 +16,3 @@ checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
 post_install() {
 	vlicense LICENSE
 }
-
-do_check() {
-	python3 -m pytest
-}
-
-python3-six_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-six b/srcpkgs/python3-six
deleted file mode 120000
index 70747adc77ed..000000000000
--- a/srcpkgs/python3-six
+++ /dev/null
@@ -1 +0,0 @@
-python-six
\ No newline at end of file
diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template
new file mode 100644
index 000000000000..2a9f67cbf510
--- /dev/null
+++ b/srcpkgs/python3-six/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-six'
+pkgname=python3-six
+version=1.16.0
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python 2 and 3 compatibility utilities (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/benjaminp/six"
+changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
+distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
+checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+
+post_install() {
+	vlicense LICENSE
+}

From f92af62d8e0a30374718da766b1e197c66b7f0a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 20:50:44 +0200
Subject: [PATCH 0910/1854] python-sqlalchemy-migrate: split
 python3-sqlachemy-migrate

---
 srcpkgs/python-sqlalchemy-migrate/template  | 25 +++++---------------
 srcpkgs/python3-sqlalchemy-migrate          |  1 -
 srcpkgs/python3-sqlalchemy-migrate/template | 26 +++++++++++++++++++++
 3 files changed, 32 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-sqlalchemy-migrate
 create mode 100644 srcpkgs/python3-sqlalchemy-migrate/template

diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
index 79f58e86ffed..72b6da7f2b5e 100644
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ b/srcpkgs/python-sqlalchemy-migrate/template
@@ -2,10 +2,10 @@
 pkgname=python-sqlalchemy-migrate
 version=0.12.0
 revision=6
-build_style=python-module
-pycompile_module="migrate"
-hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six python-sqlparse python-tempita"
+build_style=python2-module
+hostmakedepends="python-setuptools python-pbr"
+depends="python-pbr python-SQLAlchemy python-decorator python-six
+ python-sqlparse python-tempita"
 short_desc="Database schema migration for SQLAlchemy (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -18,20 +18,7 @@ alternatives="
  migrate:migrate:/usr/bin/migrate2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/migrate-repository{,2}
+	mv ${DESTDIR}/usr/bin/migrate{,2}
 	vlicense COPYING LICENSE
 }
-
-python3-sqlalchemy-migrate_package() {
-	alternatives="
-	 migrate:migrate-repository:/usr/bin/migrate-repository3
-	 migrate:migrate:/usr/bin/migrate3"
-	depends="python3-pbr python3-SQLAlchemy python3-decorator python3-six
-	 python3-sqlparse python3-tempita"
-	pycompile_module="migrate"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense COPYING LICENSE
-	}
-}
diff --git a/srcpkgs/python3-sqlalchemy-migrate b/srcpkgs/python3-sqlalchemy-migrate
deleted file mode 120000
index b984188f6331..000000000000
--- a/srcpkgs/python3-sqlalchemy-migrate
+++ /dev/null
@@ -1 +0,0 @@
-python-sqlalchemy-migrate
\ No newline at end of file
diff --git a/srcpkgs/python3-sqlalchemy-migrate/template b/srcpkgs/python3-sqlalchemy-migrate/template
new file mode 100644
index 000000000000..aba3c5e56f00
--- /dev/null
+++ b/srcpkgs/python3-sqlalchemy-migrate/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-sqlalchemy-migrate'
+pkgname=python3-sqlalchemy-migrate
+version=0.12.0
+revision=6
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-pbr"
+depends="python3-pbr python3-SQLAlchemy python3-decorator python3-six
+ python3-sqlparse python3-tempita"
+checkdepends="python3-pytest python3-testtools ${depends}"
+short_desc="Database schema migration for SQLAlchemy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/stackforge/sqlalchemy-migrate"
+distfiles="${PYPI_SITE}/s/sqlalchemy-migrate/sqlalchemy-migrate-${version}.tar.gz"
+checksum=8cfada30bbcf79a83b3a2d1bcd637de7e1f43e390d54de33e4f3249fd9aacfae
+make_check=no # tests need a specific version of testtools
+
+alternatives="
+ migrate:migrate-repository:/usr/bin/migrate-repository3
+ migrate:migrate:/usr/bin/migrate3"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/migrate-repository{,3}
+	mv ${DESTDIR}/usr/bin/migrate{,3}
+	vlicense COPYING LICENSE
+}

From 815f78d6bc01c41938f2e6653270ce4730dbd24f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:14:08 +0200
Subject: [PATCH 0911/1854] python-sqlparse: split python3-sqlparse

---
 srcpkgs/python-sqlparse/template  | 18 +++---------------
 srcpkgs/python3-sqlparse          |  1 -
 srcpkgs/python3-sqlparse/template | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-sqlparse
 create mode 100644 srcpkgs/python3-sqlparse/template

diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
index 791f925cac92..1690e9f65171 100644
--- a/srcpkgs/python-sqlparse/template
+++ b/srcpkgs/python-sqlparse/template
@@ -2,9 +2,8 @@
 pkgname=python-sqlparse
 version=0.3.0
 revision=6
-build_style=python-module
-pycompile_module="sqlparse"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-setuptools"
 short_desc="Non-validating SQL parser for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,17 +14,6 @@ checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
 alternatives="sqlparse:sqlformat:/usr/bin/sqlformat2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/sqlformat{,2}
 	vlicense LICENSE
 }
-
-python3-sqlparse_package() {
-	depends="python3-setuptools"
-	pycompile_module="sqlparse"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3"
-	pkg_install() {
-		vmove usr/bin/sqlformat3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-sqlparse b/srcpkgs/python3-sqlparse
deleted file mode 120000
index c99cce656dc2..000000000000
--- a/srcpkgs/python3-sqlparse
+++ /dev/null
@@ -1 +0,0 @@
-python-sqlparse
\ No newline at end of file
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..268097f90641
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-sqlparse'
+pkgname=python3-sqlparse
+version=0.3.0
+revision=6
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Non-validating SQL parser for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andialbrecht/sqlparse"
+distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz"
+checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
+alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3"
+# sys.stdout.encoding = 'utf-8' AttributeError: readonly attribute
+# will be fixed in 0.4.0
+make_check=no
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/sqlformat{,3}
+	vlicense LICENSE
+}

From 6eeb30f6dda2efdad7e34dfe5fca264dde8f67e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:14:27 +0200
Subject: [PATCH 0912/1854] python-tempita: split python3-tempita

---
 srcpkgs/python-tempita/template  | 33 ++++----------------------------
 srcpkgs/python3-tempita          |  1 -
 srcpkgs/python3-tempita/template | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 120000 srcpkgs/python3-tempita
 create mode 100644 srcpkgs/python3-tempita/template

diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
index d40ef79a5c66..28a57ed123a4 100644
--- a/srcpkgs/python-tempita/template
+++ b/srcpkgs/python-tempita/template
@@ -2,37 +2,12 @@
 pkgname=python-tempita
 version=0.5.2
 revision=8
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="${hostmakedepends}"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python"
-pycompile_module="tempita"
-short_desc="A small text templating language for text substitution (Python2)"
+short_desc="Small text templating language for text substitution (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://pythonpaste.org/tempita/"
 license="MIT"
+homepage="http://pythonpaste.org/tempita/"
 distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
 checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
-
-post_patch() {
-	# setuptools no longer supports use_2to3
-	vsed -i setup.py -e '/use_2to3/d'
-}
-
-do_build() {
-	# This is pure python, no need for cross antics
-	python2.7 setup.py build --build-base=build-2.7
-
-	# Convert py2 syntax to py3 since setuptools no longer does it
-	2to3-${py3_ver} -w tempita
-	python3 setup.py build --build-base=build-${py3_ver}
-}
-
-python3-tempita_package() {
-	depends="python3"
-	pycompile_module="tempita"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-tempita b/srcpkgs/python3-tempita
deleted file mode 120000
index 63636314d977..000000000000
--- a/srcpkgs/python3-tempita
+++ /dev/null
@@ -1 +0,0 @@
-python-tempita
\ No newline at end of file
diff --git a/srcpkgs/python3-tempita/template b/srcpkgs/python3-tempita/template
new file mode 100644
index 000000000000..dc8219438ee0
--- /dev/null
+++ b/srcpkgs/python3-tempita/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-tempita'
+pkgname=python3-tempita
+version=0.5.2
+revision=8
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-nose"
+short_desc="A small text templating language for text substitution (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://pythonpaste.org/tempita/"
+license="MIT"
+distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
+checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
+make_check=no # FIXME
+
+post_patch() {
+	# setuptools no longer supports use_2to3
+	vsed -i setup.py -e '/use_2to3/d'
+}

From cc9231424e3273568176c196721d9ef8a6a956be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:15:00 +0200
Subject: [PATCH 0913/1854] python-zope.interface: split python3-zope.interface

---
 srcpkgs/python-zope.interface/template  | 19 ++++---------------
 srcpkgs/python3-zope.interface          |  1 -
 srcpkgs/python3-zope.interface/template | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-zope.interface
 create mode 100644 srcpkgs/python3-zope.interface/template

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 35f87781a1d8..64cae0e63031 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -2,9 +2,9 @@
 pkgname=python-zope.interface
 version=5.5.2
 revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel"
 depends="python-setuptools"
 short_desc="Zope interfaces for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,17 +18,6 @@ make_check=no
 
 post_install() {
 	# zope.interface provides the zope namespace
-	for py_sitelib in $py2_sitelib $py3_sitelib; do
-		vinstall src/zope/__init__.py 644 ${py_sitelib}/zope
-	done
+	vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
 	vlicense LICENSE.txt LICENSE
 }
-
-python3-zope.interface_package() {
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-zope.interface b/srcpkgs/python3-zope.interface
deleted file mode 120000
index 48f8d4c160ef..000000000000
--- a/srcpkgs/python3-zope.interface
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.interface
\ No newline at end of file
diff --git a/srcpkgs/python3-zope.interface/template b/srcpkgs/python3-zope.interface/template
new file mode 100644
index 000000000000..2e98dba5ba4a
--- /dev/null
+++ b/srcpkgs/python3-zope.interface/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-zope.interface'
+pkgname=python3-zope.interface
+version=5.5.2
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Zope interfaces for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ZPL-2.1"
+homepage="https://github.com/zopefoundation/zope.interface"
+changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
+checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
+# Tests can't find the package they test
+make_check=no
+
+post_install() {
+	vinstall src/zope/__init__.py 644 ${py3_sitelib}/zope
+	vlicense LICENSE.txt LICENSE
+}

From 8a5f4cca547aae49e532efa51c0e536b33aba591 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:14 -0400
Subject: [PATCH 0914/1854] New package: php8.0-mongodb-1.15.3

---
 srcpkgs/php8.0-mongodb/INSTALL.msg |  3 +++
 srcpkgs/php8.0-mongodb/template    | 24 ++++++++++++++++++++++++
 srcpkgs/php8.0-mongodb/update      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/php8.0-mongodb/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-mongodb/template
 create mode 100644 srcpkgs/php8.0-mongodb/update

diff --git a/srcpkgs/php8.0-mongodb/INSTALL.msg b/srcpkgs/php8.0-mongodb/INSTALL.msg
new file mode 100644
index 000000000000..a8d869ad7b0f
--- /dev/null
+++ b/srcpkgs/php8.0-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+	extension=mongodb.so
diff --git a/srcpkgs/php8.0-mongodb/template b/srcpkgs/php8.0-mongodb/template
new file mode 100644
index 000000000000..b3dbbfe89af1
--- /dev/null
+++ b/srcpkgs/php8.0-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.0-mongodb'
+pkgname=php8.0-mongodb
+version=1.15.3
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="php8.0-devel autoconf pkg-config"
+makedepends="php8.0-devel pcre2-devel openssl-devel"
+depends="php8.0"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=4f2c4e417fb606b462e870ec03656f3a97ba0b399dc24a6d9d153e9846134388
+
+pre_configure() {
+	phpize8.0
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.0-mongodb/update b/srcpkgs/php8.0-mongodb/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.0-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 4b7d8ad61b9cb43e9a792e83591e4dadb1367e55 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:17 -0400
Subject: [PATCH 0915/1854] New package: php8.1-mongodb-1.15.3

---
 srcpkgs/php8.1-mongodb/INSTALL.msg |  3 +++
 srcpkgs/php8.1-mongodb/template    | 24 ++++++++++++++++++++++++
 srcpkgs/php8.1-mongodb/update      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/php8.1-mongodb/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-mongodb/template
 create mode 100644 srcpkgs/php8.1-mongodb/update

diff --git a/srcpkgs/php8.1-mongodb/INSTALL.msg b/srcpkgs/php8.1-mongodb/INSTALL.msg
new file mode 100644
index 000000000000..a8d869ad7b0f
--- /dev/null
+++ b/srcpkgs/php8.1-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+	extension=mongodb.so
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
new file mode 100644
index 000000000000..83c45d1b8374
--- /dev/null
+++ b/srcpkgs/php8.1-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.1-mongodb'
+pkgname=php8.1-mongodb
+version=1.15.3
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="php8.1-devel autoconf pkg-config"
+makedepends="php8.1-devel pcre2-devel openssl-devel"
+depends="php8.1"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=4f2c4e417fb606b462e870ec03656f3a97ba0b399dc24a6d9d153e9846134388
+
+pre_configure() {
+	phpize8.1
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.1-mongodb/update b/srcpkgs/php8.1-mongodb/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.1-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From e283936cac215ce10c9943ca417b458a61b5bb99 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:19 -0400
Subject: [PATCH 0916/1854] New package: php8.2-mongodb-1.15.3

---
 srcpkgs/php8.2-mongodb/INSTALL.msg |  3 +++
 srcpkgs/php8.2-mongodb/template    | 24 ++++++++++++++++++++++++
 srcpkgs/php8.2-mongodb/update      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/php8.2-mongodb/INSTALL.msg
 create mode 100644 srcpkgs/php8.2-mongodb/template
 create mode 100644 srcpkgs/php8.2-mongodb/update

diff --git a/srcpkgs/php8.2-mongodb/INSTALL.msg b/srcpkgs/php8.2-mongodb/INSTALL.msg
new file mode 100644
index 000000000000..a8d869ad7b0f
--- /dev/null
+++ b/srcpkgs/php8.2-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+	extension=mongodb.so
diff --git a/srcpkgs/php8.2-mongodb/template b/srcpkgs/php8.2-mongodb/template
new file mode 100644
index 000000000000..ee5afd8458fe
--- /dev/null
+++ b/srcpkgs/php8.2-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.2-mongodb'
+pkgname=php8.2-mongodb
+version=1.15.3
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.2"
+hostmakedepends="php8.2-devel autoconf pkg-config"
+makedepends="php8.2-devel pcre2-devel openssl-devel"
+depends="php8.2"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=4f2c4e417fb606b462e870ec03656f3a97ba0b399dc24a6d9d153e9846134388
+
+pre_configure() {
+	phpize8.2
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.2-mongodb/update b/srcpkgs/php8.2-mongodb/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.2-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 796216c4e6e9eb23ef63437dff0d57a1eba58dd7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 30 Mar 2023 15:10:23 -0400
Subject: [PATCH 0917/1854] php: add php-mongodb meta package.

---
 srcpkgs/php-mongodb  | 1 +
 srcpkgs/php/template | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/php-mongodb

diff --git a/srcpkgs/php-mongodb b/srcpkgs/php-mongodb
new file mode 120000
index 000000000000..fa557ad95d0a
--- /dev/null
+++ b/srcpkgs/php-mongodb
@@ -0,0 +1 @@
+php
\ No newline at end of file
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index ec485a5a6d42..9fd1e27be27c 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=8.2
-revision=1
+revision=2
 build_style=meta
 depends="php${version}"
 short_desc="Meta package for PHP"
@@ -155,6 +155,12 @@ php-imagick_package() {
 	short_desc="PHP ImageMagick library wrapper meta package"
 }
 
+php-mongodb_package() {
+	depends="php${version}-mongodb"
+	build_style=meta
+	short_desc="PHP MongoDB driver meta package"
+}
+
 xdebug_package() {
 	depends="xdebug${version}"
 	build_style=meta

From a6a6e3024e9fe2d6c589411c4bebf61dc42c3444 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:54:30 -0400
Subject: [PATCH 0918/1854] php8.1: update to 8.1.19.

---
 srcpkgs/php8.1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..90be03c44a5d 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.17
-revision=2
+version=8.1.19
+revision=1
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=ef270156291d90a80ce83d68eee812f301cf5e48836a0ff6fd2931913f8e25c5
+checksum=0ebb6b0ecf5d8e355c2f1362807f9b73c6e803d496c5ad3e4fb00be989988372
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From 9f5183c8f09e848a50d352b1e181524a3ccc2b7f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:54:31 -0400
Subject: [PATCH 0919/1854] php8.2: update to 8.2.6.

---
 srcpkgs/php8.2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..c73b5f8c010c 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
-version=8.2.4
-revision=2
+version=8.2.6
+revision=1
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=cee7748015a2ddef1739d448b980b095dccd09ed589cf1b6c6ee2d16f5e73c50
+checksum=1b8463df1f180ed39475cfcded1ff106242ccb823f99c9fc1a407c0b76afa2c8
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From 45070afd9324fb05de7b7e996ff55721e40ef49f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:57:22 -0400
Subject: [PATCH 0920/1854] composer8.0: update to 2.5.7.

---
 srcpkgs/composer8.0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template
index a816ecad7feb..4e3823643f99 100644
--- a/srcpkgs/composer8.0/template
+++ b/srcpkgs/composer8.0/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.0'
 pkgname=composer8.0
-version=2.5.5
+version=2.5.7
 revision=1
 build_style=fetch
 depends="php8.0"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="566a6d1cf4be1cc3ac882d2a2a13817ffae54e60f5aa7c9137434810a5809ffc
+checksum="9256c4c1c803b9d0cb7a66a1ab6c737e48c43cc6df7b8ec9ec2497a724bf44de
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.0"
 

From 3f943382552c2d2df8ac1f744bf8feebd676348d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:57:23 -0400
Subject: [PATCH 0921/1854] composer8.1: update to 2.5.7.

---
 srcpkgs/composer8.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
index b0e23089ce78..3c5b6dc6f8a2 100644
--- a/srcpkgs/composer8.1/template
+++ b/srcpkgs/composer8.1/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.1'
 pkgname=composer8.1
-version=2.5.5
+version=2.5.7
 revision=1
 build_style=fetch
 depends="php8.1"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="566a6d1cf4be1cc3ac882d2a2a13817ffae54e60f5aa7c9137434810a5809ffc
+checksum="9256c4c1c803b9d0cb7a66a1ab6c737e48c43cc6df7b8ec9ec2497a724bf44de
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.1"
 

From 659783a25d2b132e8347825d1cab685964468632 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 1 Jun 2023 08:57:25 -0400
Subject: [PATCH 0922/1854] composer8.2: update to 2.5.7.

---
 srcpkgs/composer8.2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/composer8.2/template b/srcpkgs/composer8.2/template
index 59bcb095fee2..e97d4880da76 100644
--- a/srcpkgs/composer8.2/template
+++ b/srcpkgs/composer8.2/template
@@ -1,6 +1,6 @@
 # Template file for 'composer8.2'
 pkgname=composer8.2
-version=2.5.5
+version=2.5.7
 revision=1
 build_style=fetch
 depends="php8.2"
@@ -11,7 +11,7 @@ homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="566a6d1cf4be1cc3ac882d2a2a13817ffae54e60f5aa7c9137434810a5809ffc
+checksum="9256c4c1c803b9d0cb7a66a1ab6c737e48c43cc6df7b8ec9ec2497a724bf44de
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.2"
 

From 6b2c7864748c0f068dfbf7410782896abb496ba5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 17 Jun 2023 20:46:15 -0500
Subject: [PATCH 0923/1854] python3-ytmusicapi: update to 1.1.0.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 78e59051e530..6cd02fa6be08 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${PYPI_SITE}/y/ytmusicapi/ytmusicapi-${version}.tar.gz"
-checksum=f798bfedd49738bece82aac15b2d97f04578ccb1572f347a350cb704df4d0e10
+checksum=3286de79e94a914e4a14814fffe372d24b734e784acd7f9fa734ee383adf8c6d
 
 post_install() {
 	vlicense LICENSE

From 4eee0206fa7c4a7c03f10c3cb2da031c89f7a383 Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sun, 18 Jun 2023 06:21:06 +0000
Subject: [PATCH 0924/1854] PrismLauncher: update to 7.1.

---
 srcpkgs/PrismLauncher/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2c9e9cc3d8d4..14813d2b7ac9 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,10 +1,10 @@
 # Template file for 'PrismLauncher'
 pkgname=PrismLauncher
-version=6.3
+version=7.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void"
-hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'"
+hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools
  qt5-qmake scdoc"
 makedepends="qt5-devel"
 depends="virtual?java-runtime qt5-svg qt5-imageformats"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://prismlauncher.org/"
 distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
+checksum=dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

From f9f216c4ac83b6613d6ef81abc8b9ddebb6aaa52 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Jun 2023 07:41:48 -0400
Subject: [PATCH 0925/1854] nvidia: update to 535.54.03.

---
 srcpkgs/nvidia/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 633aea354dbc..6b7b86af94d2 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=525.116.04
+version=535.54.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=8610ec82447cff72cb5f18b3657ee9a634a5151662b8ad901eb81f4c4fb617fe
+checksum=454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082
 # 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}
@@ -117,7 +117,7 @@ do_install() {
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
 
 	# firmware
-	for fw in gsp_tu10x.bin gsp_ad10x.bin; do
+	for fw in gsp_ga10x.bin gsp_tu10x.bin; do
 		vinstall "firmware/${fw}" 644 "usr/lib/firmware/nvidia/${version}"
 	done
 
@@ -129,8 +129,8 @@ do_install() {
 		${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1
 
 	# Wayland/GBM
-	vinstall libnvidia-egl-wayland.so.1.1.10 755 usr/lib
-	ln -sf libnvidia-egl-wayland.so.1.1.10 \
+	vinstall libnvidia-egl-wayland.so.1.1.11 755 usr/lib
+	ln -sf libnvidia-egl-wayland.so.1.1.11 \
 		${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1
 	vinstall libnvidia-egl-gbm.so.1.1.0 755 usr/lib
 	ln -sf libnvidia-egl-gbm.so.1.1.0 \
@@ -207,8 +207,6 @@ do_install() {
 	vinstall nvidia.icd 644 etc/OpenCL/vendors
 	vinstall nvidia_layers.json 644 usr/share/vulkan/implicit_layer.d
 
-	vinstall libnvidia-compiler.so.${version} 755 usr/lib
-
 	vinstall libnvidia-opencl.so.${version} 755 usr/lib
 	ln -sf libnvidia-opencl.so.${version} \
 		${DESTDIR}/usr/lib/libnvidia-opencl.so
@@ -239,6 +237,7 @@ do_install() {
 	vinstall nvngx.dll 755 usr/lib/nvidia/wine
 
 	# optix ray racing engine
+	vinstall nvoptix.bin 755 usr/share/nvidia
 	vinstall libnvoptix.so.${version} 755 usr/lib
 	ln -sf libnvoptix.so.${version} ${DESTDIR}/usr/lib/libnvoptix.so
 	ln -sf libnvoptix.so.${version} ${DESTDIR}/usr/lib/libnvoptix.so.1
@@ -326,7 +325,6 @@ nvidia-opencl_package() {
 	depends="ocl-icd"
 	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
-		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"
 		vmove etc/OpenCL
 	}

From af5d025cbc0ee6c6e8103740144f46f54492c298 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 6 Apr 2023 15:42:36 -0400
Subject: [PATCH 0926/1854] gnome-secrets: update to 7.3

---
 srcpkgs/gnome-secrets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-secrets/template b/srcpkgs/gnome-secrets/template
index 2ab5db37f438..bf508316477f 100644
--- a/srcpkgs/gnome-secrets/template
+++ b/srcpkgs/gnome-secrets/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-secrets'
 pkgname=gnome-secrets
-version=7.2
+version=7.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext gobject-introspection python3-pykeepass
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/secrets"
 distfiles="https://gitlab.gnome.org/World/secrets/-/archive/${version}/secrets-${version}.tar.gz"
-checksum=e029e72f8765bb8862463beec46851794b3fb7ad5214b08a63e12a2cc8d23da7
+checksum=e1464220d58673cbe6e222519b331d4846084c6ec471f8b8d293cc898a63aa4e
 
 gnome-passwordsafe_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bdb7de96cdbdf499597ca4cd5e954c1f9559ee6e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 24 Mar 2023 16:18:31 -0700
Subject: [PATCH 0927/1854] gnome-software: update to 44.2.

---
 srcpkgs/gnome-software/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-software/template b/srcpkgs/gnome-software/template
index 357bc1e8ffae..64774c54dd5b 100644
--- a/srcpkgs/gnome-software/template
+++ b/srcpkgs/gnome-software/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-software'
 pkgname=gnome-software
-version=43.3
+version=44.2
 revision=1
 build_style=meson
 configure_args="-Dpackagekit=false -Dfwupd=false
@@ -16,8 +16,9 @@ short_desc="GNOME Software Center (flatpak only)"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-software"
+changelog="https://gitlab.gnome.org/GNOME/gnome-software/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/GNOME/gnome-software/-/archive/${version}/gnome-software-${version}.tar.gz"
-checksum=9fbdf888ec61cd6f261dbf9e94939a5ff95ba43993ef58946b02b4f92866819c
+checksum=bedfe8652d2ceaf17eccc57d6befe6d95f09d15e486a58f0bb7a9a868d0bacc0
 make_check=no # FIXME
 
 build_options="gtk_doc"

From 3f2dd922001ac9c4427e7d0c06469656d49c40d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 18 Jun 2023 17:25:37 +0200
Subject: [PATCH 0928/1854] dool: update to 1.2.0.

---
 srcpkgs/dool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dool/template b/srcpkgs/dool/template
index 4c81a8a39cd2..82c3f28167d0 100644
--- a/srcpkgs/dool/template
+++ b/srcpkgs/dool/template
@@ -1,6 +1,6 @@
 # Template file for 'dool'
 pkgname=dool
-version=1.1.0
+version=1.2.0
 revision=1
 makedepends="python3"
 short_desc="Versatile tool for generating system resource statistics"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/scottchiefbaker/dool"
 distfiles="https://github.com/scottchiefbaker/dool/archive/refs/tags/v${version}.tar.gz"
-checksum=e5e4008ffe5bc566d5580ea2c66b0f7a7de68e27f25930abed9f7ebbd398dec3
+checksum=a626ec796a2508443625314e464adec885cb22543157794a6255570b19f68a7d
 python_version="3"
 
 do_install() {

From 272fbf158b92aa03d0f3e18f18db0c4230eead57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 18 Jun 2023 17:31:51 +0200
Subject: [PATCH 0929/1854] gnuplot: update to 5.4.8.

---
 srcpkgs/gnuplot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index 18760f006715..f5112e1f8525 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnuplot'
 pkgname=gnuplot
-version=5.4.5
+version=5.4.8
 revision=1
 configure_args="--with-readline=builtin"
 hostmakedepends="pkg-config lua52"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="http://www.gnuplot.info/"
 license="gnuplot"
 distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
-checksum=66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478
+checksum=931279c7caad1aff7d46cb4766f1ff41c26d9be9daf0bcf0c79deeee3d91f5cf
 
 subpackages="gnuplot-common"
 if [ -z "$CROSS_BUILD" ]; then

From a1a83a7e44f79ec875c9c5453abed0b57f138168 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 0930/1854] gnome-desktop: update to 44.0.

---
 srcpkgs/gnome-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=43
+version=44.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
-checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
 
 build_options="gir"
 build_options_default="gir"

From c994b488f166fef9104b075798592859b2d392fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 0931/1854] gnome-session: update to 44.0.

---
 srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
 srcpkgs/gnome-session/template                     |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch

diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
- 
-   # Check for systemd
-   if enable_systemd
--    systemd_dep = dependency('systemd', version: '>= 242', required: true)
--    systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
--                                                             define_variable: ['prefix', prefix])
--
-+    systemd_userunitdir = '/tmp'
-     libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
-     session_bin_deps += libsystemd_dep
- 
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=43.0
+version=44.0
 revision=1
 build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="glib-devel gettext pkg-config xmlto"
 makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel
  libglib-devel libICE-devel libSM-devel xtrans"
@@ -15,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6

From f659b3cd17712b5cde8b4650b12acddfde2c571c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 0932/1854] mutter: update to 44.2.

---
 common/shlibs                          |  8 ++---
 srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
 srcpkgs/mutter/template                | 25 +++++++-------
 3 files changed, 17 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch

diff --git a/common/shlibs b/common/shlibs
index 494e99b89550..c293ac460c08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2987,10 +2987,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-11.so.0 mutter-43.2_1
-libmutter-clutter-11.so.0 mutter-43.2_1
-libmutter-cogl-11.so.0 mutter-43.2_1
-libmutter-cogl-pango-11.so.0 mutter-43.2_1
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub-0.6.so.0 libgepub-0.6.0_4
 libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
-   if (x11_display->focused_by_us &&
-       event->xany.serial > x11_display->focus_serial &&
-       display->focus_window &&
-+      display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
-       !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
-       meta_display_windows_are_interactable (display))
-     {
--- 
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..01d00e8a94c2 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=43.3
-revision=2
+version=44.2
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
  xorg-server-xwayland"
 makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
  wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
 short_desc="Wayland display server, X11 window manager and compositor library"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ pre_build() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
 }
 
 mutter-devel_package() {
-	depends="gtk+3-devel graphene-devel clutter-devel
+	depends="gtk4-devel graphene-devel clutter-devel
 	 libX11-devel libXtst-devel mutter-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-11/*.gir"
+		vmove "usr/lib/mutter-12/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 712a5ff7d0bd3ed5e9b8654a5a10d23080a76b68 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 0933/1854] gnome-shell: update to 44.2.

---
 ...2e61a9882edc722ac64da80804e75f832155.patch | 32 -------------------
 .../patches/no-exe-introspection.patch        | 25 +++++++++++++++
 srcpkgs/gnome-shell/template                  |  7 ++--
 3 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
 create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch

diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
deleted file mode 100644
index 328ecbefb3c4..000000000000
--- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 3 Mar 2023 17:50:10 +0900
-Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal
-
-require-surrounding-text signal has been added since IBus 1.5.28.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405
----
- js/misc/inputMethod.js | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
-index e008e6411..aa610b3bf 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({
- 
-         this._context.set_client_commit_preedit(true);
-         this._context.connect('commit-text', this._onCommitText.bind(this));
--        this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+        try {
-+            // Require ibus 1.5.28 or later.
-+            this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+        } catch (e) {
-+        }
-         this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
-         this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this));
-         this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Sun Mar 19 19:11:00 2023 +0100
+
+    Disable 9bc89b821cf09195418f20225bbec39c0567d263
+    
+    Even if we manually define _DYNAMIC, it does not work (segfaults
+    somewhere in musl, coming from g_strsplit) and is pretty useless
+    for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+ 
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..3fc7eb89d17d 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=43.3
+version=44.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 6011c24f0b4bff51dfff7a5ccddd872c24986912 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 0934/1854] gdm: update to 44.1.

---
 srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
 srcpkgs/gdm/template                         |  7 ++++---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
-   libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+   libwrap_dep = cc.find_library('wrap')
  endif
  # systemd
 -systemd_dep = dependency('systemd')
  libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
--  systemd_multiseat_x = find_program('systemd-multi-seat-x',
--    required: false,
--    dirs: [
--      systemd_dep.get_pkgconfig_variable('systemdutildir'),
--      '/lib/systemd',
--      '/usr/lib/systemd',
--    ])
--else
--  systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+-  required: false,
+-  dirs: [
+-    systemd_dep.get_pkgconfig_variable('systemdutildir'),
+-    '/lib/systemd',
+-    '/usr/lib/systemd',
+-  ])
 +systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
  systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
  # Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..5cdcf618cb83 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=43.0
+version=44.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -23,9 +23,10 @@ short_desc="GNOME Display Manager"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d
 
 conf_files="
 	/etc/gdm/custom.conf

From de21bf170fcf1f82c6d0785001f0dd47698bfa38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 0935/1854] gnome-shell-extensions: update to 44.0.

---
 srcpkgs/gnome-shell-extensions/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
 depends="gnome-shell>=${version} nautilus unzip"
 short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab

From 9296c1eb04bbd86b5a8073c4a2773ad59be81882 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 0936/1854] gsettings-desktop-schemas: update to 44.0.

---
 srcpkgs/gsettings-desktop-schemas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=43.0
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
 
 # Package build options
 build_options="gir"

From 5588f1b157c03c7ac52a691fc584e2de5320bbd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 0937/1854] gnome-settings-daemon: update to 44.1.

---
 srcpkgs/gnome-settings-daemon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 3d3cf393f960..a5886956cda9 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.1
+revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From 5b96f36fc891dfc79360571885f7732a5f5fdaa7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 0938/1854] gnome-control-center: update to 44.0.

---
 srcpkgs/gnome-control-center/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 3c8a1fe43e96..33f2d653add5 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=43.2
-revision=3
+version=44.2
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
-changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c
 make_check=no # needs X11 and requires altered filesystem
 
 pre_build() {

From 15208876a2f32e3ca7e47ff08b5a8afb233dfe19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 0939/1854] gnome-backgrounds: update to 44.0.

---
 srcpkgs/gnome-backgrounds/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=43
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e

From b6c950bae3d7e59f19f9f8db4ac39b4d6beb8a47 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 0940/1854] gnome-user-docs: update to 44.1.

---
 srcpkgs/gnome-user-docs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..350bfa523daf 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=43.0
+version=44.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
-checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
+checksum=93f3294d43fd22f9962ccf6bd17ff64eae78a6ca063fe6c1e9bc58d00f34e3a8

From ef19a292ec1a99faad84a15770ec5021694dcc42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 0941/1854] xdg-desktop-portal-gnome: update to 44.1.

---
 srcpkgs/xdg-desktop-portal-gnome/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..884baccf764b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
 # Template file for 'xdg-desktop-portal-gnome'
 pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.1
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
 makedepends="gtk4-devel libadwaita-devel libglib-devel
  gnome-desktop-devel gsettings-desktop-schemas-devel
  xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
 #changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=3682c546c81922a5ba69d62d86f69c0c26b17c9096823f58149d0b55bbf0eedb

From 94dba9ef45321aa33137b838269f18c5f0066362 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 0942/1854] gnome-online-accounts: update to 3.48.0.

---
 srcpkgs/gnome-online-accounts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
 
 build_options="gir"
 build_options_default="gir"

From 8fa43124d9c6c0ea020439383dd5f6069fc6fb75 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 0943/1854] gvfs: update to 1.50.4.

---
 srcpkgs/gvfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.50.2
+version=1.50.4
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From e9966104dc909b49fdaf5e28327d6d55b8a6fb2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 0944/1854] zenity: update to 3.44.1.

---
 srcpkgs/zenity/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..03b5ea4ce7c7 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
 # Template file for 'zenity'
 pkgname=zenity
-version=3.43.0
+version=3.44.1
 revision=1
 build_style=meson
 configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
 makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
 short_desc="Display GNOME dialogs from the command line"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://help.gnome.org/users/zenity/"
-changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/zenity-3-44/NEWS"
 distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=d65400aec965411f4c0b3d8e0e0dac54be55d807a29279697537da2dfee93eaa
 
 build_options="webkit"
 build_options_default="webkit"

From 81f805b35b7f579a19a210f7447bc616f8914e84 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 0945/1854] gnome-core: update to 44.0.

---
 srcpkgs/gnome-core/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=43.0
+version=44.0
 revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
  folks>=0.15.5
  font-adobe-source-code-pro>=2.030R
  gcr>=3.41.0
  gdm>=${version}
  geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
  gmime>=3.2.7
  gnome-backgrounds>=${version}
  gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
  gnome-desktop>=${version}
  gnome-initial-setup>=${version}
  gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
  gnome-session>=${version}
  gnome-settings-daemon>=${version}
  gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
  mutter>=${version}
  nautilus>=${version}
  sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
  xdg-desktop-portal-gnome>=${version}
  zenity>=3.${version}"

From ab441b1c06fc2a0c10e042c90c289f6fd07cbb76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 0946/1854] gnome: update to 44.0.

---
 srcpkgs/gnome/template | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..e3c61d304a1e 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=43.0
-revision=2
+version=44.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
 depends="
  gnome-core>=${version}
  baobab>=${version}
- cheese>=${version}
+ cheese>=43
  eog>=${version}
  evince>=${version}
- file-roller>=${version}
+ file-roller>=43
  gnome-calculator>=${version}
  gnome-calendar>=${version}
  gnome-characters>=${version}
@@ -23,26 +23,27 @@ depends="
  gnome-disk-utility>=${version}
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
  gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
  gnome-console>=${version}
  gnome-text-editor>=${version}
  gnome-tweaks>=42.beta
  gnome-weather>=${version}
  gsound>=1.0.3
  gspell>=1.11.0
- mousetweaks>=3.32.0
+ iio-sensor-proxy>=3.0
  orca>=${version}
+ power-profiles-daemon>=0.12
  phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
 
 _apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
  bijiben>=40.1
  dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
  epiphany>=${version}
  evolution>=3.44.0
  ghex>=${version}
@@ -58,14 +59,15 @@ _apps_depends="
  gnome-disk-utility>=${version}
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
  gnome-nettool>=42
  gnome-photos>=${version}
  gnome-screenshot>=41.0
  gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
  gnome-console>=${version}
  gnome-text-editor>=${version}
+ gnome-tour>=${version}
  gnote>=${version}
  polari>=3.38.0
  rygel>=0.40.2
@@ -78,7 +80,7 @@ _games_collection_depends="
  five-or-more>=3.32.2
  four-in-a-row>=3.38.1
  gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
  gnome-klotski>=3.38.2
  gnome-mahjongg>=3.38.3
  gnome-mines>=40.0

From aeab0f917aabf17f84222d1c6130b04338fc939d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 0947/1854] budgie-desktop: rebuild for mutter 44

---
 srcpkgs/budgie-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 48c4dd2b55c9..80da2a8a367a 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.7.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false -Duse-old-zenity=true"

From 7821093d43fb85a73c47618a423f7984dd2ef64a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 0948/1854] GPaste: update to 44.0.

---
 srcpkgs/GPaste/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
 # Template file for 'GPaste'
 pkgname=GPaste
-version=43.0
+version=44.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,15 +11,15 @@ hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
  desktop-file-utils"
 makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
  libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-devel"
 short_desc="Clipboard management system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.imagination-land.org/tags/GPaste.html"
-#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
 changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
 distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
 
 build_options="gnome_shell"
 desc_option_gnome_shell="Build GNOME Shell integration and extension"

From fe64bb0a8c3b7db5ef6272d099679bf90cc2e5b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 19:33:10 -0700
Subject: [PATCH 0949/1854] gnome-tour: update to 44.0.

---
 srcpkgs/gnome-tour/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
index 56b8466925b1..e8eb54f1bf7c 100644
--- a/srcpkgs/gnome-tour/template
+++ b/srcpkgs/gnome-tour/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tour'
 pkgname=gnome-tour
-version=43.0
+version=44.0
 revision=1
 build_style=meson
 build_helper=rust
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
 changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-tour/${version%.*}/gnome-tour-${version}.tar.xz"
-checksum=1351e419627fbd7c771932a6ef1ad80c0bf2e6828c4948a062068984ddb3cc88
+checksum=06de7677dd1c590d0ea33a032c9ccf4c37c62bc56215b823c879e42ee630c2b6
 
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0

From ea28be1023737df3febd3bbfdba7488a7173416d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:20:54 +0200
Subject: [PATCH 0950/1854] common: remove unused python-module build style

python-module build style is now unused, all projects that want to have
a python2 and a python3 package should be split to two templates
---
 Manual.md                                     |  8 +-
 common/build-style/python-module.sh           | 96 -------------------
 .../environment/build-style/python-module.sh  |  2 -
 3 files changed, 3 insertions(+), 103 deletions(-)
 delete mode 100644 common/build-style/python-module.sh
 delete mode 100644 common/environment/build-style/python-module.sh

diff --git a/Manual.md b/Manual.md
index 0b6b5ab645fc..1670863cbe54 100644
--- a/Manual.md
+++ b/Manual.md
@@ -995,13 +995,11 @@ system. Additional arguments may be passed to the `zig build` invocation using
 For packages that use the Python module build method (`setup.py` or
 [PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
 
-- `python-module` to build *both* Python 2.x and 3.x modules
+- `python2-module` to build Python 2.x modules
 
-- `python2-module` to build Python 2.x only modules
+- `python3-module` to build Python 3.x modules
 
-- `python3-module` to build Python 3.x only modules
-
-- `python3-pep517` to build Python 3.x only modules that provide a PEP 517 build description without
+- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
 a `setup.py` script
 
 Environment variables for a specific `build_style` can be declared in a filename
diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh
deleted file mode 100644
index b80801a67247..000000000000
--- a/common/build-style/python-module.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# This helper is for templates installing python modules.
-#
-
-do_build() {
-	: ${python_versions:="2.7 $py3_ver"}
-	local pyver= tmp_cflags="$CFLAGS" tmp_ldflags="$LDFLAGS"
-
-	for pyver in $python_versions; do
-		if [ -n "$CROSS_BUILD" ]; then
-			CFLAGS="$tmp_cflags"
-			LDFLAGS="$tmp_ldflags"
-			ADDENV=
-
-			PYPREFIX="$XBPS_CROSS_BASE"
-			CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
-			LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
-			CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
-			LDSHARED="${CC} -shared $LDFLAGS"
-			case $pyver in
-			3.*)
-				for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
-					f=${f##*/}
-					_PYTHON_SYSCONFIGDATA_NAME=${f%.py}
-				done
-				ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}"
-				ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME""
-			esac
-			env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \
-				PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-				LDFLAGS="$LDFLAGS" python${pyver} setup.py \
-					build --build-base=build-${pyver} ${make_build_args}
-		else
-			python${pyver} setup.py build --build-base=build-${pyver} ${make_build_args}
-		fi
-	done
-}
-
-do_check() {
-	: ${python_versions:="2.7 $py3_ver"}
-
-	for pyver in $python_versions; do
-		ln -s build-${pyver} build
-		if [ -z "$make_check_target" ]; then
-			if ! python${pyver} setup.py --help test >/dev/null 2>&1; then
-				msg_warn "No command 'test' defined by setup.py for python${pyver}.\n"
-				rm build
-				return 0
-			fi
-		fi
-
-		${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
-		rm build
-	done
-}
-
-do_install() {
-	: ${python_versions:="2.7 $py3_ver"}
-	local pyver=
-
-	for pyver in $python_versions; do
-		if [ -n "$CROSS_BUILD" ]; then
-			ADDENV=
-			PYPREFIX="$XBPS_CROSS_BASE"
-			CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
-			LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
-			CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
-			LDSHARED="${CC} -shared $LDFLAGS"
-			case $pyver in
-			3.*)
-				for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
-					f=${f##*/}
-					_PYTHON_SYSCONFIGDATA_NAME=${f%.py}
-				done
-				ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}"
-				ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME""
-			esac
-			env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \
-				PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-				LDFLAGS="$LDFLAGS" python${pyver} setup.py \
-					build --build-base=build-${pyver} \
-					install --prefix=/usr --root=${DESTDIR} ${make_install_args}
-		else
-			python${pyver} setup.py build --build-base=build-${pyver} \
-				install --prefix=/usr --root=${DESTDIR} ${make_install_args}
-		fi
-
-		# Rename unversioned scripts to avoid name conflicts.
-		if [ -d ${DESTDIR}/usr/bin ]; then
-			find ${DESTDIR}/usr/bin -type f ! -name "*[[:digit:]]" | while IFS= read -r f _; do
-				mv "${f}" "${f}${pyver%.*}"
-				echo "[python-module] Unversioned script renamed to '${f#$DESTDIR}${pyver%.*}'"
-			done
-		fi
-	done
-}
diff --git a/common/environment/build-style/python-module.sh b/common/environment/build-style/python-module.sh
deleted file mode 100644
index d6b6502e44fd..000000000000
--- a/common/environment/build-style/python-module.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-lib32disabled=yes
-makedepends+=" python python3"

From 6f988e97c879f20078b86424e8c4cbab11b05cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Jun 2023 10:37:09 +0200
Subject: [PATCH 0951/1854] tectonic: update to 0.14.1.

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index e07f8841815b..ef293da34228 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.14.0
+version=0.14.1
 revision=1
 build_style=cargo
 configure_args="--features=external-harfbuzz"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=2191e3599b7e34f01d24a8d0ed873d8a8696e5ed4af05e9ce30685a053e9b57a
+checksum=3703a4fc768b3c7be6a4560857b17b2671f19023faee414aa7b6befd24ec9d25
 
 post_install() {
 	vlicense LICENSE

From 49019b80b30e98392076e4bfce02e2c27cd58695 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 17:48:52 +0100
Subject: [PATCH 0952/1854] libheif: move thumbnailer to tools subpackage.

The thumbnailer uses the `heif-thumbnailer` binary, which is in
libheif-tools.
---
 srcpkgs/libheif/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 2056a8d8d491..63e4e4fb5313 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.16.2
-revision=1
+revision=2
 build_style=cmake
 makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
  libaom-devel"
@@ -28,5 +28,6 @@ libheif-tools_package() {
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/share/man
+		vmove usr/share/thumbnailers
 	}
 }

From c5b81434c49bfc59243faf68f185fa8866ae9ca4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 11:35:34 +0530
Subject: [PATCH 0953/1854] python3-codespell: update to 2.2.5.

---
 srcpkgs/python3-codespell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
index da6beaf53eb2..a78c2caf727b 100644
--- a/srcpkgs/python3-codespell/template
+++ b/srcpkgs/python3-codespell/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-codespell'
 pkgname=python3-codespell
-version=2.2.4
-revision=2
+version=2.2.5
+revision=1
 build_style=python3-pep517
 make_check_args="--deselect codespell_lib/tests/test_basic.py::test_command
  --deselect codespell_lib/tests/test_basic.py::test_permission_error"
@@ -13,7 +13,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-2.0-only"
 homepage="https://github.com/codespell-project/codespell"
 distfiles="${PYPI_SITE}/c/codespell/codespell-${version}.tar.gz"
-checksum=0b4620473c257d9cde1ff8998b26b2bb209a35c2b7489f5dc3436024298ce83a
+checksum=6d9faddf6eedb692bf80c9a94ec13ab4f5fb585aabae5f3750727148d7b5be56
 conflicts="python-codespell>=0"
 
 pre_check() {

From 549c78f28b330080bdc92ec1536940d2782f6990 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 18 Jun 2023 12:06:56 +0530
Subject: [PATCH 0954/1854] python3-platformdirs: update to 3.6.0.

---
 srcpkgs/python3-platformdirs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index dc60d45ecfa4..c9f34973027b 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.5.3
+version=3.6.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e
+checksum=57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From 55136842f42d73aafb471f62dfeaaf4d36501b77 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 14 Jun 2023 02:17:29 -0400
Subject: [PATCH 0955/1854] ircdog: update to 0.5.1.

---
 srcpkgs/ircdog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index 4eac96514502..e4988efb392a 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,6 +1,6 @@
 # Template file for 'ircdog'
 pkgname=ircdog
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
@@ -10,7 +10,7 @@ license="ISC"
 homepage="https://github.com/ergochat/ircdog"
 changelog="https://raw.githubusercontent.com/ergochat/ircdog/master/CHANGELOG.md"
 distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
-checksum=d999c8e25eca99e7464e97bb61bc213d66fbef3e925a099f90d4be8c6f021d24
+checksum=04d41168329523b44fe77a28d0aca83c60cdee913e8ee9abf5901de5fed4aa4a
 
 post_install() {
 	vlicense LICENSE

From 3aaeb71c4e71bedbb87275b6627a687ee7cee693 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 17 Jun 2023 13:39:44 +0300
Subject: [PATCH 0956/1854] tiff: update to 4.5.1.

---
 srcpkgs/tiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index d3269060df2f..3ef8a5701b1f 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -1,6 +1,6 @@
 # Template file for 'tiff'
 pkgname=tiff
-version=4.5.0
+version=4.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="libtiff"
 homepage="http://www.simplesystems.org/libtiff/"
 distfiles="https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
-checksum=c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464
+checksum=d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" --enable-tests"

From 54e541569481307a02680b67c89c43aa0f1ae9fb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 14 Jun 2023 17:49:22 +0200
Subject: [PATCH 0957/1854] terraform: update to 1.5.0.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 6083dfe51de3..a81f0fd86028 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.4.6
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=6c3e538f8c2ebaf1d5ac1f929753c4fabddb8b3af638829212df494c569a8d02
+checksum=c53c97dcaa4bf705a3755aa552581c20f525d8204e41b704a0aa9d8890603469

From a798a97a73fa901f78e38132f2cb253714f7921c Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:47:47 +0200
Subject: [PATCH 0958/1854] yoshimi: update to 2.3.0.2.

---
 srcpkgs/yoshimi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 0b72467a8d57..c474217dfd31 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=2.3.0
+version=2.3.0.2
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=167c3f300a3513407f5ed61b1104a79552bfc574f4a6dbf5bb713f2456a834f9
+checksum=2710c0fdea108b1aad2d60aef3694f0655b1420ff8e99739358f3d0c37f4c6ca
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From 953933f0c917948e42cf61b66805cdf8f887fe34 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:50:07 +0200
Subject: [PATCH 0959/1854] terragrunt: update to 0.47.0.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8be2655d6368..85dee0d2ef20 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.46.3
+version=0.47.0
 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=7ccb057317d5c7073a3c510ab9670cdb429dde87e5c6b18597a3118a6b0107dc
+checksum=ddc0171d1be0f603b4c2fe8cf51b4a2084477f4c0ebc13499d6ce92c492bce6b
 
 post_install() {
 	vlicense LICENSE.txt

From b9ece5362e1b96d1f0c60e5889c3588c41b84acb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:51:39 +0200
Subject: [PATCH 0960/1854] kubernetes: update to 1.27.3.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index cd21779f27d9..d6843cc80220 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.27.2
+version=1.27.3
 revision=1
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=c6fcfddd38f877ce49c49318973496f9a16672e83a29874a921242950cd1c5d2
+checksum=8ef07217229e1c0dab21cc014ee05f79dffd31d3bf13a8ff3c730e031973f3e8
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From f08992b53f4a0c0a1cfc8681c7ae80817f24ea2e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 19 Jun 2023 14:54:52 +0200
Subject: [PATCH 0961/1854] hopper: update to 5.11.1.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 2bc7952d22d3..96fb20d992f0 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=5.11.0
+version=5.11.1
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=c14843755669369df54222a54ab0d2069edb30b2fbcdb33abc8da6575bfde6d3
+checksum=c7c8f9e220714061b33270084c4de5ffd6da62645a35f4fc692161de7afeeeee
 
 archs="x86_64"
 restricted=yes

From 8c6796034809eda05b6ed1fb4912df27d9ab9c5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 19 Jun 2023 10:29:29 -0400
Subject: [PATCH 0962/1854] python3-Cython: ignore preview releases

---
 srcpkgs/python3-Cython/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/python3-Cython/update

diff --git a/srcpkgs/python3-Cython/update b/srcpkgs/python3-Cython/update
new file mode 100644
index 000000000000..6267ade562c3
--- /dev/null
+++ b/srcpkgs/python3-Cython/update
@@ -0,0 +1 @@
+ignore="*[A-Za-z]*"

From d880ecb4cabd25f59bd5b38178e8f2d3ef46050f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 19 Jun 2023 11:41:11 -0500
Subject: [PATCH 0963/1854] QMPlay2: update to 23.06.17.

---
 srcpkgs/QMPlay2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 17879a25093d..850df9d418b9 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=23.06.04
+version=23.06.17
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=9173b9b8ae26b9e97092239f40451172e9fe8d5d7ac1cbf0aa88ab8a73db7d1a
+checksum=dc57afc6e3299701508e5dbffa486d7956d6764420dcc0f22a0da8f7d07a2137
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 526fc3c80afbca336666df5ae6518b0b35e4b498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20Wa=C5=82kuski?= <contact@tomekw.com>
Date: Mon, 19 Jun 2023 10:08:46 +0200
Subject: [PATCH 0964/1854] slack-desktop: update to 4.32.127

---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index e5e00568ce52..d8708a089c7b 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.32.122
+version=4.32.127
 revision=1
 archs="x86_64"
 depends="xdg-utils"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=5622471bbb3bc6a9dab4d3acb3999f6bb1aaaa51db06b2c61c1cd3aaaa3b5bfc
+checksum=8e0216aba77798b6252902a0bd6fe2286325fdf246916f5ed4cabed3e7527521
 restricted=yes
 repository="nonfree"
 nopie=yes

From f795b2672c997d7b097292e80714625a9eb8b083 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 18 Jun 2023 20:38:24 +0200
Subject: [PATCH 0965/1854] typioca: update to 2.4.2.

---
 srcpkgs/typioca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index 139447ffd424..ccb0af3051a6 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,6 +1,6 @@
 # Template file for 'typioca'
 pkgname=typioca
-version=2.3.1
+version=2.4.2
 revision=1
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bloznelis/typioca"
 distfiles="https://github.com/bloznelis/typioca/archive/refs/tags/${version}.tar.gz"
-checksum=19713300a9f2feb6f28c689bfd298e6b0f7fdfe05439f538d11d62701b13d304
+checksum=57246b9f13b8f4f34a93eed7b2ac3efa871dd49714f44b9b85bbc82c4700b9a2
 
 post_install() {
 	vlicense LICENSE

From 3f44df17983f6c782ce085d7544d4804778c928a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 19 Jun 2023 11:22:54 +0200
Subject: [PATCH 0966/1854] shfmt: update to 3.7.0.

---
 srcpkgs/shfmt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 28556341f6cd..61667a1862e5 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.6.0
-revision=2
+version=3.7.0
+revision=1
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 changelog="https://raw.githubusercontent.com/mvdan/sh/master/CHANGELOG.md"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=4fe5a7b0aab5fba437696b68c5424e49ba9f793de2f534647e1d814108ebad23
+checksum=89eafc8790df93305dfa42233e262fb25e1c96726a3db420a7555abadf3111ed
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 080742f38abc5971e71c54155f5dfee5480d8d56 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 19 Jun 2023 21:15:18 +0300
Subject: [PATCH 0967/1854] spotify: update to 1.2.13.

---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 4dc3395617cd..c02185fd643e 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.2.11
+version=1.2.13
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
-distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.916.geb595a67_amd64.deb"
-checksum=472bf841451c219320f1ca038915f52bd4afdf7a1c979571d6ed541ca5e26d51
+distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.661.ga588f749_amd64.deb"
+checksum=fcbae7530d09e729b3bbb762a3127ad2cb841646615839125b58d811bcf4c928
 repository=nonfree
 restricted=yes
 nostrip=yes

From 28db16922007e9225a16de250f0cf2af25363f38 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Jun 2023 14:14:10 +0530
Subject: [PATCH 0968/1854] wego: update to 2.2.

---
 srcpkgs/wego/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index ea3111ac800c..077d3968bf34 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,15 +1,16 @@
 # Template file for 'wego'
 pkgname=wego
-version=2.1
-revision=2
+version=2.2
+revision=1
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/schachmat/wego"
-distfiles=${homepage}/archive/${version}.tar.gz
-checksum=cebfa622789aa8e7045657d81754cb502ba189f4b4bebd1a95192528e06969a6
+changelog="https://github.com/schachmat/wego/releases"
+distfiles="https://github.com/schachmat/wego/archive/refs/tags/${version}.tar.gz"
+checksum=e7a6d40cb44f4408aedceebbed5854b3b992936cc762df6b76f5a9dca7909321
 
 post_install() {
 	vlicense LICENSE

From b4a9088e318f1f0c8d0556af4988447658b23e06 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 13 Jun 2023 01:06:34 +0530
Subject: [PATCH 0969/1854] strongswan: update to 5.9.11.

---
 srcpkgs/strongswan/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index 64b061b18cde..f9421150163e 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,7 +1,7 @@
 # Template file for 'strongswan'
 pkgname=strongswan
-version=5.9.10
-revision=2
+version=5.9.11
+revision=1
 build_style=gnu-configure
 # tpm support waits on libtss2
 configure_args="--disable-static --enable-blowfish --enable-curl --enable-md4
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 changelog="https://raw.githubusercontent.com/strongswan/strongswan/master/NEWS"
 distfiles="https://download.strongswan.org/strongswan-${version}.tar.bz2"
-checksum=3b72789e243c9fa6f0a01ccaf4f83766eba96a5e5b1e071d36e997572cf34654
+checksum=ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d
 make_dirs="/etc/ipsec.d/ 0755 root root
  /etc/ipsec.d/aacerts 0755 root root
  /etc/ipsec.d/acerts 0755 root root

From 1f4666d8d1849b4300086ddb5d9f487649dae8d4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Jun 2023 19:53:36 +0530
Subject: [PATCH 0970/1854] fonttools: update to 4.40.0.

---
 srcpkgs/fonttools/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index 6d2160272853..9611cf4e8163 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,9 +1,10 @@
 # Template file for 'fonttools'
 pkgname=fonttools
-version=4.39.4
+version=4.40.0
 revision=1
 build_style=python3-module
 make_check_args="--deselect Tests/otlLib/optimize_test.py::test_main
+ --deselect Tests/ttx/ttx_test.py::test_ttcompile_timestamp_calcs
  --ignore Tests/misc/plistlib_test.py --ignore Tests/pens --ignore Tests/ufoLib"
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -14,7 +15,7 @@ license="MIT, OFL-1.1, BSD-3-Clause"
 homepage="https://github.com/fonttools/fonttools"
 changelog="https://raw.githubusercontent.com/fonttools/fonttools/main/NEWS.rst"
 distfiles="https://github.com/fonttools/fonttools/archive/refs/tags/${version}.tar.gz"
-checksum=9fab7f15ad7a0b5cd040331090b726c81d8b0d7b043bb348c7dc242d901b4ee5
+checksum=f03f5a5414587fed31d11e007e680ea522a918ea27a793a5931641ef5915bcd2
 replaces="python-fonttools>=0 python3-fonttools>=0"
 provides="python-fonttools-${version}_${revision} python3-fonttools-${version}_${revision}"
 

From 8bf5c0817506a702674688216f3f32b789e82dec Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Fri, 16 Jun 2023 22:20:40 +0200
Subject: [PATCH 0971/1854] hcloud: update to 1.35.0.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index fcdc3c3963fc..da0f7d134550 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.34.1
+version=1.35.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=00ec9466bedca9fbe3ab5151a79df4db6a8997b263bcc6bffb50f25ccc191c80
+checksum=3dad20aa8b4592c65046a0587ded4cccc87aeba308bf1f5f07cde0bb864e6717
 
 post_install() {
 	vlicense LICENSE

From 5bd02e665f42b600aba5f02bd40a18bc05953c6d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 11:24:10 +0100
Subject: [PATCH 0972/1854] libdrm: update to 2.4.115.

---
 srcpkgs/libdrm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 929d3c11ba0f..5c7578cef745 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
 # Template file for 'libdrm'
 pkgname=libdrm
-version=2.4.114
+version=2.4.115
 revision=1
 build_style=meson
 configure_args="-Dudev=true -Dvalgrind=disabled -Dinstall-test-programs=true"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://dri.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=919ccacc5d9211840b9433d16ee825b1bc7108e7d63e05557969a17c3532d764
+checksum=fd8b7c6e4e40d13c32ab67ace2cb6c71e08c9ca53124ff33ccadd74f604117e3
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) configure_args+=" -Dvc4=enabled";;

From b0ce274afa0cc1bb3279b478e7a00b7af9b016ab Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 11:32:27 +0530
Subject: [PATCH 0973/1854] qsv: update to 0.107.0.

---
 srcpkgs/qsv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index 30448b946128..068d261bbd0f 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.106.0
+version=0.107.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,4 +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=ce7c3eac35d495188ceda49536ce1997a78a319a42d715d3b0b1712b57c3267c
+checksum=628b18a3ea9ebd0b5e82e3fd9db05348c0c6aa32b43b32bdd12c0217443d88be

From 2c491ae46619aa6180af6747cdcd95805ca9c979 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 12:09:20 +0530
Subject: [PATCH 0974/1854] StyLua: update to 0.18.0.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index 55f097c41a00..cb582ecbc6d4 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.17.1
+version=0.18.0
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if lua53 '--features lua53')
@@ -11,7 +11,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/main/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/refs/tags/v${version}.tar.gz"
-checksum=94d421033a41d7030bfec5cafafd16e52951b08685f4a908087cbcbb8fea4073
+checksum=198e54433b866b8d3a8934be3d1a0f4b40ac934621231be43d4aa2056cb66018
 
 build_options="lua52 lua53 lua54 luau"
 build_options_default="lua52 lua53 lua54 luau"

From 52f2e7a888cdb9598fb69a628e7785489b0e1c38 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 11:54:41 +0530
Subject: [PATCH 0975/1854] hatchling: update to 1.18.0.

---
 srcpkgs/hatchling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
index bb221be3e722..75c668d88f3c 100644
--- a/srcpkgs/hatchling/template
+++ b/srcpkgs/hatchling/template
@@ -1,6 +1,6 @@
 # Template file for 'hatchling'
 pkgname=hatchling
-version=1.17.0
+version=1.18.0
 revision=1
 build_style=python3-pep517
 _deps="python3-editables python3-packaging python3-pathspec python3-pluggy
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://hatch.pypa.io/latest/"
 changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history/hatchling.md"
 distfiles="${PYPI_SITE}/h/hatchling/hatchling-${version}.tar.gz"
-checksum=b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930
+checksum=50e99c3110ce0afc3f7bdbadff1c71c17758e476731c27607940cfa6686489ca
 
 post_install() {
 	vlicense LICENSE.txt

From 54667d0b7e88fe23515c48271d8674b2c9c8e49c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 18 Jun 2023 15:06:17 +0200
Subject: [PATCH 0976/1854] rosegarden: update to 23.06

---
 .../patches/fix-use-after-free-lilypad.patch         | 12 ------------
 srcpkgs/rosegarden/template                          |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch

diff --git a/srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch b/srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch
deleted file mode 100644
index 7d84b7376556..000000000000
--- a/srcpkgs/rosegarden/patches/fix-use-after-free-lilypad.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/document/io/LilyPondExporter.cpp
-+++ b/src/document/io/LilyPondExporter.cpp
-@@ -462,7 +462,8 @@ LilyPondExporter::handleStartingPostEven
-                             }
- 
-                             // Duration
--                            const char * d = restsDuration.toStdString().data();
-+                            std::string tmp = restsDuration.toStdString();
-+                            const char * d = tmp.data();
- 
-                             // Indication
-                             const char * in =
diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index ba6498262438..1262053be213 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
 # Template file for 'rosegarden'
 pkgname=rosegarden
-version=22.12.1
+version=23.06
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config shared-mime-info"
@@ -12,8 +12,8 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://rosegardenmusic.com/"
 changelog="https://raw.githubusercontent.com/tedfelix/rosegarden-official/master/CHANGELOG"
-distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=7ea7a27f7ee5c49781708f9c615a51919b892264a599e64edf2cd23733d99206
+distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.xz"
+checksum=1f34578bf47bac364faf1c6c14daaedaa387a4f3b19704f5ba868f4ecd2d72cc
 
 if [ -n "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"

From ffe7affb6f366193d12470275e4a6d7eda132f44 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 19:14:37 +0530
Subject: [PATCH 0977/1854] geeqie: update to 2.1.

---
 srcpkgs/geeqie/patches/fix-musl.patch | 22 ++++++++++++++++++++++
 srcpkgs/geeqie/template               |  6 +++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/geeqie/patches/fix-musl.patch

diff --git a/srcpkgs/geeqie/patches/fix-musl.patch b/srcpkgs/geeqie/patches/fix-musl.patch
new file mode 100644
index 000000000000..9a21dd6334f6
--- /dev/null
+++ b/srcpkgs/geeqie/patches/fix-musl.patch
@@ -0,0 +1,22 @@
+From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <wiz@gatalith.at>
+Date: Sat, 17 Jun 2023 18:47:28 +0200
+Subject: [PATCH] Add missing header for setlocale().
+
+---
+ src/misc.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/misc.cc b/src/misc.cc
+index 9942605c..a2ad3eb6 100644
+--- a/src/misc.cc
++++ b/src/misc.cc
+@@ -18,6 +18,8 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include <locale.h>
++
+ #include "main.h"
+ #include "misc.h"
+ 
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 0f199ffb7c38..b5f958f854c1 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # Template file for 'geeqie'
 pkgname=geeqie
-version=2.0.1
-revision=2
+version=2.1
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext xxd gdk-pixbuf-devel glib-devel"
 makedepends="gtk+3-devel glib-devel lcms2-devel exiv2-devel libheif-devel
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.geeqie.org"
 changelog="https://raw.githubusercontent.com/BestImageViewer/geeqie/master/NEWS"
 distfiles="https://github.com/BestImageViewer/geeqie/archive/refs/tags/v${version}.tar.gz"
-checksum=6d87004a21b91afb7ea9eac3624fc37f5ccf1818fd40f567f8c7d1b5cbc2a6c7
+checksum=61edff10540bcee01af7ff0dbc3658c99c2e27854a7dc2915b44624ec39b8744

From 5e336225b0df90bea90f6b0664285d4c0c2ede7b Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 16 Jun 2023 00:11:21 +0200
Subject: [PATCH 0978/1854] limine: update to 4.20230615.0.

---
 srcpkgs/limine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index 25e23c5cd630..f986e43f675c 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230606.0
+version=4.20230615.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=8a6fdb8b520a030928ab4e11756126a7b80790889a5567d0c92b907a1b131759
+checksum=f17b816aa7b88ab0e66a32e45afad55accee41cd336aba372c2a3eca7e0a41ad
 
 post_install() {
 	vlicense LICENSE

From c1bcf79aaecd6c2a06b308071d76b5eb1c740852 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 16 Jun 2023 10:30:48 +0200
Subject: [PATCH 0979/1854] vscode: update to 1.79.2

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index d7de2feef325..a7d418f5696f 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.79.0
+version=1.79.2
 revision=1
 _electronver=24.2.0
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=37a5182d77fbe670be180d1e19907ef5a0b970afda0ba57626a1d2c3d715ce28
+checksum=2719ccbb573f5b7c174bd5bbcad97d3fe4d917e16327a6b72162ff7014c17c9b
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 3504ef91485e55071c4f80df6023315b2a43cb12 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 16 Jun 2023 11:53:52 +0200
Subject: [PATCH 0980/1854] pyradio: update to 0.9.2.10.

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 65c463fe6539..2ee62bff7306 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.7
+version=0.9.2.10
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=3694b423aa7b3302f90db9a620aa8155ee05501493d748544522f70f50a50d81
+checksum=c3ab4773d0bdfd28015ef621a86ba103764f36708f8e07cbd0d1b908bcc8e032
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From aa6ef1ad2946bb5fdcb5c58178e66905c2d7941d Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Thu, 15 Jun 2023 16:09:38 -0400
Subject: [PATCH 0981/1854] hackrf: update to 2023.01.1.

---
 srcpkgs/hackrf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hackrf/template b/srcpkgs/hackrf/template
index 962cc7f4e856..189ab5b1f00a 100644
--- a/srcpkgs/hackrf/template
+++ b/srcpkgs/hackrf/template
@@ -1,6 +1,6 @@
 # Template file for 'hackrf'
 pkgname=hackrf
-version=2022.09.1
+version=2023.01.1
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://greatscottgadgets.com/hackrf/"
 distfiles="https://github.com/greatscottgadgets/hackrf/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e
+checksum=32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11
 
 post_install() {
 	for f in ../firmware-bin/*.{bin,dfu}; do

From dc1253dd0133b322c4379973a72a8fedaa47bf58 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 15 Jun 2023 01:05:10 +0300
Subject: [PATCH 0982/1854] putty: update to 0.78

---
 srcpkgs/putty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index 023abf4f18ae..9f70a820a725 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.77
+version=0.78
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config perl"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="https://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=419a76f45238fd45f2c76b42438993056e74fa78374f136052aaa843085beae5
+checksum=274e01bcac6bd155dfd647b2f18f791b4b17ff313753aa919fcae2e32d34614f
 
 CFLAGS="-Wno-error -UNDEBUG"
 

From 0000b826d0493322fffa33b34f707c110168756a Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 15:11:12 -0500
Subject: [PATCH 0983/1854] python3-sphinx-copybutton: update to 0.5.2.

---
 srcpkgs/python3-sphinx-copybutton/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinx-copybutton/template b/srcpkgs/python3-sphinx-copybutton/template
index f5b5a14d296b..3074116956dd 100644
--- a/srcpkgs/python3-sphinx-copybutton/template
+++ b/srcpkgs/python3-sphinx-copybutton/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sphinx-copybutton'
 pkgname=python3-sphinx-copybutton
-version=0.5.1
+version=0.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://sphinx-copybutton.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/executablebooks/sphinx-copybutton/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/sphinx-copybutton/sphinx-copybutton-${version}.tar.gz"
-checksum=366251e28a6f6041514bfb5439425210418d6c750e98d3a695b73e56866a677a
+checksum=4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd
 make_check=no # package provides no tests
 
 post_install() {

From bc1b9326fd766a4d4580f1356f90d073a320170b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:42:23 -0500
Subject: [PATCH 0984/1854] perl-Devel-CheckLib: update to 1.16.

---
 srcpkgs/perl-Devel-CheckLib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Devel-CheckLib/template b/srcpkgs/perl-Devel-CheckLib/template
index aa813ab62019..7c53a6e02f37 100644
--- a/srcpkgs/perl-Devel-CheckLib/template
+++ b/srcpkgs/perl-Devel-CheckLib/template
@@ -1,14 +1,15 @@
 # Template file for 'perl-Devel-CheckLib'
 pkgname=perl-Devel-CheckLib
-version=1.14
-revision=2
+version=1.16
+revision=1
 build_style=perl-module
 hostmakedepends="perl-IO-CaptureOutput"
 makedepends="${hostmakedepends}"
 depends="perl"
+checkdepends="perl-Capture-Tiny"
 short_desc="Module to check for other perl modules"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Devel-CheckLib"
 distfiles="${CPAN_SITE}/Devel/Devel-CheckLib-${version}.tar.gz"
-checksum=f21c5e299ad3ce0fdc0cb0f41378dca85a70e8d6c9a7599f0e56a957200ec294
+checksum=869d38c258e646dcef676609f0dd7ca90f085f56cf6fd7001b019a5d5b831fca

From 10f7415e95089b2c1cfe1b354c6389315dd2f57f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 13 Jun 2023 21:19:12 -0400
Subject: [PATCH 0985/1854] cherrytree: update to 0.99.55

---
 srcpkgs/cherrytree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index ef8bdd30ce22..3b6fa46f175b 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,6 +1,6 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.51
+version=0.99.55
 revision=1
 build_style=cmake
 # Tests are built during the normal build process and require access to X server
@@ -16,5 +16,5 @@ license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
 changelog="https://raw.githubusercontent.com/giuspen/cherrytree/master/changelog.txt"
 distfiles="https://github.com/giuspen/cherrytree/archive/refs/tags/${version}.tar.gz"
-checksum=5c88bd8d709226006819cc7bba8445bab7bc5d2795364110d9ce59ecb69c7bcb
+checksum=c7e6393af6a7e82e02692faf06e62b3214c147818de1c3bbe809fa4113854215
 make_check=no  # Tests are run during build step

From ce586672e63e608c28bbafb375223a5f9404714b Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Tue, 13 Jun 2023 15:03:55 +0200
Subject: [PATCH 0986/1854] ack: update to 3.7.0

---
 srcpkgs/ack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template
index 25e08e33ac21..b14cb3987ee8 100644
--- a/srcpkgs/ack/template
+++ b/srcpkgs/ack/template
@@ -1,6 +1,6 @@
 # Template file for 'ack'
 pkgname=ack
-version=3.6.0
+version=3.7.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-File-Next"
@@ -10,4 +10,4 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="Artistic-2.0"
 homepage="https://beyondgrep.com/"
 distfiles="${CPAN_SITE}/App/ack-v${version}.tar.gz"
-checksum=03144d1070649e92f6a1b7d20bdc535e2bb1ac258daabe482e9aa8277b48f005
+checksum=ea7caa14f757de083310ed2cba298661ddcca5dee06ec8f18043ea625a79df20

From 0119fab846efa9c6072ee56874b7a29aa23c0877 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 4 Jun 2023 11:47:02 -0400
Subject: [PATCH 0987/1854] shotcut: update to 23.05.14.

---
 srcpkgs/shotcut/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 99ebf2e8a5af..7d2af7b0470b 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,20 +1,20 @@
 # Template file for 'shotcut'
 pkgname=shotcut
-version=22.12.21
+version=23.05.14
 revision=1
 build_style=cmake
 configure_args="-DSHOTCUT_VERSION=${version}"
-hostmakedepends="pkg-config qt5-tools-devel"
-makedepends="mlt7-devel qt5-declarative-devel qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
-depends="ffmpeg frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
+hostmakedepends="pkg-config qt6-tools-devel"
+makedepends="mlt7-devel qt6-declarative-devel qt6-multimedia-devel
+ qt6-websockets-devel qt6-plugin-mysql qt6-plugin-odbc
+ qt6-plugin-pgsql qt6-plugin-sqlite"
+depends="ffmpeg frei0r-plugins qt6-declarative"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.shotcut.org"
 changelog="https://github.com/mltframework/shotcut/releases"
 distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=1b9a4f87b16a9751f9cb41588f22af4c00f085105d82cf21d095d9f3c280bc86
+checksum=94632bd69cc8f3b2cba0668b9e8d051493efa5a9c9554c02822c346fe64c1ce0
 
 CXXFLAGS="-DHAVE_LOCALE_H=1 -DSHOTCUT_NOUPGRADE"

From 7bbf2e017ce4aad0b05a2c4e4c3a618c979bdaa9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sat, 20 May 2023 13:04:15 +0200
Subject: [PATCH 0988/1854] openttd: update to 13.1.

---
 .../openttd/patches/regression_tests.patch    | 12 +++
 srcpkgs/openttd/template                      | 73 ++++++++++---------
 2 files changed, 52 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/openttd/patches/regression_tests.patch

diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
new file mode 100644
index 000000000000..2afc07eb4204
--- /dev/null
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -0,0 +1,12 @@
+Fix regression tests on musl libc
+index 19fece83f5..641e1e6de2 100644
+--- a/openttd-13.1/cmake/scripts/Regression.cmake
++++ b/openttd-13.1/cmake/scripts/Regression.cmake
+@@ -53,6 +53,7 @@ endif()
+ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
++string(REPLACE "(null : 0x0)" "(null : 0x00000000)" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ 
+ # Remove timestamps if any
+ string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..3649699062df 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,64 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=1.10.3
-revision=6
-_gfxver=0.6.0
-_sfxver=0.2.3
+version=13.1
+revision=1
+_gfxver=7.1
+_sfxver=1.0.3
+_msxver=0.4.2
 create_wrksrc=yes
 build_wrksrc=openttd-$version
-build_style=gnu-configure
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_BINDIR=bin
+ -DCMAKE_INSTALL_DATADIR=/usr/share
+ -DCMAKE_INSTALL_DOCDIR=share/doc/openttd
+"
+
 hostmakedepends="pkg-config unzip tar"
-makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel
- libxdg-basedir-devel"
-depends="hicolor-icon-theme"
+makedepends="SDL2-devel libcurl-devel freetype-devel fontconfig-devel
+ harfbuzz-devel icu-devel libpng-devel liblzma-devel fluidsynth-devel"
+depends="hicolor-icon-theme fluidsynth soundfont-fluid"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
-distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
+distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
- https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip"
-checksum="c11601ef547eb1f6d4f9a035bd19e0a760b47872ce7d9b4117aaa45ac377b53b
- d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774
- 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02"
-
+ https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
+ https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
+checksum="5edf22d37035238285ef672a97d59e64280bebab23e584780834ccd6be0a58bb
+ 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
+ e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
+ 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
 
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 post_extract() {
-	cd $wrksrc
 	bsdtar xf opengfx-${_gfxver}.tar
+	bsdtar xf opensfx-${_sfxver}.tar
+	bsdtar xf openmsx-${_msxver}.tar
 	rm opengfx-${_gfxver}.tar
+	rm opensfx-${_sfxver}.tar
+	rm openmsx-${_msxver}.tar
 }
 
-do_configure() {
-	./configure --prefix-dir=/usr \
-		--cc-build=gcc \
-		--cxx-build=g++ \
-		--binary-dir=bin \
-		--data-dir=share/openttd \
-		--doc-dir=share/doc/openttd \
-		--with-lzo2=${XBPS_CROSS_BASE}/usr/lib \
-		--binary-name=openttd \
-		--install-dir=${DESTDIR} \
-		--menu-name=OpenTTD \
-		--with-xdg-basedir
+post_build() {
+	cp ../opengfx-${_gfxver}/*.grf build/baseset
+	cp ../opengfx-${_gfxver}/opengfx.obg build/baseset
+	cp ../opensfx-${_sfxver}/opensfx.* build/baseset
+	cp -r ../openmsx-${_msxver} build/baseset
 }
 
 post_install() {
-	vmkdir usr/share/openttd/data
-	vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data
-	vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data
-	vcopy ../opensfx-${_sfxver}/opensfx.* usr/share/openttd/data
 	vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx
 	vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx
+	vlicense ../openmsx-${_msxver}/license.txt LICENSE-msx
 	vdoc ../opengfx-${_gfxver}/readme.txt README-gfx
 	vdoc ../opensfx-${_sfxver}/readme.txt README-sfx
+	vdoc ../openmsx-${_msxver}/readme.txt README-msx
 }

From 8ac7801413a82a15b26439acfbd009d53fb4cb12 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 19 Jun 2023 20:58:03 -0500
Subject: [PATCH 0989/1854] hugo: update to 0.114.0.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d5c4cfeca19a..bbc39aac0122 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.113.0
+version=0.114.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=0bea01f37d7d04e6262844ff3070b76e5fb9f5fe2330a1367bd1c35c77098161
+checksum=485a0f8346ef74a89ab075613590bd94c86d322208cb7b567ceada758459e3b3
 
 post_install() {
 	vdoc README.md

From 788b8a28d4902edec32151a114204e89b272cb8e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 19 Jun 2023 19:51:32 -0700
Subject: [PATCH 0990/1854] kdenlive: depend on mediainfo-cli instead of
 mediainfo-gui

---
 srcpkgs/kdenlive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 429126ef3c3b..89c0dcfb8577 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,7 +1,7 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="
  extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config python3
@@ -11,7 +11,7 @@ makedepends="
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols
- kirigami2 mediainfo"
+ kirigami2 mediainfo-cli"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e412b992828c11edea8c0aaaf6c5dee366904c84 Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Tue, 4 Apr 2023 01:55:22 -0300
Subject: [PATCH 0991/1854] New package: stc-1.4

---
 srcpkgs/stc/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/stc/template

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
new file mode 100644
index 000000000000..ff2964d169e1
--- /dev/null
+++ b/srcpkgs/stc/template
@@ -0,0 +1,12 @@
+# Template file for 'stc'
+pkgname=stc
+version=1.4
+revision=1
+build_style=go
+go_import_path=github.com/tenox7/stc
+short_desc="Syncthing CLI Tool"
+maintainer="LucasTavaresA <tavares.lassuncao@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/tenox7/stc"
+distfiles="https://github.com/tenox7/stc/archive/refs/tags/${version}.tar.gz"
+checksum=5bae51e0fa34311c1ec9e2798badc6fb8b6333485d295beb8631936faeaeb1dc

From 25f57340339707fd81f736281214160d7b304756 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Jun 2023 09:46:33 -0500
Subject: [PATCH 0992/1854] google-chrome: update to 114.0.5735.133.

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 58e12a821110..ffef308cdec8 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=113.0.5672.126
+version=114.0.5735.133
 revision=1
 _channel=stable
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:chrome"
 homepage="https://www.google.com/chrome/"
 distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb"
-checksum=6a624904d7a7ee2ec27e637164ddddd102cc799ffa9c14a05f88762363200bf1
+checksum=6f700ff90db3a0f72ed9fb7ccbce31bd2f937366ed9b80d3ee0dafab7ba0693e
 _license_checksum=8023b18fb5118ef65d586363e53909861bd1a9676e5eb83c20fd3ac6e33ea0be
 
 skiprdeps="/opt/google/chrome/libqt5_shim.so"

From 98741883d8570cc35f81c84eb6deb1e6343fa0f7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 20 Jun 2023 15:50:53 +0300
Subject: [PATCH 0993/1854] nemo: update to 5.8.2.

---
 srcpkgs/nemo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index e0b4f2247e3c..e54d98c677e5 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=5.6.5
+version=5.8.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 changelog="https://raw.githubusercontent.com/linuxmint/nemo/master/debian/changelog"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=7e9e6c58222e07c40bc0ebd2c930b599ec781b7678721e01c6a75dfdc995ec94
+checksum=6a53fb8cec225f08a364e551b442a3e4cfbbad8812ef4bd77494a0236544f387
 python_version=3
 # Requires xvfb-run and dbus-run-session
 make_check=no # can't be run inside chroot due to fusermount3

From 29793064f6bdb0f54511d03de360c7c0ed225011 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 20 Jun 2023 10:12:42 +0200
Subject: [PATCH 0994/1854] proj: update to 9.2.1.

---
 srcpkgs/proj/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index f69c53e4ac8c..50fd8fc17b99 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,6 +1,6 @@
 # Template file for 'proj'
 pkgname=proj
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -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=dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e
+checksum=15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1
 
 post_install() {
 	vlicense COPYING

From da7a68d8b2832cd635f6e34e1acf6ead845edf61 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 20 Jun 2023 14:33:42 +0300
Subject: [PATCH 0995/1854] pmbootstrap: update to 1.53.0.

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index c8f908232a36..c9f735af9234 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.52.0
+version=1.53.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,5 +11,5 @@ license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 changelog="https://git.sr.ht/~postmarketos/pmbootstrap/refs"
 distfiles="https://git.sr.ht/~postmarketos/pmbootstrap/archive/${version}.tar.gz"
-checksum=a05fef2bb495a2e0d8e0369e4a8a1038baf50b7514ec89582b5ec785f9bfa7cb
+checksum=524a7ef43bc254bdb0973926312befc6f76b0c14b03cecdfc6407388c97cbec7
 make_check=no # tests require chroot

From f5826d3b9df9bf0f5667ccb53592c67b6e658200 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 0996/1854] libglibutil: update to 1.0.70.

---
 srcpkgs/libglibutil/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..0f435b6bb18a 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
 # Template file for 'libglibutil'
 pkgname=libglibutil
-version=1.0.67
+version=1.0.70
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -14,8 +14,9 @@ short_desc="Library of glib utilities"
 maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/sailfishos/libglibutil"
+changelog="https://raw.githubusercontent.com/sailfishos/libglibutil/master/debian/changelog"
 distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=dd89b91627b991c2be5c68b3cca61475bad6f9de626536faac0107d23be444ef
 
 post_install() {
 	vlicense LICENSE

From 8404b6da1b299f3d56ff96577e5763f26e12ff1a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 20 Jun 2023 09:41:35 +0200
Subject: [PATCH 0997/1854] golangci-lint: update to 1.53.3.

---
 srcpkgs/golangci-lint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 7b2aa25aa7a9..173632a02ff4 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.53.2
+version=1.53.3
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=fc3e94b5574cdbe0faf37c8cbc1764c4ed07852a9e9dc146216ee69a20b3f97c
+checksum=a11540d116fa6b015423afc1bfe57c4b22ec3c3165189442cdb7ff8fda729370
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From ca9c732dc95add5ce49f4832430e7da9916c58cd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 19 Jun 2023 21:16:48 -0400
Subject: [PATCH 0998/1854] gitui: update to 0.23.0

---
 srcpkgs/gitui/patches/bump-git2.patch | 13 -------------
 srcpkgs/gitui/template                | 10 +++-------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/gitui/patches/bump-git2.patch

diff --git a/srcpkgs/gitui/patches/bump-git2.patch b/srcpkgs/gitui/patches/bump-git2.patch
deleted file mode 100644
index e4b5dfc1fad5..000000000000
--- a/srcpkgs/gitui/patches/bump-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
-index 5ab4da1..f17fbbe 100644
---- a/asyncgit/Cargo.toml
-+++ b/asyncgit/Cargo.toml
-@@ -14,7 +14,7 @@ keywords = ["git"]
- [dependencies]
- crossbeam-channel = "0.5"
- easy-cast = "0.5"
--git2 = "0.15"
-+git2 = "0.17"
- log = "0.4"
- # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
- # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 14a6deb5ba43..2df97ebfc1e1 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.22.1
-revision=2
+version=0.23.0
+revision=1
 build_style=cargo
 make_check_args="-- --skip  components::textinput::tests::test_visualize_newline"
 hostmakedepends="pkg-config python3"
@@ -12,11 +12,7 @@ license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=285e86c136ee7f410fdd52c5284ccf0d19011cc5f7709e5e10bb02f439a218ea
-
-post_patch() {
-	cargo update --package git2@0.15.0 --precise 0.17.2
-}
+checksum=5180d5d8fd2fe6400148d6078b4b318c7530ca6c27ea8d8c0882f2e4d9064a80
 
 post_install() {
 	vlicense LICENSE.md

From 8150d8f9d92b226498b2146207b3e07dccaffc19 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 18 Jun 2023 22:32:23 -0400
Subject: [PATCH 0999/1854] wmctrl: update defunct sources. closes #44513

---
 srcpkgs/wmctrl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wmctrl/template b/srcpkgs/wmctrl/template
index 774c4ca6f200..495ef14ef948 100644
--- a/srcpkgs/wmctrl/template
+++ b/srcpkgs/wmctrl/template
@@ -1,13 +1,13 @@
 # Template file for 'wmctrl'
 pkgname=wmctrl
 version=1.07
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXmu-devel glib-devel"
 short_desc="CLI tool to interact with EWMH compliant WMs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
-homepage="https://sites.google.com/site/tstyblo/wmctrl/"
-distfiles="https://sites.google.com/site/tstyblo/wmctrl/wmctrl-${version}.tar.gz"
+homepage="https://packages.debian.org/sid/source/wmctrl"
+distfiles="http://deb.debian.org/debian/pool/main/w/wmctrl/wmctrl_${version}.orig.tar.gz"
 checksum=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9

From f93849f1acd2fc3b1110f4d19d7e621318c3f8ca Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 21 Jun 2023 00:11:47 +0200
Subject: [PATCH 1000/1854] luakit: update to 2.3.3.

Closes: #41734
---
 srcpkgs/luakit/patches/glib-pcre2.patch | 39 -------------------------
 srcpkgs/luakit/template                 |  6 ++--
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch

diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch
deleted file mode 100644
index f79c38ff5273..000000000000
--- a/srcpkgs/luakit/patches/glib-pcre2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
-From: Tao Nelson <taobert@gmail.com>
-Date: Fri, 23 Sep 2022 19:17:47 +1000
-Subject: [PATCH] Accommodate glib now using pcre2
-
----
- common/clib/regex.c | 2 +-
- common/util.c       | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/clib/regex.c b/common/clib/regex.c
-index c4f42317c..e87156cf8 100644
---- a/common/clib/regex.c
-+++ b/common/clib/regex.c
-@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex)
- 
-     GError *error = NULL;
-     regex->reg = g_regex_new(regex->pattern,
--            G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error);
-+            G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error);
-     if (error) {
-         lua_pushstring(L, error->message);
-         g_error_free(error);
-diff --git a/common/util.c b/common/util.c
-index 4b44d8515..738e1e5cb 100644
---- a/common/util.c
-+++ b/common/util.c
-@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in)
-     static GRegex *reg;
- 
-     if (!reg) {
--        const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-+        const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-         GError *err = NULL;
--        reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-+        reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-         g_assert_no_error(err);
-     }
- 
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 8f82764e3da8..4f317377dccd 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,8 +1,8 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.3.1
-revision=2
+version=2.3.3
+revision=1
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
 makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e
+checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5
 
 CFLAGS="-fcommon"
 

From 99ced54fd44e54575716339632da31bba8a3521e Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 21 Jun 2023 00:16:25 +0200
Subject: [PATCH 1001/1854] Revert "luakit: update to 2.3.3."

This reverts commit abf8348d9dd9321129a5b1b61212242204317964.
---
 srcpkgs/luakit/patches/glib-pcre2.patch | 39 +++++++++++++++++++++++++
 srcpkgs/luakit/template                 |  6 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch

diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch
new file mode 100644
index 000000000000..f79c38ff5273
--- /dev/null
+++ b/srcpkgs/luakit/patches/glib-pcre2.patch
@@ -0,0 +1,39 @@
+From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
+From: Tao Nelson <taobert@gmail.com>
+Date: Fri, 23 Sep 2022 19:17:47 +1000
+Subject: [PATCH] Accommodate glib now using pcre2
+
+---
+ common/clib/regex.c | 2 +-
+ common/util.c       | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/clib/regex.c b/common/clib/regex.c
+index c4f42317c..e87156cf8 100644
+--- a/common/clib/regex.c
++++ b/common/clib/regex.c
+@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex)
+ 
+     GError *error = NULL;
+     regex->reg = g_regex_new(regex->pattern,
+-            G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error);
++            G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error);
+     if (error) {
+         lua_pushstring(L, error->message);
+         g_error_free(error);
+diff --git a/common/util.c b/common/util.c
+index 4b44d8515..738e1e5cb 100644
+--- a/common/util.c
++++ b/common/util.c
+@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in)
+     static GRegex *reg;
+ 
+     if (!reg) {
+-        const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
++        const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
+         GError *err = NULL;
+-        reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
++        reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
+         g_assert_no_error(err);
+     }
+ 
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 4f317377dccd..8f82764e3da8 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,8 +1,8 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.3.3
-revision=1
+version=2.3.1
+revision=2
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
 makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5
+checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e
 
 CFLAGS="-fcommon"
 

From 56ce5ac61cb589ff69b96a2362ab3f966ae7bbd5 Mon Sep 17 00:00:00 2001
From: Mugr Rex <mugr@disroot.org>
Date: Thu, 19 Jan 2023 01:07:00 +0000
Subject: [PATCH 1002/1854] luakit: update to 2.3.3

Closes: #41734 [via git-merge-pr]
---
 srcpkgs/luakit/patches/glib-pcre2.patch | 39 -------------------------
 srcpkgs/luakit/template                 |  6 ++--
 srcpkgs/luakit/update                   |  1 -
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/luakit/patches/glib-pcre2.patch
 delete mode 100644 srcpkgs/luakit/update

diff --git a/srcpkgs/luakit/patches/glib-pcre2.patch b/srcpkgs/luakit/patches/glib-pcre2.patch
deleted file mode 100644
index f79c38ff5273..000000000000
--- a/srcpkgs/luakit/patches/glib-pcre2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4c69751d3ed6c0623aceee3d77499f1c477136ab Mon Sep 17 00:00:00 2001
-From: Tao Nelson <taobert@gmail.com>
-Date: Fri, 23 Sep 2022 19:17:47 +1000
-Subject: [PATCH] Accommodate glib now using pcre2
-
----
- common/clib/regex.c | 2 +-
- common/util.c       | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/clib/regex.c b/common/clib/regex.c
-index c4f42317c..e87156cf8 100644
---- a/common/clib/regex.c
-+++ b/common/clib/regex.c
-@@ -59,7 +59,7 @@ luaH_regenerate_regex(lua_State *L, lregex_t *regex)
- 
-     GError *error = NULL;
-     regex->reg = g_regex_new(regex->pattern,
--            G_REGEX_DOTALL|G_REGEX_OPTIMIZE|G_REGEX_JAVASCRIPT_COMPAT, 0, &error);
-+            G_REGEX_DOTALL|G_REGEX_OPTIMIZE, 0, &error);
-     if (error) {
-         lua_pushstring(L, error->message);
-         g_error_free(error);
-diff --git a/common/util.c b/common/util.c
-index 4b44d8515..738e1e5cb 100644
---- a/common/util.c
-+++ b/common/util.c
-@@ -61,9 +61,9 @@ strip_ansi_escapes(const gchar *in)
-     static GRegex *reg;
- 
-     if (!reg) {
--        const gchar *expr = "[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-+        const gchar *expr = "[\x1b\x9b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]";
-         GError *err = NULL;
--        reg = g_regex_new(expr, G_REGEX_JAVASCRIPT_COMPAT | G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-+        reg = g_regex_new(expr, G_REGEX_DOTALL | G_REGEX_EXTENDED | G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, &err);
-         g_assert_no_error(err);
-     }
- 
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 8f82764e3da8..4f317377dccd 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,8 +1,8 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.3.1
-revision=2
+version=2.3.3
+revision=1
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
 makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e
+checksum=8e6571f11119b31e7a343db7b03f68d823f1fd175fdff4870d40a2afd9e732d5
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/luakit/update b/srcpkgs/luakit/update
deleted file mode 100644
index fab90a9fdea2..000000000000
--- a/srcpkgs/luakit/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[12][0-9][0-9][0-9].[01][0-9].[0-3][0-9]"

From bc4882979a985d1aad080317d70ce18427d18434 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Jun 2023 17:25:55 -0500
Subject: [PATCH 1003/1854] Amass: update to 3.23.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 285fdfb6dd08..7e391d034df9 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.23.2
+version=3.23.3
 revision=1
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/owasp-amass/amass/archive/v${version}.tar.gz"
-checksum=a308036757d8505cf5cb420b4bfebdc8f57f35ee247e6b01aa9192e9eae8d342
+checksum=be1be397f77a095472e277a48a1439719ae6e19387712f58dc01305915bfadd0

From 3929a7a1b13abab2c0dc312791003b65b8be132a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Jun 2023 17:25:59 -0500
Subject: [PATCH 1004/1854] mongo-c-driver: update to 1.24.0.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 1785e796bd79..f8ee1fa80f47 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.23.5
+version=1.24.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=260dc2207881ccbe7b79b1fa6b3ba84ab9be94eb93d4beefbbe8a6cb562947ed
+checksum=c37d8965f1e22236241e9474190110cfeeededbe9aa7c630ce8a9c379e97fc47
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 358ca2ee2d62ff84a65c12fea0689e7ddfef6af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 21 Jun 2023 16:47:35 +0700
Subject: [PATCH 1005/1854] linux6.3: update to 6.3.8.

---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 135f88fab13f..d2c7b7a3cf48 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.6
+version=6.3.8
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- 0bceca759d8c1531197b369668a8aa800b3733fcbe87cc0ecf8f014389c16fd8"
+ 927ba93d3da556c8e30b2640aa3f19c3c3cda66c655754e0798024020e2981b4"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 99a07f9bbae516bc302baf4f9a124d9382bd2fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 30 May 2023 13:51:06 +0700
Subject: [PATCH 1006/1854] dkms: force dkms install

Whenever the installing step is failing, for some reasons,
all subsequent installing step will run into failure,
except when --force is passed.
---
 srcpkgs/dkms/files/kernel.d/dkms.postinst | 2 +-
 srcpkgs/dkms/template                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index 6b345bef9050..66d22981b517 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -87,7 +87,7 @@ while [ $# -gt 1 ]; do
 	if [ $(echo "$status"|grep -c ": built") -eq 1 ] &&
 	   [ $(echo "$status"|grep -c ": installed") -eq 0 ]; then
 		echo -n "Installing DKMS module: ${module}-${modulever}... "
-		/usr/bin/dkms install -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
+		/usr/bin/dkms install --force -q -m ${module} -v ${modulever} -k ${VERSION} -a ${ARCH}
 		rval=$?
 		# If the module failed installation, go to the next module.
 		if [ $rval -eq 0 ]; then
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 5da51b101a8c..34ee6c4afabb 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=3.0.10
-revision=1
+revision=2
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1"
 short_desc="Dynamic Kernel Module Support"

From a9e5e07c876c69ccf5c4e43eb50a5f6f85a61ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 30 May 2023 13:52:08 +0700
Subject: [PATCH 1007/1854] xbps-triggers: update to 0.125.

`dkms install` with `--force`, for some reasons, my initial installing
of some dkms modules was failing, the subsequent installing run into
failure too, except when `--force` has been passed in. `--force` seems
to be the correct flags for all invocation of `dkms` because it will be
invoked either by `xbps-install` (`--force` is harmless there),
or `xbps-install -yff` or `xbps-reconfigure`,
which obviously need `--force`.

While we're at it, invoke `dkms` in quiet mode because we will dump dkms
into /dev/null anyway.
---
 srcpkgs/xbps-triggers/files/dkms | 4 ++--
 srcpkgs/xbps-triggers/template   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 6b285c576b53..ae87f3bff838 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -89,7 +89,7 @@ add_modules() {
 		set -- ${dkms_modules}
 		while [ $# -gt 0 ]; do
 			echo -n "Building DKMS module '$1-$2' for kernel-${_kver}... "
-			$DKMS build -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
+			$DKMS build -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
@@ -99,7 +99,7 @@ add_modules() {
 				shift 2; continue
 			fi
 			echo -n "Installing DKMS module '$1-$2' for kernel-${_kver}... "
-			$DKMS install -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
+			$DKMS install --force -q -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index aa62e0902528..89cc9398c8c4 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.124
+version=0.125
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

From 8dfc8d4aaa6c9d2bfe899ab2fa55745f28a0f7e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 21 Jun 2023 16:57:44 +0700
Subject: [PATCH 1008/1854] linux6.1: update to 6.1.34.

---
 srcpkgs/linux6.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 632c671f13b7..36c411cfd693 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.31
+version=6.1.34
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 2d5754525d09d6696e190bca06d9a466ba3f502976ce89f4f2c5f618e8a288f6"
+ d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1cee326a064a64808568cd02e7e937dc2d0256e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 19 Jun 2023 17:36:14 +0200
Subject: [PATCH 1009/1854] amdvlk: update to 2023.Q2.3.

---
 .../patches/pal-define-ACCESSPERMS.patch      | 12 ++++++
 srcpkgs/amdvlk/template                       | 38 +++++++++----------
 2 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch

diff --git a/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch b/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch
new file mode 100644
index 000000000000..d61ba4ba09cb
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/pal-define-ACCESSPERMS.patch
@@ -0,0 +1,12 @@
+diff --git a/pal/src/util/lnx/lnxSysUtil.cpp b/pal/src/util/lnx/lnxSysUtil.cpp
+index 3105084b..e61c438a 100644
+--- a/pal/src/util/lnx/lnxSysUtil.cpp
++++ b/pal/src/util/lnx/lnxSysUtil.cpp
+@@ -1207,6 +1207,7 @@ bool IsDebuggerAttached()
+ Result SetRwxFilePermissions(
+     const char* pFileName)
+ {
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX)
+     Result result = Result::Success;
+     struct stat info;
+     int ret = stat(pFileName, &info);
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 76d066d5a0e9..3bfefd83e071 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,14 +1,15 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2022.Q4.4
+version=2023.Q2.3
 revision=1
-_xgl_commit=8aa0e76a110fa264608ee1b4e412aa8fb40286d3
-_pal_commit=287ef684bc36a86af55d4ed1c4c4f4c35577e21e
-_llpc_commit=37dcb2e5cedb00bb025c84238d816f19c93b3060
-_gpurt_commit=1f0c4f7e9cea22452e5e20a6cdfc4a84a2bf5bac
-_llvm_project_commit=42a4d92d3c68995d04f1ed580613d162054f5795
+_xgl_commit=6288905587fafc221b60045bceba73cf26e433ad
+_pal_commit=f01505f7fe4b38b573a41cb4d9d66d00e0c256f0
+_llpc_commit=f44e737f5e13eca803f465fc86532c24608c4daf
+_gpurt_commit=a1103572dfcc29c7baee04e2ececedca8fda86d7
+_llvm_project_commit=02394516f587d6bdb606b068fe604284f5c6a007
 _MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
 _CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
+_llvm_dialects_commit=e7464fe6373553fa1b1c1398417d7bb76d7931ef
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
@@ -31,15 +32,17 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm-project/archive/${_llvm_project_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
- https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="19e1b4344b76aa52429f06bf083ba90070c2415bda90f0991dddebf846e84752
- d3b465c84bdff774d2b2916121d7e9d6b31cb8467eb08fa8e1de9a5136dfe7be
- b992d8f4b4093793de87375a3f7b0ded71a1a2443c620fbc017776588861421d
- 9a2d41a49dd69a9634ab7aa30e750dfdc255c4f2e0c4c739028ac8a52c1bb5a6
- 11c31d5da5a846476825b2af2c67fd2025c892b6133b1b0a97c3548d691e5584
- 2b154a73681aa0424446b09737263fb35ae842fc92ee60fed999bad5fe15a7f9
+ https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/llvm-dialects/archive/${_llvm_dialects_commit}.tar.gz"
+checksum="0fd70d472200c98dabdf86b58a0cf7a1af1a46dd32d02d165676faa8dedf16f7
+ 42bf8f0410e48f3e33ad4f728416f769e59d26089dfc259441a0d3f96a1e081a
+ 629778956dcab9afe42450f3048e189c24b4c22862c90524df1de3910a5bbb86
+ 53d5dbcbeae08809a5d7a0c109be07a24bb97bef1ff5099de0666dd72f57ccfb
+ 75ec3380afa1cc3baf55897f72573c84849b70c0e97c36b311761bb2aa9fcb58
+ a2054e610ef420b083f0ca071f62a9f51db29e3c246ba3de2f5d0437b722e611
  141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
- 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484"
+ 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
+ 6c1c0e9f7dae4848bf5106d4b89f310e4c269a575b74daced547933abd14c7ee"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
@@ -47,11 +50,6 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*) nodebug=yes;;
 esac
 
-pre_build() {
-	pwd
-	ninja -C build GpuRtGenerateShaders
-}
-
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl
@@ -62,6 +60,8 @@ post_extract() {
 	mkdir ${wrksrc}/third_party
 	mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/third_party/metrohash
 	mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/third_party/cwpack
+	rmdir ${wrksrc}/llpc/imported/llvm-dialects/
+	mv ${wrksrc}/llvm-dialects-${_llvm_dialects_commit}/ ${wrksrc}/llpc/imported/llvm-dialects/
 }
 
 pre_configure() {

From a92bfa8f1a5f425eb8d81b51a4223738f9c3e8a2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 21 Jun 2023 10:00:16 +0200
Subject: [PATCH 1010/1854] github-cli: update to 2.31.0

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index f70306706384..89ffc67e39fe 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.30.0
+version=2.31.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=5e66be97f51559dcea3621c8cc3cf2f67bf47bf2e1902014b3ec5689ab4e8add
+checksum=9a9896fa80ecfec640cf5d93da830713150f4b44e0db142c958bfa36d09d2c03
 
 pre_build() {
 	local _date

From 9f89c847f736ab7d782b68579a4423d862e33748 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 21 Jun 2023 18:40:11 +0200
Subject: [PATCH 1011/1854] openfortivpn: update to 1.20.4.

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 6d916b48b31b..b8500f0f2546 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.20.3
+version=1.20.4
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=e54331098dc2c009cf98524f0ade027e337739506c5a60b65e2c2bf5f9c1d7e1
+checksum=af4b729baa60897a566c920bf34c9ed927eefe14909d13a980a25c8ae91f144f
 
 conf_files="/etc/openfortivpn/config"
 

From 8cef31b8b8106b944620d760945e94dcb71b7e03 Mon Sep 17 00:00:00 2001
From: Aicaya Maro <aicaya@posteo.net>
Date: Fri, 19 May 2023 15:34:57 -0400
Subject: [PATCH 1012/1854] New package: gargoyle-2023.1

---
 srcpkgs/gargoyle/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/gargoyle/template

diff --git a/srcpkgs/gargoyle/template b/srcpkgs/gargoyle/template
new file mode 100644
index 000000000000..e153c0841e6f
--- /dev/null
+++ b/srcpkgs/gargoyle/template
@@ -0,0 +1,24 @@
+# Template file for 'gargoyle'
+pkgname=gargoyle
+version=2023.1
+revision=1
+build_style=cmake
+configure_args="-DWITH_TTS=on -DWITH_QT6=false"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+makedepends="SDL2-devel SDL2_mixer-devel qt5-devel fmt-devel fontconfig-devel
+ freetype-devel libjpeg-turbo-devel libpng-devel speech-dispatcher-devel
+ zlib-devel"
+short_desc="Interactive fiction player that supports all the major IF formats"
+maintainer="Aicaya Maro <aicaya@posteo.net>"
+license="Artistic-2.0, BSD-2-Clause, BSD-3-Clause, GPL-2.0-only, MIT, OFL-1.1"
+homepage="https://ccxvii.net/gargoyle/"
+changelog="https://raw.githubusercontent.com/garglk/garglk/master/NEWS"
+distfiles="https://github.com/garglk/garglk/archive/refs/tags/${version}.tar.gz"
+checksum=f766186558f8db24243cede878f38b8a2026bf2ebed5d9d4f0e690916d56827a
+
+post_install() {
+	vconf garglk/garglk.ini
+	vlicense licenses/BSD-2-Clause.txt
+	vlicense 'licenses/Go Mono.txt' Go-Mono-BSD-3-Clause.txt
+	vlicense 'licenses/MIT License.txt' MIT.txt
+}

From 903980a8240f61dbadf9487b515cdf5386dee1c9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 1013/1854] libgbinder: update to 1.1.34.

---
 srcpkgs/libgbinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..13a2e9a6f684 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
 # Template file for 'libgbinder'
 pkgname=libgbinder
-version=1.1.31
+version=1.1.34
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/mer-hybris/libgbinder"
 changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
 distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=f9150de954a3f15c863e7b60816dacf68147ae510b3ca0e49dbb24ba4b9e35dc
 
 post_install() {
 	vlicense LICENSE

From 9229c0814e82ec36040f582ceb9283b2fc5c59dc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 00:52:40 -0400
Subject: [PATCH 1014/1854] gwenview: depend on qt5-imageformats

without qt5-imageformats, some image formats fail to load (like TIFF)
---
 srcpkgs/gwenview/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 4ab9a1c9ab0a..0f1f582dc87a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenview'
 pkgname=gwenview
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,6 +14,7 @@ makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-dev
  kparts-devel kcoreaddons-devel kconfig-devel kservice-devel kcompletion-devel
  kitemviews-devel kxmlgui-devel kconfigwidgets-devel kauth-devel kcodecs-devel
  sonnet-devel"
+depends="qt5-imageformats"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"

From 3fa6fc17811befd35bcd089a61aa99c0c0fb3121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 9 Jun 2021 00:44:37 +0200
Subject: [PATCH 1015/1854] New package: highway-1.0.4

---
 srcpkgs/highway/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/highway/template

diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template
new file mode 100644
index 000000000000..47c51ec1d616
--- /dev/null
+++ b/srcpkgs/highway/template
@@ -0,0 +1,19 @@
+# Template file for 'highway'
+pkgname=highway
+version=1.0.4
+revision=1
+build_style=cmake
+configure_args="-DHWY_SYSTEM_GTEST=ON -DHWY_ENABLE_EXAMPLES=OFF"
+makedepends="libatomic-devel"
+checkdepends="gtest-devel"
+short_desc="C++ library providing portable SIMD/vector intrinsics"
+maintainer="Joshua Krämer <joshua@kraemer.link>"
+license="Apache-2.0"
+homepage="https://github.com/google/highway"
+changelog="https://raw.githubusercontent.com/google/highway/master/debian/changelog"
+distfiles="https://github.com/google/highway/archive/${version}.tar.gz"
+checksum=faccd343935c9e98afd1016e9d20e0b8b89d908508d1af958496f8c2d3004ac2
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi

From 35d8fbf54c93007d5dee95987e9b47cade3f914d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 9 Jun 2021 01:52:29 +0200
Subject: [PATCH 1016/1854] New package: libjxl-0.8.2

---
 common/shlibs           |  3 ++
 srcpkgs/libjxl-devel    |  1 +
 srcpkgs/libjxl-plugins  |  1 +
 srcpkgs/libjxl-tools    |  1 +
 srcpkgs/libjxl/template | 75 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 81 insertions(+)
 create mode 120000 srcpkgs/libjxl-devel
 create mode 120000 srcpkgs/libjxl-plugins
 create mode 120000 srcpkgs/libjxl-tools
 create mode 100644 srcpkgs/libjxl/template

diff --git a/common/shlibs b/common/shlibs
index c293ac460c08..b34887a091f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,6 @@ libplayerctl.so.2 playerctl-2.4.1_1
 libwireplumber-0.4.so.0 wireplumber-0.4.14_1
 libjodycode.so.2 libjodycode-2.0.1_1
 libgsoapssl++-2.8.124.so gsoap-2.8.124_1
+libjxl.so.0.8 libjxl-0.8.2_1
+libjxl_dec.so.0.8 libjxl-0.8.2_1
+libjxl_threads.so.0.8 libjxl-0.8.2_1
diff --git a/srcpkgs/libjxl-devel b/srcpkgs/libjxl-devel
new file mode 120000
index 000000000000..ddc1abf827d9
--- /dev/null
+++ b/srcpkgs/libjxl-devel
@@ -0,0 +1 @@
+libjxl
\ No newline at end of file
diff --git a/srcpkgs/libjxl-plugins b/srcpkgs/libjxl-plugins
new file mode 120000
index 000000000000..ddc1abf827d9
--- /dev/null
+++ b/srcpkgs/libjxl-plugins
@@ -0,0 +1 @@
+libjxl
\ No newline at end of file
diff --git a/srcpkgs/libjxl-tools b/srcpkgs/libjxl-tools
new file mode 120000
index 000000000000..ddc1abf827d9
--- /dev/null
+++ b/srcpkgs/libjxl-tools
@@ -0,0 +1 @@
+libjxl
\ No newline at end of file
diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
new file mode 100644
index 000000000000..8aa7c970accb
--- /dev/null
+++ b/srcpkgs/libjxl/template
@@ -0,0 +1,75 @@
+# Template file for 'libjxl'
+pkgname=libjxl
+version=0.8.2
+revision=1
+_testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
+_skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
+build_style=cmake
+build_wrksrc="libjxl-${version}"
+configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF
+ -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_PLUGINS=ON -DJPEGXL_VERSION=${version}"
+hostmakedepends="tar pkg-config asciidoc"
+makedepends="brotli-devel highway libpng-devel giflib-devel libjpeg-turbo-devel
+ libopenexr-devel libwebp-devel gdk-pixbuf-devel gimp-devel"
+checkdepends="gtest-devel xdg-utils"
+short_desc="JPEG XL image format reference implementation"
+maintainer="Joshua Krämer <joshua@kraemer.link>"
+license="BSD-3-Clause, custom:Patent grant"
+homepage="https://jpeg.org/jpegxl/"
+changelog="https://raw.githubusercontent.com/libjxl/libjxl/main/CHANGELOG.md"
+distfiles="https://github.com/libjxl/libjxl/archive/v${version}.tar.gz
+ https://github.com/libjxl/testdata/archive/${_testdata_hash}.tar.gz>testdata-${_testdata_hash}.tar.gz
+ https://skia.googlesource.com/skcms/+archive/${_skcms_hash}.tar.gz>skcms-${_skcms_hash}.tar.gz"
+checksum="c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420
+ 64658d3341bff2976899cb8b140242ffa4de1cd41aed507dfec4aa9e7e05ca24
+ @8feb1e33c38ca13f91a0d5bd8ce25f976eb239edf38f49e6db8895ae9f1e833c"
+skip_extraction="skcms-${_skcms_hash}.tar.gz"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LIBS="-latomic"
+fi
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
+
+post_extract() {
+	mv "testdata-${_testdata_hash}"/* "${build_wrksrc}/testdata/"
+	bsdtar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/skcms-${_skcms_hash}.tar.gz" -C "${build_wrksrc}/third_party/skcms"
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense PATENTS
+}
+
+libjxl-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} highway brotli-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libjxl-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+	}
+}
+
+libjxl-plugins_package() {
+	short_desc+=" - plugins"
+	depends="desktop-file-utils"
+	pkg_install() {
+		vmove usr/lib/gdk-pixbuf-2.0
+		vmove usr/lib/gimp
+		vmove usr/share/mime
+		vmove usr/share/thumbnailers
+	}
+}

From 1c03e685cc81519668f62858da7cfd15bf23709f Mon Sep 17 00:00:00 2001
From: Joshua <joshua@kraemer.link>
Date: Wed, 30 Mar 2022 21:23:16 +0200
Subject: [PATCH 1017/1854] kimageformats: enable JPEG XL support

---
 srcpkgs/kimageformats/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 21dd21420fac..364ad440219e 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,13 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.107.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
  pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-devel"
+makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-devel
+ libjxl-devel"
 short_desc="KDE Plugins to allow QImage to support extra file formats"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
@@ -14,7 +15,7 @@ homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kimageformats-${version}.tar.xz"
 checksum=97258ad36bf98cd1aaeeb29c49946031f5051d9984bda9f41fda5a35ccd4d1c1
 
-if [ "$XBPS_MACHINE" = i686 ]; then
-	# FIXME: some tests fail on i686.
-	make_check=no
-fi
+# FIXME: some tests fail on i686.
+# FIXME: 1 test fails on all archs, solved by
+# https://invent.kde.org/frameworks/kimageformats/-/commit/41f0411b62d10d602a4def0c0d12975e77a16028
+make_check=no

From 6049eb55097e43e823dd7702307413b651410f5a Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Wed, 21 Jun 2023 01:56:57 +0200
Subject: [PATCH 1018/1854] limine: update to 5.20230620.0.

---
 srcpkgs/limine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index f986e43f675c..e89d2ba08339 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230615.0
+version=5.20230620.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=f17b816aa7b88ab0e66a32e45afad55accee41cd336aba372c2a3eca7e0a41ad
+checksum=347ce98e56ada7ca7ce00e430f5b82f57dc49f4b363f33c98c8bc4cba02b73d6
 
 post_install() {
 	vlicense LICENSE

From e1c9f362fe5550e6a7e98343ff4a7327880f15a0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 20 Jun 2023 21:10:34 +0200
Subject: [PATCH 1019/1854] leftwm: update to 0.4.2

---
 srcpkgs/leftwm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leftwm/template b/srcpkgs/leftwm/template
index f872956e22c1..2b744bdb4dd4 100644
--- a/srcpkgs/leftwm/template
+++ b/srcpkgs/leftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'leftwm'
 pkgname=leftwm
-version=0.4.1
+version=0.4.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features --features lefthk,sys-log"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/leftwm/leftwm"
 changelog="https://raw.githubusercontent.com/leftwm/leftwm/main/CHANGELOG"
 distfiles="https://github.com/leftwm/leftwm/archive/refs/tags/${version}.tar.gz"
-checksum=fe10c6ef9f458a889ff0020d348e0185eeba8c606e2fb8ac04a78ac214ce40bc
+checksum=97a86b2966d20fd56237905fd90692a873e979759831f6030da2db9d5dc11f2b
 
 do_install() {
 	vdoc README.md

From aca232963ece8673fc81af8324295a844f4093fd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 20 Jun 2023 00:37:48 +0530
Subject: [PATCH 1020/1854] rust-analyzer: update to 2023.06.19.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index ec58fe55835a..6c417b01509d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.06.05
+version=2023.06.19
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=ae616d81e31df1f97342d2f55c0fe1b82fe88f4773a98bb6cb04e9303bf3d612
+checksum=3365b6a8de1929a73af198520f3169f146ab882b47b41146045ea8217fcdcd61
 # tests require Rust source code
 make_check=no
 

From e669204ee7ebc94b6de1153f515c71b6235febb4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Jun 2023 23:30:59 +0530
Subject: [PATCH 1021/1854] cargo-outdated: update to 0.13.1.

---
 srcpkgs/cargo-outdated/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index fc5ea5a43561..82e4996327a1 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
-version=0.11.2
+version=0.13.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config zlib-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/kbknapp/cargo-outdated"
 changelog="https://raw.githubusercontent.com/kbknapp/cargo-outdated/master/CHANGELOG.md"
 distfiles="https://github.com/kbknapp/cargo-outdated/archive/refs/tags/v${version}.tar.gz"
-checksum=7e82d1507594d86cb1c2007d58e329a9780a22bdb0f38d5e71d2692a7f1727d9
+checksum=571910b0c44f0bcf0b6e5c24184247e4603f474c7bde5f0eaa1203ce802b4a4a
 
 post_install() {
 	vlicense LICENSE-MIT

From e14280f1fc7bad8e176798b2b2e7482e93732e80 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:13:23 -0400
Subject: [PATCH 1022/1854] python3-saml2: update to 7.4.2.

---
 srcpkgs/python3-saml2/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 9583564c1008..dfc944b67c7e 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=7.4.1
+version=7.4.2
 revision=1
 build_style=python3-pep517
 make_check_args="--ignore=tests/test_36_mdbcache.py \
@@ -17,9 +17,4 @@ license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=33afba452544662887f6eb8c6405aeebfa4017dc7762e414ab4318f2f9d9bb6d
-make_check_pre="env PYTHONPATH=src"
-
-pre_check() {
-	unzip ${make_install_target} "*.dist-info/*"
-}
+checksum=dfeaa53854467cdcdae1b0fb2c76a3610f8b179dca8176757d245db7fa7ad806

From 524c5b30db54ffd21282315b2ef1ebffc4e8a958 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:13:35 -0400
Subject: [PATCH 1023/1854] python3-phonenumbers: update to 8.13.14.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index e0fd2119165f..4e85b29c598e 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.13.13
+version=8.13.14
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=4bdf8c989aff0cdb105aef170ad2c21f14b4537bcb32cf349f1f710df992a40a
+checksum=5fa952b4abf9fccdaf1f130d96114a520c48890d4091b50a064e22c0fdc12dec

From 842497ad712cd7c142b9b2447d24dd9e03caf654 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:15:09 -0400
Subject: [PATCH 1024/1854] python3-ijson: update to 3.2.1.

---
 srcpkgs/python3-ijson/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template
index b2656c5eb283..41914046d28b 100644
--- a/srcpkgs/python3-ijson/template
+++ b/srcpkgs/python3-ijson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ijson'
 pkgname=python3-ijson
-version=3.2.0.post0
+version=3.2.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -11,8 +11,9 @@ short_desc="Iterative JSON parser with Pythonic interfaces"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/ICRAR/ijson"
+changelog="https://raw.githubusercontent.com/ICRAR/ijson/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/i/ijson/ijson-${version}.tar.gz"
-checksum=80a5bd7e9923cab200701f67ad2372104328b99ddf249dbbe8834102c852d316
+checksum=8574bf19f31fab870488769ad919a80f130825236ac8bde9a733f69c2961d7a7
 
 post_install() {
 	vlicense LICENSE.txt

From dfa1e54dba27e7016b9fda5f8875157b32b56e99 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 20 Jun 2023 12:15:52 -0400
Subject: [PATCH 1025/1854] synapse: update to 1.86.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 81f887e451ff..f0a91c560e6d 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.85.2
+version=1.86.0
 revision=1
 build_style=python3-pep517
 build_helper=rust
@@ -24,7 +24,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=a227c7347996eae008e0f8f0f2e9290c70e1d96e7687293b2ebd1533766ad43b
+checksum=891cef42dcf71f7f01e6db22c25c1724d2a137f8347c5ba89c62a439ec623842
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 6215eaed3950945ef0c5b6c764d70a71a9db91cf Mon Sep 17 00:00:00 2001
From: Massimo Manzato <massimo.manzato@gmail.com>
Date: Wed, 3 May 2023 23:37:38 +0200
Subject: [PATCH 1026/1854] New package: a4-0.2.1

---
 srcpkgs/a4/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/a4/template

diff --git a/srcpkgs/a4/template b/srcpkgs/a4/template
new file mode 100644
index 000000000000..42c3ee99ade7
--- /dev/null
+++ b/srcpkgs/a4/template
@@ -0,0 +1,16 @@
+# Template file for 'a4'
+pkgname=a4
+version=0.2.1
+revision=1
+build_style=gnu-makefile
+makedepends="libvterm-devel libtickit-devel"
+short_desc="Dynamic terminal manager and multiplexer"
+maintainer="Massimo Manzato <massimo.manzato@gmail.com>"
+license="MIT"
+homepage="https://a4term.com/"
+distfiles="https://github.com/rpmohn/a4/archive/v${version}.tar.gz"
+checksum=52e16e58ac52b9157933a3fd1063bc79e8dfa2f72ea2b4f03e77327bbec2c59e
+
+post_install() {
+	vlicense LICENSE
+}

From 3ad94315261878ea9c9c9ade62dbb9fb27605227 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Jun 2023 01:19:58 +0530
Subject: [PATCH 1027/1854] jrnl: update to 4.0.1.

---
 srcpkgs/jrnl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index a1936a09ea5c..63ac0518d956 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=4.0
+version=4.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=ea690cb141cbd39f491eca6c56605491facbaa9397cfa8f9fcae5b926efd522d
+checksum=f3b17c4b040af44fde053ae501832eb313f2373d1b3b1a82564a8214d223ede8
 # Tarball provides no tests
 make_check=no

From 11e006522439e30778b79ac9343fa5cc596ce93f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 15 Jun 2023 22:00:12 +0530
Subject: [PATCH 1028/1854] himalaya: update to 0.8.1.

---
 srcpkgs/himalaya/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index a115d4e5562c..6143999a060d 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,6 +1,6 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.8.0
+version=0.8.1
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -12,7 +12,11 @@ license="MIT"
 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=c9bf62c802b05d3c98e105513042eafbbcbed4c5ed61aec7addae185accc5b40
+checksum=0a4d6325f541e0eb1b23c2f9b6b47eb01feaf78a0eb3fd5a29624990d9ca0e23
+
+post_patch() {
+	cargo update --package crossbeam-channel@0.5.6 --precise 0.5.8
+}
 
 post_install() {
 	vlicense LICENSE

From 41638c02681535ff1765cee6e522710832b3340d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 16 Jun 2023 19:40:01 +0530
Subject: [PATCH 1029/1854] fselect: update to 0.8.4.

---
 srcpkgs/fselect/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 9a9fe4371235..2aa8aa8bf435 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,7 +1,7 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.8.3
-revision=2
+version=0.8.4
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libzstd-devel"
@@ -11,7 +11,7 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/jhspetersson/fselect"
 changelog="https://github.com/jhspetersson/fselect/releases"
 distfiles="https://github.com/jhspetersson/fselect/archive/refs/tags/${version}.tar.gz"
-checksum=2b8e8b40ef490663239f3a24f9383fd5b832530e96513d58755b688b507d876e
+checksum=db720310ff265012f283f9fdfb4ac99188bb4a3cbfe5550171c7e2ab55a36420
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) ;;
@@ -23,10 +23,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	XBPS_CROSS_RUSTFLAGS+=" -latomic"
 fi
 
-post_patch() {
-	cargo update --package mp4parse@0.12.0 --precise 0.12.1
-}
-
 post_install() {
 	vlicense LICENSE-MIT
 	vman docs/fselect.1

From 486726ac30878dec2072e0f699b74ef70e335b8b Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 15 Jun 2023 20:32:55 +0200
Subject: [PATCH 1030/1854] qmidiarp: update to 0.7.0

---
 srcpkgs/qmidiarp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qmidiarp/template b/srcpkgs/qmidiarp/template
index 964024906a6f..72ed7bb6bf8f 100644
--- a/srcpkgs/qmidiarp/template
+++ b/srcpkgs/qmidiarp/template
@@ -1,6 +1,6 @@
 # Template file for 'qmidiarp'
 pkgname=qmidiarp
-version=0.6.7
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="http://qmidiarp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/project/qmidiarp/qmidiarp/${version}/qmidiarp-${version}.tar.bz2"
-checksum=1bc73896e33da0aa52e90f16f393acb437594b0a9ad8fc97d73b39e028589c2c
+checksum=b4296a67febbd2930058075cd7de021663f12586699d39d851c5e6e36dc92828
 CXXFLAGS="-D_GNU_SOURCE"
 
 pre_configure() {

From b451eed41e4839b5328d938355f7b7ae9305d5cb Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 15 Jun 2023 18:33:05 +0200
Subject: [PATCH 1031/1854] mkvtoolnix: update to 77.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 3a7c0cd37a3f..c974ebabbdd3 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=76.0
+version=77.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6ace661b61a49d1026b1a97336051d7aa85d56fb34527f2ca97d8933f7efe90d
+checksum=5f0cb2b7afe39226d0d41bd7ba098db669981da8c4b455862faffae04ca8e57a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 60500c2308e402f55de30d4f17a1d064d9bfe765 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 18:11:21 +0100
Subject: [PATCH 1032/1854] libde265: update to 1.0.12.

---
 srcpkgs/libde265/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libde265/template b/srcpkgs/libde265/template
index a9c70c63a41c..1e3048f509b4 100644
--- a/srcpkgs/libde265/template
+++ b/srcpkgs/libde265/template
@@ -1,6 +1,6 @@
 # Template file for 'libde265'
 pkgname=libde265
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,12 @@ license="LGPL-3.0-or-later"
 homepage="https://www.libde265.org"
 changelog="https://github.com/strukturag/libde265/releases"
 distfiles="https://github.com/strukturag/libde265/releases/download/v${version}/libde265-${version}.tar.gz"
-checksum=2f8f12cabbdb15e53532b7c1eb964d4e15d444db1be802505e6ac97a25035bab
+checksum=62185ea2182e68cf68bba20cc6eb4c287407b509cf0a827d7ddb75614db77b5c
+
+post_install() {
+	# Why is this installed anyway?
+	rm -f ${DESTDIR}/bin/tests
+}
 
 libde265-devel_package() {
 	short_desc+=" - development files"

From 85c7edcdfbaa7f0f098b8e7c84293d50cd30b3c0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 16 Jun 2023 05:56:45 +0200
Subject: [PATCH 1033/1854] tuxedo-keyboard: update to 3.2.6

---
 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 79d6181124b5..35b92c83debc 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.5
+version=3.2.6
 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=ec8f4608018d7702a8b89734b1c91152b597984bf37242924d8f76d270a74580
+checksum=154d5bcda595aa20941d7d98d5baae882d02a7ee26e9c014f6f99b9ae8a19274
 
 dkms_modules="tuxedo-keyboard ${version}"
 

From 2bf4adf261743d0cc81656f52a19b59a3996eb2f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 17:37:30 +0100
Subject: [PATCH 1034/1854] libevent: fix update-checka and do small cleanup.

---
 srcpkgs/libevent/template | 6 +++---
 srcpkgs/libevent/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index c0503e2760e3..de59faa1e760 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -7,7 +7,7 @@ makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://libevent.org/"
+homepage="https://libevent.org/"
 distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"
 checksum=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 python_version=3
@@ -23,7 +23,7 @@ libevent-devel_package() {
 		vmove usr/bin
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/libevent/update b/srcpkgs/libevent/update
index 5ef6a1abbe65..0c24f7209946 100644
--- a/srcpkgs/libevent/update
+++ b/srcpkgs/libevent/update
@@ -1 +1 @@
-pattern="release-\K[\d.]+"
+pattern="release-\K[\d.]+(?=-stable)"

From 68f265605e62799c15d30d0c429b6e5c1559115c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 17:29:08 +0100
Subject: [PATCH 1035/1854] libgusb: update to 0.4.6.

---
 srcpkgs/libgusb/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 80663c38a5ff..8cf0579cc9a5 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.4.5
+version=0.4.6
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,13 +15,19 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
 distfiles="https://github.com/hughsie/libgusb/releases/download/${version}/libgusb-${version}.tar.xz"
-checksum=bc8c6328289f057c8f73b07c1ba6251de96029787309f2672ca252ca90ace1b2
+checksum=1b0422bdcd72183272ac42eec9398c5a0bc48a02f618fa3242c468cbbd003049
 # requires access to USB devices, not available on CI
 make_check=ci-skip
 
 build_options="gir vala"
 build_options_default="gir vala"
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=true"
+else
+	configure_args+=" -Dtests=false"
+fi
+
 libgusb-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 97c9f279123b631c5c3a078b6e5a81bcb5e193d8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 16:51:15 +0100
Subject: [PATCH 1036/1854] python3-txtorcon: update to 23.5.0.

---
 srcpkgs/python3-txtorcon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
index 07e5fedce66b..4e6d5a3b7b07 100644
--- a/srcpkgs/python3-txtorcon/template
+++ b/srcpkgs/python3-txtorcon/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-txtorcon'
 pkgname=python3-txtorcon
-version=22.0.0
+version=23.5.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://txtorcon.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/meejah/txtorcon/main/docs/releases.rst"
 distfiles="https://github.com/meejah/txtorcon/archive/v${version}.tar.gz"
-checksum=195c2e3d1ed4ad564570d20af54812163ca1de9e9ee034f0c8276fd4410759e7
+checksum=01a98243caf49035a0e823f6633fb2c4ea9613aa123dda063845bf7ee5c920de
 make_check=ci-skip # Can not open ports in CI
 
 post_install() {

From 81d4aa314ae0f702bf830d2a246718eacbc469ad Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 15 Jun 2023 21:09:58 +0100
Subject: [PATCH 1037/1854] android-udev-rules: update to 20230614.

---
 srcpkgs/android-udev-rules/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/android-udev-rules/template b/srcpkgs/android-udev-rules/template
index c4e475a1d68d..a26e4998cd30 100644
--- a/srcpkgs/android-udev-rules/template
+++ b/srcpkgs/android-udev-rules/template
@@ -1,13 +1,14 @@
 # Template file for 'android-udev-rules'
 pkgname=android-udev-rules
-version=20230303
+version=20230614
 revision=1
 short_desc="Android udev rules list aimed to be the most comprehensive on the net"
 maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/M0Rf30/android-udev-rules"
+changelog="https://github.com/M0Rf30/android-udev-rules/releases"
 distfiles="https://github.com/M0Rf30/android-udev-rules/archive/${version}.tar.gz"
-checksum=be0ef595f1ff1262696ac63fa2fc16998da02c170b49be461cfc712cd4317a9f
+checksum=563b8f3194110b7173dfaad61e74da2842b28c4f2409dedce04d5572ef2f056f
 system_groups="adbusers"
 
 do_install() {

From aa8a2a22a51999c79bd88c02db0e2cb63aa3eff1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 14 Jun 2023 18:42:20 +0100
Subject: [PATCH 1038/1854] xkeyboard-config: update to 2.39.

---
 srcpkgs/xkeyboard-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 863789a22775..53165fd127af 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,6 +1,6 @@
 # Template file for 'xkeyboard-config'
 pkgname=xkeyboard-config
-version=2.38
+version=2.39
 revision=1
 build_style=meson
 configure_args="-Dxorg-rules-symlinks=true -Dcompat-rules=true"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 changelog="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/raw/master/NEWS"
 distfiles="${XORG_SITE}/data/xkeyboard-config/xkeyboard-config-${version}.tar.xz"
-checksum=0690a91bab86b18868f3eee6d41e9ec4ce6894f655443d490a2184bfac56c872
+checksum=5ac5f533eff7b0c116805fe254fd79b2c9882700a4f9f2c070f8c4eae5aaa682
 
 post_install() {
 	vlicense COPYING

From 3454fc6f4bfe64df9115d09762367853dafad6e2 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Tue, 13 Jun 2023 10:21:50 -0700
Subject: [PATCH 1039/1854] tintin: update to 2.02.31.

---
 srcpkgs/tintin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index 40027cacd809..c5c338dea1a2 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.02.20
+version=2.02.31
 revision=1
 build_wrksrc=src
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Michael Taboada <voidpkgs@forwardme.email>"
 license="GPL-2.0-or-later"
 homepage="https://tintin.mudhalla.net/"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=331673e6ee3c945cf27e1c0d71cec1225c9d992588ed73b2a707c4c49523e8d2
+checksum=0c94fbbbbac4e96b25898f32c147dfdab6f4ee77ea72ba77700086e2c966ee4b
 
 post_install() {
 	for i in FAQ SCRIPTS README; do

From b70918802abc4e996b382835f66a43aeaf7ddfb1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 15:42:35 +0100
Subject: [PATCH 1040/1854] iproute2: update to 6.3.0.

---
 srcpkgs/iproute2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 413c49151c02..6d188731ec1f 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/iproute2/iproute2-${version}.tar.xz"
-checksum=4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62
+checksum=dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732
 # Requires unshare, which is not provided by chroot-util-linux.
 make_check=no
 

From b783eca0166112b53465797ef3cd69be7510ba3e Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Tue, 13 Jun 2023 11:31:00 -0300
Subject: [PATCH 1041/1854] nextcloud-client: update to 3.9.0

---
 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 8d667180293f..6ad1a0619f4d 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.2
+version=3.9.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_UPDATER=NO -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=6186aaa70b82b06b4531cff2e55e0dd38a0d817de7ef039a81293d82cb05e8c0
+checksum=867d0d1f1d950ce224ea78d3009a89e7bedc3317bb9dc45a9f9ff961e4913201
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 

From 68ecce94423fea8bca0e1c2b11841a3caf719380 Mon Sep 17 00:00:00 2001
From: 0cool-f <ravnos@duck.com>
Date: Tue, 13 Jun 2023 15:31:06 +0200
Subject: [PATCH 1042/1854] pnpm: update to 8.6.2

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index f3e52bc62974..09d40e5b7124 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=8.6.1
+version=8.6.2
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=5380612e01e0a3029991d3f329f07429313f4825de47b885b4bb3d1aec9e44e1
+checksum=c6da9e00697e334b6193c034a5d1508e4c8605b12f249736b13f31139f4f0d73
 python_version=3
 
 do_install() {

From 5204d76015f608fd9aaf2a328f4641d4a06cad1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 22 Jun 2023 12:56:35 +0200
Subject: [PATCH 1043/1854] ostree: update to 2023.4.

---
 srcpkgs/ostree/patches/missing-off-t.patch | 14 ++++++++++
 srcpkgs/ostree/patches/musl-fixes.patch    | 31 ----------------------
 srcpkgs/ostree/template                    |  4 +--
 3 files changed, 16 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/ostree/patches/missing-off-t.patch
 delete mode 100644 srcpkgs/ostree/patches/musl-fixes.patch

diff --git a/srcpkgs/ostree/patches/missing-off-t.patch b/srcpkgs/ostree/patches/missing-off-t.patch
new file mode 100644
index 000000000000..67864dc55c93
--- /dev/null
+++ b/srcpkgs/ostree/patches/missing-off-t.patch
@@ -0,0 +1,14 @@
+From https://git.alpinelinux.org/aports/tree/community/ostree/missing-off-t.patch
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 8fcd5e8..2454a58 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint
+ /* This is a roundabout but more trustworthy way of doing a space check than
+  * relying on statvfs's f_bfree when you know the size of the objects. */
+ static gboolean
+-dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error)
++dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error)
+ {
+   /* If the requested size is 0 then return early. Passing a 0 len to
+    * fallocate results in EINVAL */
diff --git a/srcpkgs/ostree/patches/musl-fixes.patch b/srcpkgs/ostree/patches/musl-fixes.patch
deleted file mode 100644
index e9a578a3e666..000000000000
--- a/srcpkgs/ostree/patches/musl-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/config.h.in
-+++ b/config.h.in
-@@ -1,5 +1,15 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Define if we are building with asan and ubsan */
- #undef BUILDOPT_ASAN
- 
---- a/src/libostree/ostree-repo-checkout.c
-+++ b/src/libostree/ostree-repo-checkout.c
-@@ -37,6 +37,10 @@
- 
- #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh."
- 
-+#ifndef ALLPERMS
-+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+#endif
-+
- /* Per-checkout call state/caching */
- typedef struct {
-   GString *path_buf; /* buffer for real path if filtering enabled */
diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template
index 4eab7462e297..3d30742c6b8e 100644
--- a/srcpkgs/ostree/template
+++ b/srcpkgs/ostree/template
@@ -1,6 +1,6 @@
 # Template file for 'ostree'
 pkgname=ostree
-version=2023.3
+version=2023.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -20,7 +20,7 @@ license="LGPL-2.0-or-later"
 homepage="https://ostree.readthedocs.io/en/latest/"
 changelog="https://github.com/ostreedev/ostree/releases"
 distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=9c575a094da2c307769f0aee15de95470c3b5550cbff211fbbc4f6fc75f333b1
+checksum=7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1
 
 build_options="gir"
 build_options_default="gir"

From f639d5c79485849c9ad7e282325b7246afb397bf Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 29 May 2023 22:34:02 +0200
Subject: [PATCH 1044/1854] lua54: update to 5.4.6, adopt.

---
 srcpkgs/lua54/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template
index b37cc47e6159..85c728209672 100644
--- a/srcpkgs/lua54/template
+++ b/srcpkgs/lua54/template
@@ -1,14 +1,14 @@
 # Template file for 'lua54'
 pkgname=lua54
-version=5.4.4
+version=5.4.6
 revision=1
 makedepends="readline-devel"
 short_desc="Powerful, fast, lightweight, embeddable scripting language (5.4.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://www.lua.org"
 distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
-checksum=164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61
+checksum=7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88
 
 alternatives="
  lua:lua:/usr/bin/lua5.4

From 968b362349329dcb4ac2706d50ceded4b2a4ba3e Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 26 May 2023 18:24:32 +0200
Subject: [PATCH 1045/1854] gogglesmm: update to 1.2.3

---
 srcpkgs/gogglesmm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 4a1339bb3fcd..459e26041c51 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,13 +1,13 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
-version=1.2.2
-revision=2
+version=1.2.3
+revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
  libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
- faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
+ faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel libxml2-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gogglesmm.github.io/"
 changelog="https://raw.githubusercontent.com/gogglesmm/gogglesmm/master/ChangeLog"
 distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
-checksum=e9d576584ea48346cd3b577967ccb40bf67113b91e8252d62052be3725b9d9fa
+checksum=4315ea4d9894fa2c7f160c73e5464b91b7a00f22964910adb77e1e9b94273006
 nocross="Tries to execute compiled code"
 
 case "$XBPS_TARGET_MACHINE" in

From 4b299c3b109ee0aa09e4a4145d9d6466faca3407 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 13 Jun 2023 13:23:20 -0400
Subject: [PATCH 1046/1854] bottom: update to 0.9.2

---
 srcpkgs/bottom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index d706fd7dffb4..14ba5d3219cc 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 changelog="https://raw.githubusercontent.com/ClementTsang/bottom/master/CHANGELOG.md"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=15136784ba4783c994bbfc1fe978ccf47360b2f2aa14ce37f8d5f93871ec9d57
+checksum=c6b1f6eefa814607cbc6f1ebf6358a070293413d09583963970d650b724a3b3a
 
 pre_build() {
 	export BTM_GENERATE=true

From 8d066513528617995dbf720ac3e5fbe3c426af47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 17 Jun 2023 09:40:18 -0400
Subject: [PATCH 1047/1854] qownnotes: update to 23.6.5

---
 srcpkgs/qownnotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index d79035baacce..9d8192e6e502 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=23.2.3
+version=23.6.5
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/qownnotes/src/qownnotes-${version}.tar.xz"
-checksum=a7e76c8ed93c2c708a9707b68db88c19b56d3d20006bc1d0e343fd06a091fdb8
+checksum=1531a9b69e9159525874b5ed0c8e5cca6b756cdafed321e4d302c23ae4dbc651
 
 pre_build() {
 	vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri

From 02faab4dc402a1929f95aba6124607c2d315dd57 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 02:07:46 +0300
Subject: [PATCH 1048/1854] python3-graphviz: update to 0.20.1

---
 srcpkgs/python3-graphviz/template | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-graphviz/template b/srcpkgs/python3-graphviz/template
index 045a3782f743..399f873fa1cb 100644
--- a/srcpkgs/python3-graphviz/template
+++ b/srcpkgs/python3-graphviz/template
@@ -1,18 +1,25 @@
 # Template file for 'python3-graphviz'
 pkgname=python3-graphviz
-version=0.13.2
-revision=4
+version=0.20.1
+revision=1
 build_style=python3-module
-pycompile_module="graphviz"
 hostmakedepends="python3-setuptools"
 depends="graphviz python3"
+checkdepends="python3-pytest-mock ${depends}"
 short_desc="Simple Python3 interface for Graphviz"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xflr6/graphviz"
 changelog="https://github.com/xflr6/graphviz/blob/master/CHANGES.txt"
 distfiles="https://github.com/xflr6/graphviz/archive/${version}.tar.gz"
-checksum=bb932d6833e7c62ac6b53624b6d55bfd81f40e861f55642e1221ac4f4d8421b4
+checksum=815346b8c2fcd8ccede29623a67bfc30abdbb75749e96128b9d414573d6d8f04
+
+post_extract() {
+	# do not run python3-coverage in unittests :/
+	vsed -i setup.cfg -e 's/--cov --cov-report=term --cov-report=html//'
+	# don't add pointless dependency on python3-pytest-mock needed on python 3.5
+	vsed -i setup.cfg -e '/mock_use_standalone_module/d'
+}
 
 post_install() {
 	vlicense LICENSE.txt

From 33d3b99b5fc86fe1c1c4a976590293519ce13a55 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 01:33:24 +0300
Subject: [PATCH 1049/1854] python3-Markdown: update to 3.4.3

---
 srcpkgs/python3-Markdown/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index 417db04401d2..2974a088eff5 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -1,19 +1,23 @@
 # Template file for 'python3-Markdown'
 pkgname=python3-Markdown
-version=3.3.4
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+version=3.4.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3"
 checkdepends="python3-yaml"
 short_desc="Python3 implementation of John Gruber's Markdown"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Python-Markdown/markdown"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
-checksum=31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49
+checksum=8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520
 conflicts="python-Markdown>=0"
 
+do_check() {
+	python3 -m unittest discover tests
+}
+
 post_install() {
 	vlicense LICENSE.md LICENSE
 }

From 6a3f02e917f3a9db98591a9825b1523090e98163 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 20 Apr 2023 14:13:10 +0530
Subject: [PATCH 1050/1854] python3-virtualenv: update to 20.23.1.

---
 srcpkgs/python3-virtualenv/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 83d61a5f619b..a9673a38307c 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,8 +1,10 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.21.0
+version=20.23.1
 revision=1
 build_style=python3-pep517
+make_check_args="--ignore tests/unit/seed/wheels/test_periodic_update.py
+ --deselect tests/unit/seed/wheels/test_acquire.py::test_get_wheel_download_cached"
 hostmakedepends="hatchling hatch-vcs"
 depends="python3-platformdirs python3-distlib python3-filelock"
 checkdepends="${depends} python3-pytest-mock python3-flaky python3-devel
@@ -13,16 +15,9 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=f50e3e60f990a0757c9b68333c9fdaa72d7188caa417f96af9e52407831a3b68
+checksum=8ff19a38c1021c742148edc4f81cb43d7f8c6816d2ede2ab72af5b84c749ade1
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
-do_check() {
-	local testdir="tmp/$(date +%s)"
-	python3 -m installer --destdir ${testdir} dist/virtualenv-${version}-*-*-*.whl
-	_skip="test_periodic_update or test_get_wheel_download_cached or test_py_pyc_missing or test_py_info_setuptools"
-	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" pytest3 -k "not(${_skip})"
-}
-
 post_install() {
 	mv $DESTDIR/usr/bin/virtualenv $DESTDIR/usr/bin/virtualenv3
 	vlicense LICENSE

From 8a730d27b8532ff5eaf20a1e19821a837b109106 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 22 Jun 2023 13:07:47 +0200
Subject: [PATCH 1051/1854] libxml2: update to 2.11.4.

---
 srcpkgs/libxml2/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c262fd43f2ee..5041c99e5819 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2'
 pkgname=libxml2
-version=2.11.2
-revision=2
+version=2.11.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu
  --with-legacy --with-ftp --with-xptr-locs --enable-static"
@@ -13,10 +13,16 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.gnome.org/GNOME/libxml2"
 distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz"
-checksum=ac11e8b66176d49514bd4fa17c3fbdb3414aef64518ff9db536862e4682e2a64
+checksum=737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
 python_version=3
 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
+post_extract() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm -f test/ebcdic_566012.xml
+	fi
+}
+
 post_install() {
 	vlicense Copyright
 }

From 6df12b6dfb4e5dbedd69655308315dc0a4179c08 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Jun 2023 15:35:00 +0200
Subject: [PATCH 1052/1854] zellij: update to 0.37.2

---
 srcpkgs/zellij/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 74eaf1a73da7..e2fa8282d770 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.36.0
+version=0.37.2
 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=df64fa143c10f3c7c3e53befeb6ab3b8f08c220f3cf6331cfc6faa2aa779b6b1
+checksum=1f22223f251dbd352479d4671c0c742ffa225420667e20711d5515be2eb2a256
 make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
 
 post_install() {

From fc9c27d0fe3d2cdb36ed58356a7db0e164309f00 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 13 Jun 2023 02:22:37 +0300
Subject: [PATCH 1053/1854] rygel: update to 0.42.3

---
 srcpkgs/rygel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 475b5a35a3d3..5239aa389ffa 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,6 +1,6 @@
 # Template file for 'rygel'
 pkgname=rygel
-version=0.42.0
+version=0.42.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Rygel"
 distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=006da78677df28caee287c44c29fcd9edcb1b2162423bc7f2dd2dc856b8e2bbb
+checksum=0fdec2128537e8b55c3c540d0a80dc7c249ab29153f4be0197a5f31025a5a5a0
 
 conf_files="/etc/rygel.conf"
 

From 8fcf09158614965d41f545323041e1a1d1cdeeb6 Mon Sep 17 00:00:00 2001
From: oliver-cfc <oliver.hemming@lumen.com>
Date: Thu, 25 May 2023 14:32:09 -0400
Subject: [PATCH 1054/1854] datamash: update to 1.8.

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: https://github.com/void-linux/void-packages/pull/44080
---
 srcpkgs/datamash/patches/musl-tests.patch | 11 +++++++++++
 srcpkgs/datamash/template                 | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/datamash/patches/musl-tests.patch

diff --git a/srcpkgs/datamash/patches/musl-tests.patch b/srcpkgs/datamash/patches/musl-tests.patch
new file mode 100644
index 000000000000..7666b0560a8e
--- /dev/null
+++ b/srcpkgs/datamash/patches/musl-tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/decorate-errors.pl
++++ b/tests/decorate-errors.pl
+@@ -149,7 +149,7 @@
+     {ERR=>"$prog: invalid dot-decimal IPv4 address 'FOO'\n" .
+           "$prog: conversion failed in line 1\n" }],
+   ['c4', '--decorate -k1,1:ipv4inet' , {IN_PIPE=>"FOO\n"}, {OUT => " "},
+-    {EXIT=>2},
++    {EXIT=>2}, {ERR_SUBST=>'s/: Invalid argument//'},
+     {ERR=>"$prog: invalid IPv4 address 'FOO'\n" .
+           "$prog: conversion failed in line 1\n" }],
+   ['c5', '--decorate -k1,1:ipv6' , {IN_PIPE=>"FOO\n"}, {OUT => " "}, {EXIT=>2},
diff --git a/srcpkgs/datamash/template b/srcpkgs/datamash/template
index 56495d251e80..b483a1709509 100644
--- a/srcpkgs/datamash/template
+++ b/srcpkgs/datamash/template
@@ -1,11 +1,19 @@
 # Template file for 'datamash'
 pkgname=datamash
-version=1.7
+version=1.8
 revision=1
 build_style=gnu-configure
+hostmakedepends="texinfo"
+checkdepends="which"
 short_desc="Command-line program that performs simple calculations on input files"
-maintainer="oliver JH <ohemming@gmail.com>"
+maintainer="oliver <void@bertmacho.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/datamash/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=574a592bb90c5ae702ffaed1b59498d5e3e7466a8abf8530c5f2f3f11fa4adb3
+distfiles="${GNU_SITE}/datamash/datamash-${version}.tar.gz"
+checksum=7ad97e8c7ef616dd03aa5bd67ae24c488272db3e7d1f5774161c18b75f29f6fd
+
+post_extract() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -e '/datamash-i18n-de\.pl/d' -i Makefile.in
+	fi
+}

From efe1c02b98fb74d43da4beaecab7789abb578900 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 22 Jun 2023 07:17:41 -0500
Subject: [PATCH 1055/1854] jc: update to 1.23.3.

---
 srcpkgs/jc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index b5b6f1e819f5..1d3278dd5ca8 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.23.2
+version=1.23.3
 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=d3df831ccaebb17800a7f1feb918daf5e9cf7fd81a12cced1670305aafe8a55e
+checksum=03b746dfa8b393bf96107d71e595597002b255892ff3cf98e36040d54c469abf
 
 post_install() {
 	vman man/jc.1

From dde767213875611432276727e11a9d2a782ef9e5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 22 Jun 2023 07:21:04 -0500
Subject: [PATCH 1056/1854] mongo-c-driver: update to 1.24.1.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index f8ee1fa80f47..85ba5144be96 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.24.0
+version=1.24.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=c37d8965f1e22236241e9474190110cfeeededbe9aa7c630ce8a9c379e97fc47
+checksum=f9bdf71f24c6621c12535bad07f4654a218d84f16b85a68aca3abf6cd36d1859
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 65ddd9ce2bd4ff628e28b495051453541cf44c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 22 Jun 2023 11:44:03 +0200
Subject: [PATCH 1057/1854] homebank: update to 5.6.5.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 0f2226d38d81..9ff1b5a35f27 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.6.4
+version=5.6.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 changelog="http://homebank.free.fr/ChangeLog"
 distfiles="http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"
-checksum=81e1ff4186cf1fa90b48978272011887fa7c0b7b066438bd494f4a0f80ff95b9
+checksum=b5494dfcf87d7a8572696a2afa2a04496ba79e3857cd3e3b18ac03bd1b6d2ca8
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 4bdff042e974198e90c68d5ba502efe1dc97c53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 22 Jun 2023 11:36:31 +0200
Subject: [PATCH 1058/1854] ncpamixer: update to 1.3.3.4.

---
 srcpkgs/ncpamixer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncpamixer/template b/srcpkgs/ncpamixer/template
index 418126589a83..2adac2d5f703 100644
--- a/srcpkgs/ncpamixer/template
+++ b/srcpkgs/ncpamixer/template
@@ -1,6 +1,6 @@
 # Template file for 'ncpamixer'
 pkgname=ncpamixer
-version=1.3.3.3
+version=1.3.3.4
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/fulhax/ncpamixer"
 distfiles="https://github.com/fulhax/ncpamixer/archive/${version}.tar.gz"
-checksum=396099897460bcde2db72134e6652fe9717375fa45300ba2251d284658d3044a
+checksum=78be1b229c0325d58d34efd50cec3d2b0a1cb04fd2b34e4914e6ad29c7c17658
 
 post_install() {
 	vlicense ../LICENSE

From e9905266ea47843c8194d92f02805c5367f26866 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:09:34 +0200
Subject: [PATCH 1059/1854] prose: update to 0.4.2.

---
 srcpkgs/prose/patches/clap.patch | 56 --------------------------------
 srcpkgs/prose/template           |  6 ++--
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/prose/patches/clap.patch

diff --git a/srcpkgs/prose/patches/clap.patch b/srcpkgs/prose/patches/clap.patch
deleted file mode 100644
index 4f1d495a62b5..000000000000
--- a/srcpkgs/prose/patches/clap.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 037bf5b8e14fc0b8b25e00e2e076515148860825 Mon Sep 17 00:00:00 2001
-From: Joshua Davey <josh@joshuadavey.com>
-Date: Sat, 10 Dec 2022 16:28:29 -0500
-Subject: [PATCH] Use usize parser from clap
-
----
- src/main.rs | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/main.rs b/src/main.rs
-index efb0420..fb0e8ad 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -29,16 +29,14 @@ fn process_paragraphs<R: BufRead + ?Sized>(io: &mut R, opts: FormatOpts) -> io::
- 
- fn matches_to_format_opts(matches: &clap::ArgMatches) -> FormatOpts {
-     let width: usize = matches
--        .get_one::<&str>("width")
--        .unwrap()
--        .parse()
-+        .get_one::<usize>("width")
-+        .cloned()
-         .expect("Choose a positive number for width");
-     let last_line = matches.get_flag("last line");
-     let reduce_jaggedness = matches.get_flag("better fit");
-     let tab_width: usize = matches
--        .get_one::<&str>("tab width")
--        .unwrap()
--        .parse()
-+        .get_one::<usize>("tab width")
-+        .cloned()
-         .expect("Choose a positive number for tab width");
-     let format_mode = if matches.get_flag("markdown") {
-         FormatMode::Markdown
-@@ -71,6 +69,7 @@ fn main() {
-              .short('w')
-              .long("width")
-              .value_name("WIDTH")
-+             .value_parser(clap::value_parser!(usize))
-              .default_value("72")
-              .help("Sets the maximum width for a line"))
-         .arg(Arg::new("last line")
-@@ -86,11 +85,13 @@ fn main() {
-         .arg(Arg::new("tab width")
-              .short('t')
-              .long("tab-width")
-+             .value_parser(clap::value_parser!(usize))
-              .default_value("4")
-              .help("Number of spaces to expand tab characters to"))
-         .arg(Arg::new("markdown")
-              .short('m')
-              .long("markdown")
-+             .conflicts_with("code comments")
-              .help("Parse as markdown rather than plain text")
-              .action(ArgAction::SetTrue))
-         .arg(Arg::new("FILE")
diff --git a/srcpkgs/prose/template b/srcpkgs/prose/template
index 5292df719c23..c78a6c20df28 100644
--- a/srcpkgs/prose/template
+++ b/srcpkgs/prose/template
@@ -1,14 +1,14 @@
 # Template file for 'prose'
 pkgname=prose
-version=0.4.0
-revision=2
+version=0.4.2
+revision=1
 build_style=cargo
 short_desc="Reformat text pleasantly"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/jgdavey/prose/"
 distfiles="https://github.com/jgdavey/prose/archive/v${version}.tar.gz"
-checksum=ab6409b1ad1cb6b19b5f2dba5c4d3c8bc3cbe8923c8dfb64a790ac93d3e86c36
+checksum=84dbec8a1616096e8ccf1b9a8669943465f680656de0dd99c47c7ff2088ed243
 
 post_install() {
 	vlicense LICENSE-MIT

From 2f7e2a9fae88f5c0a02cdbeb39a3248cd14ef909 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:13:56 +0200
Subject: [PATCH 1060/1854] uftrace: update to 0.14.

---
 srcpkgs/uftrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index 71eea668110c..8f703e0a812f 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'uftrace'
 pkgname=uftrace
-version=0.13.1
+version=0.14
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/namhyung/uftrace"
 distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
-checksum=88b59923fdd9804fd29da8a784cd1b39837b1b735fc3be4165b3932eca3661ad
+checksum=b81255bc288e79e96a5b158d4875fa6425ad51c85f4c4c8523c1defb9366ad12
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;

From 375ca729b7294072a7182cf80848f4ca44f4476e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:15:59 +0200
Subject: [PATCH 1061/1854] bmake: update to 20230601.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index a0bb5be099ba..b0bb26e6daf0 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20230522
+version=20230601
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=dfe556df70e1555b70eccf4e6d367aa8b91aa076d5e9b55e36b5ce3e721f9050
+checksum=8d0b2e593946539065530a241040b0b0525ebb2b924ed67fc497ad17845a5a09
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From 8b874db17add18077f126976476ea02b506d522f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:17:35 +0200
Subject: [PATCH 1062/1854] janet: update to 1.29.1.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 87ae7384c7f7..5a0c893b5dfb 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.28.0
+version=1.29.1
 revision=1
 build_style=meson
 configure_args="-Db_lto=false --libdir=/usr/lib"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=d78a4c367f1b2c9f95897fa13fc788b36ce49cfcc18083b0810e86b2dd1285bb
+checksum=2ac3f69842f3e805a8d072a9e36f207f6287f063654c51cb3cd2b6e73b1cadf6
 
 post_install() {
 	vlicense LICENSE

From 1fa0ea4f00edd87b56837bc958073738a2c8254f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:18:19 +0200
Subject: [PATCH 1063/1854] minify: update to 2.12.7.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 3d71f543e395..8c39fdcae1a4 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=c5ab7bc5f71e2b9686db73d46013bc2ad15e97824acf477508ae5a39bae920d2
+checksum=91b262713dc4a3ce817cf71a414856089476c8b400da2cfce07f7519e14dea68
 
 post_install() {
 	vlicense LICENSE

From 95bd73b635132f4fdc2fa4631c6112ee77fec999 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:19:59 +0200
Subject: [PATCH 1064/1854] nickle: update to 2.92.

---
 srcpkgs/nickle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nickle/template b/srcpkgs/nickle/template
index 2c3e900f9915..097510213317 100644
--- a/srcpkgs/nickle/template
+++ b/srcpkgs/nickle/template
@@ -1,6 +1,6 @@
 # Template file for 'nickle'
 pkgname=nickle
-version=2.91
+version=2.92
 revision=1
 build_style=gnu-configure
 makedepends="readline-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://nickle.org/"
 distfiles="https://nickle.org/release/${pkgname}-${version}.tar.gz"
-checksum=4fff8c9b0245b9c32ff8fd43054b739325f3a7a52c4e3fc2d6e25e19b852964d
+checksum=d7ebe2e23806a3690a75c6f380f06fd815dfd92334c6143aed95f7111bf08efe
 
 pre_build() {
 	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \

From 4b13e2c4aa4f67bcec5b9cc4895b021c55b60e2d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:28:25 +0200
Subject: [PATCH 1065/1854] New package: perl-HTTP-CookieJar-0.014

---
 srcpkgs/perl-HTTP-CookieJar/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/perl-HTTP-CookieJar/template

diff --git a/srcpkgs/perl-HTTP-CookieJar/template b/srcpkgs/perl-HTTP-CookieJar/template
new file mode 100644
index 000000000000..d98fe59679f6
--- /dev/null
+++ b/srcpkgs/perl-HTTP-CookieJar/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-HTTP-CookieJar'
+pkgname=perl-HTTP-CookieJar
+version=0.014
+revision=1
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="${hostmakedepends}"
+depends="${makedepends}"
+checkdepends="perl-Test-Deep perl-Test-Requires"
+short_desc="HTTP-CookieJar - A minimalist HTTP user agent cookie jar"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/dist/HTTP-CookieJar"
+distfiles="${CPAN_SITE}/HTTP/HTTP-CookieJar-${version}.tar.gz"
+checksum=7094ea5c91f536d263b85e83ab4e9a963e11c4408ce08ecae553fa9c0cc47e73

From 46174917e83eda0b3ca4eb0095ae149f738b023f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Jun 2023 15:29:55 +0200
Subject: [PATCH 1066/1854] perl-LWP: update to 6.71.

---
 srcpkgs/perl-LWP/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index 2e5396a2a8a5..cfb75e85fca2 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.68
+version=6.71
 revision=1
 build_style=perl-module
 hostmakedepends="
  perl perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message
  perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP
- perl-HTTP-Cookies perl-WWW-RobotRules perl-Try-Tiny"
+ perl-HTTP-Cookies perl-HTTP-CookieJar perl-WWW-RobotRules perl-Try-Tiny"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 checkdepends="perl-Test-RequiresInternet perl-Test-Fatal perl-Test-Needs
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=42784a5869855ee08522dfb1d30fccf98ca4ddefa8c6c1bcb0d68a0adceb7f01
+checksum=9d852d92c1f087d838adcb4107c4ff69887e7e5bdb742f984639c4c18dddb6e7

From adee75102acac8d928eef54844a036eb05467e5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Jun 2023 17:16:26 +0200
Subject: [PATCH 1067/1854] dune: update to 3.8.2.

---
 srcpkgs/dune/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 1d38c2419cab..da572e1b0574 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,6 +1,6 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.8.0
+version=3.8.2
 revision=1
 makedepends="ocaml"
 depends="ocaml"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://dune.build/"
 changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md"
 distfiles="https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"
-checksum=f7e2970bfab99c7766ff1a05deff5ad7f82cb2471abca6f72449572293f5f6b4
+checksum=5a6ec790128616b6b46616427fa9c8f2ba0d6ef5a405bf8fdbc6f82dc0d935fd
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-build-info dune-configurator

From 27c71288a534a0766b35fd039bec5a6a68d51281 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 22 Jun 2023 19:56:49 +0200
Subject: [PATCH 1068/1854] etr: update to 0.8.3.

---
 srcpkgs/etr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/etr/template b/srcpkgs/etr/template
index 5d5ee815a140..615f2d754d83 100644
--- a/srcpkgs/etr/template
+++ b/srcpkgs/etr/template
@@ -1,6 +1,6 @@
 # Template file for 'etr'
 pkgname=etr
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,5 +10,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/extremetuxracer/"
 distfiles="${SOURCEFORGE_SITE}/extremetuxracer/${pkgname}-${version}.tar.xz"
-checksum=1c874965e9e249533bf15c08dabc61e60c05bb3fd578917880117ff8a910cd4e
+checksum=2ee42f3f5fc2f8d49aa75056eb116f6cab84d6564120e6961ae5927367245113
 replaces="etr-data>=0"

From 34f45a7157a3fbd913a1379d0d2a0b4a87324d99 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 22 Jun 2023 20:16:30 +0200
Subject: [PATCH 1069/1854] linux4.19: update to 4.19.287.

---
 srcpkgs/linux4.19/files/arm-dotconfig   | 16 +++++-----------
 srcpkgs/linux4.19/files/arm64-dotconfig | 19 ++++++-------------
 srcpkgs/linux4.19/template              |  4 ++--
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux4.19/files/arm-dotconfig b/srcpkgs/linux4.19/files/arm-dotconfig
index 5939bec1c6ee..76157f822fb3 100644
--- a/srcpkgs/linux4.19/files/arm-dotconfig
+++ b/srcpkgs/linux4.19/files/arm-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.268 Kernel Configuration
+# Linux/arm 4.19.287 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (GCC) 10.2.1 20201203
+# Compiler: arm-linux-gnueabihf-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -574,13 +574,8 @@ CONFIG_REFCOUNT_FULL=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -1233,7 +1228,6 @@ CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1305,7 +1299,6 @@ CONFIG_NET_SCH_INGRESS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -1944,6 +1937,7 @@ CONFIG_SCSI_3W_SAS=m
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_ESAS2R is not set
diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index 956120f2b637..d7fb03ced161 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.268 Kernel Configuration
+# Linux/arm64 4.19.287 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203
+# Compiler: aarch64-linux-gnu-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -765,13 +765,8 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -1503,7 +1498,6 @@ CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 CONFIG_ATALK=m
@@ -1575,7 +1569,6 @@ CONFIG_NET_SCH_PLUG=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2257,6 +2250,7 @@ CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
@@ -2654,6 +2648,7 @@ CONFIG_IXGBE_DCB=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 # CONFIG_I40E_DCB is not set
+CONFIG_IAVF=m
 CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
@@ -5371,8 +5366,6 @@ CONFIG_HISI_KIRIN_DW_DSI=m
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_DRM_ZTE is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 # CONFIG_DRM_TINYDRM is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 3128f4bd1480..52000a3f1f46 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.284
+version=4.19.287
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 1ddfab2ee12c010d3291716d0d03f485d50b8c69e0afb0111bec16acdc9d4be2"
+ 6b36e15b50116dc414473a3fec4e012139e622ef99d5b7128935e28f787245eb"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 3c3a5f7a25dbe40132f173545c50ebd4ab4c9296 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 22 Jun 2023 20:37:21 +0200
Subject: [PATCH 1070/1854] linux5.4: update to 5.4.248.

---
 srcpkgs/linux5.4/files/arm-dotconfig   | 21 ++++++++-------------
 srcpkgs/linux5.4/files/arm64-dotconfig | 21 ++++++++++-----------
 srcpkgs/linux5.4/template              |  4 ++--
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm-dotconfig b/srcpkgs/linux5.4/files/arm-dotconfig
index 5669743b34b9..6832ad8ebbce 100644
--- a/srcpkgs/linux5.4/files/arm-dotconfig
+++ b/srcpkgs/linux5.4/files/arm-dotconfig
@@ -1,16 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.226 Kernel Configuration
+# Linux/arm 5.4.248 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (GCC) 10.2.1 20201203
+# Compiler: arm-linux-gnueabihf-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -559,12 +561,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1220,7 +1218,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1293,7 +1290,6 @@ CONFIG_NET_SCH_INGRESS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2080,6 +2076,7 @@ CONFIG_SCSI_3W_SAS=m
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_ESAS2R is not set
@@ -6720,11 +6717,9 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT=y
 CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_STACK_ALL is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 4fab5ae7ca41..71a85d17b2bc 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,16 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.226 Kernel Configuration
+# Linux/arm64 5.4.248 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203
+# Compiler: aarch64-linux-gnu-gcc (GCC) 12.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -74,8 +76,6 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
-CONFIG_CONTEXT_TRACKING=y
-# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
@@ -87,8 +87,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 #
 # CPU/Task time and stats accounting
 #
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_BSD_PROCESS_ACCT=y
@@ -799,9 +798,8 @@ CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1564,7 +1562,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1637,7 +1634,6 @@ CONFIG_NET_SCH_PLUG=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2636,6 +2632,7 @@ CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
+# CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
@@ -9971,6 +9968,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT=y
 CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_STACK_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
@@ -10437,6 +10435,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_KASAN_SW_TAGS=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
 # end of Memory Debugging
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index a48fbde924c7..8bd845cec228 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.245
+version=5.4.248
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- 8e0a8911bccb734a55b319687ee7050259b1c9d64324ef04448d9bea7c8a02be"
+ 0d919e129bdd21bdd25f6f358b8da04a48b598de7baba067ce3e3489b5b4fadf"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From 0a77895285373f1ad74d6c57b5c116c52de31382 Mon Sep 17 00:00:00 2001
From: oliverwiegers <oliver.wiegers@gmail.com>
Date: Tue, 20 Jun 2023 08:09:53 +0200
Subject: [PATCH 1071/1854] nyxt: update to 3.2.0

- Updated 002-webkit2gtk.init.lisp patch. The patch itself is the same,
  but the structure of the source file to be patched changed.
- Included "pkg-config" into hostmakedepends.
---
 srcpkgs/nyxt/patches/002-webkit2gtk.patch | 20 ++++++++++----------
 srcpkgs/nyxt/template                     | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
index 5a0fe2e923d3..dd4808382c1d 100644
--- a/srcpkgs/nyxt/patches/002-webkit2gtk.patch
+++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
@@ -1,14 +1,14 @@
---- a/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-01-14 03:22:05.000000000 -0700
-+++ b/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-02-27 09:59:29.175938024 -0700
-@@ -18,9 +18,9 @@
-               "libwebkit2gtk-4.0.37.dylib"
+--- a/_build/cl-webkit/webkit2/webkit2.init.lisp    2023-06-19 18:14:54.899937994 +0200
++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp    2023-06-19 18:15:45.707030674 +0200
+@@ -19,9 +19,9 @@
                "libwebkit2gtk-4.0.dylib"))
-     (:unix (:or "libwebkit2gtk-4.1.so"
--                "libwebkit2gtk-4.0.so"
-                 ;; Fedora only has this one?
--                "libwebkit2gtk-4.0.so.37")))
-+                "libwebkit2gtk-4.0.so.37"
-+                "libwebkit2gtk-4.0.so")))
+     (:unix (:or
+             "libwebkit2gtk-4.1.so"
+-            "libwebkit2gtk-4.0.so"
+             ;; Fedora only has this one?
+-            "libwebkit2gtk-4.0.so.37")))
++            "libwebkit2gtk-4.0.so.37"
++            "libwebkit2gtk-4.0.so")))
    (use-foreign-library libwebkit2))
  
  (defcfun "webkit_get_major_version" :int)
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index d3d1c20fe9cd..d0f7ddf489cd 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,19 +1,19 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=2.2.4
-revision=3
+version=3.2.0
+revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
-hostmakedepends="sbcl git"
+hostmakedepends="sbcl git pkg-config"
 makedepends="webkit2gtk libfixposix-devel libgirepository"
 depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=04f740f8405044cc89920d41d340d6d137e1d4f7be098d4813d1523f73d725a9
+checksum=3e7a2812563ea3f2fe0c039db0d693a4de99d22cef1b0dec09173d1b7fbaf691
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From aa8ed8bae3830c358639e7192dfabb992eea67b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:01:03 -0400
Subject: [PATCH 1072/1854] vivaldi: update to 6.1.3035.100.

---
 srcpkgs/vivaldi/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 13a1769c7d81..dd123eb8f684 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
 # Permission to redistribute is granted.
 # see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.1.3035.75
+version=6.1.3035.100
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ 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=f8acb92f5346ec0a7b4086b2f6709d1b1430ace9f0a27c1439443ecf6afdc96a
+	checksum=0cff2e18ef765490322eec672a8d84e171cef8d20c6264a95409ad138607c029
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=fe1063fa6ccb14a4f1e6edbea47c0631334d6ea3f49daf319a0bf40eaab053c6
+	checksum=babac4870118227e5016e1d21794b3ac0ead356c1a7a0ac0fb1ee681a45c5ba9
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=f3af5b7cc192db0d69080b3c4348bc83cca3a39bd31f2beb29cf4e5c7bb119e9
+	checksum=611be9b2bc1045afb4bc14e9b3a381b86919d2de17e0441adf991d30fcd0d4d3
 	;;
 *)
 	broken="No distfiles available for this target"

From fd99f376ee300ffe67b274389850934c48d95a88 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:01:15 -0400
Subject: [PATCH 1073/1854] liquid-dsp: update to 1.6.0.

---
 .../liquid-dsp/patches/fix-make-install.patch | 22 -------------------
 srcpkgs/liquid-dsp/template                   |  9 ++++++--
 2 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/liquid-dsp/patches/fix-make-install.patch

diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
deleted file mode 100644
index 6029886906c4..000000000000
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: makefile.in
-===================================================================
---- a/makefile.in
-+++ b/makefile.in
-@@ -1287,7 +1287,7 @@
- 	@echo ""
- 	mkdir -p $(DESTDIR)$(prefix)/include/liquid
- 	mkdir -p $(DESTDIR)$(libdir)
--	install -m 644 -p libliquid.${AR_LIB} $(DESTDIR)$(libdir)/libliquid.${AR_LIB}.${VERSION}
-+	install -m 644 -p libliquid.${AR_LIB} $(DESTDIR)$(libdir)/libliquid.${AR_LIB}
- 	install -m 644 -p libliquid.${SH_LIB} $(DESTDIR)$(libdir)/libliquid.${SH_LIB}.${VERSION}
- 	install -m 644 -p include/liquid.h $(DESTDIR)$(prefix)/include/liquid/liquid.h
- 	ln -sf libliquid.${SH_LIB}.${VERSION} $(DESTDIR)$(libdir)/libliquid.${SH_LIB}
-@@ -1300,7 +1300,7 @@ install: all
- 	@echo "  libraries by running 'ldconfig' to make the shared"
- 	@echo "  object available.  You might also need to modify your"
- 	@echo "  LD_LIBRARY_PATH environment variable to include the"
--	@echo "  directory $(DESTDIR)$(exec_prefix)"
-+	@echo "  directory $(DESTDIR)"
- 	@echo ""
- 	@echo "  Please report bugs to $(BUGREPORT)"
- 	@echo "---------------------------------------------------------"
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 0276e85aa0a9..94d2e6ac17d3 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,6 +1,6 @@
 # Template file for 'liquid-dsp'
 pkgname=liquid-dsp
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-simdoverride"
@@ -10,8 +10,13 @@ short_desc="Signal processing library for software-defined radios (SDR)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="http://liquidsdr.org/"
+changelog="https://raw.githubusercontent.com/jgaeddert/liquid-dsp/v1.6.0/HISTORY"
 distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=93003edb6e74090b41009b1fae6f273a3e711dc4c8c56a0cca3e89167b765953
+checksum=6ee6a5dfb48e047b118cf613c0b9f43e34356a5667a77a72a55371d2c8c53bf5
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) make_check=no # FAILED 46 / 487206 CHECKS (   0.01%)
+esac
 
 pre_configure() {
 	autoreconf -fi

From 2f89224b5fd5cb7e82ad89419b95440ef6af76dd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:04:10 -0400
Subject: [PATCH 1074/1854] chezmoi: update to 2.34.2.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 346c8f4ae203..4e8b46f9b709 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.34.1
+version=2.34.2
 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=d81bb3a9f4632ab27422c05bb243692f1d55e33cae2c55c691f7f0b9248f46cf
+checksum=fc47d6e4cbe1b8f4762c204be28e30d9e9f3bcfa8c51ac276cbd1864804b2dc8
 
 pre_build() {
 	local _date

From bc4dcf8ced1991d8a34644867291b8e7254e496b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:05:17 -0400
Subject: [PATCH 1075/1854] pyright: update to 1.1.315.

---
 srcpkgs/pyright/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index 28b0db32be36..f8bb5adf6691 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.313
+version=1.1.315
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=3bdd9dbd026fb2dc580178753bcea113907797caa0971561aa3b8e00fe30112a
+checksum=6c3d404815527b8143b9eab0e3978b3126a95d9e8502177ebb4f1b23a437896e
 
 do_configure() {
 	cd "$wrksrc"

From c6d4ef55852a176ca142ab1118d2421d677c04f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:09:16 -0400
Subject: [PATCH 1076/1854] typst-lsp: update to 0.7.1.

---
 srcpkgs/typst-lsp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 6d4f0cef0ae2..1fb2b5d01f8e 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'typst-lsp'
 pkgname=typst-lsp
-version=0.5.1
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Language server for Typst"
@@ -8,7 +8,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/nvarner/typst-lsp"
 distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
-checksum=99a6143118fb8dc40f7b69a0a4d1b02f4ef9a06e8606f73ff0d5c1100e9e999d
+checksum=d88eb4c4d45250efa18e2c5e3fe09e322f96cca35fb14e4d116d6a92d76d18fb
 
 post_install() {
 	vlicense LICENSE-MIT.txt

From d375f002d73f5f54acffb748b8c864c279f2ef86 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 22 Jun 2023 23:51:56 -0400
Subject: [PATCH 1077/1854] linux: update to 6.3.

closes #44526
---
 srcpkgs/linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 2f0ae7d62704..16471ed4b9cb 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,6 +1,6 @@
 # Template file for 'linux'
 pkgname=linux
-version=6.1
+version=6.3
 revision=1
 build_style=meta
 depends="linux${version} linux-base"

From eca4c6f6940f8ec0b17c2b03fd14263b133cb420 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 22 Jun 2023 18:32:28 +0200
Subject: [PATCH 1078/1854] bird: update to 2.13.1

Security update, changes:
  o BGP: Fix role check when no capability option is present
  o Filter: Fixed segfault when a case option had an empty block
---
 srcpkgs/bird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 822ad73cf48a..4df92f652571 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,6 +1,6 @@
 # Template file for 'bird'
 pkgname=bird
-version=2.13
+version=2.13.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://bird.network.cz"
 changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
 distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
-checksum=8d895e3e311880e9efb888b4386cbec2f7e18bfb8334e8d4c8ca7c4341092638
+checksum=97bb8d57be9bc5083e2b566416d27e314162856a12ca7c77e202e467d20d4080
 
 conf_files="/etc/bird.conf"
 system_accounts="_bird"

From 003e40035953328cc03450ee377a711b1b8b7f26 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 22 Jun 2023 19:49:29 +0200
Subject: [PATCH 1079/1854] yt-dlp: update to 2023.06.22

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index a13631631169..fbad7395bf14 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2023.03.04
+version=2023.06.22
 revision=1
 build_style=python3-module
 make_check_args="-k not(download)"
@@ -13,4 +13,4 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=771d2abefcd5f1e6f3ab6d6d18cdae98be4ab73538d1174e7e7236640418e150
+checksum=5291eb8e077ee1bc2585f4f522d75f1e4f9fd4c3374bace1572cf59b97bdd9c3

From 8cfa2470684f525a9fa64bd486d334a4c335046c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 19:49:38 +0200
Subject: [PATCH 1080/1854] miniflux: update to 2.0.45.

---
 srcpkgs/miniflux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 1e22a1146957..30313c3979c1 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.44
+version=2.0.45
 revision=1
 build_style=go
 go_import_path="miniflux.app"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/main/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=9b3d873c21dde5eafc947be5394cd1bdd6d4f49ba62e5d796a526176647d9404
+checksum=beef96a42e670344eae9096dc13ceb759a6b7eb085d77b96000731ae1569ca4f
 system_accounts="_miniflux"
 
 post_install() {

From f0facfeb9ecdb58214f97f5959d9d7fcfc09d000 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 22 Jun 2023 20:12:54 +0200
Subject: [PATCH 1081/1854] gopls: update to 0.12.3

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c786fc23aeb6..d766a2bba3e6 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.12.2
+version=0.12.3
 revision=1
 build_wrksrc=gopls
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/golang/tools/tree/master/gopls"
 distfiles="https://github.com/golang/tools/archive/refs/tags/gopls/v${version}.tar.gz"
-checksum=f185a44f46fe39688493008d47debfe63ea7cd26464f522df292c62539b8ca8d
+checksum=77fa296b58ea38d9727b3f564d28bf816eb05ffaa587a2830ef405e479dab060
 
 post_install() {
 	vlicense ../LICENSE

From 6fb2fb5b80745ff5344e09011a96fedd609621c5 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 20:05:16 +0200
Subject: [PATCH 1082/1854] qpwgraph: update to 0.4.4.

---
 srcpkgs/qpwgraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index 7cd13f3e9a83..c4abe3d04baa 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.4.1
+version=0.4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=ac37d00c1d1adbdb517c558483dec11105ff9e2d3ac7c4f87744d08a552e75ea
+checksum=8bfd561dcd921dd14577f7a49a25a4bb481a61ff4b504943f1606f0ce549ac38

From a4208111da5ac4b5cf280fd610a1abdc07392e5a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 20:28:34 +0200
Subject: [PATCH 1083/1854] yq-go: update to 4.34.1.

---
 srcpkgs/yq-go/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 9ea9325498d7..ad7830305bbd 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.33.1
-revision=2
+version=4.34.1
+revision=1
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/refs/tags/v${version}.tar.gz"
-checksum=c38b8210fb5a80ac88314fa346ea31f3dc9324cae9fe93cb334cacf909e09bc3
+checksum=69ff6f8bbb5f9eff5ccb537597740d24200db201b2709e442ae5effdbcb8ff9d
 
 do_check() {
 	go test -v

From 5fd0eed70ae1a647a02efd2e56688dffeb6e8f5e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 21 Jun 2023 00:57:13 +0530
Subject: [PATCH 1084/1854] python3-importlib_metadata: update to 6.7.0.

---
 srcpkgs/python3-importlib_metadata/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template
index 82f5db1b125b..29c19546984e 100644
--- a/srcpkgs/python3-importlib_metadata/template
+++ b/srcpkgs/python3-importlib_metadata/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-importlib_metadata'
 pkgname=python3-importlib_metadata
-version=6.6.0
+version=6.7.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -9,6 +9,6 @@ short_desc="Read metadata from python3 packages"
 maintainer="icp <pangolin@vivaldi.net>"
 license="Apache-2.0"
 homepage="https://pypi.org/project/importlib-metadata/"
-changelog="https://raw.githubusercontent.com/python/importlib_metadata/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/python/importlib_metadata/main/NEWS.rst"
 distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705
+checksum=1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4

From 30de085344e05467f40b32bd72e28fe5467182bf Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 21 Jun 2023 00:58:05 +0530
Subject: [PATCH 1085/1854] python3-keyring: update to 24.0.1.

---
 srcpkgs/python3-keyring/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 306cab402c8c..24eb8790ee38 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=23.13.1
+version=24.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -11,9 +11,14 @@ short_desc="Python interface to the system keyring service"
 maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://pypi.org/project/keyring/"
-changelog="https://raw.githubusercontent.com/jaraco/keyring/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/keyring/main/NEWS.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678
+checksum=f77da625a448baa77906b099be9feaa29aa90979547506ac1ec422926085cee0
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
+
+pre_check() {
+	vsed -e '/addopts/d' -i pytest.ini
+}
 
 post_install() {
 	vlicense LICENSE

From a2778fda57973c6f3be44132125c8446f3ebda5f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 20:50:58 +0200
Subject: [PATCH 1086/1854] remmina: update to 1.4.31.

---
 srcpkgs/remmina/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index a27d96914755..657e392d1f01 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.4.29
-revision=2
+version=1.4.31
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_USE_PTHREADS_INIT=ON"
 hostmakedepends="glib-devel intltool pkg-config shared-mime-info"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://gitlab.com/Remmina/Remmina/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/Remmina/Remmina/-/archive/v${version}/Remmina-v${version}.tar.bz2"
-checksum=94d11d00602d12ed033b1018e42171dfd1b1a42081530c229e4a3988c4f3a3d9
+checksum=cfe9d4a6f2951d35533e5b2235f76640573c91f1be3bd8118637fbf68234500a
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 1d9047e9d2603d3e9448ab2c5000530dc1e52a6f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 22:38:11 +0200
Subject: [PATCH 1087/1854] kubetail: update to 1.6.18.

---
 srcpkgs/kubetail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubetail/template b/srcpkgs/kubetail/template
index aefd029568e5..07584a9fa24b 100644
--- a/srcpkgs/kubetail/template
+++ b/srcpkgs/kubetail/template
@@ -1,6 +1,6 @@
 # Template file for 'kubetail'
 pkgname=kubetail
-version=1.6.17
+version=1.6.18
 revision=1
 depends="bash"
 short_desc="Bash script to tail Kubernetes logs from multiple pods at the same time"
@@ -8,7 +8,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/johanhaleby/kubetail"
 distfiles="https://github.com/johanhaleby/kubetail/archive/${version}.tar.gz"
-checksum=9dee9fbc4c472cf73666ee77e8f430e3aaea2ee3ca2f34dda15a4da9a6bad69a
+checksum=62ba29b3a869bba5b2ddf8c0fbbd307330dfe8cf8f3d47ae459c327b66afbb93
 
 do_install() {
 	vbin kubetail

From 3bde863527bc595c337a96de7c2b192821fa9d9d Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Thu, 22 Jun 2023 18:20:36 -0300
Subject: [PATCH 1088/1854] xonotic: update to 0.8.6

---
 srcpkgs/xonotic-data/template | 4 ++--
 srcpkgs/xonotic/template      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index 4b51d3de5477..d2f483f4b3fe 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -1,6 +1,6 @@
 # Template file for 'xonotic-data'
 pkgname=xonotic-data
-version=0.8.5
+version=0.8.6
 revision=1
 hostmakedepends="unzip"
 short_desc="Xonotic's data files"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xonotic.org"
 distfiles="https://dl.xonotic.org/xonotic-${version}.zip"
-checksum=0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5
+checksum=50850f8d800e7499722f6ea61e478e96464a375494b5a24da93aa0598cbe964d
 
 do_install() {
 	vmkdir usr/share/xonotic
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index c9fc95bbdc66..b4f51efcf1e6 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,6 +1,6 @@
 # Template file for 'xonotic'
 pkgname=xonotic
-version=0.8.5
+version=0.8.6
 revision=1
 hostmakedepends="unzip automake libtool"
 makedepends="gmp-devel MesaLib-devel SDL2-devel libcurl-devel alsa-lib-devel
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="http://xonotic.org"
 distfiles="https://dl.xonotic.org/xonotic-${version}-source.zip"
-checksum=a1a81ba55ab151bf09758e7f59614b2e5150e84224753e77950bcd07a282ea5d
+checksum=8b92ac781cff4ae89c121a23eacd7dec05a2aabedaccc23a19d1a0958b4012a8
 nocross=yes
 
 do_build() {

From 692482ffc81b0375f41998d34fe8e6a2d868b306 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 22 Jun 2023 23:12:34 +0200
Subject: [PATCH 1089/1854] xterm: update to 382.

---
 srcpkgs/xterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 12256b08ea84..802e29b4a6e7 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=379
+version=382
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT, X11"
 homepage="https://invisible-island.net/xterm/"
 changelog="https://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=a7ddf274ee84b97fb1283675009d53ca2d02a0ffd5ce5a5118dafc3623ebb310
+checksum=0cd0bcf3d0aa746a840ea3f1366ea29a74263694d535b5c777f27eb65d7fceed
 
 CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700"
 

From 602ed063092280f82f144f7f6ea6f93ab4641f64 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 22 Jun 2023 21:50:36 -0400
Subject: [PATCH 1090/1854] iwd: update to 2.6

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 25f42b7d02c3..c0cd5e42447f 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=2.5
+version=2.6
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=3441effed58297b63779e706c74884234acb874b07872f8b55e0da28729fda32
+checksum=f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 1f5c4044352475d5bb6a6334635234edddc87a37 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:20:28 +0200
Subject: [PATCH 1091/1854] mtools: update to 4.0.43.

---
 srcpkgs/mtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index c063430d56fc..e8f06f4a1c44 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -1,6 +1,6 @@
 # Template file for 'mtools'
 pkgname=mtools
-version=4.0.42
+version=4.0.43
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/mtools"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=64bfdfde4d82af6b22f3c1c72c3e231cbb618f4c2309cc46f54d16d5502ccf15
+checksum=541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339
 conf_files="/etc/mtools.conf"
 
 post_extract() {

From 5d086072ce8eadacd293857b4ae4250289808553 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 07:28:49 -0500
Subject: [PATCH 1092/1854] xml2rfc: update to 3.17.4.

---
 srcpkgs/xml2rfc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 8d5be28f449a..69ccd32cde71 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
 # Template file for 'xml2rfc'
 pkgname=xml2rfc
-version=3.17.3
+version=3.17.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ietf-tools.github.io/xml2rfc/"
 distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=535b7f701a5d87be8fb8ecdefcef486b11fa454bf0be236c6378c20ca57f28c5
+checksum=7b7e91e7b46db56d0c9ea07e0d7c0d1aa79e2117f028a3134fef4b31fb96ce3a
 make_check=no # too many dependencies
 
 post_install() {

From 92109804a469b464cd24d3eae9987c153e8c5d39 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 07:29:43 -0500
Subject: [PATCH 1093/1854] autorandr: update to 1.14.

---
 srcpkgs/autorandr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template
index 4c1ed42c6a06..df0b1a50b957 100644
--- a/srcpkgs/autorandr/template
+++ b/srcpkgs/autorandr/template
@@ -1,6 +1,6 @@
 # Template file for 'autorandr'
 pkgname=autorandr
-version=1.13.3
+version=1.14
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config desktop-file-utils"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/phillipberndt/autorandr"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=512538d230bb46bf64f5f4203df841872867cb06e0afc0b25a2552529f5b286d
+checksum=d7d4f2e57c14c0e032ddfde24da2b22e5831cc792dca2c6bad3622502e634c60
 
 post_install() {
 	make install TARGETS='pmutils udev autostart_config bash_completion' \

From 12dcd1ce370d0bcd1fedab4cd49a4ee000616f29 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Fri, 23 Jun 2023 18:26:25 +1000
Subject: [PATCH 1094/1854] saml2aws: update to 2.36.9

---
 srcpkgs/saml2aws/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index f921faf8712b..8962d3780d09 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.36.0
-revision=2
+version=2.36.9
+revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
@@ -12,7 +12,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=7ccf328c1ef8a6dec950e8474803539b5dfd1632587073edb850b7dd15122f0b
+checksum=a2ccc55d2ee9e572b46f6b508dc6f474550ae103d20961994c6cf58cdcba5006
 
 post_install() {
 	vlicense LICENSE.md

From 52b86290c862dff313d9c576c40b2396ad8590ba Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Wed, 21 Jun 2023 23:45:33 +0200
Subject: [PATCH 1095/1854] pyradio: update to 0.9.2.11.

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 2ee62bff7306..8b9ad44e1f18 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.10
+version=0.9.2.11
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=c3ab4773d0bdfd28015ef621a86ba103764f36708f8e07cbd0d1b908bcc8e032
+checksum=fe715119a7341e4f940e3edd854ef2e41285773a9086c6bff611be821e452bcd
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 33bb94480c5787dc0edfad30110e5d042647b0cf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 22 Jun 2023 21:45:40 -0400
Subject: [PATCH 1096/1854] libjodycode: update to 3.0.1

---
 common/shlibs                | 2 +-
 srcpkgs/libjodycode/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b34887a091f0..3e91bf520622 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4270,7 +4270,7 @@ 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
-libjodycode.so.2 libjodycode-2.0.1_1
+libjodycode.so.3 libjodycode-3.0.1_1
 libgsoapssl++-2.8.124.so gsoap-2.8.124_1
 libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
index 645266101089..92f5ed05e736 100644
--- a/srcpkgs/libjodycode/template
+++ b/srcpkgs/libjodycode/template
@@ -1,6 +1,6 @@
 # Template file for 'libjodycode'
 pkgname=libjodycode
-version=2.0.1
+version=3.0.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -8,12 +8,12 @@ short_desc="Shared code used by several utilities written by Jody Bruchon"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/libjodycode"
-changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
-checksum=1fdd106ab4d90aa1c0a2546299144f62d18b90acada2d6ee25370c4907048927
+checksum=e02aa4b96577fb5b6ca26018759cdaf71e3768dac321c07a84f2fb93ca4871bf
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }
 
 libjodycode-devel_package() {

From d8e01b8c1e38f027d9eeaf542ba1192bd28cc0d4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 22 Jun 2023 21:46:03 -0400
Subject: [PATCH 1097/1854] jdupes: update to 1.25.2

---
 srcpkgs/jdupes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 3124ed79ffea..28914083a92a 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.24.0
+version=1.25.2
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -10,12 +10,12 @@ short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
-changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
+changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=76ee1ffcf958958c3e093bbe9674c9410d4b1d730081b50f6d1e2dc342b230dd
+checksum=c137d07a70bcf70e15e92365df6b69bd210bb7856b6f10a860529aa7afc324a7
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }
 
 do_check() {

From b9dbb73e7ab2c40dd2de8189c8b2ea877b86855b Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 21 Jun 2023 21:39:40 -0500
Subject: [PATCH 1098/1854] Signal-Desktop: update to 6.22.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 6bd0160a886c..992612267835 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.21.0
+version=6.22.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=fea24e57de48cf60f42f40764429176cd236a0a765bb18e1815e2d56511923f7
+checksum=b895314710284bb7b5caac67eb514d8b83e933ace2c0801bc690a9c621cbed94
 nostrip_files="signal-desktop"
 
 post_extract() {

From ec1b5601c9f58b825de7309af0b25ea239dba2c6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 15:02:31 +0200
Subject: [PATCH 1099/1854] grim: update to 1.4.1, orphan

---
 srcpkgs/grim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index c320d2e38504..fe64688edcf0 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,6 +1,6 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=meson
 configure_args="-Djpeg=enabled -Dwerror=false"
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wayland-devel wayland-protocols pixman-devel libjpeg-turbo-devel
  libpng-devel"
 short_desc="Grab images from a Wayland compositor"
-maintainer="Derriick <derriick.ensiie@yahoo.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.emersion.fr/grim/"
 distfiles="https://git.sr.ht/~emersion/grim/archive/v${version}.tar.gz"
-checksum=66729ae654546404f50ed163055310dd23ed52cc5a881d39752c0cd076e3d7aa
+checksum=5ed8e70fcd83a7e203e92d34dbb82a1342d3f13ad98a6b0310cc97e1a9342ded
 
 post_install() {
 	vlicense LICENSE

From 0b8e425ff2988e38d47588cb42ad7fcee81e6a56 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:56:44 +0200
Subject: [PATCH 1100/1854] cups: update to 2.4.6.

---
 srcpkgs/cups/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index f1dc66f098d0..584a12d0ebf0 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.4.2
-revision=4
+version=2.4.6
+revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908
+checksum=58e970cf1955e1cc87d0847c32526d9c2ccee335e5f0e3882b283138ba0e7262
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="

From c1c46b3ad589f6376646159a55a2ba2173bb11b4 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Tue, 20 Jun 2023 14:36:14 +0200
Subject: [PATCH 1101/1854] python3-plotly: update to 5.15.0.

---
 srcpkgs/python3-plotly/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index 3ceb2053a2d5..412b25bad368 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,18 +1,17 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
-version=4.14.3
-revision=3
+version=5.15.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat"
+depends="python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat python3-tenacity"
 short_desc="Python plotting library for collaborative, interactive graphs"
 maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://plot.ly/python/"
 changelog="https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-checksum=7d8aaeed392e82fb8e0e48899f2d3d957b12327f9d38cdd5802bc574a8a39d91
-conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json"
+checksum=822eabe53997d5ebf23c77e1d1fcbf3bb6aa745eb05d532afd4b6f9a2e2ab02f
 
 do_check() {
 	: no test is shipped

From 902af60983a74bdbd1ee09de915043cf2a04f398 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Jun 2023 01:44:55 +0530
Subject: [PATCH 1102/1854] python3-tzlocal: update to 5.0.1.

---
 srcpkgs/python3-tzlocal/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tzlocal/template b/srcpkgs/python3-tzlocal/template
index 7c19b075620a..0882e496e606 100644
--- a/srcpkgs/python3-tzlocal/template
+++ b/srcpkgs/python3-tzlocal/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-tzlocal'
 pkgname=python3-tzlocal
-version=4.3
+version=5.0.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
-depends="python3-pytz_deprecation_shim"
+depends="python3"
 checkdepends="${depends} python3-pytest-mock python3-pytest-xdist"
 short_desc="Return the tzinfo object for the local timezone (Python 3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/regebro/tzlocal"
 changelog="https://raw.githubusercontent.com/regebro/tzlocal/master/CHANGES.txt"
 distfiles="https://github.com/regebro/tzlocal/archive/refs/tags/${version}.tar.gz"
-checksum=3c27e0fd8d6dbc403d0622d3f2e8804503e3099adf432fdbb91c676cf1f3f884
+checksum=ff80678a1741828fc4c64baba988da084f86676ae8c7b21474d6fb794069a4c1
 
 post_install() {
 	vlicense LICENSE.txt

From 6520ec3bcf5353123dc4372d2ae9602be4c513c7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 16 Jan 2023 02:01:43 +0200
Subject: [PATCH 1103/1854] waydroid: update to 1.4.1.

D-Bus is now used for IPC but disable D-Bus activation for Waydroid
container because there's no way to supervise (or stop) it properly
under runit.
---
 srcpkgs/waydroid/INSTALL                      |  8 ++++----
 srcpkgs/waydroid/files/README.voidlinux       |  7 ++++---
 srcpkgs/waydroid/files/waydroid-container/run |  1 +
 srcpkgs/waydroid/template                     | 11 ++++++-----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/waydroid/INSTALL b/srcpkgs/waydroid/INSTALL
index b6ca3e4ef5ab..34fa67f8c09e 100644
--- a/srcpkgs/waydroid/INSTALL
+++ b/srcpkgs/waydroid/INSTALL
@@ -1,8 +1,8 @@
 case "$ACTION" in
 post)
-	if [ ! -f ./var/lib/waydroid/waydroid.cfg ]; then return 0; fi
-	if [ ! -f ./var/lib/waydroid/waydroid_base.prop ]; then return 0; fi
-	echo "Regenerating Waydroid configs..."
-	waydroid upgrade --offline || exit 0
+	if [ -f /var/lib/waydroid/waydroid_base.prop ]; then
+		echo "Regenerating Waydroid configs..."
+		waydroid upgrade --offline || :
+	fi
 	;;
 esac
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..5653c569b66e 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -4,8 +4,9 @@ To finish Waydroid installation run:
 	# waydroid init
 
 Additionally ensure /proc/pressure/cpu exists, otherwise add 'psi=1' to your
-kernel cmdline; without this /system/bin/lmkd will keep crashing and the LXC
-container won't finish booting.
+kernel cmdline; without this under memory pressure e.g. even the OS bootup or
+gaming *may* cause the /dev/binder session manager to die due to
+/system/bin/lmkd crashing.
 For more details on kernel command line arguments and their configuration see
 https://docs.voidlinux.org/config/kernel.html#cmdline
 
@@ -15,7 +16,7 @@ also works).
 Optionally clipboard syncing between the container and host Wayland compositor
 can be enabled with:
 
-	# xbps-install python3-pyclip wl-clipboard
+	# xbps-install -S python3-pyclip wl-clipboard
 
 When running under X11 in a nested Wayland compositor you'll also need xclip.
 
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
index 3e44af632958..8de4fd3df6d2 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 exec 2>&1
+sv check dbus >/dev/null || exit 1
 exec waydroid -w container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index af8f78ff64c8..70e07b3e5c9a 100644
--- a/srcpkgs/waydroid/template
+++ b/srcpkgs/waydroid/template
@@ -1,19 +1,20 @@
 # Template file for 'waydroid'
 pkgname=waydroid
-version=1.3.4
-revision=2
+version=1.4.1
+revision=1
 # https://developer.android.com/ndk/guides/abis#sa
 archs="aarch64* armv7* i686* x86_64*"
 build_style=gnu-makefile
-make_install_args="USE_NFTABLES=1"
-depends="python3 gbinder-python python3-gobject gtk+3 lxc dnsmasq nftables"
+make_install_args="USE_NFTABLES=1 USE_DBUS_ACTIVATION=0"
+depends="gbinder-python python3-gobject python3-dbus gtk+3 polkit dnsmasq
+ nftables lxc"
 short_desc="Container-based approach to boot a full Android system"
 maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://waydro.id"
 changelog="https://raw.githubusercontent.com/waydroid/waydroid/main/debian/changelog"
 distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
-checksum=32e30e6c7384a514649daeac68b1326e2781362692ae143927628ff2f1387c4e
+checksum=6c9a87bf61efb72c19d96f442b710bd8b4dd5b5be093e10e2d0b1d1782376207
 
 python_version=3
 pycompile_dirs="usr/lib/waydroid"

From af556952ac3a25207251feb7bea30c4ac01cd7ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 23 Jun 2023 18:08:49 +0200
Subject: [PATCH 1104/1854] ostree: revert to 2023.3, 2023.4 breaks flatpak
 install.

---
 srcpkgs/ostree/patches/missing-off-t.patch | 14 --------------
 srcpkgs/ostree/template                    |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/ostree/patches/missing-off-t.patch

diff --git a/srcpkgs/ostree/patches/missing-off-t.patch b/srcpkgs/ostree/patches/missing-off-t.patch
deleted file mode 100644
index 67864dc55c93..000000000000
--- a/srcpkgs/ostree/patches/missing-off-t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From https://git.alpinelinux.org/aports/tree/community/ostree/missing-off-t.patch
-diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index 8fcd5e8..2454a58 100644
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint
- /* This is a roundabout but more trustworthy way of doing a space check than
-  * relying on statvfs's f_bfree when you know the size of the objects. */
- static gboolean
--dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error)
-+dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error)
- {
-   /* If the requested size is 0 then return early. Passing a 0 len to
-    * fallocate results in EINVAL */
diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template
index 3d30742c6b8e..e5c08263b5ad 100644
--- a/srcpkgs/ostree/template
+++ b/srcpkgs/ostree/template
@@ -1,7 +1,8 @@
 # Template file for 'ostree'
 pkgname=ostree
-version=2023.4
-revision=1
+reverts="2023.4_1"
+version=2023.3
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="
@@ -20,7 +21,7 @@ license="LGPL-2.0-or-later"
 homepage="https://ostree.readthedocs.io/en/latest/"
 changelog="https://github.com/ostreedev/ostree/releases"
 distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1
+checksum=9c575a094da2c307769f0aee15de95470c3b5550cbff211fbbc4f6fc75f333b1
 
 build_options="gir"
 build_options_default="gir"

From ca3240132623d01485d6626e8c8f06c7ddfd51f6 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@tuta.io>
Date: Mon, 5 Jun 2023 10:20:46 +0200
Subject: [PATCH 1105/1854] dunst: update to 1.9.2.

---
 srcpkgs/dunst/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index f1f57f153040..ab41433cfe4e 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.9.0
+version=1.9.2
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -13,12 +13,12 @@ makedepends="gdk-pixbuf-devel libXScrnSaver-devel libXinerama-devel libXrandr-de
 checkdepends="dbus"
 conf_files="/etc/dunst/dunstrc"
 short_desc="Lightweight and customizable notification daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
 license="BSD-3-Clause"
 homepage="https://dunst-project.org"
 changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=b7b8d7d6560bb241b1e4d37eba770cdf19b9d5dbfc1d4d47572ad676f3f7c98a
+checksum=fa6ce45c0af4bae188b0d679a5ba92f8f9b7e4301bb1bb476e82df26bce9e71a
 
 build_options="wayland"
 build_options_default="wayland"

From d8f81de90c69b3ee1d4242bde877acdbfc0cc4cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 22 Jun 2023 09:59:02 -0400
Subject: [PATCH 1106/1854] python3-bokeh: update to 3.2.0.

---
 srcpkgs/python3-bokeh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index 54a98e016096..f7a155c3e677 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=3.1.1
+version=3.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-colorama"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=ba0fc6bae4352d307541293256dee930a42d0acf92e760c72dc0e7397c3a28e9
+checksum=cdb3a8c3109d8d91a2814f4cddea045c14d049021f7fb6ce2a6b2c15e224bb17
 # Tests have unpackaged dependencies and require fetching data; skipping
 make_check=no
 

From 6a711a96840fb1fbeacdf12ef689f3bb0f475ebe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 22 Jun 2023 09:59:41 -0400
Subject: [PATCH 1107/1854] python3-h5py: update to 3.9.0.

---
 srcpkgs/python3-h5py/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-h5py/template b/srcpkgs/python3-h5py/template
index 72b004c74781..d491f5cc3aca 100644
--- a/srcpkgs/python3-h5py/template
+++ b/srcpkgs/python3-h5py/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-h5py'
 pkgname=python3-h5py
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=python3-module
 build_helper="numpy"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="http://www.h5py.org/"
 distfiles="${PYPI_SITE}/h/h5py/h5py-${version}.tar.gz"
-checksum=6fead82f0c4000cf38d53f9c030780d81bfa0220218aee13b90b7701c937d95f
+checksum=e604db6521c1e367c6bd7fad239c847f53cc46646f2d2651372d05ae5e95f817
 # Tests require unpackaged pytest-mpi
 make_check=no
 

From 6a1d83d2257af2a9fb521076e27fbc6dafc80c2a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 22 Jun 2023 10:01:26 -0400
Subject: [PATCH 1108/1854] python3-hypothesis: update to 6.79.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 21f3e940e2d3..6848376206d9 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.78.0
+version=6.79.0
 revision=1
 build_wrksrc=hypothesis-python
 build_style=python3-pep517
@@ -24,7 +24,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=d0d9059f9f87da798802a6cc92e55b15bb3c16e4df824618e6d6f9d508cdbae6
+checksum=d6a7a8d7282804f7b7fefe293e21a84a7edb6fd7f34b7b60c7bdd4b71582b5af
 
 if [ "$XBPS_CHECK_PKGS" != full ]; then
 	# Skip "full" tests unless explicitly requested"

From 845dc251cfad0d1d6658db41f5f494481b71e57b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:50:04 -0400
Subject: [PATCH 1109/1854] python3-parsing: update to 3.1.0.

---
 srcpkgs/python3-parsing/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-parsing/template b/srcpkgs/python3-parsing/template
index 053098f8ab52..daf9fcf3392a 100644
--- a/srcpkgs/python3-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,23 +1,26 @@
 # Template file for 'python3-parsing'
 pkgname=python3-parsing
-version=3.0.9
-revision=2
+version=3.1.0
+revision=1
 # This package is used by the python3-pep517 build style; using that style here
 # would create a build cycle
 build_style=python3-module
 # disable tests that need `python3-railroad` (not in repo)
-make_check_args="-k not(testEmptyExpressionsAreHandledProperly)"
-make_check_target="--ignore=tests/test_diagram.py"
+make_check_args="
+ -k not(testEmptyExpressionsAreHandledProperly)
+ --ignore=tests/test_diagram.py
+ --deselect=tests/test_examples.py::TestExamples::test_range_check
+"
 hostmakedepends="python3-flit_core python3-installer"
 depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-xdist"
 short_desc="Python parsing module"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/pyparsing/pyparsing"
 changelog="https://github.com/pyparsing/pyparsing/raw/master/CHANGES"
-distfiles="https://github.com/pyparsing/pyparsing/archive/pyparsing_${version}.tar.gz"
-checksum=7e8ce1684c517f57f945698fd3bbf86b36a2e60cd223f74886d3af04deb06306
+distfiles="${PYPI_SITE}/p/pyparsing/pyparsing-${version}.tar.gz"
+checksum=edb662d6fe322d6e990b1594b5feaeadf806803359e3d4d42f11e295e588f0ea
 
 do_build() {
 	python3 -m flit_core.wheel

From b2dbbb8e8556683c129cc1e6ef53b15ee656f10e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:53:08 -0400
Subject: [PATCH 1110/1854] python3-pytools: update to 2023.1.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index db6e41820cde..a68d9cc96631 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.14
+version=2023.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=41017371610bb2a03685597c5285205e6597c7f177383d95c8b871244b12c14e
+checksum=f10e425220aefa1ff925342b658ff02dc33597c21fb88d7a63f9441bf2e7a50e
 
 post_install() {
 	vlicense LICENSE

From 402934ef3b4a70911393abc9eeffd728c2f76fe8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:53:17 -0400
Subject: [PATCH 1111/1854] python3-setuptools: update to 68.0.0.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 77bf9caa877e..b23f61bb633d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=67.8.0
+version=68.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102
+checksum=baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 94d4dc0837f78db54491b688f69c3b82672fba34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 23 Jun 2023 09:55:29 -0400
Subject: [PATCH 1112/1854] xpra: update to 4.4.6.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index ee8ce4ec78a9..0a63fdb6c743 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.4.5
+version=4.4.6
 revision=1
 build_style=python3-module
 make_build_args="--without-cuda_kernels --without-cuda_rebuild"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=591bd39953cebbfba1a4543bab280b7c1065c3179318f37a41539e954d0709a2
+checksum=7fec998cf9816df3f0fa5ded01903b07211b0c36a7316c9e9bf6db8b80fb477a
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 # Tests don't run properly without package installed
 make_check=no

From a4adade9ba6331d538527311901c464397eacae0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 23 Jun 2023 14:03:38 -0400
Subject: [PATCH 1113/1854] discord-ptb: update to 0.0.43.

---
 srcpkgs/discord-ptb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index 1ff2e7729a50..4cd2473ffec6 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,6 +1,6 @@
 # Template file for 'discord-ptb'
 pkgname=discord-ptb
-version=0.0.42
+version=0.0.43
 revision=1
 archs="x86_64"
 depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
@@ -10,7 +10,7 @@ maintainer="0x5c <dev@0x5c.io>"
 license="custom:Proprietary"
 homepage="https://discord.com/"
 distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=64033202ac8510125e4d4a90cebe702be04e146511aa1a072fcc36849bcbd2f2
+checksum=b46f9047ad8970162bbc94ba294ea801649f405765ebc00c714f04f596a1cb60
 nopie=yes
 restricted=yes
 repository=nonfree

From 69755f5d452503ffae30fb38a6fa574ac96283ff Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 18 Jun 2023 21:53:26 -0400
Subject: [PATCH 1114/1854] tio: update to 2.6.

---
 srcpkgs/tio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tio/template b/srcpkgs/tio/template
index ab3e267c9029..99cd54b76419 100644
--- a/srcpkgs/tio/template
+++ b/srcpkgs/tio/template
@@ -1,6 +1,6 @@
 # Template file for 'tio'
 pkgname=tio
-version=2.5
+version=2.6
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/tio/tio"
 changelog="https://github.com/tio/tio/raw/master/NEWS"
 distfiles="https://github.com/tio/tio/archive/refs/tags/v${version}.tar.gz"
-checksum=5a35796c9fb3e155e9dc5af478c3ce8cf8ca6bb5f6aaff3761173564bd33f1a0
+checksum=9b8a69124662cda8aee0faf74c71cdcd482530a46368f784015b579759e5d485
 
 post_install() {
 	vcompletion "build/src/bash-completion/tio" bash tio

From 09780d703ca74e805a8a08eb9ee59897d1b13770 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Jun 2023 01:24:12 +0530
Subject: [PATCH 1115/1854] Clightd: update to 5.8.

Adopt.
---
 srcpkgs/Clightd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index ee4d81225cc2..fa429ef619c7 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,6 +1,6 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=5.7
+version=5.8
 revision=1
 build_style=cmake
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
@@ -10,12 +10,12 @@ makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel
  wayland-devel libdrm-devel libusb-devel"
 depends="ddcutil"
 short_desc="API to read webcam brightness & alter screen brightness/temperature"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clightd"
 changelog="https://github.com/FedeDP/Clightd/releases"
 distfiles="https://github.com/FedeDP/Clightd/archive/refs/tags/${version}.tar.gz"
-checksum=75a01ee5f314866291efd66f2639516e3a7aa06da6ec5ea33f81211dc1082efa
+checksum=89f0906bc2c1dd4f9bd62194499fd156197c211760c4bb1adcb149650f852684
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From 4658920a556c2b076f13a2fe11ab137b4459a722 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Jun 2023 01:24:45 +0530
Subject: [PATCH 1116/1854] Clight: update to 4.10.

Adopt.
---
 srcpkgs/Clight/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 73649cc5788a..11065b4cda75 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.9
+version=4.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -8,12 +8,12 @@ makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
  dbus-devel libmodule-devel"
 depends="Clightd>=5.0"
 short_desc="Use your webcam as a light sensor to adjust screen backlight"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/FedeDP/Clight"
 changelog="https://github.com/FedeDP/Clight/releases"
 distfiles="https://github.com/FedeDP/Clight/archive/refs/tags/${version}.tar.gz"
-checksum=638696ee22a3a3340659db37d4e3c6fc2763eee9c8c2f7f227190ad9db7742db
+checksum=fa385472d3b055f94875930873fafbb225d4874793755bd3ec2bba6ef1b85871
 
 post_install() {
 	vcompletion Extra/completions/_clight zsh

From 5db8d544f74784a590118297ac924b6dee4d8657 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Wed, 14 Jun 2023 17:39:33 -0300
Subject: [PATCH 1117/1854] papirus-icon-theme: update to 20230601.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 9cf57757b240..75cf92f850b0 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20230301
+version=20230601
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=9e56bd9b04768b7aa415c82f430f5e76e854c63ba4eeba59a39b9a0ad9d000c1
+checksum=92d2e487cd3572e90c8cd28ada407cf0d28a81a4f4cb16cb537d1b92f7269486
 
 do_install() {
 	vmkdir usr/share/icons

From fa564c3eb878d543102e3e5f5530bbeca2c134ab Mon Sep 17 00:00:00 2001
From: aadi58002 <aadi58002gmail.com>
Date: Tue, 20 Jun 2023 10:59:24 +0530
Subject: [PATCH 1118/1854] podman-compose: update to 1.0.6

---
 srcpkgs/podman-compose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 310027c1a045..205691f08dcb 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
-version=1.0.3
-revision=2
+version=1.0.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="podman python3-yaml python3-dotenv"
@@ -10,6 +10,6 @@ maintainer="juan <juan@horlux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"
-checksum=b28e5792a50feee987e7864e0df1b6e8929c923c010e1f65493fe29b4c2aedcf
+checksum=0b9ee7cc000ef5d0ce7f81ce2e306be56d1edb0f494a883ca25c4d163469b12b
 # Source distribution does not script unit tests
 make_check=no

From 1e9106478d0224fcb6986884fcc7f466cc933c79 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 30 May 2023 17:48:30 +0100
Subject: [PATCH 1119/1854] eudev: update to 3.2.12.

---
 ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 ------------------
 srcpkgs/eudev/template                        | 21 +++++++++----------
 2 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch

diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
deleted file mode 100644
index b36b84f75496..000000000000
--- a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001
-From: oreo639 <31916379+Oreo639@users.noreply.github.com>
-Date: Sat, 9 Apr 2022 05:39:56 -0700
-Subject: [PATCH] udev: add udev_dir as synonym of udevdir
-
----
- src/udev/udev.pc.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
-index 4a9d867b8..cccebb245 100644
---- a/src/udev/udev.pc.in
-+++ b/src/udev/udev.pc.in
-@@ -3,4 +3,5 @@ Description: eudev
- Version: @UDEV_VERSION@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--udevdir=@udevlibexecdir@
-+udev_dir=@udevlibexecdir@
-+udevdir=${udev_dir}
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 1639a17d3448..27c652e974ea 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -3,33 +3,32 @@
 _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
-version=3.2.11
+version=3.2.12
 revision=1
 build_style=gnu-configure
-configure_args="--enable-hwdb --enable-manpages --disable-introspection"
+configure_args="--enable-hwdb --enable-manpages"
 hostmakedepends="pkg-config gperf"
 makedepends="libblkid-devel libkmod-devel"
 checkdepends="xz tar perl"
 short_desc="Fork of systemd-udev (enhanced userland device daemon)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/eudev-project"
+homepage="https://github.com/eudev-project/eudev"
+changelog="https://github.com/eudev-project/eudev/releases"
 distfiles="https://github.com/eudev-project/eudev/releases/download/v${version}/eudev-${version}.tar.gz"
-checksum=19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b
+checksum=ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8
 conf_files="/etc/udev/udev.conf"
 
+if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+	# requires unshare(2) which is not available in chroot
+	make_check=no
+fi
+
 post_install() {
 	mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev"
 	vsv udevd
 }
 
-do_check() {
-	# requires unshare(2) which is not available in chroot
-	if [ ! "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
-		make check
-	fi
-}
-
 eudev-libudev-devel_package() {
 	provides="libudev-devel-${_UDEV_VERSION}_${revision}"
 	depends="eudev-libudev>=${version}_${revision}"

From 7cb405ee2a799faa1e6fb6da771fcdc09282b40a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 19:26:50 +0100
Subject: [PATCH 1120/1854] base-files: add 'sgx' group.

---
 srcpkgs/base-files/files/group | 1 +
 srcpkgs/base-files/template    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
index dfad1019792b..455c937b1aef 100644
--- a/srcpkgs/base-files/files/group
+++ b/srcpkgs/base-files/files/group
@@ -24,6 +24,7 @@ kvm:x:24:
 input:x:25:
 plugdev:x:26:
 usbmon:x:27:
+sgx:x:28:
 nogroup:x:99:
 users:x:100:
 xbuilder:x:101:
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index b96d09351a08..5594c5a0efb4 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -29,7 +29,7 @@ conf_files="
 
 replaces="base-directories>=0"
 # New system groups
-system_groups="kvm:24 plugdev:26 usbmon:27"
+system_groups="kvm:24 plugdev:26 usbmon:27 sgx:28"
 
 do_install() {
 	# Create bin and lib dirs and symlinks.

From f2bdc3269a32a58266594ff42414ee393fe78dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Jun 2023 21:33:41 +0200
Subject: [PATCH 1121/1854] python3-pypdf: update to 3.11.0.

---
 srcpkgs/python3-pypdf/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pypdf/template b/srcpkgs/python3-pypdf/template
index 0de5f7c99f0f..1ee44b488b17 100644
--- a/srcpkgs/python3-pypdf/template
+++ b/srcpkgs/python3-pypdf/template
@@ -1,13 +1,15 @@
 # Template file for 'python3-pypdf'
 pkgname=python3-pypdf
-version=3.7.1
+version=3.11.0
 revision=1
-_sample_files_gitrev=d89d531f4bed7c5e692e4c094645133baf50a044
+_sample_files_gitrev=69b31cff6b183a42f9081709ef9bee4047976f56
 build_wrksrc="pypdf-${version}"
 build_style=python3-pep517
+# requires unpackaged fpdf2
+make_check_args="-k not(test_compression)"
 hostmakedepends="python3-flit_core"
 depends="python3-Pillow"
-checkdepends="python3-pytest python3-pycryptodome ${depends}"
+checkdepends="python3-pytest python3-pytest-timeout python3-pycryptodome ${depends}"
 short_desc="PDF library for splitting, merging, cropping, and transforming pages"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-3-Clause"
@@ -15,8 +17,8 @@ homepage="https://pypdf.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/py-pdf/pypdf/main/CHANGELOG.md"
 distfiles="https://github.com/py-pdf/pypdf/archive/refs/tags/${version}.tar.gz
  https://github.com/py-pdf/sample-files/archive/${_sample_files_gitrev}.tar.gz"
-checksum="c9d28daa1d8acedd4a63570df1ea5548da3022eb9c066c080e607dcae82e6bfa
- 4e5a055c0b6f8b7f37730456e4c376aa62afba44c439698cc6135c3906489c8e"
+checksum="bde551e6951ae65e9df119d261e4ce2d1c7aa5acfd3a24b33d5d797a8d65c03a
+ 0167f2e32e27fe6ad9c27ea7378f82f47fb53df3f5ccf63a9fde5c5924e49053"
 
 post_extract() {
 	rmdir ${build_wrksrc}/sample-files

From 052e2561e4e33e78104f018ae7d942862334c6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Jun 2023 21:33:42 +0200
Subject: [PATCH 1122/1854] diffoscope: update to 242.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 72c3abe3deb2..392bb4f42170 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=240
+version=242
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,4 +15,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/-/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=79e30534e348a95caf2f4d7138403ba4a44e64a0777a98b71b7d8873635ce302
+checksum=d858c591d2c8d42b2b29eb6d229408607b1cd8a4e7ade72d0cd002db6d1c2a6e

From 9b5d93fcc5c364867e022c586dff4327d8f69924 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 14 May 2023 22:32:07 +0200
Subject: [PATCH 1123/1854] gtk-layer-shell: update to 0.8.1.

---
 srcpkgs/gtk-layer-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk-layer-shell/template b/srcpkgs/gtk-layer-shell/template
index 4a5fc2b89b0d..48f9c985620e 100644
--- a/srcpkgs/gtk-layer-shell/template
+++ b/srcpkgs/gtk-layer-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk-layer-shell'
 pkgname=gtk-layer-shell
-version=0.6.0
+version=0.8.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="LGPL-3.0-or-later, MIT"
 homepage="https://github.com/wmww/gtk-layer-shell"
 distfiles="https://github.com/wmww/gtk-layer-shell/archive/v${version}.tar.gz"
-checksum=9a0ba72cea90e092d6b10ba47e627cd873271d287d9af80a6f66ab131fb34cac
+checksum=c329fac878a1731cb23ad7365f2f2a35e4ab26e72b4e69458e06afd825baad48
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"

From 52892a2aac28cbc57ad73a51fd489b7e4253b058 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 15 Apr 2023 22:40:37 +0100
Subject: [PATCH 1124/1854] xmlsec1: update to 1.3.1.

---
 srcpkgs/xmlsec1/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index d57bd4b9f645..9cd74e808365 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,9 +1,9 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
-version=1.2.37
+version=1.3.1
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config gnutls-devel"
+hostmakedepends="pkg-config"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
  nspr-devel nss-devel"
 short_desc="XML Security Library is a C library based on LibXML2"
@@ -12,11 +12,7 @@ license="MIT"
 homepage="https://www.aleksey.com/xmlsec/"
 changelog="https://www.aleksey.com/xmlsec/news.html"
 distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"
-checksum=5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
-
-pre_configure() {
-	autoreconf -if
-}
+checksum=10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then

From f1b3cd3444aa3c34757276647d752dbb2a83f225 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emruemru1@gmail.com>
Date: Fri, 31 Mar 2023 10:16:49 +0200
Subject: [PATCH 1125/1854] transmission: update to 4.0.2.

---
 .../patches/add-missing-files.patch           | 2462 -----------------
 .../transmission/patches/fix-makefiles.patch  |   62 -
 srcpkgs/transmission/template                 |   25 +-
 3 files changed, 9 insertions(+), 2540 deletions(-)
 delete mode 100644 srcpkgs/transmission/patches/add-missing-files.patch
 delete mode 100644 srcpkgs/transmission/patches/fix-makefiles.patch

diff --git a/srcpkgs/transmission/patches/add-missing-files.patch b/srcpkgs/transmission/patches/add-missing-files.patch
deleted file mode 100644
index 0bdfda34d1fa..000000000000
--- a/srcpkgs/transmission/patches/add-missing-files.patch
+++ /dev/null
@@ -1,2462 +0,0 @@
-diff --git a/libtransmission/subprocess-test.cmd b/libtransmission/subprocess-test.cmd
-new file mode 100644
-index 0000000..4d08d06
---- /dev/null
-+++ b/libtransmission/subprocess-test.cmd
-@@ -0,0 +1,48 @@
-+@echo off
-+setlocal EnableExtensions EnableDelayedExpansion
-+
-+set __argc=0
-+for %%i in (%*) do (
-+    set /a __argc+=1
-+    set "__argv[!__argc!]=%%~i"
-+)
-+
-+set "result_path=!__argv[1]!"
-+set "test_action=!__argv[2]!"
-+
-+set "temp_result_path=%result_path%.tmp"
-+>"%temp_result_path%" <nul set /p=
-+
-+if "%test_action%" == "--dump-args" goto dump_args
-+if "%test_action%" == "--dump-env" goto dump_env
-+if "%test_action%" == "--dump-cwd" goto dump_cwd
-+
-+exit /b 1
-+
-+:dump_args
-+    for /l %%i in (3,1,%__argc%) do (
-+        >>"%temp_result_path%" echo.!__argv[%%i]!
-+    )
-+    goto finish
-+
-+:dump_env
-+    for /l %%i in (3,1,%__argc%) do (
-+        >>"%temp_result_path%" call :dump_env_var "!__argv[%%i]!"
-+    )
-+    goto finish
-+
-+:dump_env_var
-+    if defined %~1 (
-+        echo.!%~1!
-+    ) else (
-+        echo.^<null^>
-+    )
-+    exit /b 0
-+
-+:dump_cwd
-+    >>"%temp_result_path%" echo.%CD%
-+    goto finish
-+
-+:finish
-+    >nul move /y "%temp_result_path%" "%result_path%"
-+    exit /b 0
-diff --git a/po/pt_PT.po b/po/pt_PT.po
-new file mode 100644
-index 0000000..d9346f8
---- /dev/null
-+++ b/po/pt_PT.po
-@@ -0,0 +1,2402 @@
-+# SOME DESCRIPTIVE TITLE.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
-+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+#
-+# Translators:
-+# Gonçalo Matos , 2017
-+# String YM <inactive+StringYM@transifex.com>, 2017
-+# Rui <xymarior@yandex.com>, 2019
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2020-05-14 18:55+0300\n"
-+"PO-Revision-Date: 2017-01-26 19:47+0000\n"
-+"Last-Translator: Rui <xymarior@yandex.com>, 2019\n"
-+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/transmissionbt/teams/33778/pt_PT/)\n"
-+"Language: pt_PT\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+
-+#: ../cli/cli.c:114 ../gtk/util.c:92 ../libtransmission/utils.c:1694
-+msgid "None"
-+msgstr "Nenhum"
-+
-+#: ../gtk/actions.c:31
-+msgid "Sort by _Activity"
-+msgstr "Ordernar por: _Atividade"
-+
-+#: ../gtk/actions.c:32
-+msgid "Sort by _Name"
-+msgstr "Ordenar por: _Nome"
-+
-+#: ../gtk/actions.c:33
-+msgid "Sort by _Progress"
-+msgstr "Ordenar por: _Progresso"
-+
-+#: ../gtk/actions.c:34
-+msgid "Sort by _Queue"
-+msgstr "Ordenar por: _Data"
-+
-+#: ../gtk/actions.c:35
-+msgid "Sort by Rati_o"
-+msgstr "Ordenar por: Percent_agem"
-+
-+#: ../gtk/actions.c:36
-+msgid "Sort by Stat_e"
-+msgstr "Ordenar por: _Estado"
-+
-+#: ../gtk/actions.c:37
-+msgid "Sort by A_ge"
-+msgstr "Ordenar por: A_ge"
-+
-+#: ../gtk/actions.c:38
-+msgid "Sort by Time _Left"
-+msgstr "Ordenar por: Time_Left"
-+
-+#: ../gtk/actions.c:39
-+msgid "Sort by Si_ze"
-+msgstr "Ordenar por: Si:ze"
-+
-+#: ../gtk/actions.c:53
-+msgid "_Show Transmission"
-+msgstr "_Mostrar o Transmission"
-+
-+#: ../gtk/actions.c:54
-+msgid "Message _Log"
-+msgstr "_Registo de Mensagens"
-+
-+#: ../gtk/actions.c:67
-+msgid "Enable Alternative Speed _Limits"
-+msgstr "Ativar _Limites de Velocidade Alternativos"
-+
-+#: ../gtk/actions.c:68
-+msgid "_Compact View"
-+msgstr "Vista _Compacta"
-+
-+#: ../gtk/actions.c:69
-+msgid "Re_verse Sort Order"
-+msgstr "In_verter Ordenação"
-+
-+#: ../gtk/actions.c:70
-+msgid "_Filterbar"
-+msgstr "Barra de _Filtros"
-+
-+#: ../gtk/actions.c:71
-+msgid "_Statusbar"
-+msgstr "Barra de E_stado"
-+
-+#: ../gtk/actions.c:72
-+msgid "_Toolbar"
-+msgstr "Barra de Ferramen_tas"
-+
-+#: ../gtk/actions.c:77
-+msgid "_File"
-+msgstr "_Ficheiro"
-+
-+#: ../gtk/actions.c:78
-+msgid "_Torrent"
-+msgstr "_Torrent"
-+
-+#: ../gtk/actions.c:79
-+msgid "_View"
-+msgstr "_Vista"
-+
-+#: ../gtk/actions.c:80
-+msgid "_Sort Torrents By"
-+msgstr "_Ordenar Torrents por:"
-+
-+#: ../gtk/actions.c:81
-+msgid "_Queue"
-+msgstr "F_ila"
-+
-+#: ../gtk/actions.c:82 ../gtk/details.c:2839
-+msgid "_Edit"
-+msgstr "_Editar"
-+
-+#: ../gtk/actions.c:83
-+msgid "_Help"
-+msgstr "_Ajuda"
-+
-+#: ../gtk/actions.c:84
-+msgid "Copy _Magnet Link to Clipboard"
-+msgstr "Copiar Link _Magnético"
-+
-+#: ../gtk/actions.c:85
-+msgid "Open URL…"
-+msgstr "Abrir URL…"
-+
-+#: ../gtk/actions.c:85
-+msgid "Open _URL…"
-+msgstr "Abrir _URL…"
-+
-+#: ../gtk/actions.c:86 ../gtk/actions.c:87
-+msgid "Open a torrent"
-+msgstr "Abrir um torrent"
-+
-+#: ../gtk/actions.c:88
-+msgid "Start torrent"
-+msgstr "_Iniciar Torrent"
-+
-+#: ../gtk/actions.c:88
-+msgid "_Start"
-+msgstr "_Iniciar"
-+
-+#: ../gtk/actions.c:89
-+msgid "Start _Now"
-+msgstr "Iniciar _Agora"
-+
-+#: ../gtk/actions.c:89
-+msgid "Start torrent now"
-+msgstr "Iniciar o torrent agora"
-+
-+#: ../gtk/actions.c:91
-+msgid "_Statistics"
-+msgstr "E_statísticas"
-+
-+#: ../gtk/actions.c:92
-+msgid "_Donate"
-+msgstr "_Doar"
-+
-+#: ../gtk/actions.c:93
-+msgid "_Verify Local Data"
-+msgstr "_Verificar Dados Locais"
-+
-+#: ../gtk/actions.c:94
-+msgid "Pause torrent"
-+msgstr "Pausar o Torrent"
-+
-+#: ../gtk/actions.c:94
-+msgid "_Pause"
-+msgstr "_Pausar"
-+
-+#: ../gtk/actions.c:95
-+msgid "Pause all torrents"
-+msgstr "Pausar todos os torrents"
-+
-+#: ../gtk/actions.c:95
-+msgid "_Pause All"
-+msgstr "Pausar tudo"
-+
-+#: ../gtk/actions.c:96
-+msgid "Start all torrents"
-+msgstr "Iniciar todos os Torrents"
-+
-+#: ../gtk/actions.c:96
-+msgid "_Start All"
-+msgstr "_Iniciar tudo"
-+
-+#: ../gtk/actions.c:97
-+msgid "Set _Location…"
-+msgstr "Definir _Localização…"
-+
-+#: ../gtk/actions.c:98
-+msgid "Remove torrent"
-+msgstr "Remover torrent"
-+
-+#: ../gtk/actions.c:99
-+msgid "_Delete Files and Remove"
-+msgstr "_Eliminar Ficheiros e Remover"
-+
-+#: ../gtk/actions.c:100
-+msgid "Create a torrent"
-+msgstr "Criar torrent"
-+
-+#: ../gtk/actions.c:100
-+msgid "_New…"
-+msgstr "_Novo"
-+
-+#: ../gtk/actions.c:101
-+msgid "_Quit"
-+msgstr "_Sair"
-+
-+#: ../gtk/actions.c:102
-+msgid "Select _All"
-+msgstr "Selecion_ar Tudo"
-+
-+#: ../gtk/actions.c:103
-+msgid "Dese_lect All"
-+msgstr "Desce_lecionar Tudo"
-+
-+#: ../gtk/actions.c:105
-+msgid "Torrent properties"
-+msgstr "Propriedades do torrent"
-+
-+#: ../gtk/actions.c:106
-+msgid "Open Fold_er"
-+msgstr "Abrir _Pasta"
-+
-+#: ../gtk/actions.c:108
-+msgid "_Contents"
-+msgstr "_Conteúdos"
-+
-+#: ../gtk/actions.c:109
-+msgid "Ask Tracker for _More Peers"
-+msgstr "Pedir ao rastreador _mais pares"
-+
-+#: ../gtk/actions.c:110
-+msgid "Move to _Top"
-+msgstr "Mover para o _Topo"
-+
-+#: ../gtk/actions.c:111
-+msgid "Move _Up"
-+msgstr "Mover para _Cima"
-+
-+#: ../gtk/actions.c:112
-+msgid "Move _Down"
-+msgstr "Mover para _Baixo"
-+
-+#: ../gtk/actions.c:113
-+msgid "Move to _Bottom"
-+msgstr "Mover para o _Fundo"
-+
-+#: ../gtk/actions.c:114
-+msgid "Present Main Window"
-+msgstr "Mostrar janela principal"
-+
-+#: ../gtk/details.c:486 ../gtk/details.c:497
-+msgid "Use global settings"
-+msgstr "Usar definições globais"
-+
-+#: ../gtk/details.c:487
-+msgid "Seed regardless of ratio"
-+msgstr "Semear independentemente do rácio"
-+
-+#: ../gtk/details.c:488
-+msgid "Stop seeding at ratio:"
-+msgstr "Parar de semear no rácio:"
-+
-+#: ../gtk/details.c:498
-+msgid "Seed regardless of activity"
-+msgstr "Semear independentemente da atividade"
-+
-+#: ../gtk/details.c:499
-+msgid "Stop seeding if idle for N minutes:"
-+msgstr "Parar de semear se inativo por N minutos:"
-+
-+#: ../gtk/details.c:517 ../gtk/tr-prefs.c:1253
-+msgid "Speed"
-+msgstr "Velocidade"
-+
-+#: ../gtk/details.c:519
-+msgid "Honor global _limits"
-+msgstr "Respeitar _limites globais"
-+
-+#: ../gtk/details.c:524
-+#, c-format
-+msgid "Limit _download speed (%s):"
-+msgstr "Limitar velocidade de _descarregamento (%s):"
-+
-+#: ../gtk/details.c:537
-+#, c-format
-+msgid "Limit _upload speed (%s):"
-+msgstr "Limitar velocidade de _envio (%s):"
-+
-+#: ../gtk/details.c:550 ../gtk/open-dialog.c:368
-+msgid "Torrent _priority:"
-+msgstr "_Prioridade do torrent:"
-+
-+#: ../gtk/details.c:554
-+msgid "Seeding Limits"
-+msgstr "Limites de Velocidade"
-+
-+#: ../gtk/details.c:564
-+msgid "_Ratio:"
-+msgstr "_Rácio:"
-+
-+#: ../gtk/details.c:573
-+msgid "_Idle:"
-+msgstr "_Inativo:"
-+
-+#: ../gtk/details.c:576
-+msgid "Peer Connections"
-+msgstr "Ligações a pares"
-+
-+#: ../gtk/details.c:579
-+msgid "_Maximum peers:"
-+msgstr "_Máximo de pares:"
-+
-+#: ../gtk/details.c:598 ../gtk/torrent-cell-renderer.c:195 ../libtransmission/verify.c:272
-+msgid "Queued for verification"
-+msgstr "Na fila para verificação"
-+
-+#: ../gtk/details.c:601
-+msgid "Verifying local data"
-+msgstr "A verificar dados locais"
-+
-+#: ../gtk/details.c:604 ../gtk/torrent-cell-renderer.c:199
-+msgid "Queued for download"
-+msgstr "Na fila para descarregar"
-+
-+#: ../gtk/details.c:607 ../gtk/filter.c:586
-+msgctxt "Verb"
-+msgid "Downloading"
-+msgstr "A descarregar"
-+
-+#: ../gtk/details.c:610 ../gtk/torrent-cell-renderer.c:203
-+msgid "Queued for seeding"
-+msgstr "Na fila para semear"
-+
-+#: ../gtk/details.c:613 ../gtk/filter.c:587
-+msgctxt "Verb"
-+msgid "Seeding"
-+msgstr "A semear"
-+
-+#: ../gtk/details.c:616 ../gtk/filter.c:589 ../gtk/torrent-cell-renderer.c:191
-+msgid "Finished"
-+msgstr "Terminado"
-+
-+#: ../gtk/details.c:616 ../gtk/filter.c:588 ../gtk/torrent-cell-renderer.c:191
-+msgid "Paused"
-+msgstr "Pausado"
-+
-+#: ../gtk/details.c:653 ../gtk/details.c:733
-+msgid "N/A"
-+msgstr "N/A"
-+
-+#: ../gtk/details.c:664 ../gtk/file-list.c:636
-+msgid "Mixed"
-+msgstr "Misturado"
-+
-+#: ../gtk/details.c:665
-+msgid "No Torrents Selected"
-+msgstr "Sem Torrents Selecionados"
-+
-+#: ../gtk/details.c:695
-+msgid "Private to this tracker -- DHT and PEX disabled"
-+msgstr "Privado para este rastreador - DHT e PEX desativados"
-+
-+#: ../gtk/details.c:695
-+msgid "Public torrent"
-+msgstr "Torrent público"
-+
-+#: ../gtk/details.c:739
-+#, c-format
-+msgid "Created by %1$s"
-+msgstr "Criado por %1$s"
-+
-+#: ../gtk/details.c:743
-+#, c-format
-+msgid "Created on %1$s"
-+msgstr "Criado em %1$s"
-+
-+#: ../gtk/details.c:747
-+#, c-format
-+msgid "Created by %1$s on %2$s"
-+msgstr "Criado por %1$s em %2$s"
-+
-+#: ../gtk/details.c:877
-+msgid "Unknown"
-+msgstr "Desconhecido"
-+
-+#: ../gtk/details.c:919
-+#, c-format
-+msgid "%1$s (%2$'d piece @ %3$s)"
-+msgid_plural "%1$s (%2$'d pieces @ %3$s)"
-+msgstr[0] "%1$s (%2$'d pedaço @ %3$s)"
-+msgstr[1] "%1$s (%2$'d pedaços @ %3$s)"
-+
-+#: ../gtk/details.c:925
-+#, c-format
-+msgid "%1$s (%2$'d piece)"
-+msgid_plural "%1$s (%2$'d pieces)"
-+msgstr[0] "%1$s (%2$'d pedaço)"
-+msgstr[1] "%1$s (%2$'d pedaços)"
-+
-+#: ../gtk/details.c:969
-+#, c-format
-+msgid "%1$s (%2$s%%)"
-+msgstr "%1$s (%2$s%%)"
-+
-+#: ../gtk/details.c:973
-+#, c-format
-+msgid "%1$s (%2$s%% of %3$s%% Available)"
-+msgstr "%1$s (%2$s%% de %3$s%% Disponível)"
-+
-+#: ../gtk/details.c:977
-+#, c-format
-+msgid "%1$s (%2$s%% of %3$s%% Available); %4$s Unverified"
-+msgstr "%1$s (%2$s%% de %3$s%% Disponível); %4$s Por verificar"
-+
-+#: ../gtk/details.c:1010
-+#, c-format
-+msgid "%1$s (+%2$s corrupt)"
-+msgstr "%1$s (+%2$s corrompido)"
-+
-+#: ../gtk/details.c:1042
-+#, c-format
-+msgid "%s (Ratio: %s)"
-+msgstr "%s (Rácio: %s)"
-+
-+#: ../gtk/details.c:1084
-+msgid "No errors"
-+msgstr "Sem erros"
-+
-+#: ../gtk/details.c:1108
-+msgid "Never"
-+msgstr "Nunca"
-+
-+#: ../gtk/details.c:1116
-+msgid "Active now"
-+msgstr "Ativo agora"
-+
-+#: ../gtk/details.c:1122
-+#, c-format
-+msgid "%1$s ago"
-+msgstr "%1$s atrás"
-+
-+#: ../gtk/details.c:1145
-+msgid "Activity"
-+msgstr "Atividade"
-+
-+#: ../gtk/details.c:1150
-+msgid "Torrent size:"
-+msgstr "Tamanho do torrent:"
-+
-+#: ../gtk/details.c:1155
-+msgid "Have:"
-+msgstr "Tenho:"
-+
-+#: ../gtk/details.c:1160 ../gtk/stats.c:133 ../gtk/stats.c:158
-+msgid "Uploaded:"
-+msgstr "Enviado:"
-+
-+#: ../gtk/details.c:1165 ../gtk/stats.c:137 ../gtk/stats.c:162
-+msgid "Downloaded:"
-+msgstr "Descarregado:"
-+
-+#: ../gtk/details.c:1170
-+msgid "State:"
-+msgstr "Estado:"
-+
-+#: ../gtk/details.c:1175
-+msgid "Running time:"
-+msgstr "Tempo em execução:"
-+
-+#: ../gtk/details.c:1180
-+msgid "Remaining time:"
-+msgstr "Tempo restante:"
-+
-+#: ../gtk/details.c:1185
-+msgid "Last activity:"
-+msgstr "Última atividade:"
-+
-+#: ../gtk/details.c:1189
-+msgid "Error:"
-+msgstr "Erro:"
-+
-+#: ../gtk/details.c:1193
-+msgid "Details"
-+msgstr "Detalhes"
-+
-+#: ../gtk/details.c:1197
-+msgid "Location:"
-+msgstr "Localização:"
-+
-+#: ../gtk/details.c:1202
-+msgid "Hash:"
-+msgstr "Hash:"
-+
-+#: ../gtk/details.c:1208
-+msgid "Privacy:"
-+msgstr "Privacidade:"
-+
-+#: ../gtk/details.c:1213
-+msgid "Origin:"
-+msgstr "Origem:"
-+
-+#: ../gtk/details.c:1228
-+msgid "Comment:"
-+msgstr "Comentário:"
-+
-+#: ../gtk/details.c:1256
-+msgid "Web Seeds"
-+msgstr "Semeares da web"
-+
-+#: ../gtk/details.c:1260 ../gtk/details.c:1316
-+msgid "Down"
-+msgstr "Baixo"
-+
-+#: ../gtk/details.c:1312
-+msgid "Address"
-+msgstr "Endereço"
-+
-+#: ../gtk/details.c:1320
-+msgid "Up"
-+msgstr "Cima"
-+
-+#: ../gtk/details.c:1323
-+msgid "Client"
-+msgstr "Cliente"
-+
-+#: ../gtk/details.c:1326
-+msgid "%"
-+msgstr "%"
-+
-+#: ../gtk/details.c:1330
-+msgid "Up Reqs"
-+msgstr "Pedid. Env."
-+
-+#: ../gtk/details.c:1334
-+msgid "Dn Reqs"
-+msgstr "Pedid. Receb."
-+
-+#: ../gtk/details.c:1338
-+msgid "Dn Blocks"
-+msgstr "Blocos Receb."
-+
-+#: ../gtk/details.c:1342
-+msgid "Up Blocks"
-+msgstr "Blocos Env."
-+
-+#: ../gtk/details.c:1346
-+msgid "We Cancelled"
-+msgstr "Nós Concelamos"
-+
-+#: ../gtk/details.c:1350
-+msgid "They Cancelled"
-+msgstr "Eles Cancelaram"
-+
-+#: ../gtk/details.c:1353
-+msgid "Flags"
-+msgstr "Bandeiras"
-+
-+#: ../gtk/details.c:1770
-+msgid "Optimistic unchoke"
-+msgstr "Desestrangulamento otimista"
-+
-+#: ../gtk/details.c:1774
-+msgid "Downloading from this peer"
-+msgstr "A descarregar deste par"
-+
-+#: ../gtk/details.c:1778
-+msgid "We would download from this peer if they would let us"
-+msgstr "Descarregaríamos deste pare se ele permitisse"
-+
-+#: ../gtk/details.c:1782
-+msgid "Uploading to peer"
-+msgstr "A enviar para o par"
-+
-+#: ../gtk/details.c:1786
-+msgid "We would upload to this peer if they asked"
-+msgstr "Enviaríamos para este par se ele pedisse"
-+
-+#: ../gtk/details.c:1790
-+msgid "Peer has unchoked us, but we're not interested"
-+msgstr "O par destrangulou-nos, mas não estamos interessados"
-+
-+#: ../gtk/details.c:1794
-+msgid "We unchoked this peer, but they're not interested"
-+msgstr "Desestrangulamos este par, mas ele não está interessado"
-+
-+#: ../gtk/details.c:1798
-+msgid "Encrypted connection"
-+msgstr "Ligação encriptada"
-+
-+#: ../gtk/details.c:1802
-+msgid "Peer was found through Peer Exchange (PEX)"
-+msgstr "O par foi descoberto através da Trocar de Pares (PEX)"
-+
-+#: ../gtk/details.c:1806
-+msgid "Peer was found through DHT"
-+msgstr "O par foi encontrado através da Tabela Hash Distribuída (DHT)"
-+
-+#: ../gtk/details.c:1810
-+msgid "Peer is an incoming connection"
-+msgstr "O par é uma ligação a dar entrada"
-+
-+#: ../gtk/details.c:1814
-+msgid "Peer is connected over µTP"
-+msgstr "O par está ligado através de µTP"
-+
-+#: ../gtk/details.c:2082 ../gtk/details.c:2854
-+msgid "Show _more details"
-+msgstr "Mostrar _mais detalhes"
-+
-+#: ../gtk/details.c:2156
-+#, c-format
-+msgid "Got a list of %1$s%2$'d peers%3$s %4$s ago"
-+msgstr "Obtida uma lista de %1$s%2$'d pares%3$s %4$s atrás"
-+
-+#: ../gtk/details.c:2161
-+#, c-format
-+msgid "Peer list request %1$stimed out%2$s %3$s ago; will retry"
-+msgstr "O pedido de lista de pares %1$sexcedeu o tempo limite%2$s %3$s atrás; a tentar novamente"
-+
-+#: ../gtk/details.c:2166
-+#, c-format
-+msgid "Got an error %1$s\"%2$s\"%3$s %4$s ago"
-+msgstr "Obtido um erro %1$s\"%2$s\"%3$s %4$s atrás"
-+
-+#: ../gtk/details.c:2175
-+msgid "No updates scheduled"
-+msgstr "Não há atualizações programadas"
-+
-+#: ../gtk/details.c:2181
-+#, c-format
-+msgid "Asking for more peers in %s"
-+msgstr "A pedir mais pares em %s"
-+
-+#: ../gtk/details.c:2186
-+msgid "Queued to ask for more peers"
-+msgstr "Na fila para pedir por mais pares"
-+
-+#: ../gtk/details.c:2192
-+#, c-format
-+msgid "Asking for more peers now… <small>%s</small>"
-+msgstr "A pedir agora por mais pares… <small>%s</small>"
-+
-+#: ../gtk/details.c:2205
-+#, c-format
-+msgid "Tracker had %s%'d seeders and %'d leechers%s %s ago"
-+msgstr "O rastreador teve %s%'d semeadores e %'d sanguesugas%s %s atrás"
-+
-+#: ../gtk/details.c:2210
-+#, c-format
-+msgid "Got a scrape error \"%s%s%s\" %s ago"
-+msgstr "Obtido um erro scrape \"%s%s%s\" %s atrás"
-+
-+#: ../gtk/details.c:2223
-+#, c-format
-+msgid "Asking for peer counts in %s"
-+msgstr "A pedir a contagem de pares em %s"
-+
-+#: ../gtk/details.c:2228
-+msgid "Queued to ask for peer counts"
-+msgstr "Na fila para pedir a contagem de pares"
-+
-+#: ../gtk/details.c:2234
-+#, c-format
-+msgid "Asking for peer counts now… <small>%s</small>"
-+msgstr "A pedir agora a contagem de pares… <small>%s</small>"
-+
-+#: ../gtk/details.c:2537
-+msgid "List contains invalid URLs"
-+msgstr "A lista contém URLs inválidos"
-+
-+#: ../gtk/details.c:2541 ../gtk/file-list.c:847
-+msgid "Please correct the errors and try again."
-+msgstr "Por favor corrija os erros e tente novamente."
-+
-+#: ../gtk/details.c:2603
-+#, c-format
-+msgid "%s - Edit Trackers"
-+msgstr "%s - Editar Rastreadores"
-+
-+#: ../gtk/details.c:2610
-+msgid "Tracker Announce URLs"
-+msgstr "URLs de anúncios do rastreador"
-+
-+#: ../gtk/details.c:2613 ../gtk/makemeta-ui.c:493
-+msgid ""
-+"To add a backup URL, add it on the line after the primary URL.\n"
-+"To add another primary URL, add it after a blank line."
-+msgstr ""
-+"Para adicionar um URL de cópia de segurança, aadicione-o à linha após o  URL principal.\n"
-+"Para adicionar outro URL principal, adicione-o após uma linha vazia."
-+
-+#: ../gtk/details.c:2713
-+#, c-format
-+msgid "%s - Add Tracker"
-+msgstr "%s - Adicionar Rastreador"
-+
-+#: ../gtk/details.c:2720
-+msgid "Tracker"
-+msgstr "Rastreador"
-+
-+#: ../gtk/details.c:2726
-+msgid "_Announce URL:"
-+msgstr "URL de _anúncios:"
-+
-+#: ../gtk/details.c:2810 ../gtk/details.c:2967
-+msgid "Trackers"
-+msgstr "Rastreadores"
-+
-+#: ../gtk/details.c:2834
-+msgid "_Add"
-+msgstr "_Adicionar"
-+
-+#: ../gtk/details.c:2845
-+msgid "_Remove"
-+msgstr "_Remover"
-+
-+#: ../gtk/details.c:2861
-+msgid "Show _backup trackers"
-+msgstr "Mostrar rastreadores na cópia de segurança"
-+
-+#: ../gtk/details.c:2959 ../gtk/msgwin.c:431
-+msgid "Information"
-+msgstr "Informação"
-+
-+#: ../gtk/details.c:2963
-+msgid "Peers"
-+msgstr "Pares"
-+
-+#: ../gtk/details.c:2972
-+msgid "File listing not available for combined torrent properties"
-+msgstr "Listagem de ficheiros não disponível para propriedades de torrents combinadas"
-+
-+#: ../gtk/details.c:2976 ../gtk/makemeta-ui.c:442
-+msgid "Files"
-+msgstr "Ficheiros"
-+
-+#: ../gtk/details.c:2980 ../gtk/tr-prefs.c:1164 ../gtk/tr-window.c:646
-+msgid "Options"
-+msgstr "Opções"
-+
-+#: ../gtk/details.c:3002
-+#, c-format
-+msgid "%s Properties"
-+msgstr "%s Propriedades"
-+
-+#: ../gtk/details.c:3013
-+#, c-format
-+msgid "%'d Torrent Properties"
-+msgstr "%'d Propriedades do Torrent"
-+
-+#: ../gtk/dialogs.c:100
-+#, c-format
-+msgid "Remove torrent?"
-+msgid_plural "Remove %d torrents?"
-+msgstr[0] "Remover torrent?"
-+msgstr[1] "Remover %d torrents?"
-+
-+#: ../gtk/dialogs.c:104
-+#, c-format
-+msgid "Delete this torrent's downloaded files?"
-+msgid_plural "Delete these %d torrents' downloaded files?"
-+msgstr[0] "Eliminar este ficheiro torrent descarregado?"
-+msgstr[1] "Eliminar estes %d ficheiros torrent descarregados?"
-+
-+#: ../gtk/dialogs.c:113
-+msgid "Once removed, continuing the transfer will require the torrent file or magnet link."
-+msgid_plural "Once removed, continuing the transfers will require the torrent files or magnet links."
-+msgstr[0] "Após sere eliminado, para continuar o descarregamento será necessário o ficheiro torrent ou o link magnético."
-+msgstr[1] "Após serem eliminados, para continuar o descarregamento serão necessários os ficheiros torrent ou os links magnéticos."
-+
-+#: ../gtk/dialogs.c:118
-+msgid "This torrent has not finished downloading."
-+msgid_plural "These torrents have not finished downloading."
-+msgstr[0] "O descarregamento deste torrent ainda não terminou."
-+msgstr[1] "O descarregamento destes torrents ainda não terminou."
-+
-+#: ../gtk/dialogs.c:123
-+msgid "This torrent is connected to peers."
-+msgid_plural "These torrents are connected to peers."
-+msgstr[0] "Este torrent está conectado aos outros pares."
-+msgstr[1] "Estes torrents estão conectados aos outros pares."
-+
-+#: ../gtk/dialogs.c:130
-+msgid "One of these torrents is connected to peers."
-+msgid_plural "Some of these torrents are connected to peers."
-+msgstr[0] "Um destes torrents está conectado a outros pares."
-+msgstr[1] "Alguns destes torrents estão conectados a outros pares."
-+
-+#: ../gtk/dialogs.c:141
-+msgid "One of these torrents has not finished downloading."
-+msgid_plural "Some of these torrents have not finished downloading."
-+msgstr[0] "Um destes torrents ainda não terminou."
-+msgstr[1] "Alguns destes torrents ainda não terminaram."
-+
-+#: ../gtk/file-list.c:624 ../gtk/util.c:520
-+msgid "High"
-+msgstr "Alta"
-+
-+#: ../gtk/file-list.c:628 ../gtk/util.c:521
-+msgid "Normal"
-+msgstr "Normal"
-+
-+#: ../gtk/file-list.c:632 ../gtk/util.c:522
-+msgid "Low"
-+msgstr "Baixa"
-+
-+#: ../gtk/file-list.c:845
-+#, c-format
-+msgid "Unable to rename file as \"%s\": %s"
-+msgstr "Não foi possível alterar o nome do ficheiro para \"%s\": %s"
-+
-+#. add file column
-+#: ../gtk/file-list.c:957 ../gtk/msgwin.c:289
-+msgid "Name"
-+msgstr "Nome"
-+
-+#. add "size" column
-+#: ../gtk/file-list.c:973
-+msgid "Size"
-+msgstr "Tamanho"
-+
-+#. add "progress" column
-+#: ../gtk/file-list.c:984
-+msgid "Have"
-+msgstr "Tenho"
-+
-+#. add "enabled" column
-+#: ../gtk/file-list.c:997
-+msgid "Download"
-+msgstr "Descarregar"
-+
-+#. add priority column
-+#: ../gtk/file-list.c:1012
-+msgid "Priority"
-+msgstr "Prioridade"
-+
-+#: ../gtk/filter.c:299 ../gtk/filter.c:583
-+msgid "All"
-+msgstr "Tudo"
-+
-+#: ../gtk/filter.c:585
-+msgid "Active"
-+msgstr "Ativo"
-+
-+#: ../gtk/filter.c:590
-+msgctxt "Verb"
-+msgid "Verifying"
-+msgstr "A verificar"
-+
-+#: ../gtk/filter.c:591 ../gtk/msgwin.c:430 ../gtk/util.c:717
-+msgid "Error"
-+msgstr "Erro"
-+
-+#: ../gtk/filter.c:880
-+msgid "_Show:"
-+msgstr "_Mostrar:"
-+
-+#: ../gtk/filter.c:884
-+#, c-format
-+msgid "_Show %'d of:"
-+msgstr "_Mostrar %'d de:"
-+
-+#: ../gtk/main.c:314
-+#, c-format
-+msgid "Error registering Transmission as a %s handler: %s"
-+msgstr "Erro ao registar o Transmission como um manipulador de %s: %s"
-+
-+#: ../gtk/main.c:480
-+#, c-format
-+msgid "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck."
-+msgstr "Foi obtido o sinal de %d; a tentar desligar corretamente. Faça-o de novo caso fique bloqueado."
-+
-+#: ../gtk/main.c:616
-+msgid "Where to look for configuration files"
-+msgstr "Onde procurar por ficheiros de configuração"
-+
-+#: ../gtk/main.c:617
-+msgid "Start with all torrents paused"
-+msgstr "Iniciar com todos os torrents em pausa"
-+
-+#: ../gtk/main.c:618
-+msgid "Start minimized in notification area"
-+msgstr "Iniciar minimizado na área de notificações"
-+
-+#: ../gtk/main.c:619
-+msgid "Show version number and exit"
-+msgstr "Mostrar número da versão e sair"
-+
-+#: ../gtk/main.c:637 ../gtk/transmission-gtk.appdata.xml.in:11 ../gtk/transmission-gtk.desktop.in:3
-+msgid "Transmission"
-+msgstr "Transmission"
-+
-+#. parse the command line
-+#: ../gtk/main.c:640
-+msgid "[torrent files or urls]"
-+msgstr "[ficheiros torrent ou urls]"
-+
-+#: ../gtk/main.c:647
-+#, c-format
-+msgid ""
-+"%s\n"
-+"Run '%s --help' to see a full list of available command line options.\n"
-+msgstr ""
-+"%s\n"
-+"Execute '%s --help' para ver uma lista completa de opções de linha de comandos disponíveis.\n"
-+
-+#: ../gtk/main.c:746
-+msgid "Transmission is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility."
-+msgstr "O Transmission é um programa de partilha de ficheiros. Quando abre um torrent, os dados deste serão partilhados com outros utilizadores. Qualquer conteúdo que partilhe será de sua inteira responsabilidade."
-+
-+#: ../gtk/main.c:749
-+msgid "I _Agree"
-+msgstr "Eu _Concordo"
-+
-+#: ../gtk/main.c:980
-+msgid "<b>Closing Connections</b>"
-+msgstr "<b>A fechar ligações</b>"
-+
-+#: ../gtk/main.c:984
-+msgid "Sending upload/download totals to tracker…"
-+msgstr "A enviar o total de enviado/descarregado ao rastreador…"
-+
-+#: ../gtk/main.c:988
-+msgid "_Quit Now"
-+msgstr "_Sair Agora"
-+
-+#: ../gtk/main.c:1038
-+msgid "Couldn't add corrupt torrent"
-+msgid_plural "Couldn't add corrupt torrents"
-+msgstr[0] "Não foi possível adicionar o torrent corrompido"
-+msgstr[1] "Não foi possível adicionar torrents corrompidos"
-+
-+#: ../gtk/main.c:1044
-+msgid "Couldn't add duplicate torrent"
-+msgid_plural "Couldn't add duplicate torrents"
-+msgstr[0] "Não foi possível adicionar o torrent duplicado"
-+msgstr[1] "Não foi possível adicionar torrents duplicados"
-+
-+#: ../gtk/main.c:1363
-+msgid "A fast and easy BitTorrent client"
-+msgstr "Um cliente BitTorrent rápido e fácil de usar"
-+
-+#: ../gtk/main.c:1364
-+msgid "Copyright (c) The Transmission Project"
-+msgstr "Direitos de Autor (c) The Transmission Project"
-+
-+#. Translators: translate "translator-credits" as your name
-+#. to have it appear in the credits in the "About"
-+#. dialog
-+#: ../gtk/main.c:1370
-+msgid "translator-credits"
-+msgstr ""
-+"Gonçalo Matos (goncalomatos);\n"
-+"Rui (xendez);\n"
-+"StringYM;"
-+
-+#: ../gtk/makemeta-ui.c:70
-+#, c-format
-+msgid "Creating \"%s\""
-+msgstr "A criar \"%s\""
-+
-+#: ../gtk/makemeta-ui.c:74
-+#, c-format
-+msgid "Created \"%s\"!"
-+msgstr "Criado \"%s\"!"
-+
-+#: ../gtk/makemeta-ui.c:78
-+#, c-format
-+msgid "Error: invalid announce URL \"%s\""
-+msgstr "Erro: URL de anúncio inválido \"%s\""
-+
-+#: ../gtk/makemeta-ui.c:82
-+msgid "Cancelled"
-+msgstr "Cancelado"
-+
-+#: ../gtk/makemeta-ui.c:86
-+#, c-format
-+msgid "Error reading \"%s\": %s"
-+msgstr "Erro ao ler \"%s\": %s"
-+
-+#: ../gtk/makemeta-ui.c:90
-+#, c-format
-+msgid "Error writing \"%s\": %s"
-+msgstr "Erro ao gravar \"%s\": %s"
-+
-+#. how much data we've scanned through to generate checksums
-+#: ../gtk/makemeta-ui.c:113
-+#, c-format
-+msgid "Scanned %s"
-+msgstr "%s processado"
-+
-+#: ../gtk/makemeta-ui.c:183 ../gtk/makemeta-ui.c:434
-+msgid "New Torrent"
-+msgstr "Novo Torrent"
-+
-+#: ../gtk/makemeta-ui.c:194
-+msgid "Creating torrent…"
-+msgstr "A criar o torrent…"
-+
-+#: ../gtk/makemeta-ui.c:304
-+msgid "No source selected"
-+msgstr "Nenhuma fonte selecionada"
-+
-+#: ../gtk/makemeta-ui.c:310
-+#, c-format
-+msgid "%1$s; %2$'d File"
-+msgid_plural "%1$s; %2$'d Files"
-+msgstr[0] "%1$s; %2$'d Ficheiro"
-+msgstr[1] "%1$s; %2$'d Ficheiros"
-+
-+#: ../gtk/makemeta-ui.c:315
-+#, c-format
-+msgid "%1$'d Piece @ %2$s"
-+msgid_plural "%1$'d Pieces @ %2$s"
-+msgstr[0] "%1$'d Peça @ %2$s"
-+msgstr[1] "%1$'d Peças @ %2$s"
-+
-+#: ../gtk/makemeta-ui.c:444
-+msgid "Sa_ve to:"
-+msgstr "Gra_var para:"
-+
-+#: ../gtk/makemeta-ui.c:450
-+msgid "Source F_older:"
-+msgstr "Pasta da f_onte:"
-+
-+#: ../gtk/makemeta-ui.c:462
-+msgid "Source _File:"
-+msgstr "_Ficheiro da fonte:"
-+
-+#: ../gtk/makemeta-ui.c:474
-+msgid "<i>No source selected</i>"
-+msgstr "<i>Nenhuma fonte selecionada</i>"
-+
-+#: ../gtk/makemeta-ui.c:478
-+msgid "Properties"
-+msgstr "Propriedades"
-+
-+#: ../gtk/makemeta-ui.c:480
-+msgid "_Trackers:"
-+msgstr "_Rastreadores:"
-+
-+#: ../gtk/makemeta-ui.c:500
-+msgid "Co_mment:"
-+msgstr "Co_mentário:"
-+
-+#: ../gtk/makemeta-ui.c:509
-+msgid "_Private torrent"
-+msgstr "Torrent _privado"
-+
-+#: ../gtk/msgwin.c:146
-+#, c-format
-+msgid "Couldn't save \"%s\""
-+msgstr "Não foi possível gravar \"%s\""
-+
-+#: ../gtk/msgwin.c:209
-+msgid "Save Log"
-+msgstr "Gravar registo"
-+
-+#: ../gtk/msgwin.c:284
-+msgid "Time"
-+msgstr "Hora"
-+
-+#: ../gtk/msgwin.c:294
-+msgid "Message"
-+msgstr "Mensagem"
-+
-+#: ../gtk/msgwin.c:432
-+msgid "Debug"
-+msgstr "Depuração de erros"
-+
-+#: ../gtk/msgwin.c:457
-+msgid "Message Log"
-+msgstr "Registo de mensagens"
-+
-+#: ../gtk/msgwin.c:491
-+msgid "Level"
-+msgstr "Nível"
-+
-+#: ../gtk/notify.c:207
-+msgid "Open File"
-+msgstr "Abrir ficheiro"
-+
-+#: ../gtk/notify.c:212
-+msgid "Open Folder"
-+msgstr "Abrir pasta"
-+
-+#: ../gtk/notify.c:217
-+msgid "Torrent Complete"
-+msgstr "Torrent terminado"
-+
-+#: ../gtk/notify.c:233
-+msgid "Torrent Added"
-+msgstr "Torrent adicionado"
-+
-+#: ../gtk/open-dialog.c:256
-+msgid "Torrent files"
-+msgstr "Ficheiros de torrents"
-+
-+#: ../gtk/open-dialog.c:261
-+msgid "All files"
-+msgstr "Todos os ficheiros"
-+
-+#. make the dialog
-+#: ../gtk/open-dialog.c:284
-+msgid "Torrent Options"
-+msgstr "Opções de torrents"
-+
-+#: ../gtk/open-dialog.c:301 ../gtk/tr-prefs.c:275
-+msgid "Mo_ve .torrent file to the trash"
-+msgstr "Mo_ver o ficheiro .torrent para o lixo"
-+
-+#: ../gtk/open-dialog.c:303
-+msgid "_Start when added"
-+msgstr "_Começar logo ao adicionar"
-+
-+#. "torrent file" row
-+#: ../gtk/open-dialog.c:318
-+msgid "_Torrent file:"
-+msgstr "Ficheiro _torrent:"
-+
-+#: ../gtk/open-dialog.c:321
-+msgid "Select Source File"
-+msgstr "Selecionar ficheiro da fonte"
-+
-+#: ../gtk/open-dialog.c:331
-+msgid "_Destination folder:"
-+msgstr "Pasta de _destino:"
-+
-+#: ../gtk/open-dialog.c:334
-+msgid "Select Destination Folder"
-+msgstr "Selecione a pasta de destino"
-+
-+#: ../gtk/open-dialog.c:455
-+msgid "Open a Torrent"
-+msgstr "Abrir um torrent"
-+
-+#: ../gtk/open-dialog.c:466
-+msgid "Show _options dialog"
-+msgstr "Mostrar janela de _opções"
-+
-+#: ../gtk/open-dialog.c:518
-+msgid "Open URL"
-+msgstr "Abrir URL"
-+
-+#: ../gtk/open-dialog.c:524
-+msgid "Open torrent from URL"
-+msgstr "Abrir um torrent por URL"
-+
-+#: ../gtk/open-dialog.c:529
-+msgid "_URL"
-+msgstr "_URL"
-+
-+#: ../gtk/relocate.c:60
-+#, c-format
-+msgid "Moving \"%s\""
-+msgstr "A mover \"1%s\""
-+
-+#: ../gtk/relocate.c:76
-+msgid "Couldn't move torrent"
-+msgstr "Não foi possível mover o torrent"
-+
-+#: ../gtk/relocate.c:111
-+msgid "This may take a moment…"
-+msgstr "Isto pode demorar um pouco…"
-+
-+#: ../gtk/relocate.c:139 ../gtk/relocate.c:153
-+msgid "Set Torrent Location"
-+msgstr "Definir a localização do torrent"
-+
-+#: ../gtk/relocate.c:146
-+msgid "Location"
-+msgstr "Localização"
-+
-+#: ../gtk/relocate.c:156
-+msgid "Torrent _location:"
-+msgstr "_Localização do torrent:"
-+
-+#: ../gtk/relocate.c:157
-+msgid "_Move from the current folder"
-+msgstr "_Mover da pasta atual"
-+
-+#: ../gtk/relocate.c:160
-+msgid "Local data is _already there"
-+msgstr "Os d_ados locais já estão lá"
-+
-+#: ../gtk/stats.c:69 ../gtk/stats.c:150
-+#, c-format
-+msgid "Started %'d time"
-+msgid_plural "Started %'d times"
-+msgstr[0] "Iniciado %'d vez"
-+msgstr[1] "Iniciado %'d vezess"
-+
-+#: ../gtk/stats.c:91
-+msgid "Reset your statistics?"
-+msgstr "Limpar as suas estatísticas?"
-+
-+#: ../gtk/stats.c:92
-+msgid "These statistics are for your information only. Resetting them doesn't affect the statistics logged by your BitTorrent trackers."
-+msgstr "Estas estatísticas existem apenas para informação. Se as limpar isso não afetará as estatísticas registadas pelos rastreadores BitTorrent."
-+
-+#: ../gtk/stats.c:96 ../gtk/stats.c:123
-+msgid "_Reset"
-+msgstr "_Limpar"
-+
-+#: ../gtk/stats.c:123 ../gtk/tr-window.c:687
-+msgid "Statistics"
-+msgstr "Estatísticas"
-+
-+#: ../gtk/stats.c:129
-+msgid "Current Session"
-+msgstr "Sessão Atual"
-+
-+#: ../gtk/stats.c:141 ../gtk/stats.c:166
-+msgid "Ratio:"
-+msgstr "Rácio:"
-+
-+#: ../gtk/stats.c:145 ../gtk/stats.c:170
-+msgid "Duration:"
-+msgstr "Duração:"
-+
-+#: ../gtk/stats.c:149
-+msgid "Total"
-+msgstr "Total"
-+
-+#. %1$s is how much we've got,
-+#. %2$s is how much we'll have when done,
-+#. %3$s%% is a percentage of the two
-+#: ../gtk/torrent-cell-renderer.c:59
-+#, c-format
-+msgid "%1$s of %2$s (%3$s%%)"
-+msgstr "%1$s de %2$s (%3$s%%)"
-+
-+#. %1$s is how much we've got,
-+#. %2$s is the torrent's total size,
-+#. %3$s%% is a percentage of the two,
-+#. %4$s is how much we've uploaded,
-+#. %5$s is our upload-to-download ratio,
-+#. %6$s is the ratio we want to reach before we stop uploading
-+#: ../gtk/torrent-cell-renderer.c:75
-+#, c-format
-+msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
-+msgstr "%1$s de %2$s (%3$s%%), enviado %4$s (Rácio: %5$s Objetivo: %6$s)"
-+
-+#. %1$s is how much we've got,
-+#. %2$s is the torrent's total size,
-+#. %3$s%% is a percentage of the two,
-+#. %4$s is how much we've uploaded,
-+#. %5$s is our upload-to-download ratio
-+#: ../gtk/torrent-cell-renderer.c:91
-+#, c-format
-+msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s)"
-+msgstr "%1$s de %2$s (%3$s%%), enviado %4$s (Rácio: %5$s)"
-+
-+#. %1$s is the torrent's total size,
-+#. %2$s is how much we've uploaded,
-+#. %3$s is our upload-to-download ratio,
-+#. %4$s is the ratio we want to reach before we stop uploading
-+#: ../gtk/torrent-cell-renderer.c:108
-+#, c-format
-+msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
-+msgstr "%1$s, enviado %2$s (Rácio: %3$s Objetivo: %4$s)"
-+
-+#. %1$s is the torrent's total size,
-+#. %2$s is how much we've uploaded,
-+#. %3$s is our upload-to-download ratio
-+#: ../gtk/torrent-cell-renderer.c:120
-+#, c-format
-+msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
-+msgstr "%1$s, enviado %2$s (Rácio: %3$s)"
-+
-+#: ../gtk/torrent-cell-renderer.c:135
-+msgid "Remaining time unknown"
-+msgstr "Tempo restante desconhecido"
-+
-+#. time remaining
-+#: ../gtk/torrent-cell-renderer.c:142
-+#, c-format
-+msgid "%s remaining"
-+msgstr "%s restante"
-+
-+#. down speed, down symbol, up speed, up symbol
-+#: ../gtk/torrent-cell-renderer.c:162
-+#, c-format
-+msgid "%1$s %2$s  %3$s %4$s"
-+msgstr "%1$s %2$s  %3$s %4$s"
-+
-+#. up speed, up symbol
-+#: ../gtk/torrent-cell-renderer.c:171
-+#, c-format
-+msgid "%1$s  %2$s"
-+msgstr "%1$s  %2$s"
-+
-+#: ../gtk/torrent-cell-renderer.c:175
-+msgid "Stalled"
-+msgstr "Paralisado"
-+
-+#: ../gtk/torrent-cell-renderer.c:207
-+#, c-format
-+msgid "Verifying local data (%.1f%% tested)"
-+msgstr "A verificar dados locais (%.1f%% testados)"
-+
-+#: ../gtk/torrent-cell-renderer.c:236
-+#, c-format
-+msgid "Tracker gave a warning: \"%s\""
-+msgstr "O rastreador forneceu um aviso: \"%s\""
-+
-+#: ../gtk/torrent-cell-renderer.c:237
-+#, c-format
-+msgid "Tracker gave an error: \"%s\""
-+msgstr "O rastreador forneceu um erro: \"%s\""
-+
-+#: ../gtk/torrent-cell-renderer.c:238
-+#, c-format
-+msgid "Error: %s"
-+msgstr "Erro: %s"
-+
-+#. Downloading metadata from 2 peer (s)(50% done)
-+#: ../gtk/torrent-cell-renderer.c:262
-+#, c-format
-+msgid "Downloading metadata from %1$'d %2$s (%3$d%% done)"
-+msgstr "A descarregar metadados de %1$'d %2$s (%3$d%% feito)"
-+
-+#: ../gtk/torrent-cell-renderer.c:263 ../gtk/torrent-cell-renderer.c:269 ../gtk/torrent-cell-renderer.c:282
-+msgid "peer"
-+msgid_plural "peers"
-+msgstr[0] "par"
-+msgstr[1] "pares"
-+
-+#. Downloading from 2 of 3 peer (s) and 2 webseed (s)
-+#: ../gtk/torrent-cell-renderer.c:268
-+#, c-format
-+msgid "Downloading from %1$'d of %2$'d %3$s and %4$'d %5$s"
-+msgstr "A descarregar de %1$'d de %2$'d %3$s e %4$'d %5$s"
-+
-+#: ../gtk/torrent-cell-renderer.c:270 ../gtk/torrent-cell-renderer.c:276
-+msgid "web seed"
-+msgid_plural "web seeds"
-+msgstr[0] "semear da web"
-+msgstr[1] "semeares da web"
-+
-+#. Downloading from 3 web seed (s)
-+#: ../gtk/torrent-cell-renderer.c:275
-+#, c-format
-+msgid "Downloading from %1$'d %2$s"
-+msgstr "A descarregar de %1$'d %2$s"
-+
-+#. Downloading from 2 of 3 peer (s)
-+#: ../gtk/torrent-cell-renderer.c:281
-+#, c-format
-+msgid "Downloading from %1$'d of %2$'d %3$s"
-+msgstr "A descarregar de %1$'d de %2$'d %3$s"
-+
-+#: ../gtk/torrent-cell-renderer.c:289
-+#, c-format
-+msgid "Seeding to %1$'d of %2$'d connected peer"
-+msgid_plural "Seeding to %1$'d of %2$'d connected peers"
-+msgstr[0] "A semear para %1$'d de %2$'d par conectado"
-+msgstr[1] "A semear para %1$'d de %2$'d pares conectados"
-+
-+#: ../gtk/tr-core.c:1241
-+#, c-format
-+msgid "Couldn't read \"%s\": %s"
-+msgstr "Não foi possível ler \"%s\": %s"
-+
-+#: ../gtk/tr-core.c:1337
-+#, c-format
-+msgid "Skipping unknown torrent \"%s\""
-+msgstr "A ignorar o torrent desconhecido \"%s\""
-+
-+#: ../gtk/tr-core.c:1612
-+msgid "Inhibiting desktop hibernation"
-+msgstr "Impedir a hibernação"
-+
-+#: ../gtk/tr-core.c:1616
-+#, c-format
-+msgid "Couldn't inhibit desktop hibernation: %s"
-+msgstr "Não foi possível impedir a hibernação: %s"
-+
-+#: ../gtk/tr-core.c:1649
-+msgid "Allowing desktop hibernation"
-+msgstr "Permitir hibernação"
-+
-+#: ../gtk/tr-icon.c:57
-+msgid "Idle"
-+msgstr "Inativo"
-+
-+#: ../gtk/tr-icon.c:80 ../gtk/tr-icon.c:102
-+#, c-format
-+msgid " (Limit: %s)"
-+msgstr " (Limite: %s)"
-+
-+#. %1$s: current upload speed
-+#. * %2$s: current upload limit, if any
-+#. * %3$s: current download speed
-+#. * %4$s: current download limit, if any
-+#: ../gtk/tr-icon.c:109
-+#, c-format
-+msgid ""
-+"Transmission\n"
-+"Up: %1$s %2$s\n"
-+"Down: %3$s %4$s"
-+msgstr ""
-+"Transmission\n"
-+"Env: %1$s %2$s\n"
-+"Rec: %3$s %4$s"
-+
-+#: ../gtk/tr-prefs.c:258
-+msgctxt "Gerund"
-+msgid "Adding"
-+msgstr "A adicionar"
-+
-+#: ../gtk/tr-prefs.c:260
-+msgid "Automatically add .torrent files _from:"
-+msgstr "Adicionar automaticamente ficheiros .torrent _de:"
-+
-+#: ../gtk/tr-prefs.c:267
-+msgid "Show the Torrent Options _dialog"
-+msgstr "Mostrar a _janela de opções do torrent"
-+
-+#: ../gtk/tr-prefs.c:271
-+msgid "_Start added torrents"
-+msgstr "_Iniciar torrents adicionados"
-+
-+#: ../gtk/tr-prefs.c:280
-+msgid "Save to _Location:"
-+msgstr "Gravar na _localização:"
-+
-+#: ../gtk/tr-prefs.c:287
-+msgid "Download Queue"
-+msgstr "Fila de descarregamento"
-+
-+#: ../gtk/tr-prefs.c:289
-+msgid "Ma_ximum active downloads:"
-+msgstr "Número má_ximo de descarregamentos:"
-+
-+#: ../gtk/tr-prefs.c:293
-+msgid "Downloads sharing data in the last _N minutes are active:"
-+msgstr "Descarregamentos a partilharem dados nos últimos _X minutos estão ativos:"
-+
-+#: ../gtk/tr-prefs.c:298 ../libtransmission/torrent.c:2170
-+msgid "Incomplete"
-+msgstr "Imcompleto"
-+
-+#: ../gtk/tr-prefs.c:300
-+msgid "Append \"._part\" to incomplete files' names"
-+msgstr "Anexar \"._part\" ao nome dos ficheiros incompletos"
-+
-+#: ../gtk/tr-prefs.c:304
-+msgid "Keep _incomplete torrents in:"
-+msgstr "Manter os torrents incompletos em:"
-+
-+#: ../gtk/tr-prefs.c:311
-+msgid "Call scrip_t when torrent is completed:"
-+msgstr "Executar scrip_t quando um torrent terminar:"
-+
-+#: ../gtk/tr-prefs.c:334
-+msgid "Limits"
-+msgstr "Limites"
-+
-+#: ../gtk/tr-prefs.c:336
-+msgid "Stop seeding at _ratio:"
-+msgstr "Parar de semear no _rácio:"
-+
-+#: ../gtk/tr-prefs.c:343
-+msgid "Stop seeding if idle for _N minutes:"
-+msgstr "Parar de semear se estiver inativo por _X minutos:"
-+
-+#: ../gtk/tr-prefs.c:365 ../gtk/tr-prefs.c:1258
-+msgid "Desktop"
-+msgstr "Secretária"
-+
-+#: ../gtk/tr-prefs.c:367
-+msgid "_Inhibit hibernation when torrents are active"
-+msgstr "_Impedir a hibernação quando os torrents estão ativos"
-+
-+#: ../gtk/tr-prefs.c:371
-+msgid "Show Transmission icon in the _notification area"
-+msgstr "Mostrar o ícone do Transmission na área de notificações"
-+
-+#: ../gtk/tr-prefs.c:376
-+msgid "Notification"
-+msgstr "Notificação"
-+
-+#: ../gtk/tr-prefs.c:378
-+msgid "Show a notification when torrents are a_dded"
-+msgstr "Mostrar uma notificação quando são a_dicionados torrents"
-+
-+#: ../gtk/tr-prefs.c:382
-+msgid "Show a notification when torrents _finish"
-+msgstr "Mostrar uma notificação quando os torrents terminam"
-+
-+#: ../gtk/tr-prefs.c:386
-+msgid "Play a _sound when torrents finish"
-+msgstr "Reproduzir um _som quando os torrents terminam"
-+
-+#: ../gtk/tr-prefs.c:412
-+#, c-format
-+msgid "Blocklist contains %'d rule"
-+msgid_plural "Blocklist contains %'d rules"
-+msgstr[0] "A lista de bloqueios contém %'d regra"
-+msgstr[1] "A lista de bloqueios contém %'d regras"
-+
-+#: ../gtk/tr-prefs.c:446
-+#, c-format
-+msgid "Blocklist has %'d rule."
-+msgid_plural "Blocklist has %'d rules."
-+msgstr[0] "A lista de bloqueios tem %'d regra."
-+msgstr[1] "A lista de bloqueios tem %'d regras."
-+
-+#: ../gtk/tr-prefs.c:450
-+msgid "<b>Unable to update.</b>"
-+msgstr "<b>Não foi possível atualizar.</b>"
-+
-+#: ../gtk/tr-prefs.c:450
-+msgid "<b>Update succeeded!</b>"
-+msgstr "<b>Atualização bem sucedida!</b>"
-+
-+#: ../gtk/tr-prefs.c:461
-+msgid "Update Blocklist"
-+msgstr "Atualizar Lista de Bloqueios"
-+
-+#: ../gtk/tr-prefs.c:463
-+msgid "Getting new blocklist…"
-+msgstr "A obter a nova lista de bloqueios…"
-+
-+#: ../gtk/tr-prefs.c:488
-+msgid "Allow encryption"
-+msgstr "Permitir encriptação"
-+
-+#: ../gtk/tr-prefs.c:488
-+msgid "Prefer encryption"
-+msgstr "Preferir encriptação"
-+
-+#: ../gtk/tr-prefs.c:489
-+msgid "Require encryption"
-+msgstr "Usar apenas encriptação"
-+
-+#: ../gtk/tr-prefs.c:511 ../gtk/tr-prefs.c:1256
-+msgid "Privacy"
-+msgstr "Privacidade"
-+
-+#: ../gtk/tr-prefs.c:513
-+msgid "_Encryption mode:"
-+msgstr "Modo de _Encriptação:"
-+
-+#: ../gtk/tr-prefs.c:518
-+msgid "Blocklist"
-+msgstr "Lista de bloqueio"
-+
-+#: ../gtk/tr-prefs.c:520
-+msgid "Enable _blocklist:"
-+msgstr "Ativar lista de _bloqueio"
-+
-+#: ../gtk/tr-prefs.c:534
-+msgid "_Update"
-+msgstr "_Atualizar"
-+
-+#: ../gtk/tr-prefs.c:546
-+msgid "Enable _automatic updates"
-+msgstr "Ativar _atualizações automáticas"
-+
-+#: ../gtk/tr-prefs.c:747
-+msgid "Remote Control"
-+msgstr "Controlo Remoto"
-+
-+#. "enabled" checkbutton
-+#: ../gtk/tr-prefs.c:750
-+msgid "Allow _remote access"
-+msgstr "Permitir acesso _remoto"
-+
-+#: ../gtk/tr-prefs.c:756
-+msgid "_Open web client"
-+msgstr "_Abrir cliente web"
-+
-+#: ../gtk/tr-prefs.c:765
-+msgid "HTTP _port:"
-+msgstr "_Porta HTTP:"
-+
-+#. require authentication
-+#: ../gtk/tr-prefs.c:769
-+msgid "Use _authentication"
-+msgstr "Usar _autenticação"
-+
-+#. username
-+#: ../gtk/tr-prefs.c:777
-+msgid "_Username:"
-+msgstr "_Nome de utilizador:"
-+
-+#. password
-+#: ../gtk/tr-prefs.c:784
-+msgid "Pass_word:"
-+msgstr "Palavra-passe:"
-+
-+#. require authentication
-+#: ../gtk/tr-prefs.c:792
-+msgid "Only allow these IP a_ddresses:"
-+msgstr "Permitir apenas estes en_dereços IP:"
-+
-+#: ../gtk/tr-prefs.c:816
-+msgid "IP addresses may use wildcards, such as 192.168.*.*"
-+msgstr "Os endereços IP podem ter caracteres-curinga, como por ex: 192.168.*.*"
-+
-+#: ../gtk/tr-prefs.c:835
-+msgid "Addresses:"
-+msgstr "Endereços:"
-+
-+#: ../gtk/tr-prefs.c:935
-+msgid "Every Day"
-+msgstr "Todos os dias"
-+
-+#: ../gtk/tr-prefs.c:936
-+msgid "Weekdays"
-+msgstr "Dias da semana"
-+
-+#: ../gtk/tr-prefs.c:937
-+msgid "Weekends"
-+msgstr "Fins de semana"
-+
-+#: ../gtk/tr-prefs.c:938
-+msgid "Sunday"
-+msgstr "Domingo"
-+
-+#: ../gtk/tr-prefs.c:939
-+msgid "Monday"
-+msgstr "Segunda-Feira"
-+
-+#: ../gtk/tr-prefs.c:940
-+msgid "Tuesday"
-+msgstr "Terça-Feira"
-+
-+#: ../gtk/tr-prefs.c:941
-+msgid "Wednesday"
-+msgstr "Quarta-Feira"
-+
-+#: ../gtk/tr-prefs.c:942
-+msgid "Thursday"
-+msgstr "Quinta-Feira"
-+
-+#: ../gtk/tr-prefs.c:943
-+msgid "Friday"
-+msgstr "Sexta-Feira"
-+
-+#: ../gtk/tr-prefs.c:944
-+msgid "Saturday"
-+msgstr "Sábado"
-+
-+#: ../gtk/tr-prefs.c:975
-+msgid "Speed Limits"
-+msgstr "Limites de Velocidade"
-+
-+#: ../gtk/tr-prefs.c:977
-+#, c-format
-+msgid "_Upload (%s):"
-+msgstr "_Enviar (%s):"
-+
-+#: ../gtk/tr-prefs.c:984
-+#, c-format
-+msgid "_Download (%s):"
-+msgstr "_Descarregar (%s):"
-+
-+#: ../gtk/tr-prefs.c:993
-+msgid "Alternative Speed Limits"
-+msgstr "Limites de velocidade alternativos"
-+
-+#: ../gtk/tr-prefs.c:1002
-+msgid "Override normal speed limits manually or at scheduled times"
-+msgstr "Ignorar limites de velocidade normal manualmente ou em horas programadas"
-+
-+#: ../gtk/tr-prefs.c:1009
-+#, c-format
-+msgid "U_pload (%s):"
-+msgstr "_Enviar (%s):"
-+
-+#: ../gtk/tr-prefs.c:1013
-+#, c-format
-+msgid "Do_wnload (%s):"
-+msgstr "_Descarregar (%s):"
-+
-+#: ../gtk/tr-prefs.c:1017
-+msgid "_Scheduled times:"
-+msgstr "_Horas programadas:"
-+
-+#: ../gtk/tr-prefs.c:1022
-+msgid " _to "
-+msgstr "_a"
-+
-+#: ../gtk/tr-prefs.c:1033
-+msgid "_On days:"
-+msgstr "_nos dias:"
-+
-+#: ../gtk/tr-prefs.c:1064 ../gtk/tr-prefs.c:1137 ../gtk/tr-prefs.c:1219
-+msgid "Status unknown"
-+msgstr "Estado desconhecido"
-+
-+#: ../gtk/tr-prefs.c:1090
-+msgid "Port is <b>closed</b>"
-+msgstr "A porta está <b>fechada</b>"
-+
-+#: ../gtk/tr-prefs.c:1090
-+msgid "Port is <b>open</b>"
-+msgstr "A porta está <b>aberta</b>"
-+
-+#: ../gtk/tr-prefs.c:1104
-+msgid "<i>Testing TCP port…</i>"
-+msgstr "<i>A testar a porta TCP…</i>"
-+
-+#: ../gtk/tr-prefs.c:1130
-+msgid "Listening Port"
-+msgstr "Porta de escuta"
-+
-+#: ../gtk/tr-prefs.c:1132
-+msgid "_Port used for incoming connections:"
-+msgstr "_Porta utilizada para entrada de ligações:"
-+
-+#: ../gtk/tr-prefs.c:1140
-+msgid "Te_st Port"
-+msgstr "Te_star Porta"
-+
-+#: ../gtk/tr-prefs.c:1147
-+msgid "Pick a _random port every time Transmission is started"
-+msgstr "Escolher uma porta _aleatória sempre que o Transmission for iniciado"
-+
-+#: ../gtk/tr-prefs.c:1151
-+msgid "Use UPnP or NAT-PMP port _forwarding from my router"
-+msgstr "Usar redirecionamento de portas UPnP ou NAT-PMP no meu router"
-+
-+#: ../gtk/tr-prefs.c:1156
-+msgid "Peer Limits"
-+msgstr "Limites de pares"
-+
-+#: ../gtk/tr-prefs.c:1159
-+msgid "Maximum peers per _torrent:"
-+msgstr "Máximo de pares por _torrent:"
-+
-+#: ../gtk/tr-prefs.c:1161
-+msgid "Maximum peers _overall:"
-+msgstr "Máximo _total de pares:"
-+
-+#: ../gtk/tr-prefs.c:1167
-+msgid "Enable _uTP for peer communication"
-+msgstr "Ativar _uTP para comunicação de pares"
-+
-+#: ../gtk/tr-prefs.c:1169
-+msgid "uTP is a tool for reducing network congestion."
-+msgstr "O uTP é uma ferramenta para reduzir o congestionamento na rede."
-+
-+#: ../gtk/tr-prefs.c:1174
-+msgid "Use PE_X to find more peers"
-+msgstr "Usar PE_X para encontrar mais pares"
-+
-+#: ../gtk/tr-prefs.c:1176
-+msgid "PEX is a tool for exchanging peer lists with the peers you're connected to."
-+msgstr "O PEX é uma ferramenta para trocar listas de pares com os pares aos quais está conectado."
-+
-+#: ../gtk/tr-prefs.c:1180
-+msgid "Use _DHT to find more peers"
-+msgstr "Usar o _DHT para encontrar mais pares"
-+
-+#: ../gtk/tr-prefs.c:1182
-+msgid "DHT is a tool for finding peers without a tracker."
-+msgstr "O DHT é uma ferramenta para encontrar pares sem um rastreador (tracker)."
-+
-+#: ../gtk/tr-prefs.c:1186
-+msgid "Use _Local Peer Discovery to find more peers"
-+msgstr "Usar _LPD para descobrir mais pares"
-+
-+#: ../gtk/tr-prefs.c:1188
-+msgid "LPD is a tool for finding peers on your local network."
-+msgstr "O LPD (descoberta local de pares) é uma ferramenta para encontrar pares na sua rede local."
-+
-+#: ../gtk/tr-prefs.c:1244
-+msgid "Transmission Preferences"
-+msgstr "Preferências do Transmission"
-+
-+#: ../gtk/tr-prefs.c:1254
-+msgctxt "Gerund"
-+msgid "Downloading"
-+msgstr "Descarregar"
-+
-+#: ../gtk/tr-prefs.c:1255
-+msgctxt "Gerund"
-+msgid "Seeding"
-+msgstr "Semear"
-+
-+#: ../gtk/tr-prefs.c:1257
-+msgid "Network"
-+msgstr "Rede"
-+
-+#: ../gtk/tr-prefs.c:1259
-+msgid "Remote"
-+msgstr "Remoto"
-+
-+#: ../gtk/tr-window.c:127
-+msgid "Torrent"
-+msgstr "Torrent"
-+
-+#: ../gtk/tr-window.c:227
-+msgid "Total Ratio"
-+msgstr "Rácio Total"
-+
-+#: ../gtk/tr-window.c:228
-+msgid "Session Ratio"
-+msgstr "Rácio da Sessão"
-+
-+#: ../gtk/tr-window.c:229
-+msgid "Total Transfer"
-+msgstr "Transferência Total"
-+
-+#: ../gtk/tr-window.c:230
-+msgid "Session Transfer"
-+msgstr "Transferência na Sessão"
-+
-+#: ../gtk/tr-window.c:255
-+#, c-format
-+msgid ""
-+"Click to disable Alternative Speed Limits\n"
-+" (%1$s down, %2$s up)"
-+msgstr ""
-+"Clique para desativar os limites de velocidade alternativos\n"
-+" (%1$s rec, %2$s env)"
-+
-+#: ../gtk/tr-window.c:256
-+#, c-format
-+msgid ""
-+"Click to enable Alternative Speed Limits\n"
-+" (%1$s down, %2$s up)"
-+msgstr ""
-+"Clique para ativar os limites de velocidade alternativos\n"
-+" (%1$s rec, %2$s env)"
-+
-+#: ../gtk/tr-window.c:310
-+#, c-format
-+msgid "Tracker will allow requests in %s"
-+msgstr "O rastreador irá permitir pedidos dentro de %s"
-+
-+#: ../gtk/tr-window.c:380
-+msgid "Unlimited"
-+msgstr "Ilimitado"
-+
-+#: ../gtk/tr-window.c:451
-+msgid "Seed Forever"
-+msgstr "Semear para sempre"
-+
-+#: ../gtk/tr-window.c:489
-+msgid "Limit Download Speed"
-+msgstr "Limitar velocidade de descarregamento"
-+
-+#: ../gtk/tr-window.c:493
-+msgid "Limit Upload Speed"
-+msgstr "Limitar velocidade de envio"
-+
-+#: ../gtk/tr-window.c:500
-+msgid "Stop Seeding at Ratio"
-+msgstr "Parar de semear no rácio"
-+
-+#: ../gtk/tr-window.c:533
-+#, c-format
-+msgid "Stop at Ratio (%s)"
-+msgstr "Parar no rácio (%s)"
-+
-+#: ../gtk/tr-window.c:761 ../gtk/tr-window.c:787
-+#, c-format
-+msgid "Ratio: %s"
-+msgstr "Rácio: %s"
-+
-+#. Translators: "size|" is here for disambiguation. Please remove it from your translation.
-+#. %1$s is the size of the data we've downloaded
-+#. %2$s is the size of the data we've uploaded
-+#: ../gtk/tr-window.c:771
-+#, c-format
-+msgid "Down: %1$s, Up: %2$s"
-+msgstr "Receb: %1$s, Env: %2$s"
-+
-+#. Translators: "size|" is here for disambiguation. Please remove it from your translation.
-+#. %1$s is the size of the data we've downloaded
-+#. %2$s is the size of the data we've uploaded
-+#: ../gtk/tr-window.c:781
-+#, c-format
-+msgid "size|Down: %1$s, Up: %2$s"
-+msgstr "Receb: %1$s, Env: %2$s"
-+
-+#: ../gtk/transmission-gtk.appdata.xml.in:12 ../gtk/transmission-gtk.desktop.in:5
-+msgid "Download and share files over BitTorrent"
-+msgstr "Descarregar e partilhar ficheiros pelo BitTorrent"
-+
-+#. Translators: these are the application description paragraphs in the AppData file.
-+#: ../gtk/transmission-gtk.appdata.xml.in:16
-+msgid "BitTorrent is a peer-to-peer file-sharing protocol that is commonly used to distribute large amounts of data between multiple users."
-+msgstr "O BitTorrent é um protocolo de partilha de ficheiros ponto-a-ponto que é comum utilizar para distribuir grandes quantidades de dados entre vários utilizadores."
-+
-+#: ../gtk/transmission-gtk.appdata.xml.in:20
-+msgid "Transmission is a BitTorrent client with an easy-to-use frontend on top a cross-platform backend. Native frontends are available for OS X and Windows, as well as command line and web frontends."
-+msgstr "O Transmission é um cliente BitTorrent com uma interface fácil de utilizar sobre um código multi-plataforma. Existem várias interfaces nativas para OS X e Windows, assim como em linha de comandos e baseado na web."
-+
-+#: ../gtk/transmission-gtk.appdata.xml.in:26
-+msgid "Notable features of Transmission include support for Local Peer Discovery, encryption, DHT, µTP, PEX and Magnet Link."
-+msgstr "O Transmission tem funcionalidaes notáveis como , descoberta de pares locais (LPD), encriptação, tabelas de hash distribuídas (DHT), protocolo de transporte micro (µTP), troca de pares (PEX) e links magnéticos."
-+
-+#: ../gtk/transmission-gtk.desktop.in:4
-+msgid "BitTorrent Client"
-+msgstr "Cliente BitTorrent"
-+
-+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-+#: ../gtk/transmission-gtk.desktop.in:7
-+msgid "torrents;downloading;uploading;share;sharing;"
-+msgstr "torrents;descarregar;baixar;transferir;transferência;enviar;partilhar;partilha;"
-+
-+#: ../gtk/transmission-gtk.desktop.in:21
-+msgid "Start Transmission with All Torrents Paused"
-+msgstr "Iniciar o Transmission com todos os torrents em pausa"
-+
-+#: ../gtk/transmission-gtk.desktop.in:25
-+msgid "Start Transmission Minimized"
-+msgstr "Iniciar o Transmission minimizado"
-+
-+#: ../gtk/util.c:36
-+msgid "KiB"
-+msgstr "KiB"
-+
-+#: ../gtk/util.c:37
-+msgid "MiB"
-+msgstr "MiB"
-+
-+#: ../gtk/util.c:38
-+msgid "GiB"
-+msgstr "GiB"
-+
-+#: ../gtk/util.c:39
-+msgid "TiB"
-+msgstr "TiB"
-+
-+#: ../gtk/util.c:42
-+msgid "kB"
-+msgstr "kB"
-+
-+#: ../gtk/util.c:43
-+msgid "MB"
-+msgstr "MB"
-+
-+#: ../gtk/util.c:44
-+msgid "GB"
-+msgstr "GB"
-+
-+#: ../gtk/util.c:45
-+msgid "TB"
-+msgstr "TB"
-+
-+#: ../gtk/util.c:48
-+msgid "kB/s"
-+msgstr "kB/s"
-+
-+#: ../gtk/util.c:49
-+msgid "MB/s"
-+msgstr "MB/s"
-+
-+#: ../gtk/util.c:50
-+msgid "GB/s"
-+msgstr "GB/s"
-+
-+#: ../gtk/util.c:51
-+msgid "TB/s"
-+msgstr "TB/s"
-+
-+#: ../gtk/util.c:122
-+#, c-format
-+msgid "%'d day"
-+msgid_plural "%'d days"
-+msgstr[0] "%'d dia"
-+msgstr[1] "%'d dias"
-+
-+#: ../gtk/util.c:123
-+#, c-format
-+msgid "%'d hour"
-+msgid_plural "%'d hours"
-+msgstr[0] "%'d hora"
-+msgstr[1] "%'d horas"
-+
-+#: ../gtk/util.c:124
-+#, c-format
-+msgid "%'d minute"
-+msgid_plural "%'d minutes"
-+msgstr[0] "%'d minuto"
-+msgstr[1] "%'d minutos"
-+
-+#: ../gtk/util.c:125
-+#, c-format
-+msgid "%'d second"
-+msgid_plural "%'d seconds"
-+msgstr[0] "%'d segundo"
-+msgstr[1] "%'d segundos"
-+
-+#: ../gtk/util.c:258
-+#, c-format
-+msgid "The torrent file \"%s\" contains invalid data."
-+msgstr "O ficheiro torrent \"%s\" contém dados inválidos."
-+
-+#: ../gtk/util.c:262
-+#, c-format
-+msgid "The torrent file \"%s\" is already in use by \"%s.\""
-+msgstr "O ficheiro torrent \"%s\" está a ser utilizador pelo \"%s.\""
-+
-+#: ../gtk/util.c:267
-+#, c-format
-+msgid "The torrent file \"%s\" encountered an unknown error."
-+msgstr "O ficheiro torrent \"%s\" encontrou um erro desconhecido."
-+
-+#: ../gtk/util.c:271
-+msgid "Error opening torrent"
-+msgstr "Erro ao abrir o torrent"
-+
-+#: ../gtk/util.c:594
-+msgid "Unrecognized URL"
-+msgstr "URL irreconhecido"
-+
-+#: ../gtk/util.c:596
-+#, c-format
-+msgid "Transmission doesn't know how to use \"%s\""
-+msgstr "O Transmission não sabe como utilizar \"%s\""
-+
-+#: ../gtk/util.c:601
-+#, c-format
-+msgid "This magnet link appears to be intended for something other than BitTorrent. BitTorrent magnet links have a section containing \"%s\"."
-+msgstr "Este link magnético parece ser para outra coisa que não o BitTorrent. Os links magnéticos BitTorrent têm uma secção com \"%s\"."
-+
-+#: ../gtk/util.c:723
-+#, c-format
-+msgid "%s free"
-+msgstr "%s livre"
-+
-+#: ../libtransmission/announcer-http.c:221 ../libtransmission/announcer-http.c:389
-+#, c-format
-+msgid "Tracker gave HTTP response code %1$ld (%2$s)"
-+msgstr "O rastreador forneceu o código HTTP de resposta %1$ld (%2$s)"
-+
-+#: ../libtransmission/announcer-udp.c:273 ../libtransmission/announcer-udp.c:423
-+msgid "Unknown error"
-+msgstr "Erro desconhecido"
-+
-+#: ../libtransmission/announcer-udp.c:513
-+#, c-format
-+msgid "DNS Lookup failed: %s"
-+msgstr "Falhou a consulta de DNS: %s"
-+
-+#: ../libtransmission/announcer-udp.c:616
-+msgid "Connection failed"
-+msgstr "A ligação falhou"
-+
-+#: ../libtransmission/announcer.c:1150 ../libtransmission/announcer.c:1469
-+msgid "Could not connect to tracker"
-+msgstr "Não foi possível conectar ao rastreador"
-+
-+#: ../libtransmission/announcer.c:1154 ../libtransmission/announcer.c:1473
-+msgid "Tracker did not respond"
-+msgstr "O rastreador não respondeu"
-+
-+#: ../libtransmission/announcer.c:1218
-+msgid "Success"
-+msgstr "Sucesso"
-+
-+#: ../libtransmission/blocklist.c:63 ../libtransmission/blocklist.c:360 ../libtransmission/utils.c:258
-+#, c-format
-+msgid "Couldn't read \"%1$s\": %2$s"
-+msgstr "Não foi possível ler \"%1$s\": %2$s"
-+
-+#: ../libtransmission/blocklist.c:103
-+#, c-format
-+msgid "Blocklist \"%s\" contains %zu entries"
-+msgstr "A lista de bloqueios \"%s\" contém %zu entradas"
-+
-+#. don't try to display the actual lines - it causes issues
-+#: ../libtransmission/blocklist.c:403
-+#, c-format
-+msgid "blocklist skipped invalid address at line %d"
-+msgstr "a lista de bloqueios ignorou endereços inválidos na linha %d"
-+
-+#: ../libtransmission/blocklist.c:460 ../libtransmission/rpcimpl.c:1650 ../libtransmission/rpcimpl.c:1664 ../libtransmission/rpcimpl.c:1687 ../libtransmission/variant.c:1226
-+#, c-format
-+msgid "Couldn't save file \"%1$s\": %2$s"
-+msgstr "Não foi possível gravar o ficheiro \"%1$s\": %2$s"
-+
-+#: ../libtransmission/blocklist.c:466
-+#, c-format
-+msgid "Blocklist \"%s\" updated with %zu entries"
-+msgstr "A lista de bloqueios \"%s\" foi atualizada com %zu entradas"
-+
-+#: ../libtransmission/fdlimit.c:168
-+#, c-format
-+msgid "Couldn't get directory for \"%1$s\": %2$s"
-+msgstr "Não foi possível obter o diretório de \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:174 ../libtransmission/file-posix.c:243
-+#, c-format
-+msgid "Couldn't create \"%1$s\": %2$s"
-+msgstr "Não foi possível criar \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:195
-+#, c-format
-+msgid "Couldn't open \"%1$s\": %2$s"
-+msgstr "Não foi possível abrir \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:207
-+msgid "full"
-+msgstr "cheio"
-+
-+#: ../libtransmission/fdlimit.c:212
-+msgid "sparse"
-+msgstr "escasso"
-+
-+#: ../libtransmission/fdlimit.c:219
-+#, c-format
-+msgid "Couldn't preallocate file \"%1$s\" (%2$s, size: %3$<PRIu64>): %4$s"
-+msgstr "Não foi possível pré-alocar o ficheiro \"%1$s\" (%2$s, tamanho: %3$<PRIu64>): %4$s"
-+
-+#: ../libtransmission/fdlimit.c:224
-+#, c-format
-+msgid "Preallocated file \"%1$s\" (%2$s, size: %3$<PRIu64>)"
-+msgstr "Ficheiro pré-alocado \"%1$s\" (%2$s, tamanho: %3$<PRIu64>)"
-+
-+#: ../libtransmission/fdlimit.c:235
-+#, c-format
-+msgid "Couldn't truncate \"%1$s\": %2$s"
-+msgstr "Não foi possível truncar \"%1$s\": %2$s"
-+
-+#: ../libtransmission/fdlimit.c:553
-+#, c-format
-+msgid "Couldn't create socket: %s"
-+msgstr "Não foi possível criar o socket: %s"
-+
-+#: ../libtransmission/file-posix.c:153
-+#, c-format
-+msgid "File \"%s\" is in the way"
-+msgstr "O ficheiro \"%s\" está no caminho"
-+
-+#: ../libtransmission/makemeta.c:54
-+#, c-format
-+msgid "Torrent Creator is skipping file \"%s\": %s"
-+msgstr "O criador de torrents está a ignorar o ficheiro \"%s\": %s"
-+
-+#: ../libtransmission/makemeta.c:209
-+#, c-format
-+msgid "Failed to set piece size to %s, leaving it at %s"
-+msgstr "Não foi possível definir o tamanho das peças em %s, a utilizar %s"
-+
-+#: ../libtransmission/metainfo.c:759
-+#, c-format
-+msgid "Invalid metadata entry \"%s\""
-+msgstr "Entrada de metadados inválidos \"%s\""
-+
-+#: ../libtransmission/natpmp.c:30
-+msgid "Port Forwarding (NAT-PMP)"
-+msgstr "Redirecionamento de portas (NAT-PMP)"
-+
-+#: ../libtransmission/natpmp.c:73
-+#, c-format
-+msgid "%s succeeded (%d)"
-+msgstr "%s bem sucedido (%d)"
-+
-+#: ../libtransmission/natpmp.c:138
-+#, c-format
-+msgid "Found public address \"%s\""
-+msgstr "Endereço público encontrado \"%s\""
-+
-+#: ../libtransmission/natpmp.c:173
-+#, c-format
-+msgid "no longer forwarding port %d"
-+msgstr "já não está a redirecionar a porta %d"
-+
-+#: ../libtransmission/natpmp.c:222
-+#, c-format
-+msgid "Port %d forwarded successfully"
-+msgstr "Porta %d redirecionada com sucesso"
-+
-+#: ../libtransmission/net.c:323
-+#, c-format
-+msgid "Couldn't set source address %s on %<PRIdMAX>: %s"
-+msgstr "Não foi possível definir o endereço da fonte %s em %<PRIdMAX>: %s"
-+
-+#: ../libtransmission/net.c:339
-+#, c-format
-+msgid "Couldn't connect socket %<PRIdMAX> to %s, port %d (errno %d - %s)"
-+msgstr "Não foi possível conectar o socket %<PRIdMAX> a %s, porta %d (errno %d - %s)"
-+
-+#: ../libtransmission/net.c:436
-+msgid "Is another copy of Transmission already running?"
-+msgstr "Está a ser executada outra instância do Transmission?"
-+
-+#: ../libtransmission/net.c:445
-+#, c-format
-+msgid "Couldn't bind port %d on %s: %s"
-+msgstr "Não foi possível vincular a porta %d em %s: %s"
-+
-+#: ../libtransmission/net.c:449
-+#, c-format
-+msgid "Couldn't bind port %d on %s: %s (%s)"
-+msgstr "Não foi possível vincular a porta %d em %s: %s (%s)"
-+
-+#: ../libtransmission/peer-msgs.c:2134
-+#, c-format
-+msgid "Please Verify Local Data! Piece #%zu is corrupt."
-+msgstr "Por favor verifique os dados locais! A peça #%zu está corrompida."
-+
-+#: ../libtransmission/platform.c:472
-+#, c-format
-+msgid "Searching for web interface file \"%s\""
-+msgstr "A procurar pelo ficheiro de interface web \"%s\""
-+
-+#: ../libtransmission/port-forwarding.c:29
-+msgid "Port Forwarding"
-+msgstr "Redirecionamento de portas"
-+
-+#: ../libtransmission/port-forwarding.c:57
-+msgid "Starting"
-+msgstr "A iniciar"
-+
-+#: ../libtransmission/port-forwarding.c:60
-+msgid "Forwarded"
-+msgstr "Redirecionado"
-+
-+#: ../libtransmission/port-forwarding.c:63
-+msgid "Stopping"
-+msgstr "A parar"
-+
-+#: ../libtransmission/port-forwarding.c:66
-+msgid "Not forwarded"
-+msgstr "Não redirecionado"
-+
-+#: ../libtransmission/port-forwarding.c:106 ../libtransmission/torrent.c:2302
-+#, c-format
-+msgid "State changed from \"%1$s\" to \"%2$s\""
-+msgstr "Estado alterado de \"%1$s\" para \"%2$s\""
-+
-+#: ../libtransmission/port-forwarding.c:196
-+msgid "Stopped"
-+msgstr "Parado"
-+
-+#: ../libtransmission/rpc-server.c:1096
-+#, c-format
-+msgid "Couldn't find settings key \"%s\""
-+msgstr "Não foi possível encontrar a chave de configurações \"%s\""
-+
-+#: ../libtransmission/rpc-server.c:1230
-+#, c-format
-+msgid "%s is not a valid address"
-+msgstr "%s não é um endereço válido"
-+
-+#: ../libtransmission/rpc-server.c:1235
-+#, c-format
-+msgid "%s is not an IPv4 or IPv6 address. RPC listeners must be IPv4 or IPv6"
-+msgstr "%s não é um endereço IPv4 nem IPv6. Os RPC listeners têm de ser IPv4 ou IPv6"
-+
-+#: ../libtransmission/rpc-server.c:1243
-+#, c-format
-+msgid "Serving RPC and Web requests on %s:%d%s"
-+msgstr "A servir pedidos RPC e Web em %s:%d%s"
-+
-+#: ../libtransmission/rpc-server.c:1249
-+msgid "Whitelist enabled"
-+msgstr "Lista branca ativada"
-+
-+#: ../libtransmission/rpc-server.c:1254
-+msgid "Password required"
-+msgstr "Necessária palavra-passe"
-+
-+#: ../libtransmission/rpcimpl.c:1674
-+#, c-format
-+msgid "Error uncompressing blocklist: %s (%d)"
-+msgstr "Erro ao descomprimir a lista de bloqueios: %s (%d)"
-+
-+#. first %s is the application name
-+#. second %s is the version number
-+#: ../libtransmission/session.c:769
-+#, c-format
-+msgid "%s %s started"
-+msgstr "1%s 1%s iniciado"
-+
-+#: ../libtransmission/session.c:2170
-+#, c-format
-+msgid "Loaded %d torrents"
-+msgstr "%d torrents carregados"
-+
-+#: ../libtransmission/torrent-magnet.c:310
-+msgid "Magnet torrent's metadata is not usable"
-+msgstr "Os metadados do torrent magnético não são utilizáveis"
-+
-+#: ../libtransmission/torrent.c:616
-+#, c-format
-+msgid "Tracker warning: \"%s\""
-+msgstr "Aviso do rastreador: \"%s\""
-+
-+#: ../libtransmission/torrent.c:623
-+#, c-format
-+msgid "Tracker error: \"%s\""
-+msgstr "Erro do rastreador: \"%s\""
-+
-+#: ../libtransmission/torrent.c:916
-+msgid "No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it."
-+msgstr "Não foram encontrados dados. Certifique-se que as suas drives estão ligadas ou utiliza \"Definir Localização\". Para tornar a descarregar, remova o torrent e torne a adicioná-lo."
-+
-+#: ../libtransmission/torrent.c:1868
-+msgid "Restarted manually -- disabling its seed ratio"
-+msgstr "Reiniciado manualmente - a desativar o rácio de semear"
-+
-+#: ../libtransmission/torrent.c:2078
-+msgid "Removing torrent"
-+msgstr "A remover o torrent"
-+
-+#. Translators: this is a minor point that's safe to skip over, but FYI:
-+#. "Complete" and "Done" are specific, different terms in Transmission:
-+#. "Complete" means we've downloaded every file in the torrent.
-+#. "Done" means we're done downloading the files we wanted, but NOT all
-+#. that exist
-+#: ../libtransmission/torrent.c:2164
-+msgid "Done"
-+msgstr "Feito"
-+
-+#: ../libtransmission/torrent.c:2167
-+msgid "Complete"
-+msgstr "Completo"
-+
-+#: ../libtransmission/torrent.c:3466
-+#, c-format
-+msgid "Piece %<PRIu32>, which was just downloaded, failed its checksum test"
-+msgstr "A peça %<PRIu32>, que acabou de ser descarregada, falhou no teste de  soma de verificação (checksum)"
-+
-+#: ../libtransmission/upnp.c:29
-+msgid "Port Forwarding (UPnP)"
-+msgstr "Redirecionamento de portas (UPnP)"
-+
-+#: ../libtransmission/upnp.c:200
-+#, c-format
-+msgid "Found Internet Gateway Device \"%s\""
-+msgstr "Foi encontrado o Internet Gateway Device \"%s\""
-+
-+#: ../libtransmission/upnp.c:201
-+#, c-format
-+msgid "Local Address is \"%s\""
-+msgstr "O endereço local é \"%s\""
-+
-+#: ../libtransmission/upnp.c:228
-+#, c-format
-+msgid "Port %d isn't forwarded"
-+msgstr "A porta %d não está a ser redirecionada"
-+
-+#: ../libtransmission/upnp.c:238
-+#, c-format
-+msgid "Stopping port forwarding through \"%s\", service \"%s\""
-+msgstr "A parar o redirecionamento de portas por \"%s\", serviço \"%s\""
-+
-+#: ../libtransmission/upnp.c:275
-+#, c-format
-+msgid "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)"
-+msgstr "A redirecionar portas por \"%s\", serviço \"%s\". (endereço local: %s:%d)"
-+
-+#: ../libtransmission/upnp.c:280
-+msgid "Port forwarding successful!"
-+msgstr "Redirecionamento de portas bem sucedido!"
-+
-+#: ../libtransmission/utils.c:270 ../libtransmission/utils.c:271
-+msgid "Not a regular file"
-+msgstr "Não é um ficheiro normal"
-+
-+#. did caller give us an uninitialized val?
-+#: ../libtransmission/variant.c:926
-+msgid "Invalid metadata"
-+msgstr "metadados inválidos"
-+
-+#: ../libtransmission/variant.c:1211 ../libtransmission/variant.c:1235
-+#, c-format
-+msgid "Couldn't save temporary file \"%1$s\": %2$s"
-+msgstr "Não foi possível gravar o ficheiro temporário \"%1$s\": %2$s"
-+
-+#: ../libtransmission/variant.c:1221
-+#, c-format
-+msgid "Saved \"%s\""
-+msgstr "\"%s\" gravado"
-+
-+#: ../libtransmission/variant.c:1264
-+msgid "Unable to parse file content"
-+msgstr "Não foi possível processar o conteúdo do ficheiro"
-+
-+#: ../libtransmission/verify.c:220
-+msgid "Verifying torrent"
-+msgstr "A verificar o torrent"
-+
-+#, c-format
-+#~ msgid "Server returned \"%1$ld %2$s\""
-+#~ msgstr "O servidor devolveu \"%1$ld %2$s\""
-+
-+#, c-format
-+#~ msgid "Error opening \"%s\""
-+#~ msgstr "Erro ao abrir \"%s\""
diff --git a/srcpkgs/transmission/patches/fix-makefiles.patch b/srcpkgs/transmission/patches/fix-makefiles.patch
deleted file mode 100644
index 37f994ef0072..000000000000
--- a/srcpkgs/transmission/patches/fix-makefiles.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 642db5762b1f8e9d2bb8527b153b6c47d856cb9d Mon Sep 17 00:00:00 2001
-From: Mike Gelfand <mikedld@mikedld.com>
-Date: Sat, 23 May 2020 01:39:36 +0300
-Subject: [PATCH] Add missing files that fail build from tarball
-
-Fixes: #1246
----
- libtransmission/Makefile.am | 3 +++
- macosx/Makefile.am          | 2 ++
- po/LINGUAS                  | 1 +
- third-party/Makefile.am     | 3 +++
- 4 files changed, 9 insertions(+)
-
-diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
-index 0885fab0d..d9a61c12f 100644
---- a/libtransmission/Makefile.am
-+++ b/libtransmission/Makefile.am
-@@ -316,3 +316,6 @@ watchdir_generic_test_CPPFLAGS = -DWATCHDIR_TEST_FORCE_GENERIC $(AM_CPPFLAGS)
- rename_test_SOURCES = rename-test.c $(TEST_SOURCES)
- rename_test_LDADD = ${apps_ldadd}
- rename_test_LDFLAGS = ${apps_ldflags}
-+
-+EXTRA_DIST = \
-+  subprocess-test.cmd
-diff --git a/macosx/Makefile.am b/macosx/Makefile.am
-index 27abb77b6..5a6fec9ef 100644
---- a/macosx/Makefile.am
-+++ b/macosx/Makefile.am
-@@ -95,6 +95,8 @@ EXTRA_DIST = \
-     InfoTabButtonBack.m \
-     InfoTabButtonCell.h \
-     InfoTabButtonCell.m \
-+    InfoTabMatrix.h \
-+    InfoTabMatrix.m \
-     InfoTextField.h \
-     InfoTextField.m \
-     InfoActivityViewController.h \
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 08629cd1b..6b3145a37 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -68,6 +68,7 @@ pa
- pl
- pt
- pt_BR
-+pt_PT
- ro
- ru
- si
-diff --git a/third-party/Makefile.am b/third-party/Makefile.am
-index 9f66878d9..33df96d42 100644
---- a/third-party/Makefile.am
-+++ b/third-party/Makefile.am
-@@ -22,5 +22,8 @@ SUBDIRS = \
-   $(UTP_DIR)
- 
- EXTRA_DIST = \
-+  curl \
-+  libevent \
-+  openssl \
-   macosx-libevent-config.h \
-   macosx-libevent-event-config.h
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 5a61a0a2bdd3..d5a1d98d5f8a 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,19 +1,19 @@
 # Template file for 'transmission'
 pkgname=transmission
-version=3.00
-revision=5
+version=4.0.2
+revision=1
 build_style=cmake
-configure_args="-DENABLE_CLI=ON"
+configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF"
 hostmakedepends="autoconf automake intltool glib-devel
  libtool pkg-config qt5-host-tools qt5-qmake"
-makedepends="dbus-glib-devel gtk+3-devel
- libcurl-devel libevent-devel qt5-tools-devel"
+makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel
+ libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel"
 short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"
-distfiles="https://github.com/transmission/transmission-releases/raw/master/${pkgname}-${version}.tar.xz"
-checksum=9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2
+distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8
 
 # Create transmission system user/group
 system_accounts="transmission"
@@ -24,13 +24,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
-post_configure() {
-	# Add missing includes which happen as side-effects with glibc
-	sed -i libtransmission/transmission.h \
-		 -e "/#include <inttypes.h>.*/i #include <sys/types.h> /* ssize_t */" \
-		 -e "/#include <inttypes.h>.*/i #include <stdio.h> /* off_t */"
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/share/${pkgname}/web/LICENSE
 	vsv transmission-daemon
@@ -45,7 +38,7 @@ transmission-qt_package() {
 		vmove usr/share/man/man1/transmission-qt.1
 		vmove usr/share/transmission/translations
 		sed -i '/Icon=/s/transmission/&-qt/' ${DESTDIR}/usr/share/applications/transmission-qt.desktop
-		vinstall ${wrksrc}/qt/icons/transmission.png 644 usr/share/pixmaps transmission-qt.png
+		vinstall ${wrksrc}/qt/icons/transmission.svg 644 usr/share/pixmaps transmission-qt.svg
 		vinstall ${wrksrc}/gtk/icons/hicolor_apps_scalable_transmission.svg \
 			644 usr/share/icons/hicolor/scalable/apps transmission-qt.svg
 		vmove usr/share/applications/transmission-qt.desktop
@@ -60,7 +53,7 @@ transmission-gtk_package() {
 		vmove usr/share/man/man1/transmission-gtk.1
 		vmove usr/share/icons/hicolor
 		vmove usr/share/applications/transmission-gtk.desktop
-		vinstall ${wrksrc}/qt/icons/transmission.png 644 usr/share/pixmaps
+		vinstall ${wrksrc}/qt/icons/transmission.svg 644 usr/share/pixmaps
 		# This install path seems to be used with musl libc
 		if [ -d ${DESTDIR}/usr/lib/locale ]; then
 			mv ${DESTDIR}/usr/lib/locale ${DESTDIR}/usr/share

From fe4e79952462795e32aea6e2f4628a11f4784284 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Thu, 30 Mar 2023 23:54:20 -0600
Subject: [PATCH 1126/1854] toybox: update to 0.8.9

---
 srcpkgs/toybox/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template
index d9b67535114f..302abb234c6d 100644
--- a/srcpkgs/toybox/template
+++ b/srcpkgs/toybox/template
@@ -1,6 +1,6 @@
 # Template file for 'toybox'
 pkgname=toybox
-version=0.8.7
+version=0.8.9
 revision=1
 create_wrksrc=yes
 short_desc="BSD-licensed alternative to busybox"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="0BSD"
 homepage="http://www.landley.net/toybox"
 distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz"
-checksum=b508bf336f82cb0739b77111f945931d1a143b5a53905cb753cd2607cfdd1494
+checksum=06913dde3de7139b40f947bd7f23869dfc8796e9c6ff39de02719f8b7b2d47ad
 
 post_extract() {
 	mv toybox-${version} toybox
@@ -30,10 +30,12 @@ do_build() {
 }
 
 _rm_failing_tests() {
-	# XXX: Some tests for du, find and grep fail
+	# XXX: Some tests for du, find, grep, sed and tar fail
 	rm tests/du.test
 	rm tests/find.test
 	rm tests/grep.test
+	rm tests/sed.test
+	rm tests/tar.test
 	[ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ] && return 0
 	# XXX: chattr, hostname,losetup, rmdir tests fail on CI
 	rm tests/chattr.test

From 58c66ce95a9abd29e574c5a03448ca9d991150c2 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Wed, 29 Mar 2023 23:49:07 +0100
Subject: [PATCH 1127/1854] apache: Update to 2.4.56

---
 srcpkgs/apache/template | 42 +++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..36fcec88ddd7 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.54
-revision=2
+version=2.4.56
+revision=1
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
@@ -34,7 +34,7 @@ license="Apache-2.0"
 homepage="https://httpd.apache.org/"
 changelog="https://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
-checksum=eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340
+checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
 
 system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"
@@ -55,12 +55,32 @@ fi
 
 pre_configure() {
 	# set default user
-	sed -e 's#User daemon#User _apache#' \
+	vsed -e 's#User daemon#User _apache#' \
 		-e 's#Group daemon#Group _apache#' \
 		-i docs/conf/httpd.conf.in
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
 	if [ "$CROSS_BUILD" ]; then
+		# NOTE: Here, we prepare a modified version of
+		# libtool into $XBPS_WRAPPERDIR. This sets...
+		#
+		# `CC=${CC:=gcc}`
+		# `LD=${LD:=ld}`
+		#
+		# ...so the build doesn't attempt to use the
+		# host linker...
+		sed ${XBPS_CROSS_BASE}/usr/bin/libtool \
+			-e 's;^\(LD\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+			-e 's;^\(CC\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+			> ${XBPS_WRAPPERDIR}/libtool
+		chmod +x ${XBPS_WRAPPERDIR}/libtool
+
+		# Here, we're altering the configure script
+		# to use our modified libtool...
+		vsed -i configure \
+			-e "s;\(my_libtool=\).*$;\1\""${XBPS_WRAPPERDIR}"/libtool\";g" \
+			-e "s;\(SH_LIBTOOL=\)'\$(SHELL).*'$;\1'\$(LIBTOOL)';g"
+
 		# pcre{,2}-config detection doesn't work on cross
 		# since httpd-2.4.53, manually export PCRE_CONFIG
 		# to let configure know where it is
@@ -76,14 +96,12 @@ pre_configure() {
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		# Build gen_test_char using $BUILD_CC
-		sed -i server/Makefile \
+		vsed -i server/Makefile \
 			-e "s;\$(LINK) \$(EXTRA_LDFLAGS) \$(\(gen_test_char\).*;${BUILD_CC} -o \1 \1.c -I${XBPS_CROSS_BASE}/usr/include/apr-1;"
 		# More hacks to make cross compiling work
-		sed -i build/*.mk Makefile */Makefile \
+		vsed -i build/rules.mk support/Makefile \
 			-e "s;--mode=compile;& --tag=CC;" \
-			-e "s;--mode=link;& --tag=CC;" \
-			-e "s;-\(L|R\)/usr/lib;-\1${XBPS_CROSS_BASE}/usr/lib;" \
-			-e "s;^\(LIBTOOL =\) /usr/share/apr-1/build/libtool;\1 ${XBPS_CROSS_BASE}/usr/bin/libtool;"
+			-e "s;--mode=link;& --tag=CC;"
 	fi
 }
 
@@ -108,7 +126,7 @@ post_install() {
 	#  * httpd-userdir.conf
 	#  * httpd-default.conf
 	#
-	sed \
+	vsed \
 		-e 's|ServerRoot ""|ServerRoot "/srv/www/apache"|' \
 		-e 's|#\(LoadModule include_module /usr/libexec/httpd/mod_include.so\)|\1|' \
 		-e 's|\(LoadModule unique_id_module /usr/libexec/httpd/mod_unique_id.so\)|#\1|' \
@@ -123,10 +141,6 @@ post_install() {
 		-e 's|#\(Include /etc/apache/extra/httpd-default.conf\)|\1|' \
 		-i "${DESTDIR}/etc/apache/httpd.conf"
 
-	# Remove references to hardening -specs.
-	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
-		${DESTDIR}/usr/share/apache/webroot/build/config{.nice,_vars.mk}
-
 	# Remove unused stuff.
 	vmkdir usr/share/apache/webroot
 	mv ${DESTDIR}/srv/www/$pkgname/cgi-bin ${DESTDIR}/usr/share/apache/webroot

From b268482e9fee154f36de7f0986e4332b05cf9a31 Mon Sep 17 00:00:00 2001
From: Gabriel Vinicius Canzi Candido <gabriel.vccandido@gmail.com>
Date: Sun, 19 Mar 2023 13:54:11 -0300
Subject: [PATCH 1128/1854] bind-utils: move nsupdate from bind to bind-utils

---
 srcpkgs/bind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 50700e0dfec9..54493e5d9cf9 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.22
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-largefile --with-libtool
@@ -54,7 +54,7 @@ bind-libs_package() {
 bind-utils_package() {
 	short_desc+=" - DNS utils"
 	pkg_install() {
-		for f in dig host nslookup; do
+		for f in dig host nslookup nsupdate; do
 			vmove usr/bin/${f}
 			vmove usr/share/man/man1/${f}.1
 		done

From 93eac7f73d047c7c18c5342501d78e3c767d7c84 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Mon, 20 Mar 2023 17:27:20 +0900
Subject: [PATCH 1129/1854] gforth: fix build on musl

---
 srcpkgs/gforth/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gforth/template b/srcpkgs/gforth/template
index f0df03991086..053a4814dd8e 100644
--- a/srcpkgs/gforth/template
+++ b/srcpkgs/gforth/template
@@ -14,6 +14,8 @@ checksum=2f62f2233bf022c23d01c920b1556aa13eab168e3236b13352ac5e9f18542bb0
 disable_parallel_build=yes
 
 nocross="Configure script is picky: https://api.travis-ci.org/jobs/158049419/log.txt?deansi=true"
-case "${XBPS_TARGET_MACHINE}" in
-	*-musl) broken="Tests fail, might just be a flushing problem";;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# Tests fail, might just be a flushing problem
+	make_check=no
+	configure_args="--without-check"
+fi

From 3772e0b53584628e17d88e043fa6fe67b1f3b853 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 25 Mar 2023 00:57:00 +0530
Subject: [PATCH 1130/1854] lua-language-server: update to 3.6.22.

---
 srcpkgs/lua-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template
index acd45f5fc61f..66162ef20b3a 100644
--- a/srcpkgs/lua-language-server/template
+++ b/srcpkgs/lua-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'lua-language-server'
 pkgname=lua-language-server
-version=3.6.17
+version=3.6.22
 revision=1
 hostmakedepends="ninja"
 short_desc="Lua LSP implementation written in Lua"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/LuaLS/lua-language-server"
 changelog="https://raw.githubusercontent.com/LuaLS/lua-language-server/master/changelog.md"
 distfiles="https://github.com/LuaLS/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip"
-checksum=3b305a17b885fbbf405eb029907984e86e0be0491f5ef94cb2778300120ed7ea
+checksum=e4bb02a5e32f0af584298da424ad3a0517bd1b9b359cc88c0d64d02a5452608f
 
 do_build() {
 	ninja -C 3rd/luamake -f compile/ninja/linux.ninja

From aeee0f83dd6f48bcd9bdbf024c361681bdfc18e8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 28 Mar 2023 01:20:49 +0530
Subject: [PATCH 1131/1854] libva: update to 2.18.0.

---
 srcpkgs/libva/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 5bb1bbd13a22..a411f3ee45da 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,7 @@
 # Template file for 'libva'
-# NOTE: keep this pkg synchronized with libva-glx
+# NOTE: keep this pkg synchronized with libva-glx and the minor version with libva-utils
 pkgname=libva
-version=2.17.0
+version=2.18.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no"
@@ -13,8 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
-distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001
+distfiles="https://github.com/intel/libva/archive/refs/tags/${version}.tar.gz"
+checksum=9d666c70c12dfefcdd27ae7dea771557f75e24961d0ed4cb050d96fb6136f438
 
 build_options="wayland"
 build_options_default="wayland"

From d4299e01b3210dfdac22627d3797c0a12b0a25f9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 28 Mar 2023 01:23:20 +0530
Subject: [PATCH 1132/1854] libva-glx: update to 2.18.0.

---
 srcpkgs/libva-glx/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index 2e4849927001..4c299577993d 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -4,10 +4,10 @@
 #
 # 	libva -> mesa -> libva
 #
-# KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
+# NOTE: keep this pkg synchronized with libva and the minor version with libva-utils
 #
 pkgname=libva-glx
-version=2.17.0
+version=2.18.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=yes -Dwith_wayland=yes"
@@ -18,8 +18,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
-distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001
+distfiles="https://github.com/intel/libva/archive/refs/tags/${version}.tar.gz"
+checksum=9d666c70c12dfefcdd27ae7dea771557f75e24961d0ed4cb050d96fb6136f438
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From 62817fcd5d65427dbdaf696979c6ec0c8597fa84 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 31 Mar 2023 13:20:10 +0530
Subject: [PATCH 1133/1854] libva-utils: update to 2.18.2.

---
 srcpkgs/libva-utils/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template
index e5422e5921a3..be76e29c3487 100644
--- a/srcpkgs/libva-utils/template
+++ b/srcpkgs/libva-utils/template
@@ -1,6 +1,7 @@
 # Template file for 'libva-utils'
+# NOTE: keep minor version synchronized with libva and libva-glx
 pkgname=libva-utils
-version=2.17.1
+version=2.18.2
 revision=1
 build_style=meson
 configure_args="-Ddrm=true -Dx11=true -Dwayland=true"
@@ -13,7 +14,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia"
 changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS"
 distfiles="https://github.com/intel/libva-utils/archive/refs/tags/${version}.tar.gz"
-checksum=6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966
+checksum=c4c0555c96ca678f9ac47fbb56f0ae56ca39fd50fe3553bae5cb13117bfcb406
 
 post_install() {
 	vlicense COPYING

From da8a6f59fbb937c54b6a459cfd88a426d35bfe9c Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 14 Mar 2023 23:12:36 +0100
Subject: [PATCH 1134/1854] kapow: update to 1.6.1.

---
 srcpkgs/kapow/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kapow/template b/srcpkgs/kapow/template
index b81bf7c3d6e4..2afc9cf7ac36 100644
--- a/srcpkgs/kapow/template
+++ b/srcpkgs/kapow/template
@@ -1,14 +1,14 @@
 # Template file for 'kapow'
 pkgname=kapow
-version=1.5.10
+version=1.6.1
 revision=1
-build_style=qmake
-hostmakedepends="pkg-config qt5-qmake qt5-tools-devel"
-makedepends="qt5-devel"
+build_style=cmake
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Simple punch-clock style time tracker"
 maintainer="Jakub Skrzypnik <jakub.skrzypnik@interia.pl>"
 license="GPL-3.0-or-later"
 homepage="https://gottcode.org/kapow/"
-changelog="https://raw.githubusercontent.com/gottcode/kapow/master/NEWS"
-distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}-src.tar.bz2"
-checksum=6ba62239f5717422d899573ff50f8a967aea8fbbd79ac57406d6b86a333d027c
+changelog="https://raw.githubusercontent.com/gottcode/kapow/master/ChangeLog"
+distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=02d28c49dc84c53be1d42042f9e5e063369e098819d5cac89ce07fc3a8dd4a9d

From 23db709db3e005b9f565358abb4dee6a032b7c1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 23 Jun 2023 22:11:58 +0200
Subject: [PATCH 1135/1854] apache: fix distfiles url

---
 srcpkgs/apache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 36fcec88ddd7..72c09ee934aa 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -33,7 +33,7 @@ maintainer="ologantr <mrphyber@protonmail.com>"
 license="Apache-2.0"
 homepage="https://httpd.apache.org/"
 changelog="https://www.apache.org/dist/httpd/CHANGES_2.4"
-distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
+distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
 
 system_accounts="_apache"

From 7c580587c03a0bbe39ee4e4476b804e11befd0bd Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Mon, 13 Feb 2023 20:58:47 -0500
Subject: [PATCH 1136/1854] megatools: update to 1.11.1

---
 srcpkgs/megatools/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index cf3fe3ffe039..fc06292f89e4 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,8 +1,8 @@
 # Template file for 'megatools'
 pkgname=megatools
-version=1.11.0
+version=1.11.1
 revision=1
-_release_date=20220519
+_release_date=20230212
 build_style=meson
 hostmakedepends="pkg-config asciidoc docbook2x"
 makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
@@ -10,8 +10,9 @@ short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="https://megatools.megous.com/"
-distfiles="${homepage}/builds/megatools-${version}.${_release_date}.tar.gz"
-checksum=b30b1d87d916570f7aa6d36777dd378e83215d75ea5a2c14106028b6bddc261b
+changelog="https://megatools.megous.com/builds/NEWS"
+distfiles="https://megatools.megous.com/builds/megatools-${version}.${_release_date}.tar.gz"
+checksum=ecfa2ee4b277c601ebae648287311030aa4ca73ea61ee730bc66bef24ef19a34
 
 post_install() {
 	vinstall contrib/bash-completion/megatools 644 usr/share/bash-completion/completions

From 1c975ee4a5e2de525150b4f64948f3e976cef557 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:58:01 -0400
Subject: [PATCH 1137/1854] gst-libav: update to 1.22.2

---
 srcpkgs/gst-libav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index e9a79dc650a5..8c72fc3e97ee 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config yasm"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe
+checksum=fcaaf9878fe8f3bc82317ef13a1558824cb68df1f8968c6797f556c5e33bcffd
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From d860361804301d0a61b257fd66188ee07cf059ff Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:58:18 -0400
Subject: [PATCH 1138/1854] gst-omx: update to 1.22.2

---
 srcpkgs/gst-omx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 893535c463da..5ad54cc7b9d8 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Dexamples=disabled -Dtarget=generic"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8db48040bb41f09edf8d17ff6d16c54888d7777ba4501c2c69f0083350ea9a15
+checksum=1b0c57f2cc4ddeec5e7f0c436e502f06665c4e93c73261855b94e04fc94337b2

From d67b76667152c2b0c35a89a15db266c8cea0853e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1139/1854] gst-plugins-bad1: update to 1.22.2

---
 common/shlibs                     | 1 +
 srcpkgs/gst-plugins-bad1/template | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e91bf520622..7bc98cc1b474 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1135,6 +1135,7 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
+libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.22.1_1
 libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index f55f82fd4c77..77bf79981c20 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.20.3
-revision=3
+version=1.22.2
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f
+checksum=3d8faf1ce3402c8535ce3a8c4e1a6c960e4b5655dbda6b55943db9ac79022d0f
 
 build_options="gir gme wayland"
 build_options_default="gir wayland"

From 30b61a0df618386c4cef426067b2b244004d82f0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1140/1854] gst-plugins-base1: update to 1.22.2

---
 srcpkgs/gst-plugins-base1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 29e8f76bd1fe..2f20ea819849 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f
+checksum=eb65120c4ee79b7a153c3c1972d5c0158c2151877cc51ec7725bba5749679d49
 
 build_options="cdparanoia gir sndio wayland"
 build_options_default="cdparanoia gir wayland"

From 276d181fefae94ef047104b7f86b0f6097e244ab Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1141/1854] gst-plugins-good1: update to 1.22.2

---
 srcpkgs/gst-plugins-good1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 1f5e620ce1fd..5d0fe1bfe284 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7
+checksum=7c8cc59425f2b232f60ca7d13e56edd615da4f711e73dd01a7cffa46e6bc0cdd
 
 build_options="gtk3 wayland"
 build_options_default="gtk3 wayland"

From a5818267ed57133cd4bf578a6ae391581ba488dd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:04 -0400
Subject: [PATCH 1142/1854] gst-plugins-ugly1: update to 1.22.2

---
 srcpkgs/gst-plugins-ugly1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index e254fd40f869..85ae64bc7a0a 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-ugly1'
 pkgname=gst-plugins-ugly1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=8caa20789a09c304b49cf563d33cca9421b1875b84fcc187e4a385fa01d6aefd
+checksum=8f30f44db0bd063709bf6fbe55138e3a98af0abcb61c360f35582bbe10e80691

From 5a80075b750cf06763fe5a2030251034ede29105 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 10:59:31 -0400
Subject: [PATCH 1143/1854] gst1-editing-services: update to 1.22.2

---
 srcpkgs/gst1-editing-services/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 673b46970f24..102440f7f253 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
-checksum=5fd896de69fbe24421eb6b0ff8d2f8b4c3cba3f3025ceacd302172f39a8abaa2
+checksum=453b1464fc3857de269a7cb0ebd966afe02171d97bef672a0b8a0a6d43e0cebf
 
 do_check() {
 	: # Tests fail in older versions as well

From 6fd3130ab35248ef9c43269fd0b8d55c8c054987 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:00 -0400
Subject: [PATCH 1144/1854] gst-rtsp-server: update to 1.22.2

---
 srcpkgs/gst-rtsp-server/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template
index 33cd64ceb95e..2f0c0c45ff82 100644
--- a/srcpkgs/gst-rtsp-server/template
+++ b/srcpkgs/gst-rtsp-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-rtsp-server'
 pkgname=gst-rtsp-server
-version=1.20.3
-revision=2
+version=1.22.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config python3"
 makedepends="glib-devel gst-plugins-bad1-devel gobject-introspection
@@ -10,5 +10,5 @@ short_desc="GStreamer multimedia graph framework - rtsp server"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
-distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz"
-checksum=ee402718be9b127f0e5e66ca4c1b4f42e4926ec93ba307b7ccca5dc6cc9794ca
+distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=2be4aecfb88710100ea7115ed0216403e8094344ebf146094271b8d4d73828bf

From 78937eb51e905539844bd06bb0a0c1aadb2cd7e9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:39 -0400
Subject: [PATCH 1145/1854] gst1-python3: update to 1.22.2

---
 srcpkgs/gst1-python3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 3f564ac64b93..789e40f036ea 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.20.3
-revision=2
+version=1.22.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config python3"
 makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=db348120eae955b8cc4de3560a7ea06e36d6e1ddbaa99a7ad96b59846601cfdc
+checksum=bef2b3d82ce4be46b775b1bb56305c1003ee01b535a53a82f9fe8924972153ad

From dd7662db6016769e979266f056f5cf3cba657ba4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:46 -0400
Subject: [PATCH 1146/1854] gstreamer-vaapi: update to 1.22.2

---
 srcpkgs/gstreamer-vaapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 3cc4e057559a..0a5ee8b1ca3f 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=6ee99eb316abdde9ad37002915bd8c3867918f6fdc74b7cf2ac4c1ae0d690b45
+checksum=d2e642f9745f97d9f73a7f5085e7659a9a31fe209b774e6e45dae041b435df06
 
 pre_check() {
 	# Seems to need certain hardware to pass

From da39198d9ec39138fd54151089739e030a23d13f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 19 Mar 2023 11:00:51 -0400
Subject: [PATCH 1147/1854] gstreamer1: update to 1.22.2

---
 srcpkgs/gstreamer1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index ae8a49cb20e8..571148f2ff33 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=607daf64bbbd5fb18af9d17e21c0d22c4d702fffe83b23cb22d1b1af2ca23a2a
+checksum=b2afe73603921c608ba48969dbb7d743776744bfe5d8059ece241137b7f88e21
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From 56218417f7fe030636d49792edc759482df5378e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 23 Jun 2023 17:50:13 +0200
Subject: [PATCH 1148/1854] cocogitto: update to 5.4.0

---
 srcpkgs/cocogitto/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index a4399ef38921..d539c000e0ce 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
-version=5.3.1
-revision=2
+version=5.4.0
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/cocogitto/cocogitto"
 changelog="https://raw.githubusercontent.com/cocogitto/cocogitto/main/CHANGELOG.md"
 distfiles="https://github.com/cocogitto/cocogitto/archive/refs/tags/${version}.tar.gz"
-checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
+checksum=93065217191d3e1739e6bca78b0b6de7d7dd1b5334229702fff9e84162060feb
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 
@@ -28,12 +28,9 @@ post_install() {
 		vcompletion cog.${shell} ${shell} cog
 	done
 
-	vtargetrun ${cog} generate-manpage cog > cog.1
-	vman cog.1
-
-	for subcommand in bump changelog check commit edit init install-hook log verify; do
-		vtargetrun ${cog} generate-manpage ${subcommand} > cog-${subcommand}.1
-		vman cog-${subcommand}.1
+	vtargetrun ${cog} generate-manpages "${XBPS_BUILDDIR}/${pkgname}-${version}/gen"
+	for manpage in gen/*.1; do
+		vman ${manpage}
 	done
 
 	vdoc README.md

From c4c725b6b7c947fbac7036e953bf4946fc1c3560 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 23 Jun 2023 10:57:33 -0300
Subject: [PATCH 1149/1854] icewm: update to 3.4.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index de72f7c9962b..3b34b3557382 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=3.3.5
+version=3.4.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=cdf46a4cb3c75541e37577a652729e8c2bdd302f5e13e30526ced27d91be596a
+checksum=2355bd274d62f639a202a8bc7224e049ef576f8ac5a08084668c8920cb9bc6be
 # broken tests
 make_check=no
 

From 520a7523f5be1306918af4f6a37874ff0d4b25e6 Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 24 Mar 2023 19:42:35 -0400
Subject: [PATCH 1150/1854] New package: newsraft-0.17

---
 srcpkgs/newsraft/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/newsraft/template

diff --git a/srcpkgs/newsraft/template b/srcpkgs/newsraft/template
new file mode 100644
index 000000000000..68cd33eea0f8
--- /dev/null
+++ b/srcpkgs/newsraft/template
@@ -0,0 +1,19 @@
+# Template file for 'newsraft'
+pkgname=newsraft
+version=0.17
+revision=1
+build_style=gnu-makefile
+make_install_args="EXAMPLES_DIR=${DESTDIR}/usr/share/examples/newsraft"
+hostmakedepends="scdoc"
+makedepends="libcurl-devel expat-devel gumbo-parser-devel ncurses-devel sqlite-devel yajl-devel"
+short_desc="Feed reader with ncurses user interface"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="ISC"
+homepage="https://codeberg.org/grisha/newsraft"
+changelog="https://codeberg.org/grisha/newsraft/releases"
+distfiles="https://codeberg.org/grisha/newsraft/archive/newsraft-${version}.tar.gz"
+checksum=12a09b4d4ade374d1ccf4256a9d7eb511f4a59e175e4d832842dfd2b95d8742c
+
+post_install() {
+	vlicense doc/license.txt
+}

From 26fa7810d90ff341a5424ca6decbcaeb0deb8849 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 21:57:40 +0200
Subject: [PATCH 1151/1854] New package: wtfutil-0.43.0

---
 srcpkgs/wtfutil/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/wtfutil/template

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
new file mode 100644
index 000000000000..363b4e71f2d9
--- /dev/null
+++ b/srcpkgs/wtfutil/template
@@ -0,0 +1,18 @@
+# Template file for 'wtfutil'
+pkgname=wtfutil
+version=0.43.0
+revision=1
+build_style=go
+go_import_path="github.com/wtfutil/wtf"
+short_desc="Personal information dashboard for the terminal"
+maintainer="Bnyro <bnyro@tutanota.com>"
+license="MPL-2.0"
+homepage="http://wtfutil.com"
+changelog="https://raw.githubusercontent.com/wtfutil/wtf/master/CHANGELOG.md"
+distfiles="https://github.com/wtfutil/wtf/archive/refs/tags/v${version}.tar.gz"
+checksum=bb48e38e479b26e0b956b163e4804e99cd49545214090c2fdf99e54382b3d651
+
+post_install() {
+	# Rename the binary to wtfutil when installing
+	mv ${DESTDIR}/usr/bin/wtf{,util}
+}

From bfc1e9f1fe9a864dff3f01c18b3f679abff389c4 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Fri, 23 Jun 2023 21:13:24 +0200
Subject: [PATCH 1152/1854] mu4e: update to 1.10.4

---
 srcpkgs/mu4e/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
index 43938e2dacba..498adc73113a 100644
--- a/srcpkgs/mu4e/template
+++ b/srcpkgs/mu4e/template
@@ -1,16 +1,16 @@
 # Template file for 'mu4e'
 pkgname=mu4e
-version=1.10.3
+version=1.10.4
 revision=1
 build_style=meson
 hostmakedepends="emacs libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel"
 short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
+maintainer="Pascal Huber <pascal.huber@resolved.ch>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 changelog="https://github.com/djcb/mu/raw/master/NEWS.org"
 distfiles="https://github.com/djcb/mu/releases/download/v${version}/mu-${version}.tar.xz"
-checksum=c83970fcb6163c27d135c207d1a5eb6f38a5732161741a4a88da2ae894e0245f
+checksum=8eba7864aad442212b2bc62aac6491708084ba5d84416a22b8a8ddf2ee7240ec
 replaces="mu<${version}"
 provides="mu-${version}_${revision}"

From 4a60a4b2753ba6bdc3cda53e5229176c9fc21b3a Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Mon, 7 Nov 2022 19:32:44 -0500
Subject: [PATCH 1153/1854] New package: drm_info-2.5.0

---
 srcpkgs/drm_info/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/drm_info/template

diff --git a/srcpkgs/drm_info/template b/srcpkgs/drm_info/template
new file mode 100644
index 000000000000..f1f14030dec5
--- /dev/null
+++ b/srcpkgs/drm_info/template
@@ -0,0 +1,18 @@
+# Template file for 'drm_info'
+pkgname=drm_info
+version=2.5.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc"
+makedepends="libdrm-devel json-c-devel"
+short_desc="Small utility to dump info about DRM devices"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/emersion/drm_info"
+changelog="https://gitlab.freedesktop.org/emersion/drm_info/-/tags"
+distfiles="https://gitlab.freedesktop.org/emersion/drm_info/-/archive/v${version}/drm_info-v${version}.tar.bz2"
+checksum=73e04f964aaf62529aca2cd57292f972c2246af4dcd7553835e16821a75961c2
+
+post_install() {
+	vlicense LICENSE
+}

From f03411da0dabd101c98e4e629e7e6e53e0127d1b Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Wed, 26 Apr 2023 23:34:05 -0400
Subject: [PATCH 1154/1854] NoiseTorch: update to 0.12.2.

Closes: https://github.com/void-linux/void-packages/pull/43646
---
 srcpkgs/NoiseTorch/template | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index a9e9fb2c92d4..1729a51943c5 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,17 +1,34 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
-version=0.11.4
+version=0.12.2
 revision=1
+build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"
 go_import_path="noisetorch"
 depends="libcap-progs"
 short_desc="Real-time microphone noise suppression on Linux"
-maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/lawl/NoiseTorch"
-distfiles="https://github.com/lawl/NoiseTorch/archive/${version}.tar.gz"
-checksum=3da6cad119ecca6f4e131c8bca86eb122d2363d5d30dcd1da41974af5887a3c1
+homepage="https://github.com/NoiseTorch/NoiseTorch"
+_c_ringbuf_commit=2037560fb90dea5d2538611d983964d790bdbac2
+_rnnoise_commit=1cbdbcf1283499bbb2230a6b0f126eb9b236defd
+distfiles="https://github.com/NoiseTorch/NoiseTorch/archive/v${version}.tar.gz
+ https://github.com/NoiseTorch/c-ringbuf/archive/${_c_ringbuf_commit}.tar.gz
+ https://github.com/NoiseTorch/rnnoise/archive/${_rnnoise_commit}.tar.gz"
+checksum="4a30650314a6f83d979f3303d49618847ba58e39e3e26482dfe58b5e261c5611
+ 877b08413c59baac56b4cc7720fa56cf0eb399192a0ec652ce7b590c9cd9ad8a
+ 68c7ab4e408426088603e19955e746bb2a412d84bb121b6f39834c60fc8068b7"
+
+post_extract() {
+	rmdir "${build_wrksrc}/c/c-ringbuf" "${build_wrksrc}/c/rnnoise"
+	ln -rsf "c-ringbuf-${_c_ringbuf_commit}" "${build_wrksrc}/c/c-ringbuf"
+	ln -rsf "rnnoise-${_rnnoise_commit}" "${build_wrksrc}/c/rnnoise"
+}
+
+post_patch() {
+	vsed -e '/git submodule/d' -i Makefile
+}
 
 pre_build() {
 	make rnnoise

From 60c89e618d4dbac106f90a680d19d09c3d7fa88c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 23:03:38 +0200
Subject: [PATCH 1155/1854] gopls: update to 0.12.4.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index d766a2bba3e6..2006f9a1f5e5 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.12.3
+version=0.12.4
 revision=1
 build_wrksrc=gopls
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/golang/tools/tree/master/gopls"
 distfiles="https://github.com/golang/tools/archive/refs/tags/gopls/v${version}.tar.gz"
-checksum=77fa296b58ea38d9727b3f564d28bf816eb05ffaa587a2830ef405e479dab060
+checksum=746b0e1942c028c62fd8c114242a024faed19009ac64180f2cbfc9480fd45544
 
 post_install() {
 	vlicense ../LICENSE

From 429df58c43259807fb1eaa1513a8a04fe9898f1e Mon Sep 17 00:00:00 2001
From: Petr Cizmar <xxb0322@xpc.ovh>
Date: Thu, 22 Jun 2023 11:17:57 +0000
Subject: [PATCH 1156/1854] New package: n2n-3.0

Closes: #44562 [via git-merge-pr]
---
 srcpkgs/n2n/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/n2n/template

diff --git a/srcpkgs/n2n/template b/srcpkgs/n2n/template
new file mode 100644
index 000000000000..689421215b0c
--- /dev/null
+++ b/srcpkgs/n2n/template
@@ -0,0 +1,19 @@
+# Template file for 'n2n'
+pkgname=n2n
+version=3.0
+revision=1
+build_style=gnu-configure
+configure_args=CFLAGS="-O3" # No justification?
+hostmakedepends="autoconf automake pkg-config"
+short_desc="Light VPN software"
+maintainer="Petr Cizmar <xxb0322@xpc.ovh>"
+license="GPL-3.0-only"
+homepage="https://github.com/ntop/n2n"
+changelog="https://raw.githubusercontent.com/ntop/n2n/dev/CHANGELOG.md"
+distfiles="https://github.com/ntop/n2n/archive/refs/tags/${version}.tar.gz"
+checksum=25fcabba7bfcf25f4c9cd7fecc7ce11de48beb0b0f3506053d8485604ea8f50d
+
+pre_configure() {
+	vsed -i 's|/sbin|/bin|g' Makefile.in
+	./autogen.sh
+}

From 981e9d034157a6c7b949dfdbca9fa2b208e7452c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jun 2023 02:27:58 +0200
Subject: [PATCH 1157/1854] base-files: revbump for sgx group

---
 srcpkgs/base-files/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 5594c5a0efb4..c3b59c8e6cd2 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=2
+revision=3
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 216f9ceb5b5a1eff7245fb09ea5e6966500f7bd8 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Sat, 24 Jun 2023 01:49:37 +0300
Subject: [PATCH 1158/1854] transmission: update to 4.0.3.

---
 srcpkgs/transmission/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index d5a1d98d5f8a..29d74a610e74 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,6 +1,6 @@
 # Template file for 'transmission'
 pkgname=transmission
-version=4.0.2
+version=4.0.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"
 distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8
+checksum=b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a
 
 # Create transmission system user/group
 system_accounts="transmission"

From ffdfb598a9845ad8b109b2807f25853d4b363231 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 24 Jun 2023 07:39:24 +0200
Subject: [PATCH 1159/1854] dhcpcd: fix dhcpv6-pd for pppoe

---
 ...-Improve-learning-IPv6-address-flags.patch | 62 +++++++++++++++++++
 srcpkgs/dhcpcd/template                       |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch

diff --git a/srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch b/srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch
new file mode 100644
index 000000000000..5fceb5e4f3d5
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/Linux-Improve-learning-IPv6-address-flags.patch
@@ -0,0 +1,62 @@
+From 45e441ada6d3ea4355d623cf12d9a559a5c2afde Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Tue, 23 May 2023 22:14:57 +0100
+Subject: [PATCH] Linux: Improve learning IPv6 address flags
+
+Rather than matching addresses during netlink message processing,
+extract the local, address and flag parts.
+Once done, then match local and address to the address we are
+looking for and if equal apply the flags.
+
+Fixes #201 and maybe #149.
+---
+ src/if-linux.c | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/src/if-linux.c b/src/if-linux.c
+index f2f609ed..212ed5df 100644
+--- a/src/if-linux.c
++++ b/src/if-linux.c
+@@ -1996,7 +1996,8 @@ _if_addrflags6(__unused struct dhcpcd_ctx *ctx,
+ 	size_t len;
+ 	struct rtattr *rta;
+ 	struct ifaddrmsg *ifa;
+-	bool matches_addr = false;
++	struct in6_addr *local = NULL, *address = NULL;
++	uint32_t *flags = NULL;
+ 
+ 	ifa = NLMSG_DATA(nlm);
+ 	if (ifa->ifa_index != ia->ifa_ifindex || ifa->ifa_family != AF_INET6)
+@@ -2007,17 +2008,26 @@ _if_addrflags6(__unused struct dhcpcd_ctx *ctx,
+ 	for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
+ 		switch (rta->rta_type) {
+ 		case IFA_ADDRESS:
+-			if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, (struct in6_addr *)RTA_DATA(rta)))
+-				ia->ifa_found = matches_addr = true;
+-			else
+-				matches_addr = false;
++			address = (struct in6_addr *)RTA_DATA(rta);
++			break;
++		case IFA_LOCAL:
++			local = (struct in6_addr *)RTA_DATA(rta);
+ 			break;
+ 		case IFA_FLAGS:
+-			if (matches_addr)
+-				memcpy(&ia->ifa_flags, RTA_DATA(rta), sizeof(ia->ifa_flags));
++			flags = (uint32_t *)RTA_DATA(rta);
+ 			break;
+ 		}
+ 	}
++
++	if (local) {
++	       if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, local))
++			ia->ifa_found = true;
++	} else if (address) {
++	       if (IN6_ARE_ADDR_EQUAL(&ia->ifa_addr, address))
++			ia->ifa_found = true;
++	}
++	if (flags && ia->ifa_found)
++		memcpy(&ia->ifa_flags, flags, sizeof(ia->ifa_flags));
+ 	return 0;
+ }
+ 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index b30bb7c24af4..09a30b9a3c8a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=10.0.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 configure_args="

From 9521e60b5f38723631f407524470764311c6d76d Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Sat, 24 Jun 2023 00:21:13 -0600
Subject: [PATCH 1160/1854] qt6ct: update to 0.8

Closes: https://github.com/void-linux/void-packages/pull/43133
---
 srcpkgs/qt6ct/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index 34f7947920dc..21edb46beadb 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6ct'
 pkgname=qt6ct
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=cmake
 hostmakedepends="qt6-tools qt6-base"
 makedepends="qt6-base-devel"
@@ -11,7 +11,7 @@ maintainer="Adam Pschorr <adampschorr13@aol.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/trialuser02/qt6ct"
 distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
-checksum=6bc4c35e7c567908d8e123b8ccc11a55d27b5353ad035905cfa44b98c29ca862
+checksum=ca3706770cbdbce769ee4393de9f7469be043810fe40283690612f5f6552018a
 
 post_install() {
 	vlicense COPYING

From a306b015815ce9312a714a6743126fa4153ad00e Mon Sep 17 00:00:00 2001
From: oliverwiegers <oliver.wiegers@gmail.com>
Date: Thu, 22 Jun 2023 21:26:12 +0200
Subject: [PATCH 1161/1854] nyxt: update to 3.2.1

---
 srcpkgs/nyxt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index d0f7ddf489cd..fd7353026197 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,6 +1,6 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=3.2.0
+version=3.2.1
 revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=3e7a2812563ea3f2fe0c039db0d693a4de99d22cef1b0dec09173d1b7fbaf691
+checksum=55112dca1a7e0fc8d8c2c2531ecd996c2020ab0e242e240d223aa00498b63d66
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From 887aba0dd54107fc3d1a1a5991636f47ba1c5407 Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 19 May 2023 16:36:06 -0400
Subject: [PATCH 1162/1854] New package: qbe-1.1

Closes: https://github.com/void-linux/void-packages/pull/43951
---
 srcpkgs/qbe/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/qbe/template

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
new file mode 100644
index 000000000000..e56a69ffcc10
--- /dev/null
+++ b/srcpkgs/qbe/template
@@ -0,0 +1,27 @@
+# Template file for 'qbe'
+pkgname=qbe
+version=1.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Small embeddable C compiler backend"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="MIT"
+homepage="https://c9x.me/compile/"
+distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
+checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+
+# Currently only aarch64 and x86_64 targets are supported and the checks
+# test the compiled binaries.
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|x86_64*) ;;
+	*) make_check=no ;;
+esac
+
+post_install() {
+	vdoc doc/abi.txt
+	vdoc doc/il.txt
+	vdoc doc/llvm.txt
+
+	vlicense LICENSE
+}

From 24da6a5f2b1beda1587888908cb2100238c56bc7 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sat, 29 Apr 2023 01:27:18 -0500
Subject: [PATCH 1163/1854] New package: n-9.1.0

---
 srcpkgs/n/files/README.voidlinux |  3 +++
 srcpkgs/n/template               | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 srcpkgs/n/files/README.voidlinux
 create mode 100644 srcpkgs/n/template

diff --git a/srcpkgs/n/files/README.voidlinux b/srcpkgs/n/files/README.voidlinux
new file mode 100644
index 000000000000..faefa91351e5
--- /dev/null
+++ b/srcpkgs/n/files/README.voidlinux
@@ -0,0 +1,3 @@
+It is strongly recommended to set the environment variable N_PREFIX to install to a user-writable area. For example:
+
+export N_PREFIX=$HOME/local/n
diff --git a/srcpkgs/n/template b/srcpkgs/n/template
new file mode 100644
index 000000000000..bf63fe5a0dba
--- /dev/null
+++ b/srcpkgs/n/template
@@ -0,0 +1,22 @@
+# Template file for 'n'
+pkgname=n
+version=9.1.0
+revision=1
+build_style=gnu-makefile
+depends="curl"
+short_desc="Simple command line NodeJS version management"
+maintainer="anelki <akierig@fastmail.de>"
+license="MIT"
+homepage="https://github.com/tj/n"
+changelog="https://raw.githubusercontent.com/tj/n/master/CHANGELOG.md"
+distfiles="https://github.com/tj/n/archive/refs/tags/v${version}.tar.gz"
+checksum=48306496413c61d37eeaa0a7328a4520b1da0c42739e046f6f9242de0d0ae270
+
+do_install() {
+	vbin bin/n n
+	vdoc ${FILESDIR}/README.voidlinux
+}
+
+post_install() {
+	vlicense LICENSE
+}

From ac869de9ed3833cc03864c8b36e357eaa5eabbb0 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Thu, 27 Apr 2023 15:51:23 -0500
Subject: [PATCH 1164/1854] New package: mmv-go 0.1.6

---
 srcpkgs/mmv-go/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/mmv-go/template

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
new file mode 100644
index 000000000000..28f23c1354fa
--- /dev/null
+++ b/srcpkgs/mmv-go/template
@@ -0,0 +1,18 @@
+# Template file for 'mmv-go'
+pkgname=mmv-go
+version=0.1.6
+revision=1
+build_style=go
+go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+short_desc="Rename and move multiple files at once with your editor"
+maintainer="anelki <akierig@fastmail.de>"
+license="MIT"
+homepage="https://github.com/itchyny/mmv"
+changelog="https://raw.githubusercontent.com/itchyny/mmv/main/CHANGELOG.md"
+distfiles="https://github.com/itchyny/mmv/archive/refs/tags/v${version}.tar.gz"
+checksum=18d181e6a53437ad18c4409f3c423bc23687152a17b53a605dde13dfffb0d215
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/mmv ${DESTDIR}/usr/bin/mmv-go
+	vlicense LICENSE
+}

From 2666087e39664cb817ee81d1b30c42c91a60cb7b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Wed, 19 Apr 2023 12:02:20 +0200
Subject: [PATCH 1165/1854] New package: solo2-cli-0.2.2

---
 srcpkgs/solo2-cli/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/solo2-cli/template

diff --git a/srcpkgs/solo2-cli/template b/srcpkgs/solo2-cli/template
new file mode 100644
index 000000000000..e61154b73bab
--- /dev/null
+++ b/srcpkgs/solo2-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'solo2-cli'
+pkgname=solo2-cli
+version=0.2.2
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="eudev-libudev-devel pcsclite-devel"
+short_desc="CLI tools for SoloKeys Solo 2 security keys"
+maintainer="Philipp David <pd@3b.pm>"
+license="Apache-2.0"
+homepage="https://github.com/solokeys/solo2-cli"
+distfiles="https://github.com/solokeys/solo2-cli/archive/v${version}.tar.gz
+ https://github.com/solokeys/solo2-cli/releases/download/v$version/solo2.completions.bash
+ https://github.com/solokeys/solo2-cli/releases/download/v$version/solo2.completions.fish
+ https://github.com/solokeys/solo2-cli/releases/download/v$version/solo2.completions.zsh"
+checksum="49a30c5ee6f38be968a520089741f8b936099611e98e6bf2b25d05e5e9335fb4
+ 09e5ae1da36e3fbb2e9183188c93277ac113fc2397f3e2447abdf7c718037f0e
+ d002a00bc6a58b23828d2cf7fcc49793dc34185c13aa6858622cda9a28a45379
+ eeda949e2a282cbbc759be939df1e0d96c50578a441dc6caa86a48a7a264a200"
+skip_extraction="solo2.completions.bash
+ solo2.completions.fish
+ solo2.completions.zsh"
+
+post_install() {
+	for shell in bash fish zsh; do
+		vcompletion "$XBPS_SRCDISTDIR/${pkgname}-${version}/solo2.completions.${shell}" \
+			"${shell}" solo2
+	done
+	vinstall 70-solo2.rules 644 usr/lib/udev/rules.d
+}

From 256284684dd3e2e979ebdf20e864c617015e44d1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 17 Jun 2023 10:24:03 +0200
Subject: [PATCH 1166/1854] New package: zls-0.10.0

---
 srcpkgs/zls/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/zls/template

diff --git a/srcpkgs/zls/template b/srcpkgs/zls/template
new file mode 100644
index 000000000000..c525b3bc1cc6
--- /dev/null
+++ b/srcpkgs/zls/template
@@ -0,0 +1,29 @@
+# Template file for 'zls'
+pkgname=zls
+version=0.10.0
+revision=1
+build_style=zig-build
+short_desc="Zig language server"
+maintainer="Bnyro <bnyro@tutanota.com>"
+license="MIT"
+homepage="https://github.com/zigtools/zls"
+_known_folders_gitrev="d13ba6137084e55f873f6afb67447fe8906cc951"
+_tracy_gitrev="f493d4aa8ba8141d9680473fad007d8a6348628e"
+distfiles="https://github.com/zigtools/zls/archive/refs/tags/${version}.tar.gz
+ https://github.com/ziglibs/known-folders/archive/${_known_folders_gitrev}.tar.gz
+ https://github.com/wolfpld/tracy/archive/${_tracy_gitrev}.tar.gz"
+checksum="ad8c16721a10a55b759f0cd63243301565b948b1d48075e1fda89ccf264a2bdf
+	1fa1c5cb7da6c2ba76ae3c52602ce525ccbbf5741d1ca9c4d2687ff10333a0cf
+	84577b79a36566a777eec3cf2b596920a0c1d7b6c216d941c04ef967a727b041"
+skip_extraction="${_known_folders_gitrev}.tar.gz ${_tracy_gitrev}.tar.gz"
+
+post_extract() {
+	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_known_folders_gitrev.tar.gz" \
+		--strip-components=1 -C "$wrksrc/src/known-folders"
+	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_tracy_gitrev.tar.gz" \
+		--strip-components=1 -C "$wrksrc/src/tracy"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From bef4cb5b020da682c9a66b2bcc1c8c75e2b48e8d Mon Sep 17 00:00:00 2001
From: dvar <dvar@tuta.io>
Date: Wed, 19 Apr 2023 14:15:58 +0200
Subject: [PATCH 1167/1854] New package: way-displays-1.8.1

---
 srcpkgs/way-displays/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/way-displays/template

diff --git a/srcpkgs/way-displays/template b/srcpkgs/way-displays/template
new file mode 100644
index 000000000000..c4b35f08d293
--- /dev/null
+++ b/srcpkgs/way-displays/template
@@ -0,0 +1,20 @@
+# Template file for 'way-displays'
+pkgname=way-displays
+version=1.8.1
+revision=1
+build_style=gnu-makefile
+make_build_args="PREFIX_ETC=/"
+make_install_args="PREFIX_ETC=/"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel yaml-cpp-devel wlroots-devel eudev-libudev-devel"
+short_desc="Auto Manage Your Wayland Displays"
+maintainer="dvar <dvar@tuta.io>"
+license="MIT"
+homepage="https://github.com/alex-courtis/way-displays"
+distfiles="https://github.com/alex-courtis/way-displays/archive/refs/tags/${version}.tar.gz"
+checksum=529d074e55f8d15abcf6fd934abe080509509d5578aa8d4fd303f5b882970047
+
+post_install() {
+	vlicense LICENSE
+	vman way-displays.1
+}

From 37ba0eb4f5286ff711e5bfcbef0b81354bfa0c07 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 26 Feb 2023 20:32:45 +0100
Subject: [PATCH 1168/1854] New package: sheldon-0.7.3

---
 srcpkgs/sheldon/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/sheldon/template

diff --git a/srcpkgs/sheldon/template b/srcpkgs/sheldon/template
new file mode 100644
index 000000000000..ba1d1ca71a44
--- /dev/null
+++ b/srcpkgs/sheldon/template
@@ -0,0 +1,30 @@
+# Template file for 'sheldon'
+pkgname=sheldon
+version=0.7.3
+revision=1
+build_style=cargo
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel openssl-devel zlib-devel"
+checkdepends="git"
+short_desc="Fast, configurable shell plugin manager"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://sheldon.cli.rs/"
+changelog="https://raw.githubusercontent.com/rossmacarthur/sheldon/trunk/RELEASES.md"
+distfiles="https://github.com/rossmacarthur/sheldon/archive/refs/tags/${version}.tar.gz"
+checksum=cf8844dce853156d076a6956733420ad7a9365e16a928e419b11de8bc634fc67
+
+if [ "$XBPS_BUILD_ENVIRONMENT" == "void-packages-ci" ]; then
+	make_check_args="-- --skip lock_and_source_clean_permission_denied"
+fi
+
+post_install() {
+	for shell in bash zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/sheldon completions --shell ${shell} > sheldon.${shell}
+		vcompletion sheldon.${shell} ${shell}
+	done
+
+	vlicense LICENSE-MIT
+	vdoc README.md
+}

From 993a5d60822a0f7d32c44da3f6d4f5c65dc2f68d Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloi.torrentsj@gmail.com>
Date: Fri, 25 Mar 2022 11:30:25 +0100
Subject: [PATCH 1169/1854] New package: ansifilter-2.18

---
 srcpkgs/ansifilter/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/ansifilter/template

diff --git a/srcpkgs/ansifilter/template b/srcpkgs/ansifilter/template
new file mode 100644
index 000000000000..30519cb8ef6c
--- /dev/null
+++ b/srcpkgs/ansifilter/template
@@ -0,0 +1,11 @@
+# Template file for 'ansifilter'
+pkgname=ansifilter
+version=2.18
+revision=1
+build_style=gnu-makefile
+short_desc="Remove or convert ANSI codes to another format"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-only"
+homepage="https://gitlab.com/saalen/ansifilter"
+distfiles="https://gitlab.com/saalen/ansifilter/-/archive/${version}/ansifilter-${version}.tar.gz"
+checksum=e91cc14bd5a464cfd39e77a254ea6e12314a2b7d4554766d6b7043a8cb5faa04

From 40a11f30db73a98333d112b76b1a5cec2d65d731 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Fri, 28 Jan 2022 18:06:24 +0900
Subject: [PATCH 1170/1854] New package: keynav-0.0.20180821

---
 .../patches/fix-cursor-passthrough.patch      | 161 ++++++++++++++++++
 .../patches/fix-overlapping-screens.patch     |  57 +++++++
 srcpkgs/keynav/template                       |  27 +++
 3 files changed, 245 insertions(+)
 create mode 100644 srcpkgs/keynav/patches/fix-cursor-passthrough.patch
 create mode 100644 srcpkgs/keynav/patches/fix-overlapping-screens.patch
 create mode 100644 srcpkgs/keynav/template

diff --git a/srcpkgs/keynav/patches/fix-cursor-passthrough.patch b/srcpkgs/keynav/patches/fix-cursor-passthrough.patch
new file mode 100644
index 000000000000..85fcce7ebb6c
--- /dev/null
+++ b/srcpkgs/keynav/patches/fix-cursor-passthrough.patch
@@ -0,0 +1,161 @@
+From 024fc8fe47454f460faa14cbb1727e04596886c0 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Sun, 23 Feb 2020 01:50:36 -0800
+Subject: [PATCH 1/2] Set input shape to 0x0 to passthrough mouse
+
+Define the input shape to be empty so that one cannot click on the grid.
+This resolves all issues where the cursor ends up pointing to the grid
+itself instead of the window under the grid due to openpixel() not being
+called.
+---
+ keynav.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/keynav.c b/keynav.c
+index 65abe7c..4453fc8 100644
+--- a/keynav.c
++++ b/keynav.c
+@@ -983,6 +983,9 @@ void cmd_start(char *args) {
+     /* Tell the window manager not to manage us */
+     winattr.override_redirect = 1;
+     XChangeWindowAttributes(dpy, zone, CWOverrideRedirect, &winattr);
++    /* Set the input shape to be nothing so that the mouse can still
++     * click/scroll if on the grid */
++    XShapeCombineRectangles(dpy, zone, ShapeInput, 0, 0, NULL, 0, ShapeSet, 0);
+ 
+     XSelectInput(dpy, zone, StructureNotifyMask | ExposureMask
+                  | PointerMotionMask | LeaveWindowMask );
+
+From 88aba2415bd20e70be91a24e2eb2409cb44b4076 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Sun, 23 Feb 2020 04:35:37 -0800
+Subject: [PATCH 2/2] Remove {open,close}pixel(), var mouseinfo, type
+ mouseinfo_t
+
+Input shape is now set to 0x0, which takes care of the functionality
+that {open,close}pixel() previously provided. As such, completely remove
+{open,close}pixel() since they're no longer needed. In addition, remove
+the mouseinfo var and the mouseinfo_t type since those were used only by
+{open,close}pixel().
+---
+ keynav.c | 64 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 63 deletions(-)
+
+diff --git a/keynav.c b/keynav.c
+index 4453fc8..fae5a76 100644
+--- a/keynav.c
++++ b/keynav.c
+@@ -80,11 +80,6 @@ typedef struct wininfo {
+   int curviewport;
+ } wininfo_t;
+ 
+-typedef struct mouseinfo {
+-  int x;
+-  int y;
+-} mouseinfo_t;
+-
+ typedef struct viewport {
+   int x;
+   int y;
+@@ -96,7 +91,6 @@ typedef struct viewport {
+ } viewport_t;
+ 
+ static wininfo_t wininfo;
+-static mouseinfo_t mouseinfo;
+ static viewport_t *viewports;
+ static int nviewports = 0;
+ static int xinerama = 0;
+@@ -191,8 +185,6 @@ void sighup(int sig);
+ void restart();
+ void recordings_save(const char *filename);
+ void parse_recordings(const char *filename);
+-void openpixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo);
+-void closepixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo);
+ 
+ typedef struct dispatch {
+   char *command;
+@@ -1178,21 +1170,7 @@ void cmd_warp(char *args) {
+   x = wininfo.x + wininfo.w / 2;
+   y = wininfo.y + wininfo.h / 2;
+ 
+-  if (mouseinfo.x != -1 && mouseinfo.y != -1) {
+-    closepixel(dpy, zone, &mouseinfo);
+-  }
+-
+-  /* Open pixels hould be relative to the window coordinates,
+-   * not screen coordinates. */
+-  mouseinfo.x = x - wininfo.x;
+-  mouseinfo.y = y - wininfo.y;
+-  openpixel(dpy, zone, &mouseinfo);
+-
+   xdo_move_mouse(xdo, x, y, viewports[wininfo.curviewport].screen_num);
+-  xdo_wait_for_mouse_move_to(xdo, x, y);
+-
+-  /* TODO(sissel): do we need to open again? */
+-  openpixel(dpy, zone, &mouseinfo);
+ }
+ 
+ void cmd_click(char *args) {
+@@ -1981,36 +1959,6 @@ void parse_recordings(const char *filename) {
+   fclose(fp);
+ }
+ 
+-void openpixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo) {
+-  XRectangle rect;
+-  if (mouseinfo->x == -1 && mouseinfo->y == -1) {
+-    return;
+-  }
+-
+-  rect.x = mouseinfo->x;
+-  rect.y = mouseinfo->y;
+-  rect.width = 1;
+-  rect.height = 1;
+-
+-  XShapeCombineRectangles(dpy, zone, ShapeBounding, 0, 0, &rect, 1,
+-                          ShapeSubtract, 0);
+-} /* void openpixel */
+-
+-void closepixel(Display *dpy, Window zone, mouseinfo_t *mouseinfo) {
+-  XRectangle rect;
+-  if (mouseinfo->x == -1 && mouseinfo->y == -1) {
+-    return;
+-  }
+-
+-  rect.x = mouseinfo->x;
+-  rect.y = mouseinfo->y;
+-  rect.width = 1;
+-  rect.height = 1;
+-
+-  XShapeCombineRectangles(dpy, zone, ShapeBounding, 0, 0, &rect, 1,
+-                          ShapeUnion, 0);
+-} /* void closepixel */
+-
+ int main(int argc, char **argv) {
+   char *pcDisplay;
+   int ret;
+@@ -2099,17 +2047,6 @@ int main(int argc, char **argv) {
+         }
+         break;
+ 
+-      case MotionNotify:
+-        if (zone) {
+-        if (mouseinfo.x != -1 && mouseinfo.y != -1) {
+-          closepixel(dpy, zone, &mouseinfo);
+-        }
+-        mouseinfo.x = e.xmotion.x;
+-        mouseinfo.y = e.xmotion.y;
+-        openpixel(dpy, zone, &mouseinfo);
+-        }
+-        break;
+-
+       // Ignorable events.
+       case GraphicsExpose:
+       case NoExpose:
+@@ -2118,6 +2055,7 @@ int main(int argc, char **argv) {
+       case DestroyNotify: // window was destroyed
+       case UnmapNotify:   // window was unmapped (hidden)
+       case MappingNotify: // when keyboard mapping changes
++      case MotionNotify:  // when mouse movement is detected
+         break;
+       default:
+         if (e.type == xrandr_event_base + RRScreenChangeNotify) {
diff --git a/srcpkgs/keynav/patches/fix-overlapping-screens.patch b/srcpkgs/keynav/patches/fix-overlapping-screens.patch
new file mode 100644
index 000000000000..ea9385b9f7a5
--- /dev/null
+++ b/srcpkgs/keynav/patches/fix-overlapping-screens.patch
@@ -0,0 +1,57 @@
+From b3d7a0966c94ea9b6dd0265c512cb7a14293f71e Mon Sep 17 00:00:00 2001
+From: Yutao Yuan <infmagic2047reg@outlook.com>
+Date: Mon, 4 Oct 2021 22:33:32 +0800
+Subject: [PATCH] Treat overlapping screens (like xrandr --same-as) as one
+ screen
+
+---
+ keynav.c | 33 ++++++++++++++++++++++-----------
+ 1 file changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/keynav.c b/keynav.c
+index 65abe7c..b4e5103 100644
+--- a/keynav.c
++++ b/keynav.c
+@@ -1811,20 +1811,31 @@ void query_screens() {
+ }
+ 
+ void query_screen_xinerama() {
+-  int i;
++  int i, j, num_screens;
+   XineramaScreenInfo *screeninfo;
+ 
+-  screeninfo = XineramaQueryScreens(dpy, &nviewports);
++  screeninfo = XineramaQueryScreens(dpy, &num_screens);
+   free(viewports);
+-  viewports = calloc(nviewports, sizeof(viewport_t));
+-  for (i = 0; i < nviewports; i++) {
+-    viewports[i].x = screeninfo[i].x_org;
+-    viewports[i].y = screeninfo[i].y_org;
+-    viewports[i].w = screeninfo[i].width;
+-    viewports[i].h = screeninfo[i].height;
+-    viewports[i].screen_num = 0;
+-    viewports[i].screen = ScreenOfDisplay(dpy, 0);
+-    viewports[i].root = DefaultRootWindow(dpy);
++  viewports = calloc(num_screens, sizeof(viewport_t));
++  nviewports = 0;
++  for (i = 0; i < num_screens; i++) {
++    int overlapping = 0;
++    for (j = 0; j < nviewports; j++) {
++      if (viewports[j].x == screeninfo[i].x_org && viewports[j].y == screeninfo[i].y_org) {
++        overlapping = 1;
++        break;
++      }
++    }
++    if (!overlapping) {
++      viewports[nviewports].x = screeninfo[i].x_org;
++      viewports[nviewports].y = screeninfo[i].y_org;
++      viewports[nviewports].w = screeninfo[i].width;
++      viewports[nviewports].h = screeninfo[i].height;
++      viewports[nviewports].screen_num = 0;
++      viewports[nviewports].screen = ScreenOfDisplay(dpy, 0);
++      viewports[nviewports].root = DefaultRootWindow(dpy);
++      nviewports++;
++    }
+   }
+   XFree(screeninfo);
+ }
diff --git a/srcpkgs/keynav/template b/srcpkgs/keynav/template
new file mode 100644
index 000000000000..6e77ba8c6ad5
--- /dev/null
+++ b/srcpkgs/keynav/template
@@ -0,0 +1,27 @@
+# Template file for 'keynav'
+pkgname=keynav
+version=0.0.20180821
+revision=1
+_commit=78f9e076a5618aba43b030fbb9344c415c30c1e5
+build_style=gnu-makefile
+make_use_env=yes
+make_install_args="PREFIX=\${DESTDIR}/usr"
+hostmakedepends="pkg-config perl"
+makedepends="cairo-devel libXinerama-devel xdotool-devel libglib-devel
+ libXrandr-devel"
+checkdepends="xorg-server-xvfb"
+short_desc="Quick way to use cursor via the keyboard"
+maintainer="hazen2215 <haz@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://www.semicomplete.com/projects/keynav/"
+distfiles="https://github.com/jordansissel/keynav/archive/${_commit}.tar.gz"
+checksum=def79c32ea8aec57ec65310ede962f4d5d54ef26c5adccb351a19fb5683b678f
+
+do_check() {
+	./test.sh
+}
+
+post_install() {
+	vsconf keynavrc
+	vlicense COPYRIGHT
+}

From d434d13d1625f1a369b07bb1dae6a54b370c6cdc Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 23 Jan 2022 20:49:34 -0500
Subject: [PATCH 1171/1854] New package: cagebreak-2.2.0

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: https://github.com/void-linux/void-packages/pull/35214
---
 srcpkgs/cagebreak/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/cagebreak/template

diff --git a/srcpkgs/cagebreak/template b/srcpkgs/cagebreak/template
new file mode 100644
index 000000000000..620b827e8697
--- /dev/null
+++ b/srcpkgs/cagebreak/template
@@ -0,0 +1,28 @@
+# Template file for 'cagebreak'
+pkgname=cagebreak
+version=2.2.0
+revision=1
+build_style=meson
+configure_args="-Dman-pages=true $(vopt_bool xwayland xwayland)"
+conf_files="/etc/xdg/cagebreak/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel cairo-devel pango-devel libevdev-devel"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
+short_desc="Tiling wayland compositor based on cage inspired by ratpoison"
+maintainer="Jose G Perez Taveras <josegpt27@gmail.com>"
+license="MIT"
+homepage="https://github.com/project-repo/cagebreak"
+changelog="https://raw.githubusercontent.com/project-repo/cagebreak/master/Changelog.md"
+distfiles="https://github.com/project-repo/cagebreak/releases/download/${version}/release_${version}.tar.gz"
+checksum=c90361c0fa77ea90f821721c132d25600eca466e37fe5c12c1af99ee466c0f54
+
+build_options="xwayland"
+build_options_default="xwayland"
+desc_option_xwayland="Enable Xwayland support"
+
+make_check=no # the tests are not really tests
+
+post_install() {
+	vsconf examples/config
+	vlicense LICENSE
+}

From 7599d4538523f305bdb1acd418fe9474055ccd9f Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 9 Sep 2022 12:15:52 +0200
Subject: [PATCH 1172/1854] New package: lesspass-10.2.1

---
 srcpkgs/lesspass/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/lesspass/template

diff --git a/srcpkgs/lesspass/template b/srcpkgs/lesspass/template
new file mode 100644
index 000000000000..5194852fe64c
--- /dev/null
+++ b/srcpkgs/lesspass/template
@@ -0,0 +1,15 @@
+# Template file for 'lesspass'
+pkgname=lesspass
+version=10.2.1
+revision=1
+build_wrksrc="cli"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pexpect python3-mock python3-requests"
+short_desc="Stateless password generator"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-only"
+homepage="https://www.lesspass.com"
+distfiles="https://github.com/lesspass/lesspass/archive/refs/tags/cli-v${version}.tar.gz"
+checksum=6727af1561acf4dd061a47995571a999f8b2972b5aeeca7bab6d2e4347134cbf

From 65e5a732a6ad95f6b2d5a3373b97a07eb82ad5de Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 7 Sep 2022 21:08:27 +0530
Subject: [PATCH 1173/1854] New package: carapace-0.24.1

Closes: #39168 [via git-merge-pr]
---
 srcpkgs/carapace/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/carapace/template

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
new file mode 100644
index 000000000000..e99aa377ea45
--- /dev/null
+++ b/srcpkgs/carapace/template
@@ -0,0 +1,27 @@
+# Template file for 'carapace'
+pkgname=carapace
+version=0.24.5
+revision=1
+build_style=go
+go_import_path=github.com/rsteube/carapace-bin
+go_package="${go_import_path}/cmd/carapace"
+go_build_tags="release"
+go_ldflags="-X main.version=${version}"
+short_desc="Multi-shell multi-command argument completer"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://github.com/rsteube/carapace-bin"
+distfiles="https://github.com/rsteube/carapace-bin/archive/refs/tags/v${version}.tar.gz"
+checksum=7f2b9dd360b716c9c1399fb080fbf42fcfdd299336928a4135b5b2a095b186f1
+
+pre_build() {
+	GOARCH= go generate ./cmd/...
+}
+
+do_check() {
+	go test ./cmd/carapace/...
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 2fe7835c9efa35b47c3e2990cd0bd34ac3f83a64 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 19 Sep 2022 19:40:47 +0530
Subject: [PATCH 1174/1854] New package: selene-0.25.0

---
 srcpkgs/selene/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/selene/template

diff --git a/srcpkgs/selene/template b/srcpkgs/selene/template
new file mode 100644
index 000000000000..36d3933566e1
--- /dev/null
+++ b/srcpkgs/selene/template
@@ -0,0 +1,12 @@
+# Template file for 'selene'
+pkgname=selene
+version=0.25.0
+revision=1
+build_style=cargo
+short_desc="CLI tool designed to help write correct and idiomatic Lua code"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MPL-2.0"
+homepage="https://kampfkarren.github.io/selene/"
+changelog="https://raw.githubusercontent.com/Kampfkarren/selene/main/CHANGELOG.md"
+distfiles="https://static.crates.io/crates/selene/selene-${version}.crate"
+checksum=b32a033da3f3fce367ac2c639ebe9c6ea0c454044b8df9151485dc6313a13252

From 15813b66ff8d892b5ceb3e771f168a88a2e0cd77 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Thu, 29 Dec 2022 23:58:57 +0100
Subject: [PATCH 1175/1854] new package: lapce

---
 srcpkgs/lapce/patches/desktop-icon.patch | 12 ++++++++++++
 srcpkgs/lapce/template                   | 21 +++++++++++++++++++++
 srcpkgs/lapce/update                     |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 srcpkgs/lapce/patches/desktop-icon.patch
 create mode 100644 srcpkgs/lapce/template
 create mode 100644 srcpkgs/lapce/update

diff --git a/srcpkgs/lapce/patches/desktop-icon.patch b/srcpkgs/lapce/patches/desktop-icon.patch
new file mode 100644
index 000000000000..484471b5441a
--- /dev/null
+++ b/srcpkgs/lapce/patches/desktop-icon.patch
@@ -0,0 +1,12 @@
+diff --git a/extra/linux/dev.lapce.lapce.desktop b/extra/linux/dev.lapce.lapce.desktop
+index 83f9c5cc..8d81cd87 100644
+--- a/extra/linux/dev.lapce.lapce.desktop
++++ b/extra/linux/dev.lapce.lapce.desktop
+@@ -6,6 +6,6 @@ Name=Lapce
+ Comment=Lightning-fast and powerful code editor written in Rust
+ Categories=Development;IDE;
+ 
+-Icon=dev.lapce.lapce
++Icon=/usr/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
+ Exec=lapce
+ Terminal=false
diff --git a/srcpkgs/lapce/template b/srcpkgs/lapce/template
new file mode 100644
index 000000000000..482b8b135fe9
--- /dev/null
+++ b/srcpkgs/lapce/template
@@ -0,0 +1,21 @@
+# Template file for 'lapce'
+pkgname=lapce
+version=0.2.8
+revision=1
+archs="aarch64* x86_64*" # wasmer-vm crate fails to build (unsupported platform)
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="fontconfig-devel gtk+3-devel openssl-devel"
+short_desc="Lightning-fast and powerful code editor"
+maintainer="Alex Lohr <alexthkloss@web.de>"
+license="Apache-2.0"
+homepage="https://lapce.dev/"
+changelog="https://github.com/lapce/lapce/releases"
+distfiles="https://github.com/lapce/lapce/archive/refs/tags/v${version}.tar.gz"
+checksum=650b81c3dfbd727101111de60c208c191258fb27a96b1cec392afa7c0579a6ff
+
+post_install() {
+	vinstall extra/linux/dev.lapce.lapce.desktop 644 usr/share/applications/
+	vinstall extra/linux/dev.lapce.lapce.metainfo.xml 644 usr/share/appdata/
+	vinstall extra/images/logo_color.svg 644 usr/share/icons/hicolor/scalable/apps/ dev.lapce.lapce.svg
+}
diff --git a/srcpkgs/lapce/update b/srcpkgs/lapce/update
new file mode 100644
index 000000000000..8f131b7b53cd
--- /dev/null
+++ b/srcpkgs/lapce/update
@@ -0,0 +1,2 @@
+site="https://github.com/lapce/lapce/releases"
+pattern="\bv\K(\d+\.\d+\.\d+)\b"

From 3e137ae6222b0420ba7356902592d861e5d64491 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Thu, 29 Dec 2022 21:46:08 +0100
Subject: [PATCH 1176/1854] New package: pipr-0.0.16

Co-authord-by: Duncaen <duncaen@voidlinux.org>
Closes: #41354 [via git-merge-pr]
---
 srcpkgs/pipr/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/pipr/template

diff --git a/srcpkgs/pipr/template b/srcpkgs/pipr/template
new file mode 100644
index 000000000000..2f2af9486491
--- /dev/null
+++ b/srcpkgs/pipr/template
@@ -0,0 +1,23 @@
+# Template file for 'pipr'
+pkgname=pipr
+version=0.0.16
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="oniguruma-devel"
+short_desc="Tool for writing interactive shell pipelines"
+maintainer="Emil Miler <em@0x45.cz>"
+license="MIT"
+homepage="https://github.com/elkowar/pipr"
+distfiles="https://github.com/elkowar/pipr/archive/v${version}/pipr-${version}.tar.gz"
+checksum=4be6f79ff25f69efe6d4fe45bdc0b751b3adc8de33a2dc825073d59e5d50d3d0
+
+post_extract() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg@1.0.1 --precise 1.1.0
+}
+
+post_install() {
+	vdoc Readme.md
+	vlicense LICENSE
+}

From fb368b6681fee5f7742be3cabb7d82641661d8bd Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Sun, 18 Dec 2022 14:45:44 +0100
Subject: [PATCH 1177/1854] New package: shotgun-2.5.0

---
 srcpkgs/shotgun/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/shotgun/template

diff --git a/srcpkgs/shotgun/template b/srcpkgs/shotgun/template
new file mode 100644
index 000000000000..dcefbb2cccb4
--- /dev/null
+++ b/srcpkgs/shotgun/template
@@ -0,0 +1,22 @@
+# Template file for 'shotgun'
+pkgname=shotgun
+version=2.5.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+short_desc="Minimal screenshot utility for X11"
+maintainer="Emil Miler <em@0x45.cz>"
+license="MPL-2.0"
+homepage="https://github.com/nexromancers/shotgun"
+distfiles="https://github.com/neXromancers/shotgun/archive/refs/tags/v${version}.tar.gz"
+checksum=862b9d6f1c418181d37375153e3ceadf87b738f5a48fcbd7257e07cd78b622a0
+
+post_extract() {
+	rm build.rs
+	vsed -i Cargo.toml -e '/^build = "build.rs"/ d'
+}
+
+post_install() {
+	vdoc README.md
+	vlicense LICENSE
+}

From 15423e7cceb4702f4ea4771af26b7a2e19a2c9ce Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Tue, 20 Dec 2022 17:16:27 +0100
Subject: [PATCH 1178/1854] New package: system-monitoring-center-2.14.0

---
 srcpkgs/system-monitoring-center/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/system-monitoring-center/template

diff --git a/srcpkgs/system-monitoring-center/template b/srcpkgs/system-monitoring-center/template
new file mode 100644
index 000000000000..0fac7cee3d7c
--- /dev/null
+++ b/srcpkgs/system-monitoring-center/template
@@ -0,0 +1,13 @@
+# Template file for 'system-monitoring-center'
+pkgname=system-monitoring-center
+version=2.14.0
+revision=1
+build_style=meson
+hostmakedepends="kdelibs4support-devel gettext"
+depends="dmidecode gir-freedesktop hwids iproute2 python3 python3-cairo util-linux"
+short_desc="Multi-featured system monitor"
+maintainer="zenobit <zen@osowoso.xyz>"
+license="GPL-3.0-only"
+homepage="https://github.com/hakandundar34coding/system-monitoring-center"
+distfiles="https://github.com/hakandundar34coding/system-monitoring-center/archive/refs/tags/v${version}.tar.gz"
+checksum=0ae387300d5a30c1323cb6f0f037cfe0d304270560018bb41933046eb20b2763

From 04d733252a46d0266e9a5c0e3200a7b656b07541 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 22 Nov 2022 17:30:51 +0000
Subject: [PATCH 1179/1854] new package: xosd-2.2.14

---
 srcpkgs/xosd/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/xosd/template

diff --git a/srcpkgs/xosd/template b/srcpkgs/xosd/template
new file mode 100644
index 000000000000..4cd325037dbc
--- /dev/null
+++ b/srcpkgs/xosd/template
@@ -0,0 +1,27 @@
+# Template file for 'xosd'
+pkgname=xosd
+version=2.2.14
+revision=1
+build_style="gnu-configure"
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
+short_desc="Simple tool to display shaped text on your X display"
+maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://sourceforge.net/projects/libxosd/"
+distfiles="${SOURCEFORGE_SITE}/libxosd/xosd-${version}.tar.gz
+ http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_${version}-2.1.debian.tar.xz"
+checksum="4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508
+ ccde8324c909d75e60b124146d1e20c6a586385934dc15df02b7209f7324322d"
+skip_extraction="xosd_${version}-2.1.debian.tar.xz"
+
+post_extract() {
+	bsdtar xvJf ${XBPS_SRCDISTDIR}/xosd-${version}/xosd_${version}-2.1.debian.tar.xz \
+		-C ${wrksrc}/ --strip-components=1 \
+		debian/patches/328676.diff debian/patches/25_fix_mangapges.diff
+}
+
+post_patch() {
+	patch -Np1 -i patches/328676.diff
+	patch -Np1 -i patches/25_fix_mangapges.diff
+}

From ee7f4972f43f5355ca1e56dd6bad644727e86884 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 7 Nov 2022 15:04:44 +0530
Subject: [PATCH 1180/1854] New package: mazter-0.4.1

---
 srcpkgs/mazter/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/mazter/template

diff --git a/srcpkgs/mazter/template b/srcpkgs/mazter/template
new file mode 100644
index 000000000000..5925e0a4db59
--- /dev/null
+++ b/srcpkgs/mazter/template
@@ -0,0 +1,15 @@
+# Template file for 'mazter'
+pkgname=mazter
+version=0.4.1
+revision=1
+build_style=cargo
+short_desc="Mazes in your terminal"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://dystroy.org/mazter/"
+distfiles="https://static.crates.io/crates/mazter/mazter-${version}.crate"
+checksum=75a4cb6b9b2df3da849f08e587ea0bd74c7a5aaf8a99d078a3b9adec1342102b
+
+post_install() {
+	vlicense LICENSE
+}

From e88fd9a5caa9a9e79de0f92602599e57718112dc Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Sat, 29 Oct 2022 00:45:02 -0500
Subject: [PATCH 1181/1854] New package: pinentry-bemenu-0.12.0

---
 common/shlibs                    |  1 +
 srcpkgs/pinentry-bemenu/template | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/pinentry-bemenu/template

diff --git a/common/shlibs b/common/shlibs
index 7bc98cc1b474..258b257a75c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1393,6 +1393,7 @@ libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libbenchmark.so.1 benchmark-1.5.5_1
 libbenchmark_main.so.1 benchmark-1.5.5_1
+libbemenu.so.0 bemenu-0.6.5_1
 libKF5Torrent.so.6 libktorrent-2.1_1
 libvncserver.so.1 libvncserver-0.9.13_2
 libvncclient.so.1 libvncserver-0.9.13_2
diff --git a/srcpkgs/pinentry-bemenu/template b/srcpkgs/pinentry-bemenu/template
new file mode 100644
index 000000000000..5c7c3bec169e
--- /dev/null
+++ b/srcpkgs/pinentry-bemenu/template
@@ -0,0 +1,15 @@
+# Template file for 'pinentry-bemenu'
+pkgname=pinentry-bemenu
+version=0.12.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libgpg-error-devel libassuan-devel bemenu-devel popt-devel"
+short_desc="Pinentry based on bemenu"
+maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/t-8ch/pinentry-bemenu"
+distfiles="https://github.com/t-8ch/pinentry-bemenu/archive/v${version}.tar.gz"
+checksum=f59c72bf2af1b1629890b6b501cbd355f1739e0ac45be1906717dad5ca493d84
+
+alternatives="pinentry:pinentry:/usr/bin/pinentry-bemenu"

From 8eef3c9b8d2fe53e948d53afc26e659ea2a4c64b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 17 May 2023 13:49:33 -0400
Subject: [PATCH 1182/1854] New package: nwg-look-0.2.2

---
 srcpkgs/nwg-look/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/nwg-look/template

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
new file mode 100644
index 000000000000..5f079c5b1a32
--- /dev/null
+++ b/srcpkgs/nwg-look/template
@@ -0,0 +1,27 @@
+# Template file for 'nwg-look'
+pkgname=nwg-look
+version=0.2.2
+revision=1
+build_style=go
+go_import_path=github.com/nwg-piotr/nwg-look
+hostmakedepends="pkg-config"
+makedepends="cairo-devel gtk+3-devel libglib-devel pango-devel"
+depends="xcur2png"
+short_desc="GTK3 settings editor adapted to work in the wlroots environment"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/nwg-piotr/nwg-look"
+distfiles="https://github.com/nwg-piotr/nwg-look/archive/refs/tags/v${version}.tar.gz"
+checksum=250e5e4e29c3e4fa047c3ab95c1946307c7290cc5a30b0cfe08c0919ace6ba87
+
+post_install() {
+	vinstall stuff/main.glade 644 /usr/share/nwg-look
+	vinstall stuff/nwg-look.desktop 644 /usr/share/applications
+	vinstall stuff/nwg-look.svg 644 /usr/share/pixmaps
+
+	for lang in langs/*.json; do
+		vinstall ${lang} 644 /usr/share/nwg-look/langs
+	done
+
+	vlicense LICENSE
+}

From 0e2f8e91e1294e414e25249e5a59b51b611b6560 Mon Sep 17 00:00:00 2001
From: akhil <akhil.j@outlook.in>
Date: Sat, 22 Oct 2022 11:54:38 +0530
Subject: [PATCH 1183/1854] New package: SwayNotificationCenter-0.9.0

Co-authored-by: Duncaen <duncaen@voidlinu.org>
Closes: #40099 [via git-merge-pr]
---
 srcpkgs/SwayNotificationCenter/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/SwayNotificationCenter/template

diff --git a/srcpkgs/SwayNotificationCenter/template b/srcpkgs/SwayNotificationCenter/template
new file mode 100644
index 000000000000..09f6cdc9dea6
--- /dev/null
+++ b/srcpkgs/SwayNotificationCenter/template
@@ -0,0 +1,15 @@
+# Template file for 'SwayNotificationCenter'
+pkgname=SwayNotificationCenter
+version=0.9.0
+revision=1
+build_style=meson
+hostmakedepends="vala glib-devel pkg-config scdoc"
+makedepends="gobject-introspection gtk+3-devel gtk-layer-shell-devel
+json-glib-devel libhandy1-devel libgee-devel pulseaudio-devel"
+depends="dbus"
+short_desc="Simple notification daemon with a GTK gui"
+maintainer="Akhil Jalagam <akhil.j@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/ErikReider/SwayNotificationCenter"
+distfiles="https://github.com/ErikReider/SwayNotificationCenter/archive/refs/tags/v${version}.tar.gz"
+checksum=3f00bc858b7b3610e88ef0f6ee64d727892dd82f280f1dfc01dde863c2ea3376

From 895902d6746756a561349aa0789cfc64c7626309 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 16 Oct 2022 18:04:48 -0500
Subject: [PATCH 1184/1854] New package: lziprecover-1.23

Closes: #39999 [via git-merge-pr]
---
 srcpkgs/lziprecover/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/lziprecover/template

diff --git a/srcpkgs/lziprecover/template b/srcpkgs/lziprecover/template
new file mode 100644
index 000000000000..38dbd9d901da
--- /dev/null
+++ b/srcpkgs/lziprecover/template
@@ -0,0 +1,20 @@
+# Template file for 'lziprecover'
+pkgname=lziprecover
+version=1.23
+revision=1
+build_style=configure
+checkdepends="lzip"
+short_desc="Data recovery tool and decompressor for files in the lzip format"
+maintainer="Matt Boehlke <mtboehlke@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.nongnu.org/lzip/lziprecover.html"
+distfiles="${NONGNU_SITE}/lzip/lziprecover/lziprecover-${version}.tar.lz"
+checksum=9a41c9823670541573b160945c23783b644e84eb940c2c803b6b8d11b2c3d208
+
+do_configure() {
+	./configure --prefix=/usr \
+		CXX="${CXX}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}

From 842ae94e41c05d2c35583495186dfb1eb3db54eb Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@proton.me>
Date: Tue, 18 Oct 2022 15:16:08 +0500
Subject: [PATCH 1185/1854] New package: xone-0.3

---
 srcpkgs/xone/files/README.voidlinux |  2 ++
 srcpkgs/xone/template               | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/xone/files/README.voidlinux
 create mode 100644 srcpkgs/xone/template

diff --git a/srcpkgs/xone/files/README.voidlinux b/srcpkgs/xone/files/README.voidlinux
new file mode 100644
index 000000000000..24c2f6a6cd5a
--- /dev/null
+++ b/srcpkgs/xone/files/README.voidlinux
@@ -0,0 +1,2 @@
+Use the included 'xone-update-firmware' script
+to update wireless dongle firmware
diff --git a/srcpkgs/xone/template b/srcpkgs/xone/template
new file mode 100644
index 000000000000..263495968aa8
--- /dev/null
+++ b/srcpkgs/xone/template
@@ -0,0 +1,24 @@
+# Template file for 'xone'
+pkgname=xone
+version=0.3
+revision=1
+depends="curl cabextract dkms"
+short_desc="Modern Linux driver for Xbox One and Xbox Series X|S controllers"
+maintainer="xolophreny <xolophreny@proton.me>"
+license="GPL-2.0-only"
+homepage="https://github.com/medusalix/xone"
+distfiles="https://github.com/medusalix/xone/archive/refs/tags/v${version}.tar.gz"
+checksum=993f6b2b07c3236ce283d5de4da47dbfc16a86e056af504a4958d87f718ece20
+
+dkms_modules="${pkgname} ${version}"
+
+do_install() {
+	vinstall install/modprobe.conf 644 /usr/lib/modprobe.d xone.conf
+	vbin install/firmware.sh xone-update-firmware
+	vdoc "${FILESDIR}/README.voidlinux"
+	find . -type f \( -name dkms.conf -o -name '*.c' \) -exec sed -i "s/#VERSION#/$version/" {} +
+	vmkdir /usr/src/${pkgname}-${version}
+	for file in bus driver transport Kbuild dkms.conf; do
+		vcopy $file /usr/src/${pkgname}-${version}/
+	done
+}

From ff9dd9b2c344472dd2f60979c00d1e3cdc06a137 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Tue, 11 Oct 2022 17:13:49 -0400
Subject: [PATCH 1186/1854] New package: nextdns-1.39.4

---
 srcpkgs/nextdns/files/nextdns/run             |  4 +++
 .../Don't touch files managed by xbps.patch   | 26 +++++++++++++++++++
 srcpkgs/nextdns/template                      | 18 +++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/nextdns/files/nextdns/run
 create mode 100644 srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch
 create mode 100644 srcpkgs/nextdns/template

diff --git a/srcpkgs/nextdns/files/nextdns/run b/srcpkgs/nextdns/files/nextdns/run
new file mode 100644
index 000000000000..d77ac6f24d27
--- /dev/null
+++ b/srcpkgs/nextdns/files/nextdns/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+exec /usr/bin/nextdns run ${OPTS:--config-file /etc/nextdns.conf}
diff --git a/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch b/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch
new file mode 100644
index 000000000000..cb4556525126
--- /dev/null
+++ b/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch	
@@ -0,0 +1,26 @@
+diff --recursive --unified nextdns-1.39.4-clean/host/service/runit/service.go nextdns-1.39.4/host/service/runit/service.go
+--- nextdns-1.39.4-clean/host/service/runit/service.go	2023-04-14 00:46:58.232616533 -0400
++++ nextdns-1.39.4/host/service/runit/service.go	2023-04-14 01:12:43.931927878 -0400
+@@ -31,20 +31,14 @@
+ }
+ 
+ func (s Service) Install() error {
+-	if err := internal.CreateWithTemplate(s.Path, tmpl, 0755, s.Config); err != nil {
+-		return err
+-	}
+-	if err := os.Symlink(strings.TrimSuffix(s.Path, "/run"), "/etc/runit/runsvdir/current/"+s.Config.Name); err != nil {
++	if err := os.Symlink(strings.TrimSuffix(s.Path, "/run"), "/var/service/"+s.Config.Name); err != nil {
+ 		return err
+ 	}
+ 	return nil
+ }
+ 
+ func (s Service) Uninstall() error {
+-	if err := os.RemoveAll("/etc/runit/runsvdir/current/" + s.Config.Name); err != nil {
+-		return err
+-	}
+-	if err := os.RemoveAll(strings.TrimSuffix(s.Path, "/run")); err != nil {
++	if err := os.RemoveAll("/var/service/" + s.Config.Name); err != nil {
+ 		return err
+ 	}
+ 	return nil
diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
new file mode 100644
index 000000000000..576e9c169401
--- /dev/null
+++ b/srcpkgs/nextdns/template
@@ -0,0 +1,18 @@
+# Template file for 'nextdns'
+pkgname=nextdns
+version=1.39.4
+revision=1
+build_style=go
+go_import_path="github.com/nextdns/nextdns"
+go_ldflags="-X main.version=${version}"
+short_desc="NextDNS CLI client (DoH Proxy)"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="MIT"
+homepage="https://nextdns.io/"
+distfiles="https://github.com/nextdns/nextdns/archive/refs/tags/v${version}.tar.gz"
+checksum=e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac
+
+post_install() {
+	vsv nextdns
+	vlicense LICENSE
+}

From a58b38be1cd99e393c8a21a915b8294c1ab53802 Mon Sep 17 00:00:00 2001
From: Numair Dubas <Numair2644@protonmail.com>
Date: Mon, 26 Dec 2022 19:06:49 -0500
Subject: [PATCH 1187/1854] New package: flavours-0.6.1

flavours: remove $wrksrc and edit $distfiles to use $homepage
---
 srcpkgs/flavours/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/flavours/template

diff --git a/srcpkgs/flavours/template b/srcpkgs/flavours/template
new file mode 100644
index 000000000000..7e5dfd626932
--- /dev/null
+++ b/srcpkgs/flavours/template
@@ -0,0 +1,29 @@
+# Template file for 'flavours'
+pkgname=flavours
+version=0.6.1
+revision=1
+build_style=cargo
+build_helper=qemu
+short_desc="Simple and easy cli to build and use base16 schemes"
+maintainer="Numair Dubas <Numair2644@protonmail.com>"
+license="MIT"
+homepage="https://github.com/Misterio77/flavours"
+distfiles=${homepage}/archive/refs/tags/v${version}.tar.gz
+checksum=48c7659031d399ff125a07b71419935946e0da8d3ef1817a9f89dda32c2dcac1
+
+post_build() {
+	FLAVOURS="target/${RUST_TARGET}/release/flavours"
+	vtargetrun ${FLAVOURS} --completions bash > flavours.bash
+	vtargetrun ${FLAVOURS} --completions zsh  > flavours.zsh
+	vtargetrun ${FLAVOURS} --completions fish > flavours.fish
+}
+
+post_install() {
+	vcompletion flavours.bash bash
+	vcompletion flavours.zsh zsh
+	vcompletion flavours.fish fish
+
+	vlicense LICENSE
+	vdoc README.md
+	vsconf example.toml
+}

From ed5f570dfbdc6c4d1c245a56e03ddc598bb82a48 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Mon, 6 Mar 2023 23:48:38 -0500
Subject: [PATCH 1188/1854] New package: ferium-4.4.0

---
 srcpkgs/ferium/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ferium/template

diff --git a/srcpkgs/ferium/template b/srcpkgs/ferium/template
new file mode 100644
index 000000000000..859e790f75d1
--- /dev/null
+++ b/srcpkgs/ferium/template
@@ -0,0 +1,21 @@
+# Template file for 'ferium'
+pkgname=ferium
+version=4.4.0
+revision=1
+build_style=cargo
+build_helper=qemu
+short_desc="CLI program for managing Minecraft mods and modpacks"
+maintainer="yosh <yosh-git@riseup.net>"
+license="MPL-2.0"
+homepage="https://github.com/gorilla-devs/ferium"
+changelog="https://raw.githubusercontent.com/gorilla-devs/ferium/main/CHANGELOG.md"
+distfiles="https://github.com/gorilla-devs/ferium/archive/refs/tags/v${version}.tar.gz"
+checksum=a19b5ea7b12123ef68b2caf96a1c58025aa30d7e14e8c0dbfef44ffc01938045
+
+post_install() {
+	local ferium="${DESTDIR}/usr/bin/ferium"
+	for shell in bash fish zsh; do
+		vtargetrun ${ferium} complete ${shell} > ferium.${shell}
+		vcompletion ferium.${shell} ${shell}
+	done
+}

From efbcf9ba25c0d6428deafbf52f0e2dc78945e7a4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 1 Mar 2023 02:39:21 +0530
Subject: [PATCH 1189/1854] lv2: update to 1.18.10, adopt

---
 srcpkgs/lv2/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5577167b3b87..6333cf33dc88 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -1,18 +1,16 @@
 # Template file for 'lv2'
 pkgname=lv2
-version=1.18.2
+version=1.18.10
 revision=1
-build_style=waf3
+build_style=meson
 hostmakedepends="pkg-config"
-makedepends="libsndfile-devel gtk+-devel"
+makedepends="libsndfile-devel gtk+-devel libsamplerate-devel"
 short_desc="Plugin standard for audio systems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="ISC"
-homepage="http://lv2plug.in"
-distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
-checksum=4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e
-python_version=3
-lib32disabled=yes
+homepage="https://lv2plug.in"
+distfiles="https://lv2plug.in/spec/lv2-${version}.tar.xz"
+checksum=78c51bcf21b54e58bb6329accbb4dae03b2ed79b520f9a01e734bd9de530953f
 
 post_install() {
 	vlicense COPYING

From f693f8c872451c67c3d7a75929da0ab396cb2e95 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 1 Mar 2023 02:44:30 +0530
Subject: [PATCH 1190/1854] New package: lsp-plugins-1.2.6

---
 srcpkgs/lsp-plugins-devel    |  1 +
 srcpkgs/lsp-plugins-doc      |  1 +
 srcpkgs/lsp-plugins/template | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/lsp-plugins-devel
 create mode 120000 srcpkgs/lsp-plugins-doc
 create mode 100644 srcpkgs/lsp-plugins/template

diff --git a/srcpkgs/lsp-plugins-devel b/srcpkgs/lsp-plugins-devel
new file mode 120000
index 000000000000..f59057b0c7f7
--- /dev/null
+++ b/srcpkgs/lsp-plugins-devel
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-doc b/srcpkgs/lsp-plugins-doc
new file mode 120000
index 000000000000..f59057b0c7f7
--- /dev/null
+++ b/srcpkgs/lsp-plugins-doc
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template
new file mode 100644
index 000000000000..added109cfbd
--- /dev/null
+++ b/srcpkgs/lsp-plugins/template
@@ -0,0 +1,42 @@
+# Template file for 'lsp-plugins'
+pkgname=lsp-plugins
+version=1.2.6
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="VERBOSE=0"
+hostmakedepends="pkg-config php lv2"
+makedepends="lv2 libglvnd-devel jack-devel libsndfile-devel
+ libXrandr-devel cairo-devel freetype-devel"
+short_desc="Collection of open-source audio plugins for studios"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://lsp-plug.in/"
+changelog="https://raw.githubusercontent.com/sadko4u/lsp-plugins/master/CHANGELOG"
+distfiles="https://github.com/sadko4u/lsp-plugins/releases/download/$version/lsp-plugins-src-${version}.tar.gz"
+checksum=94dac8b175b764d28c170b25e6aa305aa2bf65a09a414025ad2b1c9ec3b1bd58
+nocross="Build system doesn't support cross-compilation properly"
+
+do_configure() {
+	make LD="$CXX" PREFIX=/usr config
+}
+
+lsp-plugins-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
+lsp-plugins-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		for f in $DESTDIR/usr/lib/*; do
+			if echo ${f##*/} | grep -Eq '^[^.]*\.(a|so)$'; then
+				vmove ${f#$DESTDIR/}
+			fi
+		done
+	}
+}

From 0314c52c3d37b2ba1d09d84da18e1e11dce0e067 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 14 Jan 2023 13:06:02 +0530
Subject: [PATCH 1191/1854] New package: hg-evolve-11.0.1

---
 srcpkgs/hg-evolve/template | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/hg-evolve/template

diff --git a/srcpkgs/hg-evolve/template b/srcpkgs/hg-evolve/template
new file mode 100644
index 000000000000..e173aab9c989
--- /dev/null
+++ b/srcpkgs/hg-evolve/template
@@ -0,0 +1,32 @@
+# Template file for 'hg-evolve'
+pkgname=hg-evolve
+version=11.0.1
+revision=1
+_hg_version=6.3.2 # sync with mercurial version in repo"
+build_style=python3-module
+build_wrksrc="hg-evolve-${version}"
+hostmakedepends="python3-setuptools"
+depends="mercurial"
+checkdepends="mercurial unzip"
+short_desc="Mercurial extension for faster and safer mutable history"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.mercurial-scm.org/doc/evolution/"
+changelog="https://www.mercurial-scm.org/repo/evolve/file/tip/CHANGELOG"
+distfiles="${PYPI_SITE}/h/hg-evolve/hg-evolve-${version}.tar.gz
+ https://www.mercurial-scm.org/release/mercurial-${_hg_version}.tar.gz"
+checksum="82ea42df9a4b40e2604a65e2069f8ac6a5ae317de22925fdc4352d11a07fc054
+ cfe6eeb5dd893ab32c0b79c1531aac420773e0fc837a35db3d4d92703df45a98"
+
+do_check() {
+	_skips="check-compat-strings check-sdist version-install"
+	for skip in $_skips; do rm "tests/test-${skip}.t"; done
+
+	python3 ${wrksrc}/mercurial-${_hg_version}/tests/run-tests.py \
+		${makejobs} --with-hg=/usr/bin/hg tests
+}
+
+post_install() {
+	# resolve conflict against mercurial
+	rm ${DESTDIR}/${py3_sitelib}/hgext3rd/__init__.py
+}

From 195320e4f7a660812f0b5847a03fe134024287db Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 8 Sep 2022 10:33:00 +0530
Subject: [PATCH 1192/1854] New package: hurl-3.0.0

---
 srcpkgs/hurl/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/hurl/template

diff --git a/srcpkgs/hurl/template b/srcpkgs/hurl/template
new file mode 100644
index 000000000000..77634e4f2065
--- /dev/null
+++ b/srcpkgs/hurl/template
@@ -0,0 +1,27 @@
+# Template file for 'hurl'
+pkgname=hurl
+version=3.0.0
+revision=1
+build_style=cargo
+make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel libcurl-devel libxml2-devel"
+short_desc="CLI to run HTTP requests defined in a simple plain text format"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://hurl.dev"
+changelog="https://raw.githubusercontent.com/Orange-OpenSource/hurl/master/CHANGELOG.md"
+distfiles="https://github.com/Orange-OpenSource/hurl/archive/refs/tags/${version}.tar.gz"
+checksum=7ad9a1043129edb4850727c085a83010b916b3515c2af5afddd0809c1e2bd85c
+
+if [[ "$XBPS_WORDSIZE" -eq 32 ]]; then
+	make_check=no # https://github.com/Orange-OpenSource/hurl/issues/1220
+fi
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/hurl
+	vbin target/${RUST_TARGET}/release/hurlfmt
+
+	vman docs/manual/hurl.1
+	vman docs/manual/hurlfmt.1
+}

From 406d3b40f442774beda077c33672f4f4a777e0df Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Sun, 22 Jan 2023 18:45:57 -0500
Subject: [PATCH 1193/1854] New package: gdm-settings-3.1

Co-authord-by: Duncaen <duncaen@voidlinux.org>
Closes: #41817 [via git-merge-pr]
---
 srcpkgs/gdm-settings/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/gdm-settings/template

diff --git a/srcpkgs/gdm-settings/template b/srcpkgs/gdm-settings/template
new file mode 100644
index 000000000000..d607cb00d5f1
--- /dev/null
+++ b/srcpkgs/gdm-settings/template
@@ -0,0 +1,19 @@
+# Template file for 'gdm-settings'
+pkgname=gdm-settings
+version=3.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils gtk-update-icon-cache gtk4 libadwaita glib-devel"
+makedepends="libglib-devel python3-gobject-devel libadwaita-devel"
+short_desc="Settings app for GNOME's Login Manager, GDM"
+maintainer="Owen Law <owenlaw222@gmail.com>"
+license="AGPL-3.0-or-later"
+homepage="https://gdm-settings.github.io/"
+changelog="https://github.com/gdm-settings/gdm-settings/releases"
+distfiles="https://github.com/gdm-settings/gdm-settings/archive/refs/tags/v${version}.tar.gz"
+checksum=aa1eb4a857904363689edb1d36cc143c820bb8eba72e68081da24da9828bdf89
+
+post_install() {
+	vlicense LICENSE
+}

From 362be2ad25e491337cd718d6a29b2f7b82935b77 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 12 Jan 2023 00:15:42 +0100
Subject: [PATCH 1194/1854] New package: taskwarrior-tui-0.23.7

---
 srcpkgs/taskwarrior-tui/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/taskwarrior-tui/template

diff --git a/srcpkgs/taskwarrior-tui/template b/srcpkgs/taskwarrior-tui/template
new file mode 100644
index 000000000000..4e46cfa31506
--- /dev/null
+++ b/srcpkgs/taskwarrior-tui/template
@@ -0,0 +1,24 @@
+# Template file for 'taskwarrior-tui'
+pkgname=taskwarrior-tui
+version=0.23.7
+revision=1
+build_style=cargo
+depends="task"
+checkdepends="git task"
+short_desc="Terminal user interface for taskwarrior"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="MIT"
+homepage="https://kdheepak.com/taskwarrior-tui/"
+distfiles="https://github.com/kdheepak/taskwarrior-tui/archive/refs/tags/v${version}.tar.gz"
+checksum=9e7dbd61219a0a7cc1916c71d05b778e515fb4eff5a22c523e4efb3ff826f4cb
+
+post_install() {
+	vlicense LICENSE
+}
+
+do_check() {
+	git clone https://github.com/kdheepak/taskwarrior-testdata/
+	export TASKRC=$(pwd)/taskwarrior-testdata/.taskrc
+	export TASKDATA=$(pwd)/taskwarrior-testdata/.task
+	task import $(pwd)/taskwarrior-testdata/export.json
+}

From e0349afb19e31ac4eb5e17127941cb764e531e1c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Dec 2022 20:47:54 +0530
Subject: [PATCH 1195/1854] joker: update to 1.1.0.

---
 srcpkgs/joker/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index 10bf26db0b17..14f4996daa29 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,26 +1,29 @@
 # Template file for 'joker'
 pkgname=joker
-version=0.14.1
-revision=2
+version=1.1.0
+revision=1
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://joker-lang.org/"
-distfiles="https://github.com/candid82/joker/archive/v${version}.tar.gz"
-checksum=c14789a091d38f7c9373705e9dc9edd24ab6c3c877f83788db4a0b14ebef26ef
+distfiles="https://github.com/candid82/joker/archive/refs/tags/v${version}.tar.gz"
+checksum=a963d8a3f1361143e33e0fa2463650173095cbf2e4593463007f32f4a81d3e57
 
 if [ "$CROSS_BUILD" ]; then
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		broken="https://github.com/candid82/joker#cross-platform-builds"
+	fi
 	hostmakedepends+=" joker"
 fi
 
 pre_build() {
 	JOKER="joker"
+	CGO_ENABLED=0 GOARCH= go generate ./...
 
 	if [ -z "$CROSS_BUILD" ]; then
 		JOKER="../joker"
-		go generate ./...
 		go build
 	fi
 

From dcef8f76069d4d5f5e9877cf8885fffc4978289f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 13 Feb 2023 15:03:45 -0500
Subject: [PATCH 1196/1854] fractal: update to 4.4.2

---
 srcpkgs/fractal/patches/meson-0.61.patch | 35 ------------------------
 srcpkgs/fractal/template                 | 11 ++------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/fractal/patches/meson-0.61.patch

diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch
deleted file mode 100644
index 79197803abf5..000000000000
--- a/srcpkgs/fractal/patches/meson-0.61.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001
-From: Jonas Platte <jplatte+git@posteo.de>
-Date: Sun, 31 Oct 2021 15:23:31 +0100
-Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file
-
-See https://github.com/mesonbuild/meson/issues/9441
----
- fractal-gtk/res/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build
-index 7a7a7d65..a176787c 100644
---- a/fractal-gtk/res/meson.build
-+++ b/fractal-gtk/res/meson.build
-@@ -2,7 +2,7 @@ subdir('icons')
- 
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Fractal.desktop.in.in'),
-@@ -28,7 +28,7 @@ endif
- 
- metainfo_conf = configuration_data()
- metainfo_conf.set('appid', application_id)
--metainfo_file = i18n.merge_file ('metainfo-file',
-+metainfo_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Fractal.metainfo.xml.in.in'),
-     output: 'org.gnome.Fractal.metainfo.xml.in',
--- 
-GitLab
-
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index fe462fc6e2d2..f86fc5f771e8 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,6 +1,6 @@
 # Template file for 'fractal'
 pkgname=fractal
-version=4.4.0
+version=4.4.2
 revision=1
 build_style=meson
 build_helper="rust"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cam@nohom.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Fractal"
 distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=33d8b5303f9309bc4a29bdcabe263f316cfb8805b50d7f4b6b2f0a0a7dd9efaf
+checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
 
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0
@@ -23,10 +23,3 @@ post_patch() {
 		-e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \
 		-e '/CARGO_HOME/d'
 }
-
-pre_build() {
-	# fixes an indexmap error when cross compiling
-	cargo update --package autocfg:1.0.0 --precise 1.1.0
-	cargo update --package autocfg:0.1.7 --precise 0.1.8
-	cargo update --package socket2 --precise 0.3.19
-}

From b4f3925287cc697d7d837bae00742b4a62aef089 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 14 Feb 2023 12:57:59 -0500
Subject: [PATCH 1197/1854] rabbitmq-c: update to 0.13.0

---
 srcpkgs/rabbitmq-c/patches/test.patch | 89 ---------------------------
 srcpkgs/rabbitmq-c/template           | 10 +--
 2 files changed, 5 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/rabbitmq-c/patches/test.patch

diff --git a/srcpkgs/rabbitmq-c/patches/test.patch b/srcpkgs/rabbitmq-c/patches/test.patch
deleted file mode 100644
index 0f10d8210906..000000000000
--- a/srcpkgs/rabbitmq-c/patches/test.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 26ecf6d3012be81f5dfb8a2d822c722e916a86cb Mon Sep 17 00:00:00 2001
-From: Simon Lepasteur <simon.lepasteur@swissdotnet.ch>
-Date: Wed, 11 Mar 2020 15:13:29 +0100
-Subject: [PATCH] Add option to run system tests (disabled by default).
-
-System tests require a RabbitMQ or other AMQP server to be running on
-`localhost` at TCP port number 5672 and therefore fails if no such
-server is running on the build machine.
-
-This is surprising for everyone running the standard `make test`
-to ensure the library is built correctly.
----
- .travis.yml          | 2 +-
- CMakeLists.txt       | 1 +
- README.md            | 2 ++
- appveyor.yml         | 2 +-
- tests/CMakeLists.txt | 8 +++++---
- 5 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git .travis.yml .travis.yml
-index 52a66b9c..5f56cb03 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -19,7 +19,7 @@ addons:
-       name: "alanxz/rabbitmq-c"
-       description: "C AMQP client for RabbitMQ"
-     notification_email: alan.antonuk@gmail.com
--    build_command_prepend: mkdir build && pushd build && cmake .. && popd
-+    build_command_prepend: mkdir build && pushd build && cmake .. -DRUN_SYSTEM_TESTS=ON && popd
-     build_command: cmake --build ./build
-     branch_pattern: coverity_scan
- 
-diff --git CMakeLists.txt CMakeLists.txt
-index f620ddc8..a39645f4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
- option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
- option(BUILD_TESTS "Build tests (run tests with make test)" ON)
- option(BUILD_API_DOCS "Build Doxygen API docs" ${DOXYGEN_FOUND})
-+option(RUN_SYSTEM_TESTS "Run system tests (i.e. tests requiring an accessible RabbitMQ server instance on localhost)" OFF)
- 
- if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
-     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
-diff --git README.md README.md
-index b7776c65..31347b15 100644
---- a/README.md
-+++ b/README.md
-@@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake:
-    default this is ON if the OpenSSL headers and library can be found.
- * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by
-    default this is OFF
-+* `RUN_SYSTEM_TESTS=ON/OFF` toggles building the system tests (i.e. tests requiring 
-+   an accessible RabbitMQ server instance on localhost), by default this is OFF
- 
- ## Running the examples
- 
-diff --git appveyor.yml appveyor.yml
-index 7e41c099..af315227 100644
---- a/appveyor.yml
-+++ b/appveyor.yml
-@@ -30,7 +30,7 @@ install:
-   - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART"
- 
- before_build:
--  - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
-+  - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DRUN_SYSTEM_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
- 
- build:
-   project: ALL_BUILD.vcxproj
-diff --git tests/CMakeLists.txt tests/CMakeLists.txt
-index cf042b04..320a73d7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -33,9 +33,11 @@ add_executable(test_basic
-                test_basic.c)
- target_link_libraries(test_basic rabbitmq-static)
- 
--if (NOT APPLE)
--  add_test(basic test_basic)
--endif()
-+if (RUN_SYSTEM_TESTS)
-+  if (NOT APPLE)
-+    add_test(basic test_basic)
-+  endif()
-+endif(RUN_SYSTEM_TESTS)
- 
- add_executable(test_sasl_mechanism test_sasl_mechanism.c)
- target_link_libraries(test_sasl_mechanism rabbitmq-static)
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 95ad7a333435..1352a274eba0 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,7 +1,7 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
-version=0.10.0
-revision=2
+version=0.13.0
+revision=1
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
@@ -10,11 +10,11 @@ short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"
 homepage="https://github.com/alanxz/rabbitmq-c"
-distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz"
-checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0
+distfiles="https://github.com/alanxz/rabbitmq-c/archive/v${version}.tar.gz"
+checksum=8b224e41bba504fc52b02f918d8df7e4bf5359d493cbbff36c06078655c676e6
 
 post_install() {
-	vlicense LICENSE-MIT LICENSE
+	vlicense LICENSE
 }
 
 rabbitmq-c-devel_package() {

From c2e70df3bd3cb2b6db3a032794638296a9222263 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Feb 2023 11:16:08 -0500
Subject: [PATCH 1198/1854] tarpaulin: update to 0.25.0, patch tests

---
 srcpkgs/tarpaulin/patches/0.20.1-tests.patch | 18 ++++++++++++++++++
 srcpkgs/tarpaulin/patches/0.25.0-tests.patch | 16 ++++++++++++++++
 srcpkgs/tarpaulin/template                   |  4 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tarpaulin/patches/0.20.1-tests.patch
 create mode 100644 srcpkgs/tarpaulin/patches/0.25.0-tests.patch

diff --git a/srcpkgs/tarpaulin/patches/0.20.1-tests.patch b/srcpkgs/tarpaulin/patches/0.20.1-tests.patch
new file mode 100644
index 000000000000..eb89bf66d9be
--- /dev/null
+++ b/srcpkgs/tarpaulin/patches/0.20.1-tests.patch
@@ -0,0 +1,18 @@
+From: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-util/cargo-tarpaulin/files/cargo-tarpaulin-0.20.1-tests.patch
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 12f578a..e8e27dd 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -15,10 +15,6 @@ build = "build.rs"
+ [[bin]]
+ name = "cargo-tarpaulin"
+ 
+-[[test]]
+-name = "integration"
+-path = "tests/mod.rs"
+-
+ [dependencies]
+ cargo_metadata = "0.14"
+ chrono = "0.4"
+
diff --git a/srcpkgs/tarpaulin/patches/0.25.0-tests.patch b/srcpkgs/tarpaulin/patches/0.25.0-tests.patch
new file mode 100644
index 000000000000..ddfc333d6c8e
--- /dev/null
+++ b/srcpkgs/tarpaulin/patches/0.25.0-tests.patch
@@ -0,0 +1,16 @@
+From: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-util/cargo-tarpaulin/files/cargo-tarpaulin-0.25.0-tests.patch
+
+diff --git a/src/report/coveralls.rs b/src/report/coveralls.rs
+index 5541e21..7feea1a 100644
+--- a/src/report/coveralls.rs
++++ b/src/report/coveralls.rs
+@@ -148,7 +148,7 @@ mod tests {
+     use super::*;
+     use std::process::Command;
+ 
+-    #[test]
++    #[test] #[ignore]
+     fn git_info_correct() {
+         let manifest = Path::new(env!("CARGO_MANIFEST_DIR")).join("Cargo.toml");
+         let res = match get_git_info(&manifest) {
+
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index 1b1dea55d0b3..07f40c6892e7 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,6 +1,6 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
-version=0.18.5
+version=0.25.0
 revision=1
 archs="x86_64*"
 build_style=cargo
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/xd009642/tarpaulin"
 distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
-checksum=08b9ac70a6e857fe9b2d39db39a7f3b67f2934be873fa44de405a9d206df4eb7
+checksum=3dde8f50a6e9eb6948062556a6125ce6d27ebe36ca808b5dd3fc7b9c8ed10112
 
 post_install() {
 	vlicense LICENSE-MIT

From 2f32a50de4bf3eb2f84cf1e5c6e4a5f449285de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 3 Feb 2023 11:46:23 +0100
Subject: [PATCH 1199/1854] crun: update to 1.8.5.

---
 srcpkgs/crun/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 5c2f41607f4c..15c643959056 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.7.2
+version=1.8.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,9 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05
+checksum=5a786d7a0ece5068447e730f8a67c9cb18a95c883f5314e154865ad87c520106
+# most of the tests don't work inside a container
+make_check=ci-skip
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
@@ -25,13 +27,6 @@ case "$XBPS_MACHINE" in
 	*) ;;
 esac
 
-do_check() {
-	if [ "$XBPS_CHECK_PKGS" = full ]; then
-		# most of the tests don't work inside a container
-		make check ${makejobs}
-	fi
-}
-
 post_install() {
-	rm -f ${DESTDIR}/usr/lib/*.a
+	rm ${DESTDIR}/usr/lib/*.a
 }

From 569b48fa24d9deaff1ba067de436e1d05917ee20 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 4 Feb 2023 11:51:41 -0500
Subject: [PATCH 1200/1854] xrootd: update to 5.5.4

---
 srcpkgs/xrootd/patches/musl.patch | 227 ------------------------------
 srcpkgs/xrootd/template           |  10 +-
 2 files changed, 7 insertions(+), 230 deletions(-)
 delete mode 100644 srcpkgs/xrootd/patches/musl.patch

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
deleted file mode 100644
index 7dccd97d6c45..000000000000
--- a/srcpkgs/xrootd/patches/musl.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
-index a06ad462f..702403d82 100644
---- a/src/Xrd/XrdConfig.hh
-+++ b/src/Xrd/XrdConfig.hh
-@@ -34,6 +34,11 @@
- #include "Xrd/XrdProtLoad.hh"
- #include "Xrd/XrdProtocol.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_mode_t
-+#include <bits/alltypes.h>
-+#endif
-+
- class XrdSysError;
- class XrdTcpMonInfo;
- class XrdNetSecurity;
-diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
-index e663fdd35..14c3b19d6 100644
---- a/src/XrdAcc/XrdAccGroups.cc
-+++ b/src/XrdAcc/XrdAccGroups.cc
-@@ -46,6 +46,14 @@
- #include "XrdAcc/XrdAccGroups.hh"
- #include "XrdAcc/XrdAccPrivs.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+int innetgr(const char *netgroup, const char *host, const char *user,
-+             const char *domain)
-+{
-+   return 0;
-+}
-+#endif
-+
- // Additionally, this routine does not support a user in more than
- // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
-   
-diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
-index 9f9d8b91f..5ff49cbbc 100644
---- a/src/XrdCl/XrdClFileStateHandler.hh
-+++ b/src/XrdCl/XrdClFileStateHandler.hh
-@@ -42,6 +42,12 @@
- #include <sys/uio.h>
- #include <cstdint>
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_suseconds_t
-+#define __NEED_struct_timeval
-+#include <bits/alltypes.h>
-+#endif
-+
- namespace
- {
-   class PgReadHandler;
-diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
-index 2fc753777..d22c3c275 100644
---- a/src/XrdCl/XrdClMonitor.hh
-+++ b/src/XrdCl/XrdClMonitor.hh
-@@ -43,6 +43,12 @@
- 
- #include "XrdCl/XrdClFileSystem.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_suseconds_t
-+#define __NEED_struct_timeval
-+#include <bits/alltypes.h>
-+#endif
-+
- namespace XrdCl
- {
-   class URL;
-diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
-index 0f8451127..e39b1ef4b 100644
---- a/src/XrdNet/XrdNetSecurity.cc
-+++ b/src/XrdNet/XrdNetSecurity.cc
-@@ -40,12 +40,14 @@
- #include <sys/types.h>
- #include <Winsock2.h>
- #include <io.h>
-+#include "XrdSys/XrdWin32.hh"
-+#endif
-+#if WIN32 || defined(__linux__) && !defined(__GLIBC__)
- int innetgr(const char *netgroup, const char *host, const char *user,
-              const char *domain)
- {
-    return 0;
- }
--#include "XrdSys/XrdWin32.hh"
- #endif
- 
- #include "XrdNet/XrdNetAddr.hh"
-diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
-index 0f32dc2ee..b6dea957f 100644
---- a/src/XrdPosix/XrdPosix.cc
-+++ b/src/XrdPosix/XrdPosix.cc
-@@ -37,6 +37,9 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/uio.h>
-+#if defined(__linux__) && !defined(_IO_ERR_SEEN)
-+#include <stdio_ext.h>
-+#endif
- 
- #include "XrdSys/XrdSysHeaders.hh"
- #include "XrdPosix/XrdPosixLinkage.hh"
-@@ -311,8 +314,12 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
-         if (bytes > 0 && size) rc = bytes/size;
- #ifndef SUNX86
- #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
-+#ifdef _IO_ERR_SEEN
-    else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
-    else                stream->_flags |= _IO_EOF_SEEN;
-+#else
-+   else if (bytes < 0) __fseterr(stream);
-+#endif
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-    else if (bytes < 0) stream->_flags |= __SEOF;
-    else                stream->_flags |= __SERR;
-@@ -482,7 +489,11 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
-    if (bytes > 0 && size) rc = bytes/size;
- #ifndef SUNX86
- #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
-+#ifdef _IO_ERR_SEEN
-       else stream->_flags |= _IO_ERR_SEEN;
-+#else
-+      else  __fseterr(stream);
-+#endif
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-       else stream->_flags |= __SERR;
- #else
-diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
-index 903153252..b5cc6d4b4 100644
---- a/src/XrdPosix/XrdPosixLinkage.hh
-+++ b/src/XrdPosix/XrdPosixLinkage.hh
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- 
- #include "XrdPosix/XrdPosixOsDep.hh"
-+#include "XrdPosix/XrdPosixXrootd.hh"
- #include "XrdSys/XrdSysPlatform.hh"
- 
- /******************************************************************************/
-diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
-index ac2da483a..a15602787 100644
---- a/src/XrdPosix/XrdPosixMap.hh
-+++ b/src/XrdPosix/XrdPosixMap.hh
-@@ -36,6 +36,11 @@
- #include "XrdCl/XrdClFileSystem.hh"
- #include "XrdCl/XrdClXRootDResponses.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_dev_t
-+#include <bits/alltypes.h>
-+#endif
-+
- class XrdPosixMap
- {
- public:
-diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
-index 867b73479..d967c53b3 100644
---- a/src/XrdPosix/XrdPosixPreload.cc
-+++ b/src/XrdPosix/XrdPosixPreload.cc
-@@ -42,6 +42,22 @@
- 
- #include "XrdPosix/XrdPosixExtern.hh"
-  
-+#ifdef creat64
-+#undef creat64
-+#undef fseeko64
-+#undef ftello64
-+#undef ftruncate64
-+#undef lseek64
-+#undef open64
-+#undef pread64
-+#undef pwrite64
-+#undef readdir64
-+#undef readdir64_r
-+#undef statfs64
-+#undef statvfs64
-+#undef truncate64
-+#endif
-+
- /******************************************************************************/
- /*                   G l o b a l   D e c l a r a t i o n s                    */
- /******************************************************************************/
-diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
-index a1ac544ad..eaeaeabac 100644
---- a/src/XrdSys/XrdSysPlatform.hh
-+++ b/src/XrdSys/XrdSysPlatform.hh
-@@ -241,16 +241,8 @@ extern "C"
- #if defined(_AIX) || \
-    (defined(XR__SUNGCC3) && !defined(__arch64__))
- #   define SOCKLEN_t size_t
--#elif defined(XR__GLIBC) || \
--   defined(__FreeBSD__) || \
--   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
--   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
--   (defined(__sun) && defined(_SOCKLEN_T))
--#   ifndef SOCKLEN_t
--#      define SOCKLEN_t socklen_t
--#   endif
- #elif !defined(SOCKLEN_t)
--#   define SOCKLEN_t int
-+#   define SOCKLEN_t socklen_t
- #endif
- 
- #ifdef _LP64
-diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
-index 17f8fd0be..78741a7dc 100644
---- a/src/XrdSys/XrdSysPthread.hh
-+++ b/src/XrdSys/XrdSysPthread.hh
-@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
- 
-         XrdSysRWLock(PrefType ptype)
-                     {
--#ifdef __linux__
-+#ifdef __GLIBC__
-                      pthread_rwlockattr_t attr;
-                      pthread_rwlockattr_setkind_np(&attr,
-                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
-@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
- inline void ReInitialize(PrefType ptype)
- {
-   pthread_rwlock_destroy(&lock);
--#ifdef __linux__
-+#ifdef __GLIBC__
-   pthread_rwlockattr_t attr;
-   pthread_rwlockattr_setkind_np(&attr,
-                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index 2bd0b59714c2..8a5358e691aa 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,15 +1,19 @@
 # Template file for 'xrootd'
 pkgname=xrootd
-version=5.4.2
+version=5.5.4
 revision=1
 build_style=cmake
-makedepends="zlib-devel openssl-devel libuuid-devel readline-devel"
+configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="pkgconf"
+makedepends="zlib-devel openssl-devel libuuid-devel readline-devel
+ libcurl-devel mit-krb5-devel libxml2-devel tinyxml-devel libcppunit-devel
+ fuse-devel json-c-devel"
 short_desc="Low latency, scalable and fault tolerant access to data"
 maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://xrootd.slac.stanford.edu"
 distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
-checksum=d868ba5d8b71ec38f7a113d2d8f3e25bbcedc1bc23d21bba1686ddfdb2b900c1
+checksum=41a8557ea2d118b1950282b17abea9230b252aa5ee1a5959173e2534b7d611d3
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"

From 9ce96a5272487c1bd2852f6dbbb8917afccb1f8c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 23 May 2023 07:32:35 -0400
Subject: [PATCH 1201/1854] xrootd: update to 5.5.5, with musl patch (merged
 upstream)

---
 srcpkgs/xrootd/patches/musl.patch | 460 ++++++++++++++++++++++++++++++
 srcpkgs/xrootd/template           |   4 +-
 2 files changed, 462 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xrootd/patches/musl.patch

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
new file mode 100644
index 000000000000..901970620d8e
--- /dev/null
+++ b/srcpkgs/xrootd/patches/musl.patch
@@ -0,0 +1,460 @@
+diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
+index 8b182e61e..9f7c9aa59 100644
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -70,6 +70,21 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
+   set( LINUX TRUE )
+   include( GNUInstallDirs )
+   set( EXTRA_LIBS rt )
++
++  # Check for musl libc with the compiler, since it provides way to detect it
++  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
++    OUTPUT_VARIABLE TARGET_TRIPLE ERROR_VARIABLE TARGET_ERROR)
++
++  if (NOT TARGET_ERROR)
++    if ("${TARGET_TRIPLE}" MATCHES "musl")
++      message(STATUS "Detected musl libc")
++      add_definitions(-DMUSL=1)
++    endif()
++  else()
++    message(WARNING "Could not detect system information!")
++  endif()
++
++  unset(TARGET_ERROR)
+ endif()
+ 
+ #-------------------------------------------------------------------------------
+diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
+index a06ad462f..2d1403a5e 100644
+--- a/src/Xrd/XrdConfig.hh
++++ b/src/Xrd/XrdConfig.hh
+@@ -34,6 +34,8 @@
+ #include "Xrd/XrdProtLoad.hh"
+ #include "Xrd/XrdProtocol.hh"
+ 
++#include <sys/types.h>
++
+ class XrdSysError;
+ class XrdTcpMonInfo;
+ class XrdNetSecurity;
+diff --git a/src/Xrd/XrdPoll.hh b/src/Xrd/XrdPoll.hh
+index 3790b03b0..d9bda5d62 100644
+--- a/src/Xrd/XrdPoll.hh
++++ b/src/Xrd/XrdPoll.hh
+@@ -29,7 +29,7 @@
+ /* specific prior written permission of the institution or contributor.       */
+ /******************************************************************************/
+ 
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "XrdSys/XrdSysPthread.hh"
+ 
+ #define XRD_NUMPOLLERS 3
+diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
+index e663fdd35..94b8edbc7 100644
+--- a/src/XrdAcc/XrdAccGroups.cc
++++ b/src/XrdAcc/XrdAccGroups.cc
+@@ -46,6 +46,14 @@
+ #include "XrdAcc/XrdAccGroups.hh"
+ #include "XrdAcc/XrdAccPrivs.hh"
+ 
++#ifdef MUSL
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ // Additionally, this routine does not support a user in more than
+ // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
+   
+diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
+index 197151321..f83538819 100644
+--- a/src/XrdCl/XrdClFileStateHandler.hh
++++ b/src/XrdCl/XrdClFileStateHandler.hh
+@@ -39,6 +39,7 @@
+ #include <set>
+ #include <vector>
+ 
++#include <sys/time.h>
+ #include <sys/uio.h>
+ #include <cstdint>
+ 
+diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
+index 2fc753777..2b3a96c46 100644
+--- a/src/XrdCl/XrdClMonitor.hh
++++ b/src/XrdCl/XrdClMonitor.hh
+@@ -43,6 +43,8 @@
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+ 
++#include <sys/time.h>
++
+ namespace XrdCl
+ {
+   class URL;
+diff --git a/src/XrdNet/XrdNetMsg.cc b/src/XrdNet/XrdNetMsg.cc
+index fa6c16f87..f97e1af09 100644
+--- a/src/XrdNet/XrdNetMsg.cc
++++ b/src/XrdNet/XrdNetMsg.cc
+@@ -29,7 +29,7 @@
+ /******************************************************************************/
+ 
+ #include <cerrno>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "XrdNet/XrdNet.hh"
+ #include "XrdNet/XrdNetMsg.hh"
+diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
+index 0f8451127..0faf563dd 100644
+--- a/src/XrdNet/XrdNetSecurity.cc
++++ b/src/XrdNet/XrdNetSecurity.cc
+@@ -40,11 +40,6 @@
+ #include <sys/types.h>
+ #include <Winsock2.h>
+ #include <io.h>
+-int innetgr(const char *netgroup, const char *host, const char *user,
+-             const char *domain)
+-{
+-   return 0;
+-}
+ #include "XrdSys/XrdWin32.hh"
+ #endif
+ 
+@@ -53,6 +48,14 @@ int innetgr(const char *netgroup, const char *host, const char *user,
+ #include "XrdNet/XrdNetUtils.hh"
+ #include "XrdSys/XrdSysTrace.hh"
+ 
++#if defined(MUSL) || defined(WIN32)
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ /******************************************************************************/
+ /*                         L o c a l   C l a s s e s                          */
+ /******************************************************************************/
+diff --git a/src/XrdOfs/XrdOfsHandle.cc b/src/XrdOfs/XrdOfsHandle.cc
+index 963f17a5a..26b40ce08 100644
+--- a/src/XrdOfs/XrdOfsHandle.cc
++++ b/src/XrdOfs/XrdOfsHandle.cc
+@@ -30,7 +30,7 @@
+ 
+ #include <cstdio>
+ #include <ctime>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/types.h>
+ 
+ #include "XrdOfs/XrdOfsHandle.hh"
+diff --git a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
+index b1a94acd6..0202579cc 100644
+--- a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
++++ b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
+@@ -38,9 +38,7 @@
+ #include <memory>
+ #include <mutex>
+ 
+-#if defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
+-#include <byteswap.h>
+-#elif defined(__APPLE__)
++#if defined(__APPLE__)
+ // Make sure that byte swap functions are not already defined.
+ #if !defined(bswap_16)
+ // Mac OS X / Darwin features
+@@ -49,6 +47,8 @@
+ #define bswap_32(x) OSSwapInt32(x)
+ #define bswap_64(x) OSSwapInt64(x)
+ #endif
++#else
++#include <byteswap.h>
+ #endif
+ 
+ class XrdOssCsiTagstoreFile : public XrdOssCsiTagstore
+diff --git a/src/XrdOuc/XrdOucBackTrace.cc b/src/XrdOuc/XrdOucBackTrace.cc
+index 813183c32..c61a89b63 100644
+--- a/src/XrdOuc/XrdOucBackTrace.cc
++++ b/src/XrdOuc/XrdOucBackTrace.cc
+@@ -34,7 +34,7 @@
+ #include <vector>
+ #include <sys/syscall.h>
+ 
+-#ifdef __GNUC__
++#ifndef MUSL /* glibc, uclibc, and macOS all have execinfo.h */
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ #endif
+@@ -176,13 +176,11 @@ XrdInfo *CvtRsp(const char *name, int snum)
+ /*                              D e m a n g l e                               */
+ /******************************************************************************/
+   
++#ifndef MUSL
+ namespace
+ {
+ int Demangle(char *cSym, char *buff, int blen)
+ {
+-#ifndef __GNUC__
+-   return -1;
+-#else
+    int   status;
+    char *plus = index(cSym, '+');
+    char *brak = (plus ? index(plus, '[') : 0);
+@@ -201,7 +199,6 @@ int Demangle(char *cSym, char *buff, int blen)
+    status = snprintf(buff, blen, "%s %s+%s\n", brak, realname, plus+1);
+    free(realname);
+    return status;
+-#endif
+ }
+ }
+ 
+@@ -221,6 +218,7 @@ int DumpDepth()
+    return (depth <= maxDepth ? depth : maxDepth);
+ }
+ }
++#endif
+ 
+ /******************************************************************************/
+ /*                             D u m p S t a c k                              */
+@@ -230,8 +228,8 @@ namespace
+ {
+ void DumpStack(char *bP, int bL, TidType tid)
+ {
+-#ifndef __GNUC__
+-   snprintf(bP, bL, "TBT " TidFmt " No stack information available, not gnuc.", tid);
++#ifdef MUSL
++   snprintf(bP, bL, "TBT " TidFmt " No stack information available with musl libc.", tid);
+    return;
+ #else
+    static int btDepth = DumpDepth(); // One time MT-safe call
+diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
+index 0f32dc2ee..e4f020c09 100644
+--- a/src/XrdPosix/XrdPosix.cc
++++ b/src/XrdPosix/XrdPosix.cc
+@@ -53,6 +53,58 @@
+   
+ extern XrdPosixLinkage   Xunix;
+ 
++/******************************************************************************/
++/*                      U t i l i t y  F u n c t i o n s                      */
++/******************************************************************************/
++
++#ifdef MUSL
++#include <stdio_ext.h>
++#endif
++
++static inline void fseterr(FILE *fp)
++{
++  /* Most systems provide FILE as a struct and the necessary bitmask in
++     <stdio.h>, because they need it for implementing getc() and putc() as
++     fast macros. This function is based on gnulib's fseterr.c */
++#if defined _IO_ERR_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
++  fp->_flags |= _IO_ERR_SEEN;
++#elif defined __sferror || defined __APPLE__ || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++  fp->_flags |= __SERR;
++#elif defined _IOERR
++  /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
++  fp->_flag |= _IOERR;
++#elif defined __UCLIBC__            /* uClibc */
++  fp->__modeflags |= __FLAG_ERROR;
++#elif defined MUSL /* musl libc */
++  __fseterr(fp);
++#else
++ #error "Unsupported platform! Please report it as a bug."
++#endif
++}
++
++static inline void fseteof(FILE *fp)
++{
++  /* Most systems provide FILE as a struct and the necessary bitmask in
++     <stdio.h>, because they need it for implementing getc() and putc() as
++     fast macros.  */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
++  fp->_flags |= _IO_EOF_SEEN;
++#elif defined __sferror || defined __APPLE__ || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++  fp->_flags |= __SEOF;
++#elif defined _IOEOF
++  /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
++  fp->_flag |= _IOEOF;
++#elif defined __UCLIBC__            /* uClibc */
++  fp->__modeflags |= __FLAG_EOF;
++#else
++  (void) fseek(fp, 0L, SEEK_END);
++#endif
++}
++
+ /******************************************************************************/
+ /*                       X r d P o s i x _ A c c e s s                        */
+ /******************************************************************************/
+@@ -308,19 +360,9 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
+ 
+ // Get the right return code. Note that we cannot emulate the flags in sunx86
+ //
+-        if (bytes > 0 && size) rc = bytes/size;
+-#ifndef SUNX86
+-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+-   else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
+-   else                stream->_flags |= _IO_EOF_SEEN;
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
+-   else if (bytes < 0) stream->_flags |= __SEOF;
+-   else                stream->_flags |= __SERR;
+-#else
+-   else if (bytes < 0) stream->_flag  |= _IOERR;
+-   else                stream->_flag  |= _IOEOF;
+-#endif
+-#endif
++   if (bytes > 0 && size) rc = bytes/size;
++   else if (bytes < 0) fseterr(stream);
++   else                fseteof(stream);
+ 
+    return rc;
+ }
+@@ -477,18 +519,10 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
+ 
+    bytes = Xroot.Write(fd, ptr, size*nitems);
+ 
+-// Get the right return code. Note that we cannot emulate the flags in sunx86
++// Get the right return code.
+ //
+    if (bytes > 0 && size) rc = bytes/size;
+-#ifndef SUNX86
+-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+-      else stream->_flags |= _IO_ERR_SEEN;
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
+-      else stream->_flags |= __SERR;
+-#else
+-      else stream->_flag  |= _IOERR;
+-#endif
+-#endif
++   else fseterr(stream);
+ 
+    return rc;
+ }
+diff --git a/src/XrdPosix/XrdPosixFile.hh b/src/XrdPosix/XrdPosixFile.hh
+index 4d77b88d3..6d99cf464 100644
+--- a/src/XrdPosix/XrdPosixFile.hh
++++ b/src/XrdPosix/XrdPosixFile.hh
+@@ -35,6 +35,7 @@
+ #include <sys/time.h>
+ #include <sys/param.h>
+ #include <sys/resource.h>
++#include <sys/types.h>
+ #include <sys/uio.h>
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
+index 903153252..b5cc6d4b4 100644
+--- a/src/XrdPosix/XrdPosixLinkage.hh
++++ b/src/XrdPosix/XrdPosixLinkage.hh
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ 
+ #include "XrdPosix/XrdPosixOsDep.hh"
++#include "XrdPosix/XrdPosixXrootd.hh"
+ #include "XrdSys/XrdSysPlatform.hh"
+ 
+ /******************************************************************************/
+diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
+index a62f0c658..8db1400d4 100644
+--- a/src/XrdPosix/XrdPosixPreload.cc
++++ b/src/XrdPosix/XrdPosixPreload.cc
+@@ -45,6 +45,22 @@
+ /******************************************************************************/
+ 
+ #include "XrdPosix/XrdPosixExtern.hh"
++
++#ifdef MUSL
++#undef creat64
++#undef fseeko64
++#undef ftello64
++#undef ftruncate64
++#undef lseek64
++#undef open64
++#undef pread64
++#undef pwrite64
++#undef readdir64
++#undef readdir64_r
++#undef statfs64
++#undef statvfs64
++#undef truncate64
++#endif
+  
+ /******************************************************************************/
+ /*                   G l o b a l   D e c l a r a t i o n s                    */
+diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
+index a1ac544ad..eaeaeabac 100644
+--- a/src/XrdSys/XrdSysPlatform.hh
++++ b/src/XrdSys/XrdSysPlatform.hh
+@@ -241,16 +241,8 @@ extern "C"
+ #if defined(_AIX) || \
+    (defined(XR__SUNGCC3) && !defined(__arch64__))
+ #   define SOCKLEN_t size_t
+-#elif defined(XR__GLIBC) || \
+-   defined(__FreeBSD__) || \
+-   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
+-   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
+-   (defined(__sun) && defined(_SOCKLEN_T))
+-#   ifndef SOCKLEN_t
+-#      define SOCKLEN_t socklen_t
+-#   endif
+ #elif !defined(SOCKLEN_t)
+-#   define SOCKLEN_t int
++#   define SOCKLEN_t socklen_t
+ #endif
+ 
+ #ifdef _LP64
+diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
+index 17f8fd0be..6d9802460 100644
+--- a/src/XrdSys/XrdSysPthread.hh
++++ b/src/XrdSys/XrdSysPthread.hh
+@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
+ 
+         XrdSysRWLock(PrefType ptype)
+                     {
+-#ifdef __linux__
++#if defined(__linux__) && (defined(__GLIBC__) || defined(__UCLIBC__))
+                      pthread_rwlockattr_t attr;
+                      pthread_rwlockattr_setkind_np(&attr,
+                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
+ inline void ReInitialize(PrefType ptype)
+ {
+   pthread_rwlock_destroy(&lock);
+-#ifdef __linux__
++#if defined(__linux__) && (defined(__GLIBC__) || defined(__UCLIBC__))
+   pthread_rwlockattr_t attr;
+   pthread_rwlockattr_setkind_np(&attr,
+                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+diff --git a/src/XrdTls/XrdTlsTempCA.cc b/src/XrdTls/XrdTlsTempCA.cc
+index faf69785f..37431dee9 100644
+--- a/src/XrdTls/XrdTlsTempCA.cc
++++ b/src/XrdTls/XrdTlsTempCA.cc
+@@ -30,7 +30,7 @@
+ #include <cstdlib>
+ #include <fcntl.h>
+ #include <dirent.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include <unordered_set>
+ #include <memory>
+diff --git a/src/XrdVoms/XrdVomsMapfile.cc b/src/XrdVoms/XrdVomsMapfile.cc
+index 8ffbe9218..fddbfdc06 100644
+--- a/src/XrdVoms/XrdVomsMapfile.cc
++++ b/src/XrdVoms/XrdVomsMapfile.cc
+@@ -40,7 +40,7 @@
+ #include <vector>
+ #include <string>
+ #include <fcntl.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ bool XrdVomsMapfile::tried_configure = false;
+ std::unique_ptr<XrdVomsMapfile> XrdVomsMapfile::mapper;
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index 8a5358e691aa..10ed861b1391 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,6 +1,6 @@
 # Template file for 'xrootd'
 pkgname=xrootd
-version=5.5.4
+version=5.5.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release"
@@ -13,7 +13,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://xrootd.slac.stanford.edu"
 distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
-checksum=41a8557ea2d118b1950282b17abea9230b252aa5ee1a5959173e2534b7d611d3
+checksum=0710caae527082e73d3bf8f9d1dffe95808afd3fcaaaa15ab0b937b8b226bc1f
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"

From 4fa7d5b32678acfebf1a639e1d70bc24dc264f33 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Jan 2023 16:54:39 +0200
Subject: [PATCH 1202/1854] CopyQ: update to 7.0.0.

---
 srcpkgs/CopyQ/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index cc16f0151a5e..0ccb3e2ec171 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.3.2
+version=7.0.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=ce122ed7f8e3e230b1c6dcce8f1ec6d717eef8c59829390cae1750c35b342c4a
+checksum=5898ba2025f8e9f61a4b4732e85adf3b1653fad20b5c1f1b0c879a7b72cd4d48

From 1e933e3cc9824168088ac5f6e563b18cbe2381b4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 6 Mar 2023 13:54:33 +0530
Subject: [PATCH 1203/1854] librsvg: update to 2.56.1.

---
 srcpkgs/librsvg/template | 38 ++++++++++++++++++--------------------
 srcpkgs/librsvg/update   |  2 ++
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/librsvg/update

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 83aec008a129..a70f0061afa3 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,36 +1,31 @@
 # Template file for 'librsvg'
 pkgname=librsvg
-version=2.52.2
-revision=2
+version=2.56.1
+revision=1
 build_style=gnu-configure
-build_helper="gir"
+build_helper="gir rust"
 configure_args="--disable-static --enable-introspection --enable-vala"
-hostmakedepends="cargo pkg-config glib-devel gdk-pixbuf-devel vala"
+hostmakedepends="cargo pkg-config glib-devel gdk-pixbuf-devel
+ gi-docgen python3-docutils"
 makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel
- libglib-devel libxml2-devel pango-devel rust vala"
+ libglib-devel libxml2-devel pango-devel vala-devel"
 short_desc="SVG library for GNOME"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="GPL-2.0-or-later, LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibRsvg"
 # update changelog when release series changes
-changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.50/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d2887c18ffb906e1a60f97fe46a7169f69aa28d6db5d285748f3618b093427
+changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.55/NEWS"
+distfiles="${GNOME_SITE}/librsvg/${version%.*}/librsvg-${version}.tar.xz"
+checksum=1685aeacae9a441dcb12c0c3ec63706172a2f52705dafbefb8e7311d4d5e430b
 
 # reference files are for specific pango and harfbuzz versions
 # the test suite isn't designed to be run by distros
 make_check=no
 
-pre_configure() {
-	# otherwise the final linking step uses "cc" instead of $CC
-	if [ "$CROSS_BUILD" ]; then
-		cat >> .cargo/config <<- EOF
-
-		[target.${RUST_TARGET}]
-		linker = "${CC}"
-		EOF
-	fi
-}
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" vala"
+	makedepends+=" rust-std"
+fi
 
 librsvg-devel_package() {
 	depends="gdk-pixbuf-devel cairo-devel libcroco-devel ${sourcepkg}>=${version}_${revision}"
@@ -39,11 +34,14 @@ librsvg-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
+
+		vmkdir usr/share/gtk-doc/html
+		mv ${DESTDIR}/usr/share/doc/Rsvg-2.0 ${PKGDESTDIR}/usr/share/gtk-doc/html/
 	}
 }
+
 librsvg-utils_package() {
 	short_desc+=" - utilities"
 	pkg_install() {
diff --git a/srcpkgs/librsvg/update b/srcpkgs/librsvg/update
new file mode 100644
index 000000000000..a8b303385110
--- /dev/null
+++ b/srcpkgs/librsvg/update
@@ -0,0 +1,2 @@
+site="https://gitlab.gnome.org/GNOME/librsvg/-/tags"
+pattern=">\K[\d.]+(?= - stable<)"

From cf44c294013cbcffbc85a7762f03fa3187e81ca2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jun 2023 16:52:27 +0200
Subject: [PATCH 1204/1854] taskwarrior-tui: update to 0.24.2.

---
 srcpkgs/taskwarrior-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/taskwarrior-tui/template b/srcpkgs/taskwarrior-tui/template
index 4e46cfa31506..22fd59f7b4ac 100644
--- a/srcpkgs/taskwarrior-tui/template
+++ b/srcpkgs/taskwarrior-tui/template
@@ -1,6 +1,6 @@
 # Template file for 'taskwarrior-tui'
 pkgname=taskwarrior-tui
-version=0.23.7
+version=0.24.2
 revision=1
 build_style=cargo
 depends="task"
@@ -10,7 +10,7 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="MIT"
 homepage="https://kdheepak.com/taskwarrior-tui/"
 distfiles="https://github.com/kdheepak/taskwarrior-tui/archive/refs/tags/v${version}.tar.gz"
-checksum=9e7dbd61219a0a7cc1916c71d05b778e515fb4eff5a22c523e4efb3ff826f4cb
+checksum=6f567acd8f0ba6009f20d9ba60078e2b999fddb0fdbcffa75f088c62679b2dc3
 
 post_install() {
 	vlicense LICENSE

From dc32f77eddf018f41807fadfc511cd2242de925a Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 22 Feb 2023 04:42:14 +0900
Subject: [PATCH 1205/1854] timidity: build on musl without broken alsa audio

---
 srcpkgs/timidity/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/timidity/template b/srcpkgs/timidity/template
index 4488d67ad953..9efb53716ee8 100644
--- a/srcpkgs/timidity/template
+++ b/srcpkgs/timidity/template
@@ -1,12 +1,10 @@
 # Template file for 'timidity'
 pkgname=timidity
 version=2.15.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-default-path=/etc/timidity
- --enable-audio=alsa,oss,ao,vorbis,flac --enable-server
- --enable-alsaseq=yes --enable-network
- --enable-gtk --enable-ncurses"
+configure_args="--with-default-path=/etc/timidity --enable-server
+ --enable-alsaseq=yes --enable-network --enable-gtk --enable-ncurses"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libvorbis-devel libao-devel libflac-devel
  libX11-devel gtk+-devel ncurses-devel"
@@ -17,9 +15,12 @@ homepage="http://timidity.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/timidity/TiMidity++-${version}.tar.xz"
 checksum=9eaf4fadb0e19eb8e35cd4ac16142d604c589e43d0e8798237333697e6381d39
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="uses alsa's pcm_old.h, which depends on symbol versioning to work";;
-esac
+# disable alsa audio on musl since it uses pcm_old.h, which depends on symbol versioning to work
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" --enable-audio=oss,ao,vorbis,flac"
+else
+	configure_args+=" --enable-audio=alsa,oss,ao,vorbis,flac"
+fi
 
 if [ "$CROSS_BUILD" ]; then
 	# check for va_copy runs test program; assume no for target

From c4914d1caa045621d79eabcd976becd26ce6ec51 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 29 May 2023 21:59:47 +0200
Subject: [PATCH 1206/1854] k3d: update to 5.5.1.

---
 srcpkgs/k3d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index ca389fe60a10..ee8f06416f1c 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
-version=5.4.8
-revision=2
+version=5.5.1
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://k3d.io/"
 changelog="https://raw.githubusercontent.com/k3d-io/k3d/main/CHANGELOG.md"
 distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
-checksum=05870da540960bbbedf3e52e4b24bae35529061d407c45f237eae8722359d4bd
+checksum=e01e274a5a9ea547bcdd885504bd44ef37b67a5a3f597bcb69b84d54eb8bfef0
 _completions="bash zsh fish"
 
 post_build() {

From e9b83f43f02092457dffb7d0728f1c99764d29ea Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 16 Mar 2023 15:06:32 +0100
Subject: [PATCH 1207/1854] geckodriver: update to 0.33.0.

---
 srcpkgs/geckodriver/template | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 784f4b381dff..e19a79900a1c 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,27 +1,14 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.30.0
+version=0.33.0
 revision=1
-_hg_commit="d372710b98a6"
-build_wrksrc=testing/geckodriver
 build_style=cargo
 short_desc="WebDriver for Firefox"
 maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/geckodriver"
-distfiles="https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/geckodriver/>geckodriver.zip
- https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/webdriver/>webdriver.zip
- https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/testing/mozbase/rust/>mozbase-rust.zip
- https://hg.mozilla.org/mozilla-central/raw-file/${_hg_commit}/Cargo.lock"
-checksum="7f8820ec83ca7671236ee74345bdbd20cf328fde4896397353952c0cc4e0eb91
- 4828ec0256835b893e5642439f83f9de84512a84e4a711262b6f2c37dff15ec8
- 71043889235bf513b2539490d1c163589484628f6fcf24e4591ba4281e620d6f
- 5daceea2850bd034ffb1b538b4aa5f8f6915f36631ef6dbeeb9d30fe26180c38"
-skip_extraction="Cargo.lock"
-
-post_extract() {
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock ${build_wrksrc}
-}
+distfiles="https://github.com/mozilla/geckodriver/archive/refs/tags/v${version}.tar.gz"
+checksum=f796679ae35a4c32b9248da9401f058578e06eec1808f4ce0abb76e2ee64b653
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="there is no firefox for armv5/6" ;;

From 809d5570ca8b70a209a251bdd1d8312ee2b1a31e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:19 +0200
Subject: [PATCH 1208/1854] plasma-sdk: update to 5.27.6.1.

---
 srcpkgs/plasma-sdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index d0fce312449e..c9c0a5844f2b 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.27.5
+version=5.27.6.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,8 +12,8 @@ short_desc="Plasma development applications"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f10245b27687bbd21b18e78267a1895aab9644722456a2b92fb54f7ca0b06915
+distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=2e4b0e466fced4345ecbd9c3b208bd334793762b02ae18bc54904860a69dceaf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 639d18e8fff8e424cb4a68af9d7b4cbc3f141d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:49 +0200
Subject: [PATCH 1209/1854] bluedevil: update to 5.27.6.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index a48ce07318ae..91af92c573f7 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=61535ae665a5bc1e17c8210d660ba79a3a694ae4ca4b3016e6523ab227a54ded
+checksum=7ceff877200edd7043a57aeba3bf54828b2d96501b4e58497b6f0ec01b73df74

From 4d4d41f6c4607ed9c2c3fa1297fe313d584da9c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:50 +0200
Subject: [PATCH 1210/1854] breeze-gtk: update to 5.27.6.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index ba5e31ead109..f5b66efa7633 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo qt5-devel"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c4956ddab4d65471dcf26634672c088b4499d27f766e41b6a8d083442e55c968
+checksum=ac2aab13b9224ddea6560fdbac9fe9d93a08a86787f95b95c43a95b134836bda

From 5f043383c93c70addff804e13e8a738b55a9d42c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:55 +0200
Subject: [PATCH 1211/1854] breeze: update to 5.27.6.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8b16b3342bb9..598469f2b120 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=70d8a35bf8c0758f9c3e3873b657250b1e09c1c79f92b066d3385a1e44fec868
+checksum=5d9a8d7e5b061ce4183c4f842b0e82e6132b6c8e7ebc2c1d579baa066ffa6c6c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From a0e11dd3845487d4a7c23bbc6994705ea11a1c2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:56 +0200
Subject: [PATCH 1212/1854] flatpak-kcm: update to 5.27.6.

---
 srcpkgs/flatpak-kcm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index 37e14d15abf2..cf5fba05e127 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -1,16 +1,16 @@
 # Template file for 'flatpak-kcm'
 pkgname=flatpak-kcm
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake
  gettext kconfig-devel kcmutils-devel"
 makedepends="flatpak-devel kcmutils-devel kdeclarative-devel
- ki18n-devel kconfig-devel"
+ ki18n-devel kconfig-devel kitemmodels-devel"
 short_desc="KDE Config Module for Flatpak Permissions"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/flatpak-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7b7541780654c1007ff268c8e0460def4aa7a58360550410a57531cb0e45ba9a
+checksum=fcee94bb9eeb58db5b304e16b5db060d8f559e1b10b202e83ab8e342be927f7a

From bc25c2326f90597341e7c7fa91ffc3e930558bcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:57 +0200
Subject: [PATCH 1213/1854] kactivitymanagerd: update to 5.27.6.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 6cf9a1001ee7..2c98ca84032a 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a209f4727bc5c44754f48ed1947fbe66419877407f83a0bad458dcab2d03b619
+checksum=06180b32ad64f88e2f3ea598e887c42cf68189dba14b220dceafcb0490c5b02d

From 264308bfbafd6f1773f0dc0faa4cd2c43d770fe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:58:58 +0200
Subject: [PATCH 1214/1854] kde-cli-tools: update to 5.27.6.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 0436ff1231a8..f8b1d7f7fc91 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed745637701210102e0e2e1354823e4e0f2bf8b7d4778cf5ed9c104fb57cef67
+checksum=b5e2b1c3bf82c112c8488aea73dca11a49963ea66e66db8f358f8e0394ba0faa
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 3284e851557a40ca35ff5f659c509cbc5ae6862d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:00 +0200
Subject: [PATCH 1215/1854] kde-gtk-config5: update to 5.27.6.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0fda095c0818..4a47776d0c87 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=477bb7c20901926faaaa0ad9d5ef61e33891a5d3bf4e51a5798eee6e5c5c1028
+checksum=b3f23a5602530b77d55ff08e108692576740de056edb01f7b1bc3843d890f820
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 12b1f5792c4d3d941bc8ebc5ee6def0c9d589a1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:01 +0200
Subject: [PATCH 1216/1854] kdecoration: update to 5.27.6.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 17d328c513fa..1ec3497326ff 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=effbf6c5c79802d07fa14f8bd40a9d57bbfc2af2861b6ed596687db48230be42
+checksum=9db69b439a9a6c863c5be74ba380964087c83b0f438aeaf6d0a97f5fd05294e6
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 9503aceb4ffdaad4a2b0d565719c99b84e389f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:02 +0200
Subject: [PATCH 1217/1854] kdeplasma-addons5: update to 5.27.6.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 4e3e38d15db2..877694cb3f46 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c9351ab0317c75b0340be44cc906b7ba66e69f5c672d33fbfd5b32bc2a560ff9
+checksum=343b0d40a81bf498633c71a138902b43e61461fcae2209b6f09e7cf6c8baf087

From a28e5c09a9175fbb796052c3d803b1dddba8311b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:03 +0200
Subject: [PATCH 1218/1854] kgamma5: update to 5.27.6.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 181febdc4142..8ff8cdf39889 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7b6626473944a8b4afb8e986a9d06ffe9afb6f24938f24053b33fcfb5ce84dd9
+checksum=61f111ecccd2fae7f46a1c7ef80d49a21bd80d8aadb65541453df134351fd692

From c400f38172a332ec4108fc26e70340c840d18432 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:05 +0200
Subject: [PATCH 1219/1854] khotkeys: update to 5.27.6.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index edcbecd5d0e1..979bf131d825 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=83e85326de1e3b430ebd0364955e2167ccee50d33fdaaba9fa0e5cf488e6ec20
+checksum=dbc7ec600e0450901648e6513f25f7c1ccad6798ce38b70437258daa6d833d7e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 12edaf7bc2f44fbb4453c3cf9f06afabde2f2bd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:07 +0200
Subject: [PATCH 1220/1854] kinfocenter: update to 5.27.6.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 354a7a0b042c..937d78309c50 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0be970049e2be8a5c21128a0ce3ba69e6b82415268a1ed1aa0a30c77c94adc48
+checksum=cd96e9952cc8c73337dda0786d45f3f381ca5137f8eca5feee2209f63981901b

From 64210d629d0c1654ac3a1ce7d313174982e270a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:08 +0200
Subject: [PATCH 1221/1854] kmenuedit: update to 5.27.6.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 253320d9914b..15080cf358a3 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=446263c4bcc4592251c0e93f3bbab1635452b26e5650605928d4933d70f31127
+checksum=89144ffa83855627506cae2c10e5e646f3f1efd839121b1d7eb595b7c51a4696

From e66da80957d03c73e965c0d710ef330fe640c7e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:09 +0200
Subject: [PATCH 1222/1854] kpipewire: update to 5.27.6.

---
 srcpkgs/kpipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template
index 05ad025944da..db4e42f0d456 100644
--- a/srcpkgs/kpipewire/template
+++ b/srcpkgs/kpipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'kpipewire'
 pkgname=kpipewire
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules plasma-wayland-protocols gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kpipewire"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=41326adceeaad0d5e0fba78af69403dea12c007b769ed4b5d5534c21f27bdd98
+checksum=7ed653bfc0e82aa32e05766def3466937a5b2e31abbf3d50c9298b23e6e4328b
 
 kpipewire-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a37e6469898c0e0cf5b501eec71cf94f8f5d41f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:10 +0200
Subject: [PATCH 1223/1854] kscreen: update to 5.27.6.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index ba630a1f14a1..4fc07d033b23 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7297aac39b79d477ecd66df5a5c464d2064d375e7b2249eb67f62195a9824468
+checksum=ded0651eec67e22f22fa3d6b0dbb03e81bfb2d4e5a7468e9efc5f5a4598bf254

From 85ad360cc6ce761d7b63bdf8db9737d431385ab1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:12 +0200
Subject: [PATCH 1224/1854] kscreenlocker: update to 5.27.6.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 262dd08205cb..c4c134123d91 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c8807f1c2ed8fa14a9b29639c7d5697b5d5bab44d6b88020e5d3f463880ec92
+checksum=5d04960f82895a15e51ad07238a394e347f28815ab93e9f5a97106c21bf1f55d
 
 kscreenlocker-devel_package() {
 	short_desc+=" - development"

From b8e94a03fa8b14ad9368eca0aa3c3eca0198148c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:13 +0200
Subject: [PATCH 1225/1854] ksshaskpass: update to 5.27.6.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 206db539f9f5..117ee058efa9 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f6ed26693e3dea8387c0980bf7335d96dc18c5c68c9e289d009dba22c79b0cd7
+checksum=854cad79eb8b27685e97c4f62fd96e97744fc6a38491f156c047d0bce5c6e8c5
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 21e3501b580197e347c49f70fff9385f38ef8940 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:14 +0200
Subject: [PATCH 1226/1854] ksystemstats: update to 5.27.6.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index a899f447f23f..d503471bdc57 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d59d84cdf8c9cd8a2c3639ebb5986f50995f1f7f74a833af867709b7c336dcf8
+checksum=f1810ac6641bb17c42a90f643ef0fb45226e9b155601dd1827ccaf302ffa2376

From 6db075faab195295fb222b9acb77725af1e480aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:15 +0200
Subject: [PATCH 1227/1854] kwallet-pam: update to 5.27.6.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 8a71a61a4d3f..6b8834e7d388 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6a9aaa8dc25ed62058058c1d813d674c7b430b4915e42253f48227e997929190
+checksum=b7adf0065f20855edc18959f5fa661f79fe53081cc35d4c4df242988e3d16830

From 86af97385f03da20c39503e7242b18fb3c745260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:16 +0200
Subject: [PATCH 1228/1854] kwayland-integration: update to 5.27.6.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6f9815bcab65..e2395bb392d9 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9ae1fc40a70d1453841e16dca2e399fc5c68de3a9ffa7475673f98bf7dcb18f9
+checksum=10b7db4dfa276fe4e2398f742f60459367c5db1c91f8a9015e06e9f51e092c83

From b420f5d4d24776531761a99046f637681a72a31f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:18 +0200
Subject: [PATCH 1229/1854] kwin: update to 5.27.6.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index d04158fdf630..c530ec5ea57d 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -22,7 +22,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bb1226b15919681ea5f1de58b24ea4b568ea3f2b5452411f76daa80eb30c20ea
+checksum=62d5bd5e91e951c9ad8c2fc49c29485feca78db985731f0779cdaaf5052499ec
 replaces="kwayland-server>=0"
 
 kwin-devel_package() {

From 9f962f8fc96902a5bfa2ae9e89c829ba89341d76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:19 +0200
Subject: [PATCH 1230/1854] kwrited: update to 5.27.6.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2f3cd4b4af73..106bfabc1b52 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f2baec5827a87c035a116795615f2dba51ebaaab6297cbe8adf50410865fcc91
+checksum=0665240812594b9c5ec20b24dde1734bedc33f1440eb8591e72429ab2b1a7894

From 7be6e1378f70473564ab2e722d1667bec8118a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:20 +0200
Subject: [PATCH 1231/1854] layer-shell-qt: update to 5.27.6.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index e03e6a3efa7f..6f6e1735ca6d 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ccdf6aa579f0437f3bad377ac35268dfab36f6816227c03bae0591301c8d1d21
+checksum=e65c29ca65bf945da4f53bce9eb3614eb1105e57652e3fb1782ee9d24a9e8793
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7a5a4d7973fcb1628727de00cd76fb25c48a7a2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:21 +0200
Subject: [PATCH 1232/1854] libkscreen: update to 5.27.6.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index b40c6b2d9151..d15037a28a7b 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=29aff3f28d8706e864b914dea4ab59e5518ed0381bb1c6625f454f08196deb65
+checksum=c1a9373faab5a7ec77980a696a7599583b4fda8e1f12da2c5716bc9562789efb
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 15be85cd05e916e5d84484face55025983e18199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:22 +0200
Subject: [PATCH 1233/1854] libksysguard: update to 5.27.6.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 006ac131c898..9ca1ac1dd256 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7e7eb53af05fefcfea6b38fed4947409370ad303247892e4719bc2a809e85e14
+checksum=9ecb2cb4aab6ba8f0b790267f22aab48244a78c6370b86eb662a0480fb031bdb
 
 build_options="webengine"
 

From 7daeb90254182c282af502bf5dec1a0927efa084 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:23 +0200
Subject: [PATCH 1234/1854] milou: update to 5.27.6.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 8d94a9cad774..ea8e16b85ef9 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1b1b0a3e672f06eb81f889b0c48726af4b3702b103eb1e680c3972ef5c8d0298
+checksum=feaea739bc100f313d098a13614b16c01bdafc7dbe0e9ebed5e7a6d8cfd381c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5456520a09dc0e214b1000d9291f9c972a42a012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:25 +0200
Subject: [PATCH 1235/1854] oxygen-sounds: update to 5.27.6.

---
 srcpkgs/oxygen-sounds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-sounds/template b/srcpkgs/oxygen-sounds/template
index 1713e184170a..d631f4127513 100644
--- a/srcpkgs/oxygen-sounds/template
+++ b/srcpkgs/oxygen-sounds/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-sounds'
 pkgname=oxygen-sounds
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,4 +9,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen-sounds"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21fb31e2c4047f56e3ec09cd4960f56120b746152485336f716c9101cd2c8566
+checksum=afeaf30c41d191e43582d41601102b17effa2b9c2e65c61ca6a3e36ef2fc327e

From 8f71340ad23e00106f946f857460810b2321301f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:26 +0200
Subject: [PATCH 1236/1854] oxygen: update to 5.27.6.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 7ce53c433e2a..a1f2b850c247 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb764ea8820a01ab9c9d0cfccf588b64c4a5b9e6644b6e4188c618a793227ebd
+checksum=a9063912e238fcd113f719c01d100028545373d1b7881b147fcc92f910dc0906

From f4db0415b389c3a395c2ab072c3e071601dfc350 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:27 +0200
Subject: [PATCH 1237/1854] plasma-browser-integration: update to 5.27.6.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 4210c96ba5bd..c6427418751e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b490451d672bb2f0294f53422d41df7594690bc8761f9724081147d5fdd1d925
+checksum=72f86d1ee1b6474921ed102439dabf4c3813c2ae3731496c222656b8ab69198a

From ad1c34860ffa44c74b7e850e3d88baa030312260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:29 +0200
Subject: [PATCH 1238/1854] plasma-desktop: update to 5.27.6.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 7fb502a99151..c7740e305b6b 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -20,6 +20,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4f2b573134658f640717d6ee67eaee41d9df4c578856016efa769b4415e91cb1
+checksum=e2485ea25d695ba22c1f14957abe14af658741a5e788269543ab7ff33045a683
 replaces="user-manager>=0"
 python_version=3

From 20ca0c6f698f70979e82187f484721625bfe5889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:30 +0200
Subject: [PATCH 1239/1854] plasma-disks: update to 5.27.6.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 9b0da9de04cd..4dffe8008ef7 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ea10e289596b3ce53c0d6ea5ee714306918c5b7368262c22965f44a1dab1480b
+checksum=3cc04456b7c16c5bb78c0e89f9a864cc48ec6d571d4d85c9025f232c3a876427

From 2a8e2929cbbbd1e40c21c2d2c2ccdc79854e3070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:31 +0200
Subject: [PATCH 1240/1854] plasma-firewall: update to 5.27.6.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 5ca700e07262..ab17632b74d4 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e32c90aa52ec35d35fd04e04d00989f18d43ea1f7b244e53de7feb7745235b41
+checksum=c8623cdfed38cd886153c51a1f6bda4af6709d237ae70963806f182cd2f76cc9

From 86fbef85813771ac8152dfb55ba69b4e97e4831b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:32 +0200
Subject: [PATCH 1241/1854] plasma-integration: update to 5.27.6.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index ae9952e93c10..7fda166d22aa 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8dedc5630828f0fb5912ca7cad9df5cde2492e17fd2956de6f514d43b4f89f7b
+checksum=a5fd5df218788b44c0bb2a437db1cad11917d4ebe6acefd89abd3f72104d8dab

From f9a546fb2f29139ae60676048d315253a2c99ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:34 +0200
Subject: [PATCH 1242/1854] plasma-nm: update to 5.27.6.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a4b533ef4c38..75e85a94a9ec 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=152f48e44b6207a606b89548c9f298f1a12a9778ff4876c3ffeeb1f2188ca62e
+checksum=0a649ee81433340eb106889d06a3b6592b99dc41dab898f9dcd14312fb68d9c9

From 1d23c247f564c4ef1dc0c19e2a7beadb8f4c9f6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:35 +0200
Subject: [PATCH 1243/1854] plasma-pa: update to 5.27.6.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index fc410aa573f6..294f5605c013 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c2ab3f73bfdeed68a5cda3bf72a67ef609bef1c3e96e43bab0a18df822d98188
+checksum=4e7608ba32a47affe64bb77ec30bc3ed977a4ca7577399238dd3821df5856e4f

From 571316ef96f029641397fb3cd5ff7c8ce54a1990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:37 +0200
Subject: [PATCH 1244/1854] plasma-systemmonitor: update to 5.27.6.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 01ded45075a8..bcfa7e9ad070 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=82e551398f208270f543d5f91be6f3f3b27b1ce9f2c0e90263f29f8d238b2e34
+checksum=796eb25f061f05cd4e59019cfe902cb61d53be60904bec69366b347c3cfb9c1d

From fba43d80e69552930e12a5d8a6d81e241dde3004 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:39 +0200
Subject: [PATCH 1245/1854] plasma-thunderbolt: update to 5.27.6.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ea02f0d85a7d..07d8ff6a90e6 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=310564c501c6621c3d0f1421865d18839191bc82915ffba555a80214e0db90d5
+checksum=669fee26f59bb2c9122b9a9286a45f0808de42d47ed4b66382bf40ae925d6cc6
 
 do_check() {
 	: # Requires running dbus and bolt services

From 105055d0777d9637cb9ac155be721659b66fe265 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:40 +0200
Subject: [PATCH 1246/1854] plasma-vault: update to 5.27.6.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index ebc592f1c804..340117f4ed11 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=74f22be02ae0e02cf2e9eb3fad62a5ca9fb5f984775455f6c7e1c6aa553527e8
+checksum=245f5f4dac9934c2491fc9369feacb4002d16bde8c4366114557de2b2a40aa73

From 7d42b3849f184741ee6fded1aaea08091beca87c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:43 +0200
Subject: [PATCH 1247/1854] plasma-workspace-wallpapers: update to 5.27.6.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index d2c3eb5e5bb7..1fedd14d1093 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=23805edcc147377c7bd7444278e76327003d142f9c4048e3970000cb6f38c840
+checksum=1303557516376eac7759c7aff796f2815a65e6874ecdd260118c66a061df1b05

From 457638316dd14fc90437251448b92936779b7668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:45 +0200
Subject: [PATCH 1248/1854] plasma-workspace: update to 5.27.6.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 027ec664e9e8..772c0dd6e846 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed0b95b2eefd0782ea652c2c6eed262e8eb91f97ff72925bb3f7e161d1f72a17
+checksum=1ce6f70f7bb909b9ed9c213bc5528a4e7c264f570a9c94f2f4fb25c1528f8883
 
 build_options="pipewire"
 build_options_default="pipewire"

From 85d108fa471d9b4ccbbdf63e1aa28d4c60606686 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:46 +0200
Subject: [PATCH 1249/1854] polkit-kde-agent: update to 5.27.6.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 9f5ce9a706c0..6d0641de9dbe 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=2ae3b4ff0c74d9f55fe85cb0fb8106401f0301a96760d0ffefb66161215a2a2f
+checksum=df737ae267ffab5abe460624c325daad176882ac1a4fd5df81e4ba44be4ced4c

From e140ac338dd7208e9950c08a8a1662dc71eeb9e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:47 +0200
Subject: [PATCH 1250/1854] powerdevil: update to 5.27.6.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index e6198d4f2cdb..e1c6ad4f3de9 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0379862c57efef4ce980f6c9583d66deafde1ed522f0e129aa50cef038fb500e
+checksum=6b230fabf2738455e3dfc3ab15e70b942ec827dc3080434774c6cb19d3217fb5

From e33e6756a49f8389ead5676ad3ad7a0624075b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:48 +0200
Subject: [PATCH 1251/1854] sddm-kcm: update to 5.27.6.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index cd45480f71b6..b09bc794b21f 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5605f2dffe33b731b08ec51b7ef4cea8ec6fb796497ae46242fe8f40e8aa199a
+checksum=dc70ab178f6954a6aaf7862440a64742c0c600c48f454462e97e09a1ddd6b5e2

From 4525e0c616cd5fcddc661376b697c657e6136dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:49 +0200
Subject: [PATCH 1252/1854] systemsettings: update to 5.27.6.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 287ef9b9c8bd..c4d9dc209e26 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5454eb0aaba331e724bd91650474bbe1658f26fcc543ab7804186bccf50b4db
+checksum=bc2c471f1e13e9d063b616552bdc0d831c430338f3e3b32bbb3c0418956e789d

From fc4eab963a038e87b03555c40b41f02f723a8b8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 21 Jun 2023 12:59:50 +0200
Subject: [PATCH 1253/1854] xdg-desktop-portal-kde: update to 5.27.6.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 818e2c721b77..94cc75f56e13 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.27.5
+version=5.27.6
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cfa3f24cff9b18baeef245e122f969092a89c41d872ea5a8df628061d8f1aab
+checksum=aed5e49660a47c86f26df67bf80ac3e55d2ce9bf2a3e676bfaa905516810f773

From c0d277d51420014510a5f1f8a16993214085ef0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Jun 2023 17:18:19 +0200
Subject: [PATCH 1254/1854] ktextaddons: update to 1.3.2.

---
 srcpkgs/ktextaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextaddons/template b/srcpkgs/ktextaddons/template
index 34ad96f9f815..ac47e5b59144 100644
--- a/srcpkgs/ktextaddons/template
+++ b/srcpkgs/ktextaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextaddons'
 pkgname=ktextaddons
-version=1.2.0
+version=1.3.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/ktextaddons"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=88126cecc592be4c5ecc0c6641474a4ca846dd1866056ce24bada9eb5d080183
+checksum=981ec78762e3ae0f03d86c43c8709ad6ce825668390c3921c1a7c4aad4aa51e3
 
 ktextaddons-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 53fc6116c37dba2809033444c89e04173c8f515f Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 27 Dec 2022 10:22:39 +0100
Subject: [PATCH 1255/1854] New package: outguess-0.4

---
 srcpkgs/outguess/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/outguess/template

diff --git a/srcpkgs/outguess/template b/srcpkgs/outguess/template
new file mode 100644
index 000000000000..e45f00e35815
--- /dev/null
+++ b/srcpkgs/outguess/template
@@ -0,0 +1,22 @@
+# Template file for 'outguess'
+pkgname=outguess
+version=0.4
+revision=1
+build_style=gnu-configure
+configure_args="--with-generic-jconfig"
+hostmakedepends="automake"
+short_desc="Universal steganographic tool"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="BSD-4-Clause"
+homepage="https://github.com/resurrecting-open-source-projects/outguess"
+changelog="https://github.com/resurrecting-open-source-projects/outguess/blob/master/ChangeLog"
+distfiles="https://github.com/resurrecting-open-source-projects/outguess/archive/refs/tags/${version}.tar.gz"
+checksum=1279b05f3bb5e8956c6eb424db247e773440898310c10dbf9571e7b6afae5d60
+
+pre_configure() {
+	./autogen.sh
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 0ee961295831b936cf4b4f9339e447a5c400495c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 24 Jun 2023 18:15:38 +0100
Subject: [PATCH 1256/1854] svt-av1: update to 1.6.0.

---
 srcpkgs/svt-av1/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index 3ca728ac94c8..99aa3571cbe5 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,16 +1,20 @@
 # Template file for 'svt-av1'
 pkgname=svt-av1
-version=1.4.1
-revision=2
+version=1.6.0
+revision=1
 build_style=cmake
-hostmakedepends="nasm"
+configure_args="-DSVT_AV1_LTO=ON"
 short_desc="AV1-compliant encoder/decoder library core"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-3-Clause-Clear"
 homepage="https://gitlab.com/AOMediaCodec/SVT-AV1"
 changelog="https://gitlab.com/AOMediaCodec/SVT-AV1/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${version}/SVT-AV1-v${version}.tar.gz"
-checksum=e3f7fc194afc6c90b43e0b80fa24c09940cb03bea394e0e1f5d1ded18e9ab23f
+checksum=3bc207247568ac713245063555082bfc905edc31df3bf6355e3b194cb73ad817
+
+case "$XBPS_TARGET_MACHINE" in
+	i686* | x86_64*) hostmakedepends="nasm"
+esac
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="32-bit is not supported"

From b8d26f70576cc38cc16c96766b53b1449f458e01 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 24 Jun 2023 14:30:05 +0200
Subject: [PATCH 1257/1854] cpuid: update to 20230614.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 849aec8d173d..9686b47b3cce 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20230505
+version=20230614
 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=55d30400cd6bab9acf3597edfc9a527a258e3a7b5c40ccc9b8b32b10d3e29b30
+checksum=b1c83045efc26076307751e0662d580277f5f9bf89cf027231a7812003c3a4e8
 
 conflicts="msr-tools"

From 072d6992ff881d7b3aa2fa7a458bd57e085e6ad8 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 24 Jun 2023 14:24:20 +0200
Subject: [PATCH 1258/1854] hcloud: update to 1.36.0.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index da0f7d134550..cf663f5dea31 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.35.0
+version=1.36.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=3dad20aa8b4592c65046a0587ded4cccc87aeba308bf1f5f07cde0bb864e6717
+checksum=d281bff826b626cd1e33ab7a3342988a647941fd02c643cf96da1bd7e2cf3c9d
 
 post_install() {
 	vlicense LICENSE

From bf0e2b3d6d488230ed60e0bf10c5d77febfad26f Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 24 Jun 2023 14:21:57 +0200
Subject: [PATCH 1259/1854] pgweb: update to 0.14.1.

---
 srcpkgs/pgweb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 08649e9df49b..2520622abc87 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.14.0
-revision=2
+version=0.14.1
+revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://sosedoff.github.io/pgweb"
 changelog="https://github.com/sosedoff/pgweb/raw/master/CHANGELOG.md"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=801f83449b88ef241a30f69d5c4201adc295f4393182cea195e51281c6df58e1
+checksum=e6636ff079c8b01ac2add78c7a05f86d61550a5213155065c892015e6217be01
 
 post_install() {
 	vdoc README.md

From eb01c48eeb7b6693b857b88eee852d24f42ba9d1 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 23 Jun 2023 17:44:05 -0500
Subject: [PATCH 1260/1854] imlib2: add JPEG XL support.

---
 srcpkgs/imlib2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index f819c0c76def..19cb61e08f4c 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,13 +1,13 @@
 # Template file for 'imlib2'
 pkgname=imlib2
 version=1.11.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
 hostmakedepends="pkg-config"
 makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
  tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
- libheif-devel librsvg-devel libopenjpeg2-devel libspectre-devel"
+ libheif-devel librsvg-devel libopenjpeg2-devel libspectre-devel libjxl-devel"
 short_desc="Image manipulation library"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"

From 66e611ad0ab49349d9a306ebf43e3204858963f6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Fri, 23 Jun 2023 08:57:58 +0700
Subject: [PATCH 1261/1854] krita: enable JPEG XL support

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index f070ef21bfb3..b39dffdd1135 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=6
+revision=7
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -15,7 +15,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
  poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
  python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
  libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel"
+ qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="Painting and image editing program"
 maintainer="John <me@johnnynator.dev>"

From 635061f69d71d4b0287a32260193efd7b09da748 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 15:00:27 +0200
Subject: [PATCH 1262/1854] clipman: update to 1.6.2.

---
 srcpkgs/clipman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index ff96c3da0e75..f6665547f4ef 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
-version=1.6.1
-revision=2
+version=1.6.2
+revision=1
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/yory8/clipman"
 changelog="https://raw.githubusercontent.com/yory8/clipman/master/CHANGELOG.md"
 distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz"
-checksum=9bfd69ed299f7641188e05668442f074fca3b01858ea8e680499ace7a36dd108
+checksum=6a94df2317e798a086dcb2b7f3cc4a6fa84189f648bac875d1789ce544cf6bc2
 
 post_install() {
 	vman docs/clipman.1

From 0d594b7ed8b439258adf280b4624f6f16e0b5ca3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 24 Jun 2023 11:56:07 -0400
Subject: [PATCH 1263/1854] scryer-prolog: update to 0.9.1

---
 srcpkgs/scryer-prolog/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3bf5b11120fc..6bdba3e996f2 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -1,28 +1,25 @@
 # Template file for 'scryer-prolog'
 pkgname=scryer-prolog
-version=0.8.123
-revision=3
+version=0.9.1
+revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel mpfr-devel libmpc-devel"
+makedepends="gmp-devel libmpc-devel libsodium-devel mpfr-devel openssl-devel"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
-distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
-checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
-nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.2.2/build.rs#L1278"
+distfiles="https://github.com/mthom/scryer-prolog/archive/refs/tags/v${version}.tar.gz"
+checksum=e69109af51f81568cec1137842cd438cb675f9fb966ba90b6a4ee85b469cd37d
+nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.5.3/build.rs#L1309"
 export CARGO_FEATURE_USE_SYSTEM_LIBS=1
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) ;;
+	x86_64*|aarch64*) ;;
+	i686*|arm*) broken="upstream dropped 32 bit support" ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-post_patch() {
-	cargo update --package lexical-core:0.4.6 --precise 0.4.8
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 24df8d87572af3ff5bc482b014d34a8c5791c318 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 24 Jun 2023 19:08:50 +0100
Subject: [PATCH 1264/1854] ghostscript: update to 10.01.2, adopt.

---
 srcpkgs/ghostscript/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 51fef8519ffd..42862a17d62a 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,18 +1,18 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=10.01.1
+version=10.01.2
 revision=1
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 short_desc="Interpreter for the PostScript language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
 changelog="https://ghostscript.readthedocs.io/en/latest/News.html"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=c91193635aa2578f9508b8ba846106c1e3705fbd3fed5fd9a015f21b55f15d68
+checksum=48d079242a2ca02a2e47a76a52cdfa818b2ad769c2bab00ad0497dd13560e7e7
 
 build_options="cups"
 build_options_default="cups"

From 862c345eafabbf41a3773a7e0e994a845685ceb4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 24 Jun 2023 13:17:54 +0200
Subject: [PATCH 1265/1854] eog: update to 44.2.

---
 srcpkgs/eog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index ea3fd2aa56af..1017a2cc4a98 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=44.0
+version=44.2
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=41d85fab05c430898dbfd847e48e1f5b4935dc3cbcee546e759a907eda671054
+checksum=468f539f6b67ee46188170f244480cc311dd1efe4786fe1554bffe26a65c72c4
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 17dc7c2b3e9f56104255f1400b5c4152c24068f8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:48:28 +0200
Subject: [PATCH 1266/1854] intellij-idea-community-edition: update to
 2023.1.3.

---
 srcpkgs/intellij-idea-community-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 63390bf45691..2ea7974e151a 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2023.1.2
+version=2023.1.3
 revision=1
 archs="x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"
-checksum=f222f0282bebe2e8c3fef6a27b160c760c118e45a0cdb7c9053d645a8e00844a
+checksum=336ec81b78645349e0b476047e2d1993ed3f1c571f8961565a3e47fe5c9c02bf
 repository=nonfree
 nopie=yes
 python_version=3

From f960fa2a41f4b6596d5d1d084372f07e825324de Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:31:03 -0500
Subject: [PATCH 1267/1854] perl-Test-Simple: update to 1.302195.

---
 srcpkgs/perl-Test-Simple/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index c23acff58480..49807f0f6e6a 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test-Simple'
 pkgname=perl-Test-Simple
-version=1.302192
+version=1.302195
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=27a7532e716b0551713db57cdc8596aec27ba4edf1b6f24f90565d5fb30865d8
+checksum=b390bb23592e0b946c95adbb3c30b11bc634a286b2847be611ad929c57e39a6c

From 3332bd34fce9203cf4d8f69824ec590f398f082c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:33:21 -0500
Subject: [PATCH 1268/1854] perl-Test2-Suite: update to 0.000155.

---
 srcpkgs/perl-Test2-Suite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Test2-Suite/template b/srcpkgs/perl-Test2-Suite/template
index 3708562dd3d5..952c32e4ff70 100644
--- a/srcpkgs/perl-Test2-Suite/template
+++ b/srcpkgs/perl-Test2-Suite/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test2-Suite'
 pkgname=perl-Test2-Suite
-version=0.000145
+version=0.000155
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test2-Suite"
 distfiles="${CPAN_SITE}/Test/EXODIST/Test2-Suite-${version}.tar.gz"
-checksum=ed44be739c8879fe178d3107b238f2db960d52797db0058de53be5b84600358b
+checksum=c78e6bc4d69bc097836976863382b52b9e0c31ee185066ce60c54bd74baad53d

From 8486c159069f12c21b8e051549bc111be64627e7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:34:27 -0500
Subject: [PATCH 1269/1854] perl-Test-Deep: update to 1.204.

---
 srcpkgs/perl-Test-Deep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Test-Deep/template b/srcpkgs/perl-Test-Deep/template
index 44b1c9d586ef..47e4d35b9515 100644
--- a/srcpkgs/perl-Test-Deep/template
+++ b/srcpkgs/perl-Test-Deep/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Deep'
 pkgname=perl-Test-Deep
-version=1.130
-revision=2
+version=1.204
+revision=1
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Deep"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-}-${version}.tar.gz"
-checksum=4064f494f5f62587d0ae501ca439105821ee5846c687dc6503233f55300a7c56
+checksum=b6591f6ccdd853c7efc9ff3c5756370403211cffe46047f082b1cd1611a84e5f

From e1f1811ee03a273896d1e8114f267047aad02f2f Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:44:44 -0500
Subject: [PATCH 1270/1854] perl-YAML-LibYAML: update to 0.88.

---
 srcpkgs/perl-YAML-LibYAML/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template
index fc434a4a9b23..281ad69994b8 100644
--- a/srcpkgs/perl-YAML-LibYAML/template
+++ b/srcpkgs/perl-YAML-LibYAML/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-YAML-LibYAML'
 pkgname=perl-YAML-LibYAML
-version=0.86
+version=0.88
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/YAML-LibYAML"
 distfiles="${CPAN_SITE}/YAML/YAML-LibYAML-${version}.tar.gz"
-checksum=b139675326591c95d2e431be8d8dd13fd87080b5826716de99879fc5e614f9d8
+checksum=a8a2738cccc332a8f7549c4c27f3e0090c9ab11eef0f6c856445177398135678

From be4f05321016ff387289f9eba4f0976a4a730b06 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 14 Jun 2023 14:57:19 -0500
Subject: [PATCH 1271/1854] perl-YAML-PP: update to 0.036.

---
 srcpkgs/perl-YAML-PP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-YAML-PP/template b/srcpkgs/perl-YAML-PP/template
index 8d58f32ae540..413449c2ebf1 100644
--- a/srcpkgs/perl-YAML-PP/template
+++ b/srcpkgs/perl-YAML-PP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-YAML-PP'
 pkgname=perl-YAML-PP
-version=0.035
+version=0.036
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/YAML-PP"
 distfiles="${CPAN_SITE}/YAML/YAML-PP-${version}.tar.gz"
-checksum=893368b89dfe23cd1ee5c848ee73f2e9c5388814dcfb9a353e2b10ac185b673d
+checksum=c8b4e50584adf92ef7573f6bb01d6ed58e6217632c57427b7274cfa7ca46fc1b

From 8fb835023ec7be042de89d96558f6d8eba34d9bf Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Sun, 18 Jun 2023 16:37:59 +0200
Subject: [PATCH 1272/1854] ansible: update to 8.0.0

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index b1161f4a9312..de839b7dfc1d 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=7.5.0
+version=8.0.0
 revision=1
 build_style="python3-pep517"
 hostmakedepends="python3-setuptools python3-wheel"
@@ -10,6 +10,6 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=4f08ca25bb29005c1afc4125e837882ad7a2c67ff0cc9d1a361b89ad09cf8c44
+checksum=8670c7c46021c188cac235e9fde7adadbb3c380c2436a3b0c1c493c4ba10bcab
 # Relevant tests happen in ansible-core
 make_check=no

From a8171a483c59efe7c2c3ef5b0625d5607b4f2395 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Mon, 19 Jun 2023 00:36:30 +0200
Subject: [PATCH 1273/1854] python3-ansible-lint: update to 6.17.1

---
 srcpkgs/python3-ansible-lint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index a842f6193637..ac598237f248 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=6.16.2
+version=6.17.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -17,7 +17,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/ansible/ansible-lint"
 distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=93ad8a04adcda6025d4ff218a10694120fe70cb91da8ac9f85c5dc82b32456e4
+checksum=f34e333f3555c99ff34c778f61d470d1e3a1eb6dc76090d0dd7b95b2c94745c2
 # cba anymore, the list of failing tests changes with every update
 make_check="no"
 

From 1bfa7a12853dbccbdaaa7617676c7484a61468fd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 18:01:22 +0100
Subject: [PATCH 1274/1854] libaio: update to 0.3.113.

---
 srcpkgs/libaio/template | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/libaio/template b/srcpkgs/libaio/template
index c7940e2fcbdf..2cdb1df6b9ab 100644
--- a/srcpkgs/libaio/template
+++ b/srcpkgs/libaio/template
@@ -1,18 +1,19 @@
 # Template file for 'libaio'
 pkgname=libaio
-version=0.3.112
+version=0.3.113
 revision=1
-short_desc="The Linux-native asynchronous I/O facility (aio) library"
+short_desc="Linux-native asynchronous I/O facility (aio) library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://lse.sourceforge.net/io/aio.html"
-distfiles="${DEBIAN_SITE}/main/liba/$pkgname/${pkgname}_${version}.orig.tar.xz"
-checksum=f69e5800425f4ea957426693ac09f9896bb993db5490fa021644454adcc72a32
+homepage="https://lse.sourceforge.net/io/aio.html"
+distfiles="${DEBIAN_SITE}/main/liba/$pkgname/${pkgname}_${version}.orig.tar.gz"
+checksum=2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b
 
 do_build() {
 	CFLAGS="${CFLAGS/-fstack-protector-strong/} -fno-stack-protector"
-	make CC=$CC
+	make CC=$CC ${makejobs}
 }
+
 do_install() {
 	make prefix=${DESTDIR}/usr install
 }
@@ -22,7 +23,11 @@ libaio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+
+		for f in man/*.3; do
+			vman "$f"
+		done
 	}
 }

From a56c0b193f1e28d63ff2af14f7f41b0e1677e5e4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 20 Jun 2023 12:16:10 -0400
Subject: [PATCH 1275/1854] broot: update to 1.23.0

---
 srcpkgs/broot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 266e1470a053..bc4edb797c2b 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,7 +1,7 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.18.0
-revision=3
+version=1.23.0
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="oniguruma-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://dystroy.org/broot/"
 changelog="https://raw.githubusercontent.com/Canop/broot/main/CHANGELOG.md"
 distfiles="https://github.com/Canop/broot/archive/refs/tags/v${version}.tar.gz"
-checksum=b195fa6b47b282a8f4baa3b7eb69fa6fd2f3fde80238bd5fe70c4dd4ae288610
+checksum=4dc855cb67eecb203759b88fb819fe4e725ea646dfdfb7af548805d2f98162b5
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="exr crate errors on big endian"

From 37aecdc7e5c7830cd07a42c8fc6466808b8a42f4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Feb 2023 23:01:14 +0200
Subject: [PATCH 1276/1854] spdx-licenses-list: update to 3.20.

Also:
- update common/travis/license.lst.
---
 common/travis/license.lst           | 40 +++++++++++++++++++++++++++++
 srcpkgs/spdx-licenses-list/template |  4 +--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index f6fdacb0e2de..649728a15e51 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -23,6 +23,7 @@ APSL-1.1
 APSL-1.2
 APSL-2.0
 Abstyles
+AdaCore-doc
 Adobe-2006
 Adobe-Glyph
 Afmparse
@@ -38,6 +39,7 @@ Artistic-1.0
 Artistic-2.0
 Autoconf-exception-2.0
 Autoconf-exception-3.0
+Autoconf-exception-generic
 BSD-1-Clause
 BSD-2-Clause-Patent
 BSD-2-Clause-Views
@@ -55,6 +57,10 @@ BSD-3-Clause
 BSD-4-Clause-Shortened
 BSD-4-Clause-UC
 BSD-4-Clause
+BSD-4.3RENO
+BSD-4.3TAHOE
+BSD-Advertising-Acknowledgement
+BSD-Attribution-HPND-disclaimer
 BSD-Protection
 BSD-Source-Code
 BSL-1.0
@@ -66,10 +72,12 @@ Beerware
 Bison-exception-2.2
 BitTorrent-1.0
 BitTorrent-1.1
+Bitstream-Charter
 Bitstream-Vera
 BlueOak-1.0.0
 Bootloader-exception
 Borceux
+Brian-Gladman-3-Clause
 C-UDA-1.0
 CAL-1.0-Combined-Work-Exception
 CAL-1.0
@@ -99,6 +107,7 @@ CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-DE
 CC-BY-NC-SA-2.0-FR
 CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
@@ -141,7 +150,9 @@ CERN-OHL-1.2
 CERN-OHL-P-2.0
 CERN-OHL-S-2.0
 CERN-OHL-W-2.0
+CFITSIO
 CLISP-exception-2.0
+CMU-Mach
 CNRI-Jython
 CNRI-Python-GPL-Compatible
 CNRI-Python
@@ -153,8 +164,10 @@ CUA-OPL-1.0
 Caldera
 ClArtistic
 Classpath-exception-2.0
+Clips
 Community-Spec-1.0
 Condor-1.1
+Cornell-Lossless-JPEG
 Crossword
 CrystalStacker
 Cube
@@ -216,6 +229,7 @@ GFDL-1.3-only
 GFDL-1.3-or-later
 GL2PS
 GLWTPL
+GNAT-exception
 GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
@@ -230,6 +244,11 @@ GStreamer-exception-2008
 Giftware
 Glide
 Glulxe
+Graphics-Gems
+HP-1986
+HPND-Markus-Kuhn
+HPND-export-US
+HPND-sell-variant-MIT-disclaimer
 HPND-sell-variant
 HPND
 HTMLTIDY
@@ -237,6 +256,8 @@ HaskellReport
 Hippocratic-2.1
 IBM-pibs
 ICU
+IEC-Code-Components-EULA
+IJG-short
 IJG
 IPA
 IPL-1.0
@@ -247,10 +268,12 @@ Info-ZIP
 Intel-ACPI
 Intel
 Interbase-1.0
+JPL-image
 JPNIC
 JSON
 Jam
 JasPer-2.0
+Kazlib
 KiCad-libraries-exception
 Knuth-CTAN
 LAL-1.2
@@ -264,6 +287,7 @@ LGPL-3.0-only
 LGPL-3.0-or-later
 LGPLLR
 LLVM-exception
+LOOP
 LPL-1.0
 LPL-1.02
 LPPL-1.0
@@ -287,6 +311,7 @@ Linux-syscall-note
 MIT-0
 MIT-CMU
 MIT-Modern-Variant
+MIT-Wu
 MIT-advertising
 MIT-enna
 MIT-feh
@@ -302,6 +327,7 @@ MS-PL
 MS-RL
 MTLL
 MakeIndex
+Martin-Birgmeier
 Minpack
 MirOS
 Motosoto
@@ -342,6 +368,7 @@ OCLC-2.0
 OCaml-LGPL-linking-exception
 ODC-By-1.0
 ODbL-1.0
+OFFIS
 OFL-1.0-RFN
 OFL-1.0-no-RFN
 OFL-1.0
@@ -381,6 +408,7 @@ OSL-2.0
 OSL-2.1
 OSL-3.0
 OpenJDK-assembly-exception-1.0
+OpenPBS-2.3
 OpenSSL
 PDDL-1.0
 PHP-3.0
@@ -395,6 +423,8 @@ PolyForm-Small-Business-1.0.0
 PostgreSQL
 Python-2.0.1
 Python-2.0
+QPL-1.0-INRIA-2004-exception
+QPL-1.0-INRIA-2004
 QPL-1.0
 Qhull
 Qt-GPL-exception-1.0
@@ -426,6 +456,7 @@ SPL-1.0
 SSH-OpenSSH
 SSH-short
 SSPL-1.0
+SWI-exception
 SWL
 Saxpath
 SchemeReport
@@ -437,15 +468,21 @@ Spencer-86
 Spencer-94
 Spencer-99
 SugarCRM-1.1.3
+SunPro
 Swift-exception
+Symlinks
 TAPR-OHL-1.0
 TCL
 TCP-wrappers
 TMate
 TORQUE-1.1
 TOSL
+TPDL
+TPL-1.0
+TTWL
 TU-Berlin-1.0
 TU-Berlin-2.0
+UCAR
 UCL-1.0
 UPL-1.0
 Unicode-DFS-2015
@@ -538,8 +575,11 @@ mplus
 openvpn-openssl-exception
 psfrag
 psutils
+snprintf
 u-boot-exception-2.0
+w3m
 x11vnc-openssl-exception
 xinetd
+xlock
 xpp
 zlib-acknowledgement
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index 35018791faa4..2fc2aba58140 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,14 +2,14 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.19
+version=3.20
 revision=1
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=2c5f6d611c1f0d6e794de5c40ddefcfdf72244b9e40d92126770cdf2d1677b2d
+checksum=fba795a26f8d646340b0cef2d22c3fa490158809636b225c7a0c2214a91c156f
 
 do_install() {
 	vmkdir usr/share/spdx

From 483299734ba336340288dd4c9c239e80563748c7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 17 Jun 2023 19:16:37 +0530
Subject: [PATCH 1277/1854] gallery-dl: update to 1.25.6.

---
 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 d782205eb048..2c893c251a71 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.5
+version=1.25.6
 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=a6a036c19702a48709130db07468e9716277915ad4e5ea37cb63abdc8321fd87
+checksum=d162f97c62e9d54ef3efdf00cd6c76ee422929bf19871b948caa6b3e0a1cc356
 
 pre_build() {
 	make man completion

From bdb96cbc6df15da6fe3020cb4f96af3361e2121e Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Fri, 10 Jun 2022 09:53:21 +0100
Subject: [PATCH 1278/1854] vice: update to 3.7.1.

---
 srcpkgs/vice/template | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..fe9d33a81194 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,26 +1,24 @@
 # Template file for 'vice'
 pkgname=vice
-version=3.5
+version=3.7.1
 revision=1
 build_style=gnu-configure
 configure_args="
 	$(vopt_enable sdl2 sdlui2)
 	$(vopt_with sdl2 sdlsound)
-	$(vopt_enable gtk3 gnomeui3)
+	$(vopt_enable gtk3 native-gtk3ui)
+	$(vopt_enable gtk3 desktop-files)
 	$(vopt_with gtk3 pulse)
-	$(vopt_enable ffmpeg  external-ffmpeg)
-	--disable-option-checking
+	$(vopt_enable ffmpeg external-ffmpeg)
 	--enable-cpuhistory
 	--enable-x64
 	--disable-pdf-docs
-	AR=${AR}"
-hostmakedepends="bdftopcf flex mkfontdir perl pkg-config xa
- glib-devel autoconf texinfo automake dos2unix"
+	--libdir=/usr/lib$XBPS_TARGET_WORDSIZE"
+hostmakedepends="pkg-config flex dos2unix xa perl glib-devel xdg-utils"
 makedepends="
 	zlib-devel
 	readline-devel
 	libpng-devel
-	giflib-devel
 	glew-devel
 	alsa-lib-devel
 	$(vopt_if sdl2 SDL2_mixer-devel)
@@ -32,10 +30,10 @@ makedepends="
 short_desc="Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://vice-emu.sourceforge.net/"
+homepage="https://vice-emu.sourceforge.net/"
 changelog="https://vice-emu.sourceforge.io/NEWS"
 distfiles="${SOURCEFORGE_SITE}/vice-emu/releases/vice-${version}.tar.gz"
-checksum=56b978faaeb8b2896032bd604d03c3501002187eef1ca58ceced40f11a65dc0e
+checksum=7e3811e6024db0698bfbc321bb324572446b8853d01b4073f09865957b0cab98
 
 # Package build options
 build_options="sdl2 gtk3 ffmpeg"
@@ -43,15 +41,14 @@ build_options_default="gtk3 ffmpeg"
 
 desc_option_ffmpeg="Support video recording via FFmpeg"
 
-CFLAGS="-fcommon"
+export XDG_DATA_DIRS=$DESTDIR/usr/share
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --disable-nls";;
-esac
+post_patch() {
+	vsed -i src/arch/gtk3/data/unix/Makefile.in -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/'
+}
 
-pre_configure() {
-	# __u_char is not portable...
-	sed -i 's,__u_char,unsigned char,g' src/*.[ch]
-	sed -i 's/lib64/lib/g' configure.ac
-	autoreconf -fi
+pre_install() {
+	# required for xdg-desktop-menu to work
+	vmkdir usr/share/applications
+	vmkdir usr/share/desktop-directories
 }

From f5b9f986a0559160e9b77736f33abd884939fd5b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 25 Jun 2023 00:23:38 +0530
Subject: [PATCH 1279/1854] mazter: update to 1.0.0.

---
 srcpkgs/mazter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mazter/template b/srcpkgs/mazter/template
index 5925e0a4db59..cff89608ab7f 100644
--- a/srcpkgs/mazter/template
+++ b/srcpkgs/mazter/template
@@ -1,6 +1,6 @@
 # Template file for 'mazter'
 pkgname=mazter
-version=0.4.1
+version=1.0.0
 revision=1
 build_style=cargo
 short_desc="Mazes in your terminal"
@@ -8,7 +8,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://dystroy.org/mazter/"
 distfiles="https://static.crates.io/crates/mazter/mazter-${version}.crate"
-checksum=75a4cb6b9b2df3da849f08e587ea0bd74c7a5aaf8a99d078a3b9adec1342102b
+checksum=0e2de0a4fa68700fba6beaf243076f24722cd924aaa9cadb018ad209b4893db0
 
 post_install() {
 	vlicense LICENSE

From f766a71dd3cf0572fb6248fc0a6867eb6f6dab9c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 24 Jun 2023 15:18:03 -0400
Subject: [PATCH 1280/1854] syft: update to 0.84.0

---
 srcpkgs/syft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index dd7ea798ffb6..a38b2524bd87 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,6 +1,6 @@
 # Template file for 'syft'
 pkgname=syft
-version=0.83.0
+version=0.84.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/syft"
 distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz"
-checksum=46124db55e6c56a09f80be123737716a9b6e35e675908639ba3bf34d10e650f6
+checksum=fc16bd2e207d864a56c7122b0ad48b393214383f606e63d3f71bc4761d809326
 
 post_install() {
 	syft="${DESTDIR}/usr/bin/syft"

From 4ce1a1514ba3a2f69e00a6065d19cb204fdcf955 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 24 Jun 2023 15:25:19 -0400
Subject: [PATCH 1281/1854] grype: update to 0.63.0

---
 srcpkgs/grype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 47170f268d9e..11972217100b 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,6 +1,6 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.62.3
+version=0.63.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=f97c8412f7c5f74a348fe011f84f5926153d23475d875e2dc61ddca30872e489
+checksum=a55aa18498a2b67f7bdcfb0fac0746a351ceb8a2e9da0842ab1a68a07f0ffa65
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

From 5c9f7ea5435b67eca9ac683bf2746d1d54d465d0 Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Sun, 25 Jun 2023 01:07:39 +0200
Subject: [PATCH 1282/1854] open-vm-tools: update to 12.2.5.

---
 srcpkgs/open-vm-tools/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 67ee6db8275d..a8781238bb76 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=12.2.0
+version=12.2.5
 revision=1
 archs="x86_64* i686* aarch64*"
 build_wrksrc="open-vm-tools"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
- --without-xmlsecurity --without-kernel-modules --disable-containerinfo
+ --without-xmlsecurity --without-kernel-modules --disable-containerinfo --disable-glibc-check
  $(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
@@ -18,15 +18,11 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/ReleaseNotes.md"
 distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz"
-checksum=5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
+checksum=8cf14932fde137d9079891c1c08ac8f41024de0af90e8ff3707fe0e66c687775
 
 build_options="pam x11"
 build_options_default="pam x11"
 
-if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then
-	configure_args+=" --disable-glibc-check"
-fi
-
 pre_configure() {
 	autoreconf -vfi
 }

From e72032f14fa65a48d4c8a347edda6477f8bcb6d0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 24 Jun 2023 23:20:58 +0200
Subject: [PATCH 1283/1854] arduino-cli: update to 0.33.0.

---
 srcpkgs/arduino-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index c1394d8dbc29..d8ee02a3b755 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,9 +1,9 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
-version=0.32.2
+version=0.33.0
 revision=1
-build_helper=qemu
 build_style=go
+build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli
 go_ldflags="-X ${go_import_path}/version.versionString=${version}"
 short_desc="Arduino command line interface"
@@ -11,7 +11,7 @@ maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arduino/arduino-cli"
 distfiles="https://github.com/arduino/arduino-cli/archive/${version}.tar.gz"
-checksum=a40462b6f9c8af1fa27cb5dda33315e7f9a6afdf845693613aa8d0550e7e9957
+checksum=5ee6a8b2e77573efb3f742f8007d9866c2d177c098794be7f03acc4a6128e616
 
 case "$XBPS_TARGET_MACHINE" in
 	# the downloaded toolchains use glibc, this allows them to work on musl

From ce6ac6b2d7f80f1cb08c37a9435cb85f7555271d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 23:31:54 -0400
Subject: [PATCH 1284/1854] New package: void-live-audio-0.1

---
 srcpkgs/void-live-audio/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/void-live-audio/template

diff --git a/srcpkgs/void-live-audio/template b/srcpkgs/void-live-audio/template
new file mode 100644
index 000000000000..db6fe559c8e4
--- /dev/null
+++ b/srcpkgs/void-live-audio/template
@@ -0,0 +1,12 @@
+# Template file for 'void-live-audio'
+pkgname=void-live-audio
+version=0.1
+revision=1
+build_style=gnu-makefile
+depends="bash alsa-utils"
+short_desc="Script for enabling and configuring audio (for live environments)"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-or-later, CC0-1.0"
+homepage="https://github.com/classabbyamp/void-live-audio"
+distfiles="https://github.com/classabbyamp/void-live-audio/archive/refs/tags/v${version}.tar.gz"
+checksum=7be549cce856a3ef01c22fa1dacca22e43f06da59a541622dd049abc089b0f89

From 4f78e5e71824b433e1beb262e2e0cd7859915e75 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 24 Jun 2023 21:23:05 +0100
Subject: [PATCH 1285/1854] openjdk17: update to 17.0.8+6.

Also fix openjdk17-jmods depending on itself instead of openjdk17.
---
 srcpkgs/openjdk17/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index a937dc0640d7..76373a138310 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.8+5
+version=17.0.8+6
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${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="adf42ea4a9bb2cffa4689c9eb98605a7cd804034cb88312c2b7bf4c5285e32ce
+checksum="ce6e1b61c70cc9d7f3c4c27bda1fa9c21d5a54f5cdb98512c30425703dee9ce4
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"
@@ -229,7 +229,7 @@ openjdk17-static-libs_package() {
 
 openjdk17-jmods_package() {
 	short_desc+=" - JMODs"
-	depends="${pkgname}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove $_jdk_home/jmods
 	}

From 9d6b038910aee09ff98d120e080d637501955217 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Jun 2023 09:18:41 +0200
Subject: [PATCH 1286/1854] wine: update to 8.11.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 18d0a93517fd..83c50e54a7cd 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.10
+version=8.11
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="c4f36dd73c176cef8e7016ca4139ee76f5b498a4afd7edb517e14c0d5394736f
- 04ff999dd3c8a469f66cb559296051bb234ab355991374deceabeaf546b7d5e3"
+checksum="0b5f2c8085352332590f076410174c486f7773da5727337745b1c1dcfe897fc9
+ 3405ef0fa99fb92b39bb7a5480774b837cb929e35e3675b33c1c260eebfcbb85"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From eb303c829892a72fdf463c68e56e7ca79708a282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 24 Jun 2023 20:20:46 -0300
Subject: [PATCH 1287/1854] transmission: add changelog

---
 srcpkgs/transmission/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 29d74a610e74..3b9dc2e0cb7e 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -12,6 +12,7 @@ short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://www.transmissionbt.com"
+changelog="https://github.com/transmission/transmission/releases"
 distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
 checksum=b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a
 

From df74bf89eaf20e7d6fc8bc2144b99e40fc61f0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 23 Jun 2023 18:04:18 -0300
Subject: [PATCH 1288/1854] transmission-remote-gtk: update to 1.6.0.

---
 srcpkgs/transmission-remote-gtk/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/transmission-remote-gtk/template b/srcpkgs/transmission-remote-gtk/template
index 107565f0a645..08fc30401de8 100644
--- a/srcpkgs/transmission-remote-gtk/template
+++ b/srcpkgs/transmission-remote-gtk/template
@@ -1,19 +1,16 @@
 # Template file for 'transmission-remote-gtk'
 pkgname=transmission-remote-gtk
-version=1.4.1
+version=1.6.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if geoip geoip) appstream-glib-devel libcurl-devel
- gtk+3-devel json-glib-devel libnotify-devel libproxy-devel libmrss-devel"
+build_style=meson
+hostmakedepends="pkg-config gettext glib-devel perl appstream-glib
+ desktop-file-utils"
+makedepends="gtk+3-devel libglib-devel json-glib-devel libsoup3-devel
+ libayatana-appindicator-devel geoip-devel"
 short_desc="GTK client for remote management of the Transmission BitTorrent client"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/transmission-remote-gtk/transmission-remote-gtk"
+changelog="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=59978381a558fc6d1a11091c702a88ac0be8fc7fa135ca367eec55f572a112ab
-
-build_options="geoip"
-build_options_default="geoip"
-
-CFLAGS="-fcommon"
+checksum=b090844f6a482e6f3588070ff3fdd54b79e8f85df02b39853cfb01fccee10cac

From a6b937acd9cc1d37c69750528e4424c24c8193b2 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Fri, 9 Jun 2023 16:32:32 +0200
Subject: [PATCH 1289/1854] New package: osc-1.1.4

---
 srcpkgs/osc/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/osc/template

diff --git a/srcpkgs/osc/template b/srcpkgs/osc/template
new file mode 100644
index 000000000000..7e34f9377b3b
--- /dev/null
+++ b/srcpkgs/osc/template
@@ -0,0 +1,15 @@
+# Template file for 'osc'
+pkgname=osc
+version=1.1.4
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-cryptography python3-devel
+ rpm-python3 python3-urllib3"
+depends="python3-cryptography rpm-python3 python3-urllib3"
+checkdepends="diffstat"
+short_desc="Command Line Interface for Open Build Service"
+maintainer="Emil Miler <em@0x45.cz>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/openSUSE/osc"
+distfiles="https://github.com/openSUSE/osc/archive/refs/tags/${version}.tar.gz"
+checksum=8407ccdcaa6089601e3b9f42c03c015d938ba756b1553f65e2eb122ff00b83e5

From 07fe96bd2b298217ffd582e6c61355207881e1dd Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sat, 3 Jun 2023 23:10:10 +0200
Subject: [PATCH 1290/1854] new package: yaydl-0.13.0

---
 srcpkgs/yaydl/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/yaydl/template

diff --git a/srcpkgs/yaydl/template b/srcpkgs/yaydl/template
new file mode 100644
index 000000000000..6c64581af1d2
--- /dev/null
+++ b/srcpkgs/yaydl/template
@@ -0,0 +1,14 @@
+# Template file for 'yaydl'
+pkgname=yaydl
+version=0.13.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Command-line video downloader"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="GPL-3.0-or-later"
+homepage="https://code.rosaelefanten.org/yaydl/index"
+changelog="https://github.com/dertuxmalwieder/yaydl/tags"
+distfiles="https://github.com/dertuxmalwieder/yaydl/archive/refs/tags/release-${version}.tar.gz"
+checksum=7d5e2246f72cf4bb3e59e97378386747a04f7d233b9ae5f41b5e82f59ce10f59

From 8daa48f1a5305d30ad9ad7cc5d8b787069cb90af Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 1 Jun 2023 22:53:46 +0200
Subject: [PATCH 1291/1854] New package: podman-tui-0.9.1

---
 srcpkgs/podman-tui/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/podman-tui/template

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
new file mode 100644
index 000000000000..05777323de45
--- /dev/null
+++ b/srcpkgs/podman-tui/template
@@ -0,0 +1,18 @@
+# Template file for 'podman-tui'
+pkgname=podman-tui
+version=0.9.1
+revision=1
+build_style=go
+go_import_path="github.com/containers/podman-tui"
+hostmakedepends="pkg-config"
+makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel"
+short_desc="Podman Terminal User Interface"
+maintainer="Uli Baum <xeji@cat3.de>"
+license="Apache-2.0"
+homepage="https://github.com/containers/podman-tui"
+distfiles="https://github.com/containers/podman-tui/archive/v${version}.tar.gz"
+checksum=c3d2cf9fbac9e319c725a79385eccb079ab8395fc35f0107a6de12b3be01128d
+
+post_install() {
+	vdoc docs/README.md
+}

From 7879903d08e4c418ad6ae7f26427cb0d5a6a6f42 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 24 May 2023 09:31:00 +0300
Subject: [PATCH 1292/1854] New package: shortwave-3.2.0

---
 srcpkgs/shortwave/patches/no-git.patch | 12 ++++++++++++
 srcpkgs/shortwave/template             | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 srcpkgs/shortwave/patches/no-git.patch
 create mode 100644 srcpkgs/shortwave/template

diff --git a/srcpkgs/shortwave/patches/no-git.patch b/srcpkgs/shortwave/patches/no-git.patch
new file mode 100644
index 000000000000..43f197af9708
--- /dev/null
+++ b/srcpkgs/shortwave/patches/no-git.patch
@@ -0,0 +1,12 @@
+diff -ru a/meson.build b/meson.build
+--- a/meson.build	2023-02-07 02:12:17.000000000 +0300
++++ b/meson.build	2023-04-27 23:57:14.057890647 +0300
+@@ -31,7 +31,7 @@
+ base_id    = 'de.haeckerfelix.Shortwave'
+ path_id    = '/de/haeckerfelix/Shortwave'
+ app_id     = base_id
+-vcs_tag    = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
++vcs_tag    = 'none'
+ profile    = get_option('profile')
+ datadir    = join_paths(get_option('prefix'), get_option('datadir'))
+ localedir  = join_paths(get_option('prefix'), get_option('localedir'))
diff --git a/srcpkgs/shortwave/template b/srcpkgs/shortwave/template
new file mode 100644
index 000000000000..a9c3f36c28f7
--- /dev/null
+++ b/srcpkgs/shortwave/template
@@ -0,0 +1,23 @@
+# Template file for 'shortwave'
+pkgname=shortwave
+version=3.2.0
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="pkg-config cargo gettext desktop-file-utils glib-devel
+ gtk-update-icon-cache"
+makedepends="libadwaita-devel libshumate-devel rust-std"
+depends="gst-plugins-good1"
+short_desc="Listen to internet radio"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Shortwave"
+distfiles="https://gitlab.gnome.org/World/Shortwave/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=b1d5272d41bf6dd2d7b578e3c352a0f3ca3e502cd3ec0c28ba8153c8887d08b9
+
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i src/meson.build \
+			-e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+	fi
+}

From e2067507e41cb5eb99d4516f725bc1a2d55e2681 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 24 May 2023 03:13:16 +0300
Subject: [PATCH 1293/1854] New package: amberol-0.10.3

---
 srcpkgs/amberol/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/amberol/template

diff --git a/srcpkgs/amberol/template b/srcpkgs/amberol/template
new file mode 100644
index 000000000000..e28139a15dd6
--- /dev/null
+++ b/srcpkgs/amberol/template
@@ -0,0 +1,29 @@
+# Template file for 'amberol'
+pkgname=amberol
+version=0.10.3
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo desktop-file-utils gettext m4 pkg-config glib-devel
+ gtk-update-icon-cache"
+makedepends="libadwaita-devel rust-std"
+depends="gst-plugins-good1 xdg-desktop-portal"
+short_desc="Small and simple sound and music player"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/amberol"
+changelog="https://gitlab.gnome.org/World/amberol/-/raw/main/CHANGES.md"
+distfiles="https://gitlab.gnome.org/World/amberol/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=52372ec6f5ba066409e8dfc4a62fdb2c57e79f83a809cf295ff0e040eebb233b
+
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i src/meson.build \
+			-e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+
+		vsed -i meson.build \
+			-e "/'libdir': get_option('libdir'),/d" \
+			-e "/'datadir': get_option('datadir'),/d" \
+			-e "/'bindir': get_option('bindir'),/d"
+	fi
+}

From 81fa67cb3848477b985d38c09c4e871bfe2f245f Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+github@gmail.com>
Date: Thu, 1 Jun 2023 22:26:16 -0500
Subject: [PATCH 1294/1854] New package: adguardian-1.3.0

---
 srcpkgs/adguardian/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/adguardian/template

diff --git a/srcpkgs/adguardian/template b/srcpkgs/adguardian/template
new file mode 100644
index 000000000000..a9f1f76579fe
--- /dev/null
+++ b/srcpkgs/adguardian/template
@@ -0,0 +1,16 @@
+# Template file for 'adguardian'
+pkgname=adguardian
+version=1.3.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+short_desc="Terminal-based real-time traffic monitor for AdGuard home instance"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/Lissy93/AdGuardian-Term"
+distfiles="https://github.com/Lissy93/AdGuardian-Term/archive/${version}.tar.gz"
+checksum=44a2ee5cdd40341ea0ea2a6800797e4440393d5d10cf377ae84db22ba0563505
+
+post_install() {
+	vlicense LICENSE
+}

From b78c6196a52fbf08353c84f81abac9e7e075165b Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Mon, 22 May 2023 06:40:39 +0700
Subject: [PATCH 1295/1854] New package: babelfish-1.1.0

---
 srcpkgs/babelfish/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/babelfish/template

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
new file mode 100644
index 000000000000..d14a9f042cd0
--- /dev/null
+++ b/srcpkgs/babelfish/template
@@ -0,0 +1,17 @@
+# Template file for 'babelfish'
+pkgname=babelfish
+version=1.1.0
+revision=1
+build_style=go
+go_import_path="bou.ke/babelfish"
+short_desc="Translate bash scripts to fish"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
+license="MIT"
+homepage="https://github.com/bouk/babelfish/"
+distfiles="https://github.com/bouk/babelfish/archive/refs/tags/v$version.tar.gz"
+checksum=7896c3e998e82ed15300f0951052af1e3a5a4c54fa9a07f1e2f743854b7ad239
+
+post_install() {
+	vcompletion babel.fish fish
+	vlicense LICENSE
+}

From 043fd9f480d02427afb1710b010b43593636a253 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Tue, 9 May 2023 23:27:54 -0700
Subject: [PATCH 1296/1854] New package: kamera-23.04.0

---
 srcpkgs/kamera/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kamera/template

diff --git a/srcpkgs/kamera/template b/srcpkgs/kamera/template
new file mode 100644
index 000000000000..2e01f65b6c22
--- /dev/null
+++ b/srcpkgs/kamera/template
@@ -0,0 +1,16 @@
+# Template file for 'kamera'
+pkgname=kamera
+version=23.04.0
+revision=1
+build_style=cmake
+configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
+hostmakedepends="extra-cmake-modules intltool pkg-config kdoctools-devel
+ kcoreaddons-devel kcmutils-devel qt5-qmake qt5-host-tools"
+makedepends="qt5-devel kio-devel ki18n-devel libgphoto2-devel kcmutils-devel
+ kcoreaddons-devel kdoctools-devel"
+short_desc="KDE integration for gphoto2 cameras"
+maintainer="Kenneth Raplee <kenrap@kennethraplee.com>"
+license="GPL-2.0-or-later"
+homepage="https://apps.kde.org/kamera/"
+distfiles="${KDE_SITE}/release-service/${version}/src/kamera-${version}.tar.xz"
+checksum=12be6f3d0de644a9c4252a166a1a19fc2fe565f5f170b1d5aec2b054bb481da8

From 4ead0d450f9c79a3ba4b01aad6ffe236956597b5 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 4 May 2023 21:37:40 +0300
Subject: [PATCH 1297/1854] polychromatic: update to 0.8.1.

---
 srcpkgs/polychromatic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polychromatic/template b/srcpkgs/polychromatic/template
index 79f243dc0a4c..965a69d0e531 100644
--- a/srcpkgs/polychromatic/template
+++ b/srcpkgs/polychromatic/template
@@ -1,6 +1,6 @@
 # Template file for 'polychromatic'
 pkgname=polychromatic
-version=0.8.0
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="ninja sassc which gettext"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://polychromatic.app"
 changelog="https://github.com/polychromatic/polychromatic/raw/master/CHANGELOG"
 distfiles="https://github.com/polychromatic/polychromatic/archive/v${version}.tar.gz"
-checksum=b751a226a22d01018c25a72222f410dfb6cd4260eda4225da70b884be499bf00
+checksum=8b905c07d9371f5277409d4921a420c96510acbf0b17e643a3d8736cc39a5a86

From 74a83078d978c87bc8aaa0d3ce3b842119928a0f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 3 May 2023 16:05:11 +0530
Subject: [PATCH 1298/1854] New package: cargo-modules-0.8.0

---
 srcpkgs/cargo-modules/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/cargo-modules/template

diff --git a/srcpkgs/cargo-modules/template b/srcpkgs/cargo-modules/template
new file mode 100644
index 000000000000..e5b5e5428650
--- /dev/null
+++ b/srcpkgs/cargo-modules/template
@@ -0,0 +1,12 @@
+# Template file for 'cargo-modules'
+pkgname=cargo-modules
+version=0.8.0
+revision=1
+build_style=cargo
+short_desc="Cargo plugin to render crate's module/item structure as a tree or graph"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MPL-2.0"
+homepage="https://github.com/regexident/cargo-modules"
+changelog="https://raw.githubusercontent.com/regexident/cargo-modules/main/CHANGELOG.md"
+distfiles="https://github.com/regexident/cargo-modules/archive/refs/tags/${version}.tar.gz"
+checksum=998132b0953bf8f2a0c998c2a9542996e035b8a535c0742da1f04ad0af96bcb7

From f23e2e64a2c507f789c33fd5d60dc40e0e73dbf8 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Tue, 2 May 2023 23:14:57 +0200
Subject: [PATCH 1299/1854] python3-mpv: update to 1.0.3

---
 srcpkgs/python3-mpv/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template
index bdd70c5f9e8e..d14b3f6eda14 100644
--- a/srcpkgs/python3-mpv/template
+++ b/srcpkgs/python3-mpv/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-mpv'
 pkgname=python3-mpv
-version=1.0.1
-revision=2
-build_style=python3-module
+version=1.0.3
+revision=1
+build_style=python3-pep517
 # this test takes too long and has a low chance of failure
 # https://github.com/jaseg/python-mpv/issues/209#issuecomment-1180248112
 make_check_args="--deselect tests/test_mpv.py::TestLifecycle::test_wait_for_prooperty_event_overflow"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-wheel"
 depends="python3 mpv"
 checkdepends="python3-pytest python3-xvfbwrapper mpv-devel"
 short_desc="Python3 interface to the MPV media player"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/jaseg/python-mpv"
 distfiles="https://github.com/jaseg/python-mpv/archive/v${version}.tar.gz"
-checksum=b5dc6dbf2e2b90ec21ffa7e30729eb7d9556296e0617742f24af179377e6bfd9
+checksum=fe14008723fd3c380098e87a0fec811fca6e8885dd9501e20ee1db29aa4920a0

From 089ca1f35389190b3b9e9ea094495c70a4b79b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Jun 2023 17:58:08 +0200
Subject: [PATCH 1300/1854] goldendict: update to 1.5.0.

---
 srcpkgs/goldendict/patches/endian.patch  | 18 ++++++++----------
 srcpkgs/goldendict/patches/ffmpeg4.patch | 21 ---------------------
 srcpkgs/goldendict/template              | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch

diff --git a/srcpkgs/goldendict/patches/endian.patch b/srcpkgs/goldendict/patches/endian.patch
index 2f7264d003e1..e0dc17f6a334 100644
--- a/srcpkgs/goldendict/patches/endian.patch
+++ b/srcpkgs/goldendict/patches/endian.patch
@@ -10,16 +10,14 @@ Date:   Sat Jan 4 23:12:59 2020 +0100
 
     This will fail with undefined reference to qbswap<unsigned long>.
 
-diff --git ripemd.cc ripemd.cc
-index bad8fc7..24ac811 100644
---- a/ripemd.cc
-+++ b/ripemd.cc
-@@ -173,7 +173,7 @@ void RIPEMD128::update( const uint8_t * data, size_t len )
+--- goldendict-1.5.0/ripemd.cc	2023-05-29 16:51:31.000000000 +0200
++++ -	2023-06-24 18:02:27.579627739 +0200
+@@ -174,7 +174,7 @@
  
- void RIPEMD128::digest( uint8_t * digest )
+ void RIPEMD128::digest( uchar * digest )
  {
--  uint64_t finalcount = qFromLittleEndian( count << 3 );
-+  uint64_t finalcount = qFromLittleEndian<quint64>( count << 3 );
-   update( (const uint8_t *) "\200", 1 );
+-  quint64 finalcount = qFromLittleEndian( count << 3 );
++  quint64 finalcount = qFromLittleEndian<quint64>( count << 3 );
+   update( (const uchar *) "\200", 1 );
    while ( ( count & 63 ) != 56 )
-     update( ( const uint8_t * ) "", 1 );
+     update( ( const uchar * ) "", 1 );
diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch
deleted file mode 100644
index f045fa27f54b..000000000000
--- a/srcpkgs/goldendict/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200
-+++ b/ffmpegaudio.cc      2018-05-09 22:16:50.748322790 +0200
-@@ -143,7 +143,7 @@
-     return false;
-   }
-
--  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-   if ( !avioBuffer )
-   {
-     errorString = QObject::tr( "av_malloc() failed." );
-@@ -380,7 +380,7 @@
-   }
-
-   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
--       codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-+       codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY )
-   {
-     av_init_packet( &packet );
-     int gotFrame = 0;
-
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index 4544ae710ee6..f4a05759f693 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -1,22 +1,25 @@
 # Template file for 'goldendict'
 pkgname=goldendict
-version=1.5.0RC2
-revision=6
+version=1.5.0
+revision=1
 build_style=qmake
-configure_args="CONFIG+=zim_support"
+configure_args="CONFIG+=zim_support goldendict.pro"
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="tiff-devel qt5-devel libvorbis-devel zlib-devel
  libXtst-devel hunspell-devel qt5-tools-devel qt5-declarative-devel
  qt5-webkit-devel lzo-devel bzip2-devel libao-devel qt5-svg-devel
- libeb-devel qt5-x11extras-devel ffmpeg-devel liblzma-devel"
+ libeb-devel qt5-x11extras-devel ffmpeg-devel liblzma-devel
+ qt5-multimedia-devel"
 short_desc="A feature-rich dictionary lookup program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://goldendict.org/"
-distfiles="https://github.com/goldendict/goldendict/archive/${version/RC/-RC}.tar.gz"
-checksum=bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde
+distfiles="https://github.com/goldendict/goldendict/archive/${version}.tar.gz"
+checksum=f9f8e068ece74cc026fdc5f56615246228b4e70c97c7197ccd4c14ceae412c7c
 
-CXXFLAGS="-std=c++14 -Wno-deprecated"
+post_patch() {
+	vsed -e '/VERSION/ s/+git//' -i goldendict.pro
+}
 
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/goldendict.png

From 650312c3f1acc873f531d25cf06a1d437c6f4899 Mon Sep 17 00:00:00 2001
From: Oliver Wilkes <oliverwilkes2006@icloud.com>
Date: Mon, 29 May 2023 19:32:09 +0100
Subject: [PATCH 1301/1854] New package: eludris-0.3.3

---
 srcpkgs/eludris/template | 20 ++++++++++++++++++++
 srcpkgs/eludris/update   |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/eludris/template
 create mode 100644 srcpkgs/eludris/update

diff --git a/srcpkgs/eludris/template b/srcpkgs/eludris/template
new file mode 100644
index 000000000000..6215920c922c
--- /dev/null
+++ b/srcpkgs/eludris/template
@@ -0,0 +1,20 @@
+# Template file for 'eludris'
+pkgname=eludris
+version=0.3.3
+revision=1
+build_style=cargo
+build_helper=rust
+configure_args="--bin eludris"
+make_install_args="--path cli"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Simple CLI to help with setting up and managing your Eludris instance"
+maintainer="Oliver Wilkes <oliverwilkes2006@icloud.com>"
+license="MIT"
+homepage="https://github.com/eludris/eludris/tree/main/cli"
+distfiles="https://github.com/eludris/eludris/archive/refs/tags/v${version}.tar.gz"
+checksum=e204969d056e147a97cb8d1b2a0c16b7e4d06c5895ef9bb939884ddc0ecdb3c2
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/eludris/update b/srcpkgs/eludris/update
new file mode 100644
index 000000000000..f1803c315380
--- /dev/null
+++ b/srcpkgs/eludris/update
@@ -0,0 +1,2 @@
+site="https://github.com/eludris/eludris/tags"
+pattern='\/tags\/v\K[\d.]+(?=\.tar\.gz)'

From 11348b619f3a859aeb135df4ca3ea27f94367460 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 2 May 2023 09:18:41 -0400
Subject: [PATCH 1302/1854] vaultwarden-web: update to 2023.5.0.

---
 srcpkgs/vaultwarden-web/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index ac2875b0ef10..18d61ff8eeef 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -1,13 +1,13 @@
 # Template file for 'vaultwarden-web'
 pkgname=vaultwarden-web
-version=2023.3.0b
+version=2023.5.0
 revision=1
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dani-garcia/bw_web_builds"
 distfiles="https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"
-checksum=ac3d27cbbb0dabb09cba0029c0b4d13b4f866fa3ae4eaa2dfd1f3880800ce19c
+checksum=7c272ff02d0a635f19348b8a991c7990c1866e3df61eeaf978f97e6ff91f5cb4
 
 do_install() {
 	vmkdir usr/share/webapps/vaultwarden-web

From 2236d4233cb27052181971ce260d1ea830e8bf61 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 17 Apr 2023 14:53:38 +0200
Subject: [PATCH 1303/1854] New package: linuxwave-0.1.3

---
 srcpkgs/linuxwave/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/linuxwave/template

diff --git a/srcpkgs/linuxwave/template b/srcpkgs/linuxwave/template
new file mode 100644
index 000000000000..60f47d8ac427
--- /dev/null
+++ b/srcpkgs/linuxwave/template
@@ -0,0 +1,17 @@
+# Template file for 'linuxwave'
+pkgname=linuxwave
+version=0.1.3
+revision=1
+build_style=zig-build
+short_desc="Generate music from the entropy of Linux"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://orhun.dev/linuxwave/"
+changelog="https://raw.githubusercontent.com/orhun/linuxwave/main/CHANGELOG.md"
+distfiles="https://github.com/orhun/linuxwave/releases/download/v${version}/v${version}.tar.gz"
+checksum=d82e0eda6f2bb3080e3af6a86bafa22ed91291eaf2afbb38492326a316f1853e
+
+post_install() {
+	vlicense LICENSE
+	vman man/linuxwave.1
+}

From 9aaa899f915da52e9b79f19c5af72252d2d15436 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 24 Jun 2023 17:36:18 +0200
Subject: [PATCH 1304/1854] cppcheck: update to 2.11.

---
 srcpkgs/cppcheck/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index bf2f4bdbf2da..98f1af93b724 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.10.3
+version=2.11
 revision=1
 build_style=cmake
 configure_args="
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=8aae5e116daeaaf5d19f3efa61b91c06f161cb97412a1d1af6e1e20686e48967
+checksum=ef7d77c16e6903834cc016986a60157918a90958e981863746a7f3147bfb94c6
 
 export CXXFLAGS="-DNDEBUG"
 
@@ -31,6 +31,7 @@ post_extract() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -e '/run-dmake/d' -i test/CMakeLists.txt -i cli/CMakeLists.txt
 	fi
+	vsed -e 's/"2.11"/"2.11.0"/' -i cmake/versions.cmake
 }
 
 post_install() {

From 4ca803a9f160f37f1cc7a060601db6a03e67e89d Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 14 Apr 2023 14:11:43 -0400
Subject: [PATCH 1305/1854] New package: minipro-0.6

Closes: #43443 [via git-merge-pr]
---
 srcpkgs/minipro/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/minipro/template

diff --git a/srcpkgs/minipro/template b/srcpkgs/minipro/template
new file mode 100644
index 000000000000..a6824c0a95c8
--- /dev/null
+++ b/srcpkgs/minipro/template
@@ -0,0 +1,25 @@
+# Template file for 'minipro'
+pkgname=minipro
+version=0.6
+revision=1
+build_style=gnu-makefile
+make_use_env=compliant
+hostmakedepends="pkg-config which"
+makedepends="libusb-devel"
+short_desc="Program for controlling the MiniPRO TL866xx series of chip programmers"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/DavidGriffith/minipro"
+distfiles="https://gitlab.com/DavidGriffith/minipro/-/archive/${version}/minipro-${version}.tar.gz"
+checksum=16b4220b5fc07dddc4d1d49cc181a2c6a735c833cc27f24ab73eac2572c9304a
+
+post_patch() {
+	vsed -i Makefile -e 's/CC=gcc/CC?=gcc/'
+}
+
+post_install() {
+	vmkdir usr/lib/udev/rules.d
+	vcopy "udev/*" usr/lib/udev/rules.d
+
+	vcompletion bash_completion.d/minipro bash
+}

From ca054b4d2b537e6025e8a98bf50a8d31ca8069d0 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 14 Apr 2023 00:03:13 +0200
Subject: [PATCH 1306/1854] New package: frobby-0.9.5

---
 srcpkgs/frobby-devel                  |  1 +
 srcpkgs/frobby/patches/Makefile.patch | 35 +++++++++++++++++++++++++++
 srcpkgs/frobby/template               | 28 +++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/frobby-devel
 create mode 100644 srcpkgs/frobby/patches/Makefile.patch
 create mode 100644 srcpkgs/frobby/template

diff --git a/srcpkgs/frobby-devel b/srcpkgs/frobby-devel
new file mode 120000
index 000000000000..5a25e67f7b46
--- /dev/null
+++ b/srcpkgs/frobby-devel
@@ -0,0 +1 @@
+frobby
\ No newline at end of file
diff --git a/srcpkgs/frobby/patches/Makefile.patch b/srcpkgs/frobby/patches/Makefile.patch
new file mode 100644
index 000000000000..2269f8bfde61
--- /dev/null
+++ b/srcpkgs/frobby/patches/Makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index 36a3778..2529515 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,10 +6,8 @@
+ # ========================
+ # For GMP set **both**  GMP_INC_DIR  **and**  ldflags_for_gmp
+ # If you have a system installation of GMP with C++ support use next 2 lines:
+-# GMP_INC_DIR=
+-# ldflags_for_gmp=-lgmpxx -lgmp
+-GMP_INC_DIR=/usr/local/include
+-ldflags_for_gmp=-L/usr/local/lib -lgmpxx -lgmp
++GMP_INC_DIR=
++ldflags_for_gmp=-lgmpxx -lgmp
+ 
+ 
+ 
+@@ -80,7 +78,7 @@ ifndef CXX
+ endif
+ 
+ ifndef BIN_INSTALL_DIR
+-  BIN_INSTALL_DIR = "/usr/local/bin/"
++  BIN_INSTALL_DIR = "/usr/bin/"
+ endif
+ 
+ cxxflags = $(CXXFLAGS) $(CPPFLAGS) -I $(GMP_INC_DIR) -Wno-uninitialized -Wno-unused-parameter
+@@ -252,7 +250,7 @@ endif
+ 
+ -include $(objs:.o=.d)
+ 
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ MAN1DIR ?= $(PREFIX)/share/man/man1
+ 
+ # Installation.
diff --git a/srcpkgs/frobby/template b/srcpkgs/frobby/template
new file mode 100644
index 000000000000..99ead8fe3ef2
--- /dev/null
+++ b/srcpkgs/frobby/template
@@ -0,0 +1,28 @@
+# Template file for 'frobby'
+pkgname=frobby
+version=0.9.5
+revision=1
+build_style=gnu-makefile
+makedepends="gmp-devel gmpxx-devel"
+short_desc="Computations with monomial ideals"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Macaulay2/frobby"
+changelog="https://raw.githubusercontent.com/Macaulay2/frobby/master/changelog.txt"
+distfiles="https://github.com/Macaulay2/frobby/archive/refs/tags/v${version}.tar.gz"
+checksum=714c33c4f68e86d82062d7a42ad42c581d4b4c60d6a73ee1836ba1be7f985eb3
+
+post_build() {
+	RANLIB=/usr/bin/ranlib make CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" library
+}
+
+frobby-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmkdir usr/include
+		vcopy src/frobby.h usr/include
+		vcopy src/stdinc.h usr/include
+		vcopy bin/libfrobby.a usr/lib
+	}
+}

From e499438d20bfeade8f9540bd9e1c39f844942f90 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 13 Apr 2023 13:02:18 +0000
Subject: [PATCH 1307/1854] New package: rtx-1.32.0

---
 srcpkgs/rtx/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/rtx/template

diff --git a/srcpkgs/rtx/template b/srcpkgs/rtx/template
new file mode 100644
index 000000000000..31b40dd9d808
--- /dev/null
+++ b/srcpkgs/rtx/template
@@ -0,0 +1,23 @@
+# Template file for 'rtx'
+pkgname=rtx
+version=1.32.0
+revision=1
+build_style=cargo
+# skip cli tests: fail to find executable
+make_check_args="-- --skip cli::direnv::exec::tests"
+short_desc="Polyglot runtime manager (asdf rust clone)"
+maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
+license="MIT"
+homepage="https://github.com/jdxcode/rtx"
+changelog="https://github.com/jdxcode/rtx/releases"
+distfiles="https://github.com/jdxcode/rtx/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=54bb235dcfc34e24c48bd5bc1f2ac9b8a6f9eb7cf1d3b64c514ebbf6d34570f1
+
+post_install() {
+	vlicense LICENSE
+	vman man/man1/rtx.1
+	vdoc README.md
+	vcompletion completions/rtx.bash bash rtx
+	vcompletion completions/rtx.fish fish rtx
+	vcompletion completions/_rtx zsh rtx
+}

From faa4e1d54590f197213ea115161beb9f6e83956c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 7 Apr 2023 22:32:18 +0530
Subject: [PATCH 1308/1854] New package: memray-1.7.0

---
 srcpkgs/memray/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/memray/template

diff --git a/srcpkgs/memray/template b/srcpkgs/memray/template
new file mode 100644
index 000000000000..8c73d35d25e0
--- /dev/null
+++ b/srcpkgs/memray/template
@@ -0,0 +1,26 @@
+# Template file for 'memray'
+pkgname=memray
+version=1.7.0
+revision=1
+build_style=python3-pep517
+make_check_target="tests/unit"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="python3-devel libunwind-devel liblz4-devel"
+depends="python3-Jinja2 python3-rich"
+checkdepends="${depends} python3-pytest"
+short_desc="Reports memory allocations in python code & compiled extensions"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://bloomberg.github.io/memray/"
+changelog="https://bloomberg.github.io/memray/changelog.html"
+distfiles="https://github.com/bloomberg/memray/archive/refs/tags/v${version}.tar.gz"
+checksum=0c735753d6d8a9050c9313c55ee41bfca271c3dec7cc37d2ed01eba5d358a7d6
+make_check_pre="env PYTHONPATH=src"
+
+pre_build() {
+	export MEMRAY_LIBBACKTRACE_TARGET="${XBPS_TARGET_MACHINE%-musl}"
+}
+
+pre_check() {
+	python3 setup.py build_ext --inplace
+}

From e54ca766508a209721d298cb27ba078375f3e358 Mon Sep 17 00:00:00 2001
From: Arya Kiran <arya@projectsegfau.lt>
Date: Tue, 11 Apr 2023 20:57:44 +0530
Subject: [PATCH 1309/1854] nheko: update to 0.11.3

---
 srcpkgs/nheko/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 6bcbeb17bd63..867dcd209ce2 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,6 +1,6 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.11.1
+version=0.11.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://nheko-reborn.github.io"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=a84d6f3a6d17ff0b6ffd07804804bbebb1191e4243f00b9b49b00891e8023b6a
+checksum=f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

From 05c646178f6d578a68f8cfa208f60f990b9b1af5 Mon Sep 17 00:00:00 2001
From: Arya Kiran <arya@projectsegfau.lt>
Date: Wed, 12 Apr 2023 12:19:58 +0530
Subject: [PATCH 1310/1854] mtxclient: update to 0.9.2

Closes: https://github.com/void-linux/void-packages/pull/43390
---
 srcpkgs/mtxclient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index a93f2e06eaa0..c7a328ed8fb0 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=bae82daa019ecdedb2433177b3d973b72f337d14e7a4f480a490559235391005
+checksum=f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
 
 post_install() {
 	vlicense LICENSE

From 5aa2fc6c9fc34d1740ee024fdadb65b2daedef5b Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Mon, 10 Apr 2023 20:04:22 +0200
Subject: [PATCH 1311/1854] New package: tessen-2.2.1

Closes: https://github.com/void-linux/void-packages/pull/43377
---
 srcpkgs/tessen/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/tessen/template

diff --git a/srcpkgs/tessen/template b/srcpkgs/tessen/template
new file mode 100644
index 000000000000..318958cf8f6f
--- /dev/null
+++ b/srcpkgs/tessen/template
@@ -0,0 +1,13 @@
+# Template file for 'tessen'
+pkgname=tessen
+version=2.2.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="scdoc"
+checkdepends="shellcheck shfmt"
+short_desc="Interactive menu to autotype and copy pass and gopass data"
+maintainer="reedts <j.reedts@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://git.sr.ht/~ayushnix/tessen"
+distfiles="https://git.sr.ht/~ayushnix/tessen/refs/download/v${version}/tessen-${version}.tar.gz"
+checksum=31d510d5ffac5825bc7e63f13283c5d432eb102db2d2483ee937c9135c8cfc04

From 2f36234f8af213cb0fd624e541d7c4d63d04eb78 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 12:56:55 -0500
Subject: [PATCH 1312/1854] ktextaddons: update common/shlibs

---
 common/shlibs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 258b257a75c3..abe182d69b9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3213,13 +3213,14 @@ libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.18 gloox-1.0.24_1
 libgsmsd.so.8 gammu-smsd-1.39.0_1
 libGammu.so.8 gammu-1.39.0_1
-libKF5TextAutoCorrection.so.1 ktextaddons-1.2.0_1
-libKF5TextEditTextToSpeech.so.1 ktextaddons-1.2.0_1
-libKF5TextEmoticonsWidgets.so.1 ktextaddons-1.2.0_1
-libKF5TextEmoticonsCore.so.1 ktextaddons-1.2.0_1
-libKF5TextGrammarCheck.so.1 ktextaddons-1.2.0_1
-libKF5TextTranslator.so.1 ktextaddons-1.2.0_1
-libKF5TextAddonsWidgets.so.1 ktextaddons-1.2.0_1
+libKF5TextAutoCorrectionCore.so.1 ktextaddons-1.3.2_1
+libKF5TextAutoCorrectionWidgets.so.1 ktextaddons-1.3.2_1
+libKF5TextEditTextToSpeech.so.1 ktextaddons-1.3.2_1
+libKF5TextEmoticonsWidgets.so.1 ktextaddons-1.3.2_1
+libKF5TextEmoticonsCore.so.1 ktextaddons-1.3.2_1
+libKF5TextGrammarCheck.so.1 ktextaddons-1.3.2_1
+libKF5TextTranslator.so.1 ktextaddons-1.3.2_1
+libKF5TextAddonsWidgets.so.1 ktextaddons-1.3.2_1
 libz3.so z3-4.6.0_2
 libngspice.so.0 ngspice-35_1
 libvulkan.so.1 vulkan-loader-1.0.57.0_1

From 8bb77cc5fba768e0aa849dc37b78efcd810c22e4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:55 -0500
Subject: [PATCH 1313/1854] akregator: rebuild for ktextaddons

---
 srcpkgs/akregator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 8649a9a8ce72..a7def8ff0f4e 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,7 +1,7 @@
 # Template file for 'akregator'
 pkgname=akregator
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools

From 3787ff25f235ae8706534fd2b8672557e6f2704c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:55 -0500
Subject: [PATCH 1314/1854] kalarm: rebuild for ktextaddons

---
 srcpkgs/kalarm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 0915e023030e..5513632081ed 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"

From c57596393f2205babda2ff505bc3747b364bc7cb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1315/1854] kmail: rebuild for ktextaddons

---
 srcpkgs/kmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 7bf67ab803dc..77413e68ead1 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,7 +1,7 @@
 # Template file for 'kmail'
 pkgname=kmail
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
  gettext kcmutils kdoctools kconfig kcoreaddons"

From 9492d105b27fddd0115a5db6b7d3b0778310ec2e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1316/1854] knotes: rebuild for ktextaddons

---
 srcpkgs/knotes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index d3130f12f0d0..f2a625cd5d72 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,7 +1,7 @@
 # Template file for 'knotes'
 pkgname=knotes
 version=23.04.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
  kcoreaddons kdoctools kconfig gettext kcmutils"

From 203fd4293d0c23eaf297903fc76e025853525163 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1317/1854] libksieve: rebuild for ktextaddons

---
 srcpkgs/libksieve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 724cb5dcf740..d63625fd5a3f 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,7 +1,7 @@
 # Template file for 'libksieve'
 pkgname=libksieve
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kdoctools kconfig"

From e38e6da6aaeea628d6f2529ff812d35e3f598bfb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1318/1854] messagelib: rebuild for ktextaddons

---
 srcpkgs/messagelib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index d49add61f4e4..0f59545094a9 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,7 +1,7 @@
 # Template file for 'messagelib'
 pkgname=messagelib
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kconfig"

From fd2bec4b2505e4cded8bf5daf6eb125b1ebd15ea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 13:00:56 -0500
Subject: [PATCH 1319/1854] pimcommon: rebuild for ktextaddons

---
 srcpkgs/pimcommon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 973ecaf378ba..053ef120993b 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,7 +1,7 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
  gettext kconfig kgendesignerplugin"

From 77c11869a945f2ae8c4e11388c829f2eb86797d6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 25 Jun 2023 14:05:12 -0400
Subject: [PATCH 1320/1854] common/shlibs: update libmatrix_client entry

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index abe182d69b9e..1cc1b6815e7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -422,7 +422,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.1 mtxclient-0.9.1_1
+libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1

From a1bb15d0669bec3ec25a3e755b2cd063503004f0 Mon Sep 17 00:00:00 2001
From: Alexandru Barbur <alex@ctrlc.name>
Date: Wed, 21 Jun 2023 13:34:50 -0400
Subject: [PATCH 1321/1854] libspnav: update to 1.1, switch upstream to github

---
 srcpkgs/libspnav/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libspnav/template b/srcpkgs/libspnav/template
index 059d254e17b7..170a840ad618 100644
--- a/srcpkgs/libspnav/template
+++ b/srcpkgs/libspnav/template
@@ -1,24 +1,20 @@
 # Template file for 'libspnav'
 pkgname=libspnav
-version=1.0
-revision=2
+version=1.1
+revision=1
 build_style=gnu-configure
-configure_args="--disable-opt"
 makedepends="libX11-devel"
 short_desc="Open source alternative to 3DConnextion drivers"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="BSD-3-Clause"
 homepage="http://spacenav.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/spacenav/${pkgname}-${version}.tar.gz"
-checksum=8849b7f7826d750f6956cf8f4f53937f2359ab6da97d6c834c71d5f771212e7c
-
-do_build() {
-	make CC="${CC}" AR="${AR}"
-}
+distfiles="https://github.com/FreeSpacenav/libspnav/archive/refs/tags/v${version}.tar.gz"
+checksum=04b297f68a10db4fa40edf68d7f823ba7b9d0442f2b665181889abe2cea42759
 
 post_install() {
 	vlicense LICENSE
 }
+
 libspnav-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 22d17caba080f2f3f2637bbde7c9a585891b495e Mon Sep 17 00:00:00 2001
From: Adam Frey <adam@adamfrey.me>
Date: Fri, 14 Apr 2023 10:58:19 -0400
Subject: [PATCH 1322/1854] clojure: update to 1.11.1.1273.

Closes: #43442 [via git-merge-pr]
---
 srcpkgs/clojure/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a14acb44c757..7259f25e6e34 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,14 +1,14 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.11.1.1200
+version=1.11.1.1273
 revision=1
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=dbde9c4bdd42b7da5a67d879548b4528e4903ce73ee26c329626b6165d57b61c
+checksum=5f8bafcf24bd148ac9bcbe60a8e7b8093c9ed8eb8e0f387199770e38f0e40ce6
 
 do_install() {
 	vmkdir /usr/lib/clojure

From d43a19c1e877c506db1859f262ed68faa9d1e1fe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:13:44 +0200
Subject: [PATCH 1323/1854] srcpkgs: orphan packages from inactive maintainer

---
 srcpkgs/caddy/template              | 2 +-
 srcpkgs/debug-me/template           | 2 +-
 srcpkgs/ghq/template                | 2 +-
 srcpkgs/git-absorb/template         | 2 +-
 srcpkgs/joker/template              | 2 +-
 srcpkgs/keybase-desktop/template    | 2 +-
 srcpkgs/libmodule/template          | 2 +-
 srcpkgs/linux-vt-setcolors/template | 2 +-
 srcpkgs/neovim-qt/template          | 2 +-
 srcpkgs/pokoy/template              | 2 +-
 srcpkgs/teensy_loader_cli/template  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index f113a2296f29..2a06c4a6c991 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -7,7 +7,7 @@ go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
 depends="shared-mime-info"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 changelog="https://github.com/caddyserver/caddy/releases"
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index f971f2156c77..c886d07b1759 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -6,7 +6,7 @@ build_style=haskell-stack
 stackage="lts-19.0"
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://debug-me.branchable.com/"
 distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 25062de44828..4c826587146a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -7,7 +7,7 @@ go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
 depends="git"
 short_desc="Remote repository management made easy"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/x-motemen/ghq"
 distfiles="https://github.com/x-motemen/ghq/archive/v${version}.tar.gz"
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 5f7d34c5fb31..8c6dd52ebf27 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -7,7 +7,7 @@ build_helper=qemu
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 short_desc="Like git commit --fixup, but automatic"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/tummychow/git-absorb"
 distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index 14f4996daa29..6bb756466ad9 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="EPL-1.0"
 homepage="https://joker-lang.org/"
 distfiles="https://github.com/candid82/joker/archive/refs/tags/v${version}.tar.gz"
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 2b97c4e45b38..21e711e5edde 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -5,7 +5,7 @@ revision=1
 hostmakedepends="git nodejs yarn unzip"
 depends="keybase kbfs"
 short_desc="Keybase desktop client"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libmodule/template b/srcpkgs/libmodule/template
index 44d9597e3402..b9c49db930fb 100644
--- a/srcpkgs/libmodule/template
+++ b/srcpkgs/libmodule/template
@@ -4,7 +4,7 @@ version=5.0.0
 revision=1
 build_style=cmake
 short_desc="C simple and elegant implementation of an actor library"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/FedeDP/libmodule"
 distfiles="https://github.com/FedeDP/libmodule/archive/${version}.tar.gz"
diff --git a/srcpkgs/linux-vt-setcolors/template b/srcpkgs/linux-vt-setcolors/template
index fa3f7681b75b..8a1aee9454b7 100644
--- a/srcpkgs/linux-vt-setcolors/template
+++ b/srcpkgs/linux-vt-setcolors/template
@@ -4,7 +4,7 @@ version=1.0.0
 revision=1
 build_style=gnu-makefile
 short_desc="Utility tool to set the linux VT default color palette"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/EvanPurkhiser/linux-vt-setcolors"
 distfiles="https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v${version}.tar.gz"
diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template
index faea60a20084..ae7db35d3bd0 100644
--- a/srcpkgs/neovim-qt/template
+++ b/srcpkgs/neovim-qt/template
@@ -8,7 +8,7 @@ hostmakedepends="qt5-host-tools qt5-qmake neovim"
 makedepends="msgpack-devel qt5-devel qt5-svg-devel"
 depends="neovim"
 short_desc="Neovim client library and GUI, in Qt5"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/equalsraf/neovim-qt"
 distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz"
diff --git a/srcpkgs/pokoy/template b/srcpkgs/pokoy/template
index 490067f7d9ff..79c10c13ecec 100644
--- a/srcpkgs/pokoy/template
+++ b/srcpkgs/pokoy/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_use_env=yes
 makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel"
 short_desc="Daemon that helps prevent RSI and other computer related stress"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/ttygde/pokoy"
 distfiles="https://github.com/ttygde/pokoy/archive/v${version}.tar.gz"
diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template
index 28d93a5e5c05..4cf4dd73414c 100644
--- a/srcpkgs/teensy_loader_cli/template
+++ b/srcpkgs/teensy_loader_cli/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_target=teensy_loader_cli
 makedepends="libusb-compat-devel"
 short_desc="Command line Teensy Loader"
-maintainer="Dominic Monroe <monroef4@googlemail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://www.pjrc.com/teensy/loader_cli.html"
 distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"

From 8cd908c854e9da63d2d91be4b9d3b8906cdc4f76 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 12 Apr 2023 01:47:24 +0530
Subject: [PATCH 1324/1854] gopass-jsonapi: update to 1.15.5.

Closes: https://github.com/void-linux/void-packages/pull/43396
---
 srcpkgs/gopass-jsonapi/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index cc6377ad70f4..f4e0e67d6063 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,8 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
-version=1.15.2
-revision=2
-create_wrksrc=yes
+version=1.15.5
+revision=1
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"
@@ -11,9 +10,9 @@ short_desc="Gopass JSON bridge for extensions"
 maintainer="KuhnChris <kuhnchris+voidpackages@kuhnchris.eu>"
 license="MIT"
 homepage="https://www.gopass.pw/"
-changelog="https://raw.githubusercontent.com/gopasspw/gopass-jsonapi/v${version}/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/gopasspw/gopass-jsonapi/master/CHANGELOG.md"
 distfiles="https://github.com/gopasspw/gopass-jsonapi/releases/download/v${version}/gopass-jsonapi-${version}.tar.gz"
-checksum=2e86b4c1705d7edfb86419549c7abbeb1cc94037e5b2d92ebcfd3a98c4538d93
+checksum=62d8df839014bad51d1b791837bc8348f7fdcafab0d04f0b7bf2b5d6f0dfc789
 
 post_install() {
 	vlicense LICENSE

From 2bd99ac5b3c289382b48ae0e4d5db0435c018cb3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 25 Jun 2023 08:08:25 -0400
Subject: [PATCH 1325/1854] onefetch: update to 2.18.1

---
 srcpkgs/onefetch/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index c46fab74df6c..3c0b1977725d 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.16.0
+version=2.18.1
 revision=1
 build_style=cargo
 make_check_args="-- --skip info::tests::test_style_subtitle"
@@ -9,10 +9,10 @@ makedepends="zlib-devel"
 short_desc="Git repository summary on your terminal"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
-homepage="https://github.com/o2sh/onefetch"
+homepage="https://onefetch.dev"
 changelog="https://github.com/o2sh/onefetch/raw/main/CHANGELOG.md"
-distfiles="https://github.com/o2sh/onefetch/archive/${version}.tar.gz"
-checksum=948abb476a1310ab9393fcce10cffabcedfa12c2cf7be238472edafe13753222
+distfiles="https://github.com/o2sh/onefetch/archive/refs/tags/${version}.tar.gz"
+checksum=7b0f03e9d2383ac32283cfb9ec09d10c8789a298969c8b7d45fa0168bd909140
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="exr crate unimplemented for BE"

From 0cb90bc03d3feff28024c7a41795ba4b3d67cb27 Mon Sep 17 00:00:00 2001
From: Till Mahlburg <mahlburg@posteo.de>
Date: Fri, 7 Apr 2023 13:10:09 +0200
Subject: [PATCH 1326/1854] New package: swayfx-0.2

---
 srcpkgs/swayfx/INSTALL           |  5 +++++
 srcpkgs/swayfx/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/swayfx/template          | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/swayfx/INSTALL
 create mode 100644 srcpkgs/swayfx/patches/7326.diff
 create mode 100644 srcpkgs/swayfx/template

diff --git a/srcpkgs/swayfx/INSTALL b/srcpkgs/swayfx/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/swayfx/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/swayfx/patches/7326.diff b/srcpkgs/swayfx/patches/7326.diff
new file mode 100644
index 000000000000..c310f9af4c7c
--- /dev/null
+++ b/srcpkgs/swayfx/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/swayfx/template b/srcpkgs/swayfx/template
new file mode 100644
index 000000000000..2483ca15cfa2
--- /dev/null
+++ b/srcpkgs/swayfx/template
@@ -0,0 +1,23 @@
+# Template file for 'swayfx'
+pkgname=swayfx
+version=0.2
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
+conf_files="/etc/sway/config"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel libevdev-devel"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
+short_desc="Sway, but with eye candy!"
+maintainer="Till Mahlburg <mahlburg@posteo.de>"
+license="MIT"
+homepage="https://github.com/WillPower3309/swayfx"
+changelog="https://github.com/WillPower3309/swayfx/releases"
+distfiles="https://github.com/WillPower3309/swayfx/archive/refs/tags/${version}.tar.gz"
+checksum=fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55
+conflicts="sway"
+
+post_install() {
+	vlicense LICENSE
+}

From 1093246239287d6a5d9e80ffc8dc23d485406be6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Thu, 2 Sep 2021 00:14:39 +0200
Subject: [PATCH 1327/1854] New package: ax25-tools-0.0.10.rc5

Closes: #43301 [via git-merge-pr]
---
 srcpkgs/ax25-tools/patches/musl.patch | 154 ++++++++++++++++++++++++++
 srcpkgs/ax25-tools/template           |  12 ++
 2 files changed, 166 insertions(+)
 create mode 100644 srcpkgs/ax25-tools/patches/musl.patch
 create mode 100644 srcpkgs/ax25-tools/template

diff --git a/srcpkgs/ax25-tools/patches/musl.patch b/srcpkgs/ax25-tools/patches/musl.patch
new file mode 100644
index 000000000000..53a8ac88f800
--- /dev/null
+++ b/srcpkgs/ax25-tools/patches/musl.patch
@@ -0,0 +1,154 @@
+Common subdirectories: tcpip/.deps and tcpip_a/.deps
+diff --color --new-file -Np1 tcpip/talkd.h tcpip_a/talkd.h
+*** a/tcpip/talkd.h	1970-01-01 01:00:00.000000000 +0100
+--- b/tcpip/talkd.h	2021-09-01 23:25:25.059430912 +0200
+***************
+*** 0 ****
+--- 1,127 ----
++ 
++ /*
++  * Copyright (c) 1983, 1993
++  *	The Regents of the University of California.  All rights reserved.
++  *
++  * Redistribution and use in source and binary forms, with or without
++  * modification, are permitted provided that the following conditions
++  * are met:
++  * 1. Redistributions of source code must retain the above copyright
++  *    notice, this list of conditions and the following disclaimer.
++  * 2. Redistributions in binary form must reproduce the above copyright
++  *    notice, this list of conditions and the following disclaimer in the
++  *    documentation and/or other materials provided with the distribution.
++  * 4. Neither the name of the University nor the names of its contributors
++  *    may be used to endorse or promote products derived from this software
++  *    without specific prior written permission.
++  *
++  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++  * SUCH DAMAGE.
++  *
++  *	@(#)talkd.h	8.1 (Berkeley) 6/2/93
++  */
++ 
++ #ifndef _PROTOCOLS_TALKD_H
++ #define	_PROTOCOLS_TALKD_H 1
++ 
++ /*
++  * This describes the protocol used by the talk server and clients.
++  *
++  * The talk server acts a repository of invitations, responding to
++  * requests by clients wishing to rendezvous for the purpose of
++  * holding a conversation.  In normal operation, a client, the caller,
++  * initiates a rendezvous by sending a CTL_MSG to the server of
++  * type LOOK_UP.  This causes the server to search its invitation
++  * tables to check if an invitation currently exists for the caller
++  * (to speak to the callee specified in the message).  If the lookup
++  * fails, the caller then sends an ANNOUNCE message causing the server
++  * to broadcast an announcement on the callee's login ports requesting
++  * contact.  When the callee responds, the local server uses the
++  * recorded invitation to respond with the appropriate rendezvous
++  * address and the caller and callee client programs establish a
++  * stream connection through which the conversation takes place.
++  */
++ 
++ #include <sys/types.h>
++ #include <sys/socket.h>
++ #include <stdint.h>
++ 
++ #include <features.h>
++ #ifndef __GLIBC__
++ struct osockaddr
++ {
++   unsigned short int sa_family;
++   unsigned char sa_data[14];
++ };
++ #else
++ #include <bits/types/struct_osockaddr.h>
++ #endif
++ 
++ /*
++  * Client->server request message format.
++  */
++ typedef struct {
++ 	unsigned char	vers;	/* protocol version */
++ 	unsigned char	type;	/* request type, see below */
++ 	unsigned char	answer;	/* not used */
++ 	unsigned char	pad;
++ 	uint32_t id_num;	/* message id */
++ 	struct	osockaddr addr;		/* old (4.3) style */
++ 	struct	osockaddr ctl_addr;	/* old (4.3) style */
++ 	int32_t	pid;		/* caller's process id */
++ #define	NAME_SIZE	12
++ 	char	l_name[NAME_SIZE];/* caller's name */
++ 	char	r_name[NAME_SIZE];/* callee's name */
++ #define	TTY_SIZE	16
++ 	char	r_tty[TTY_SIZE];/* callee's tty name */
++ } CTL_MSG;
++ 
++ /*
++  * Server->client response message format.
++  */
++ typedef struct {
++ 	unsigned char	vers;	/* protocol version */
++ 	unsigned char	type;	/* type of request message, see below */
++ 	unsigned char	answer;	/* response to request message, see below */
++ 	unsigned char	pad;
++ 	uint32_t	id_num;	/* message id */
++ 	struct	osockaddr addr;	/* address for establishing conversation */
++ } CTL_RESPONSE;
++ 
++ #define	TALK_VERSION	1		/* protocol version */
++ 
++ /* message type values */
++ #define LEAVE_INVITE	0	/* leave invitation with server */
++ #define LOOK_UP		1	/* check for invitation by callee */
++ #define DELETE		2	/* delete invitation by caller */
++ #define ANNOUNCE	3	/* announce invitation by caller */
++ 
++ /* answer values */
++ #define SUCCESS		0	/* operation completed properly */
++ #define NOT_HERE	1	/* callee not logged in */
++ #define FAILED		2	/* operation failed for unexplained reason */
++ #define MACHINE_UNKNOWN	3	/* caller's machine name unknown */
++ #define PERMISSION_DENIED 4	/* callee's tty doesn't permit announce */
++ #define UNKNOWN_REQUEST	5	/* request has invalid type value */
++ #define	BADVERSION	6	/* request has invalid protocol version */
++ #define	BADADDR		7	/* request has invalid addr value */
++ #define	BADCTLADDR	8	/* request has invalid ctl_addr value */
++ 
++ /*
++  * Operational parameters.
++  */
++ #define MAX_LIFE	60	/* max time daemon saves invitations */
++ /* RING_WAIT should be 10's of seconds less than MAX_LIFE */
++ #define RING_WAIT	30	/* time to wait before resending invitation */
++ 
++ #endif /* protocols/talkd.h */
++ 
+diff --color --new-file -Np1 tcpip/ttylinkd.c tcpip_a/ttylinkd.c
+*** a/tcpip/ttylinkd.c	2021-09-01 23:20:39.121449187 +0200
+--- b/tcpip/ttylinkd.c	2021-09-01 23:25:25.059430912 +0200
+***************
+*** 41,43 ****
+  
+! #include <protocols/talkd.h>
+  
+--- 41,43 ----
+  
+! #include "talkd.h"
+  
+*** a/dmascc/dmascc_cfg.c	2019-03-28 19:07:47.000000000 +0100
+--- b/dmascc/dmascc_cfg.c	2021-09-01 23:41:28.698369324 +0200
+***************
+*** 26,27 ****
+--- 26,28 ----
+  #include <sys/ioctl.h>
++ #include <sys/types.h>
+  #include <linux/if.h>
diff --git a/srcpkgs/ax25-tools/template b/srcpkgs/ax25-tools/template
new file mode 100644
index 000000000000..dadbd5891750
--- /dev/null
+++ b/srcpkgs/ax25-tools/template
@@ -0,0 +1,12 @@
+# Template file for 'ax25-tools'
+pkgname=ax25-tools
+version=0.0.10rc5
+revision=1
+build_style=gnu-configure
+makedepends="zlib-devel libax25-devel"
+short_desc="Basic AX.25 (Amateur Radio/hamradio) administrative tools and daemons"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
+license="GPL-2.0-or-later"
+homepage="https://linux-ax25.in-berlin.de/wiki/Main_Page"
+distfiles="https://linux-ax25.in-berlin.de/pub/ax25-tools/ax25-tools-${version/rc/-rc}.tar.gz"
+checksum=92a9cb8b58a86dcb9f55630fc54c9a46c58a20fc93bed524b8c111190b36aa06

From c0095551fbdbb64575d4be040e6335056a6270b4 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Sun, 25 Jun 2023 11:18:32 -0700
Subject: [PATCH 1328/1854] zoom: update to 5.15.0.4063

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 7c2f5befa040..4271caca95a0 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.14.10.3738
+version=5.15.0.4063
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=a0b2b0b1d7cab73ad884ab469d22f2a2ba895593eae78b91f2f3d5ec91710e8a
+checksum=5cd162d5a86144e4f87967f5a132c7f0b8cb6d9585fdc02d1ae0ea8a20bbe9db
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From ccf22e4a0f39b4991a8ee5ce12d20407aca894dd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:33:18 +0200
Subject: [PATCH 1329/1854] openfortivpn: update to 1.20.5.

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index b8500f0f2546..ca5988ae420d 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.20.4
+version=1.20.5
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=af4b729baa60897a566c920bf34c9ed927eefe14909d13a980a25c8ae91f144f
+checksum=82581408fd3fff3e017ad188e648ce6e935febc97f6bcd96945372638bfc7f13
 
 conf_files="/etc/openfortivpn/config"
 

From 536455fec9fe67a3af43edc15932b917686c05f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:33:30 +0200
Subject: [PATCH 1330/1854] minidlna: update to 1.3.3.

---
 srcpkgs/minidlna/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template
index e8081b1cbc67..d551e49ed465 100644
--- a/srcpkgs/minidlna/template
+++ b/srcpkgs/minidlna/template
@@ -1,6 +1,6 @@
 # Template file for 'minidlna'
 pkgname=minidlna
-version=1.3.2
+version=1.3.3
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -20,7 +20,7 @@ license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://minidlna.sourceforge.net/"
 changelog="https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0
+checksum=39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4
 
 system_accounts="minidlna"
 minidlna_homedir="/var/lib/minidlna"

From 08bf23e09b9f5b4ac04eb905f136a2a2c20e8be6 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 1 Apr 2023 07:32:58 +0200
Subject: [PATCH 1331/1854] New package: skate-0.2.2

---
 srcpkgs/skate/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/skate/template

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
new file mode 100644
index 000000000000..df8f47371c47
--- /dev/null
+++ b/srcpkgs/skate/template
@@ -0,0 +1,26 @@
+# Template file for 'skate'
+pkgname=skate
+version=0.2.2
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/charmbracelet/skate"
+go_ldflags="-X main.Version=${version}"
+short_desc="Personal key value store"
+maintainer="zenobit <zen@osowoso.xyz>"
+license="MIT"
+homepage="https://github.com/charmbracelet/skate"
+changelog="https://github.com/charmbracelet/skate/releases"
+distfiles="https://github.com/charmbracelet/skate/archive/refs/tags/v${version}.tar.gz"
+checksum=e982348a89a54c0f9fafe855ec705c91b12eb3bb9aceb70b37abf7504106b04e
+
+post_install() {
+	vlicense LICENSE
+
+	for shell in bash fish zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/skate completion $shell > skate.${shell}
+		vcompletion skate.${shell} $shell
+	done
+	vtargetrun ${DESTDIR}/usr/bin/skate man > skate.1
+	vman skate.1
+}

From f33f1c7089ea8e8da60aeaf9881417837117d678 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 25 Jun 2023 14:42:40 -0400
Subject: [PATCH 1332/1854] knotes: add missing dep

---
 srcpkgs/knotes/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index f2a625cd5d72..99a5886c1d3a 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,12 +1,13 @@
 # Template file for 'knotes'
 pkgname=knotes
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
  kcoreaddons kdoctools kconfig gettext kcmutils"
 makedepends="akonadi-notes-devel kcalutils-devel kdelibs4support-devel kdnssd-devel
- knotifyconfig-devel kontactinterface-devel pimcommon-devel grantleetheme-devel"
+ knotifyconfig-devel kontactinterface-devel pimcommon-devel grantleetheme-devel
+ ktextaddons-devel"
 short_desc="Popup notes"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"

From ab3d9972541b3b83b3c841155fc04a142c8b6254 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 20:43:41 +0200
Subject: [PATCH 1333/1854] knotes: fix build

---
 ...90def780440587084811c35c1f7cae3b4eff.patch | 186 ++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch

diff --git a/srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch b/srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch
new file mode 100644
index 000000000000..fed1f2a490cc
--- /dev/null
+++ b/srcpkgs/knotes/patches/1a6190def780440587084811c35c1f7cae3b4eff.patch
@@ -0,0 +1,186 @@
+From 1a6190def780440587084811c35c1f7cae3b4eff Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 23 Apr 2023 15:36:08 +0200
+Subject: [PATCH] Adapt to build against last textaddons
+
+---
+ CMakeLists.txt                                | 11 +++++++-
+ noteshared/src/CMakeLists.txt                 |  7 ++++-
+ noteshared/src/config-noshared.h.in           |  7 +++++
+ .../widget/richtexteditwithautocorrection.cpp | 26 +++++++++++++++++++
+ .../widget/richtexteditwithautocorrection.h   | 11 ++++++++
+ 5 files changed, 60 insertions(+), 2 deletions(-)
+ create mode 100644 noteshared/src/config-noshared.h.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e0cd817..e89e0781 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,7 +115,16 @@ find_package(KPim${KF_MAJOR_VERSION}PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CO
+ find_package(KPim${KF_MAJOR_VERSION}TextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KPim${KF_MAJOR_VERSION}GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
+ 
+-find_package(KF${KF_MAJOR_VERSION}TextAutoCorrection ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
++find_package(KF${KF_MAJOR_VERSION}TextAutoCorrectionWidgets ${KTEXTADDONS_MIN_VERSION} CONFIG)
++set_package_properties(KF${KF_MAJOR_VERSION}TextAutoCorrectionWidgets PROPERTIES DESCRIPTION
++    "Add support for text auto correction"
++    TYPE OPTIONAL
++)
++if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets)
++    set(HAVE_TEXT_AUTOCORRECTION_WIDGETS TRUE)
++else()
++    find_package(KF${KF_MAJOR_VERSION}TextAutoCorrection ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ 
+ find_package(KPim${KF_MAJOR_VERSION}AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
+ set_package_properties(KPim${KF_MAJOR_VERSION}AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://invent.kde.org/pim/akonadi-search" TYPE REQUIRED PURPOSE "Provides search capabilities in pim apps and Akonadi")
+diff --git a/noteshared/src/CMakeLists.txt b/noteshared/src/CMakeLists.txt
+index c3bd6dc4..49ec63be 100644
+--- a/noteshared/src/CMakeLists.txt
++++ b/noteshared/src/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
+ add_definitions(-DTRANSLATION_DOMAIN=\"libnoteshared\")
++configure_file(config-noshared.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-noshared.h)
+ 
+ 
+ set(libnoteshared_SRCS
+@@ -99,7 +100,11 @@ target_link_libraries(notesharedprivate
+     if (TARGET Qt::Core5Compat)
+         target_link_libraries(notesharedprivate PRIVATE Qt::Core5Compat)
+     endif()
+-    target_link_libraries(notesharedprivate PRIVATE KF${KF_MAJOR_VERSION}::TextAutoCorrection)
++    if (TARGET KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets)
++        target_link_libraries(notesharedprivate PRIVATE KF${KF_MAJOR_VERSION}::TextAutoCorrectionWidgets)
++    else()
++        target_link_libraries(notesharedprivate PRIVATE KF${KF_MAJOR_VERSION}::TextAutoCorrection)
++    endif()
+ 
+ set_target_properties(notesharedprivate
+     PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
+diff --git a/noteshared/src/config-noshared.h.in b/noteshared/src/config-noshared.h.in
+new file mode 100644
+index 00000000..2f9f3f8e
+--- /dev/null
++++ b/noteshared/src/config-noshared.h.in
+@@ -0,0 +1,7 @@
++/*
++SPDX-License-Identifier: CC0-1.0
++SPDX-FileCopyrightText: none
++*/
++#pragma once
++
++#cmakedefine01 HAVE_TEXT_AUTOCORRECTION_WIDGETS
+diff --git a/noteshared/src/widget/richtexteditwithautocorrection.cpp b/noteshared/src/widget/richtexteditwithautocorrection.cpp
+index 8d42e2fd..2e51782f 100644
+--- a/noteshared/src/widget/richtexteditwithautocorrection.cpp
++++ b/noteshared/src/widget/richtexteditwithautocorrection.cpp
+@@ -5,7 +5,12 @@
+ */
+ 
+ #include "richtexteditwithautocorrection.h"
++
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++#include <TextAutoCorrectionCore/AutoCorrection>
++#else
+ #include <TextAutoCorrection/AutoCorrection>
++#endif
+ 
+ #include <QKeyEvent>
+ 
+@@ -15,7 +20,11 @@ class NoteShared::RichTextEditWithAutoCorrectionPrivate
+ {
+ public:
+     RichTextEditWithAutoCorrectionPrivate()
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++        : mAutoCorrection(new TextAutoCorrectionCore::AutoCorrection())
++#else
+         : mAutoCorrection(new TextAutoCorrection::AutoCorrection())
++#endif
+     {
+     }
+ 
+@@ -25,7 +34,11 @@ class NoteShared::RichTextEditWithAutoCorrectionPrivate
+             delete mAutoCorrection;
+         }
+     }
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++    TextAutoCorrectionCore::AutoCorrection *mAutoCorrection = nullptr;
++#else
+     TextAutoCorrection::AutoCorrection *mAutoCorrection = nullptr;
++#endif
+     bool mNeedToDelete = true;
+ };
+ 
+@@ -36,21 +49,34 @@ RichTextEditWithAutoCorrection::RichTextEditWithAutoCorrection(QWidget *parent)
+ }
+ 
+ RichTextEditWithAutoCorrection::~RichTextEditWithAutoCorrection() = default;
++
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++void RichTextEditWithAutoCorrection::setAutocorrection(TextAutoCorrectionCore::AutoCorrection *autocorrect)
++#else
+ void RichTextEditWithAutoCorrection::setAutocorrection(TextAutoCorrection::AutoCorrection *autocorrect)
++#endif
+ {
+     d->mNeedToDelete = false;
+     delete d->mAutoCorrection;
+     d->mAutoCorrection = autocorrect;
+ }
+ 
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++TextAutoCorrectionCore::AutoCorrection *RichTextEditWithAutoCorrection::autocorrection() const
++#else
+ TextAutoCorrection::AutoCorrection *RichTextEditWithAutoCorrection::autocorrection() const
++#endif
+ {
+     return d->mAutoCorrection;
+ }
+ 
+ void RichTextEditWithAutoCorrection::setAutocorrectionLanguage(const QString &language)
+ {
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++    TextAutoCorrectionCore::AutoCorrectionSettings *settings = d->mAutoCorrection->autoCorrectionSettings();
++#else
+     TextAutoCorrection::AutoCorrectionSettings *settings = d->mAutoCorrection->autoCorrectionSettings();
++#endif
+     settings->setLanguage(language);
+     d->mAutoCorrection->setAutoCorrectionSettings(settings);
+ }
+diff --git a/noteshared/src/widget/richtexteditwithautocorrection.h b/noteshared/src/widget/richtexteditwithautocorrection.h
+index 9ad9ec4e..787350d8 100644
+--- a/noteshared/src/widget/richtexteditwithautocorrection.h
++++ b/noteshared/src/widget/richtexteditwithautocorrection.h
+@@ -6,11 +6,17 @@
+ 
+ #pragma once
+ 
++#include "config-noshared.h"
+ #include <KPIMTextEdit/RichTextEditor>
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++namespace TextAutoCorrectionCore
++#else
+ namespace TextAutoCorrection
++#endif
+ {
+ class AutoCorrection;
+ }
++
+ namespace NoteShared
+ {
+ class RichTextEditWithAutoCorrectionPrivate;
+@@ -25,8 +31,13 @@ class RichTextEditWithAutoCorrection : public KPIMTextEdit::RichTextEditor
+     explicit RichTextEditWithAutoCorrection(QWidget *parent = nullptr);
+     ~RichTextEditWithAutoCorrection() override;
+ 
++#ifdef HAVE_TEXT_AUTOCORRECTION_WIDGETS
++    Q_REQUIRED_RESULT TextAutoCorrectionCore::AutoCorrection *autocorrection() const;
++    void setAutocorrection(TextAutoCorrectionCore::AutoCorrection *autocorrect);
++#else
+     Q_REQUIRED_RESULT TextAutoCorrection::AutoCorrection *autocorrection() const;
+     void setAutocorrection(TextAutoCorrection::AutoCorrection *autocorrect);
++#endif
+ 
+     void setAutocorrectionLanguage(const QString &language);
+ 

From 2e7bdef71254a98e5fcd84d1c8c5049c4fca78e0 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Mon, 27 Mar 2023 07:50:20 +0100
Subject: [PATCH 1334/1854] New package: clifm-1.11

---
 srcpkgs/clifm/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/clifm/template

diff --git a/srcpkgs/clifm/template b/srcpkgs/clifm/template
new file mode 100644
index 000000000000..824f00db336e
--- /dev/null
+++ b/srcpkgs/clifm/template
@@ -0,0 +1,14 @@
+# Template file for 'clifm'
+pkgname=clifm
+version=1.11
+revision=1
+build_style=gnu-makefile
+make_install_args="MANDIR=/usr/share/man"
+makedepends="libcap-devel acl-devel file-devel readline-devel"
+short_desc="Command Line Interface File Manager"
+maintainer="Greg Beard <gmbeard@googlemail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/leo-arch/clifm"
+changelog="https://raw.githubusercontent.com/leo-arch/clifm/master/CHANGELOG"
+distfiles="https://github.com/leo-arch/clifm/releases/download/v${version}/clifm-${version}.tar.gz"
+checksum=32f69ab2215bfcf10e8fe3920c5b4ffd6e699a68463577b32c39f9189d5a9c56

From f265ddfd96e6790586e2c7aaf42f3d6baf995424 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Mar 2023 12:19:03 +0300
Subject: [PATCH 1335/1854] New package: rinstall-0.2.0

---
 srcpkgs/rinstall/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/rinstall/template

diff --git a/srcpkgs/rinstall/template b/srcpkgs/rinstall/template
new file mode 100644
index 000000000000..3514d61352b8
--- /dev/null
+++ b/srcpkgs/rinstall/template
@@ -0,0 +1,13 @@
+# Template file for 'rinstall'
+pkgname=rinstall
+version=0.2.0
+revision=1
+build_style=cargo
+short_desc="Declarative install for programs"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/danyspin97/rinstall"
+changelog="https://raw.githubusercontent.com/danyspin97/rinstall/main/CHANGELOG.md"
+distfiles="https://github.com/danyspin97/rinstall/archive/refs/tags/${version}.tar.gz"
+checksum=386ae4d52ad62b03304596d5dfc7bb273492ac3fed54f1110d0da8dc1847e4c6
+conflicts="rset"

From fda51a9f335f7d6244129e83c82f50b2a6c6724e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 1 Mar 2023 23:18:45 +0100
Subject: [PATCH 1336/1854] New package: netavark-1.6.0

---
 srcpkgs/netavark/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/netavark/template

diff --git a/srcpkgs/netavark/template b/srcpkgs/netavark/template
new file mode 100644
index 000000000000..4bc741f29a5f
--- /dev/null
+++ b/srcpkgs/netavark/template
@@ -0,0 +1,23 @@
+# Template file for 'netavark'
+pkgname=netavark
+version=1.6.0
+revision=1
+build_style=cargo
+hostmakedepends="mandown protobuf"
+short_desc="Container network stack"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/containers/netavark"
+changelog="https://raw.githubusercontent.com/containers/netavark/main/RELEASE_NOTES.md"
+distfiles="https://github.com/containers/netavark/archive/refs/tags/v${version}.tar.gz"
+checksum=3bec9e9b0f3f8f857370900010fb2125ead462d43998ad8f43e4387a5b06f9d6
+# needs unshare which cannot be used in CI
+make_check=ci-skip
+
+post_install() {
+	vmkdir usr/libexec/podman
+	ln -sf ../../bin/netavark "${DESTDIR}/usr/libexec/podman"
+	ln -sf ../../bin/netavark-dhcp-proxy-client "${DESTDIR}/usr/libexec/podman"
+	mandown docs/netavark.1.md > netavark.1
+	vman netavark.1
+}

From 7b1d8daf65ce7054088755fc1068c8ad3a9c2f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 1 Mar 2023 23:29:23 +0100
Subject: [PATCH 1337/1854] New package: aardvark-dns-1.6.0

---
 srcpkgs/aardvark-dns/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/aardvark-dns/template

diff --git a/srcpkgs/aardvark-dns/template b/srcpkgs/aardvark-dns/template
new file mode 100644
index 000000000000..c4a47746f1f3
--- /dev/null
+++ b/srcpkgs/aardvark-dns/template
@@ -0,0 +1,17 @@
+# Template file for 'aardvark-dns'
+pkgname=aardvark-dns
+version=1.6.0
+revision=1
+build_style=cargo
+short_desc="Authoritative dns server for A/AAAA container records"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/containers/aardvark-dns"
+changelog="https://raw.githubusercontent.com/containers/aardvark-dns/main/RELEASE_NOTES.md"
+distfiles="https://github.com/containers/aardvark-dns/archive/refs/tags/v${version}.tar.gz"
+checksum=f3a2ff2d7baf07d8bf2785b6f1c9618db8aa188bd738b7f5cf1b0a31848232f5
+
+post_install() {
+	vmkdir usr/libexec/podman
+	ln -sf ../../bin/aardvark-dns "${DESTDIR}/usr/libexec/podman"
+}

From c084bea1d86f7459e32aa0e6e10485c3e04f7631 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Thu, 6 Apr 2023 09:40:03 -0600
Subject: [PATCH 1338/1854] New package: moar-1.13.0

---
 srcpkgs/moar/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/moar/template

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
new file mode 100644
index 000000000000..381454967d4e
--- /dev/null
+++ b/srcpkgs/moar/template
@@ -0,0 +1,20 @@
+# Template file for 'moar'
+pkgname=moar
+version=1.13.0
+revision=1
+build_style=go
+go_import_path=github.com/walles/moar
+go_ldflags="-X main.versionString=${version}"
+short_desc="Drop-in replacement for the less pager"
+maintainer="Diego Magdaleno <diegomagdaleno@pm.me>"
+license="BSD-2-Clause"
+homepage="https://github.com/walles/moar"
+changelog="https://github.com/waller/moar/releases"
+distfiles="https://github.com/walles/moar/archive/refs/tags/v${version}.tar.gz"
+checksum=65eac0d4f8a40f0198a93f0888a60a28e8466b2ee9d0437f143db5c25d5e9319
+conflicts="MoarVM"
+
+post_install() {
+	vman moar.1
+	vlicense LICENSE
+}

From 45ca6435904999c54ae1714aa922570c4558676d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 22 Mar 2023 01:12:44 +0530
Subject: [PATCH 1339/1854] New package: zet-1.0.0

---
 srcpkgs/zet/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/zet/template

diff --git a/srcpkgs/zet/template b/srcpkgs/zet/template
new file mode 100644
index 000000000000..86c2fdad2b29
--- /dev/null
+++ b/srcpkgs/zet/template
@@ -0,0 +1,13 @@
+# Template file for 'zet'
+pkgname=zet
+version=1.0.0
+revision=1
+build_style=cargo
+short_desc="CLI to find union, intersection, set difference, etc of files"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://github.com/yarrow/zet"
+changelog="https://raw.githubusercontent.com/yarrow/zet/main/CHANGELOG.md"
+distfiles="https://github.com/yarrow/zet/archive/refs/tags/v${version}.tar.gz"
+checksum=792a1a1de73bf4145ccaa71f8e6bb34b62e690270a432c4de4d8639e1a741b5b
+make_check=no # https://github.com/yarrow/zet/commit/8e21b96ec73979adcfb92550906e8d49fe46e75f

From 32b528605b4a636b27fab145d04749ab1e66ded0 Mon Sep 17 00:00:00 2001
From: Maeve Sproule <code@sprock.dev>
Date: Sun, 12 Mar 2023 14:38:57 -0600
Subject: [PATCH 1340/1854] New package: offpunk-1.9.2

---
 srcpkgs/offpunk/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/offpunk/template

diff --git a/srcpkgs/offpunk/template b/srcpkgs/offpunk/template
new file mode 100644
index 000000000000..c31ee75c07f9
--- /dev/null
+++ b/srcpkgs/offpunk/template
@@ -0,0 +1,21 @@
+# Template file for 'offpunk'
+pkgname=offpunk
+version=1.9.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="chafa file less python3-BeautifulSoup4 python3-cryptography
+ python3-feedparser python3-readability-lxml python3-requests
+ python3-setproctitle timg xdg-utils xsel"
+short_desc="Offline-first command-line browser for gemini, gopher and the web"
+maintainer="Maeve Sproule <code@sprock.dev>"
+license="BSD-2-Clause"
+homepage="https://sr.ht/~lioploum/offpunk"
+changelog="https://git.sr.ht/~lioploum/offpunk/blob/master/CHANGELOG"
+distfiles="https://git.sr.ht/~lioploum/offpunk/archive/v${version}.tar.gz"
+checksum=96574ac3754f1564af4a2231c7ef0c2ff238b99f118a1244c8baafc4dd753a76
+
+post_install() {
+	vlicense LICENSE
+	vman man/offpunk.1
+}

From 9ae62fc2801a894c2f307020ca50b4f751fd241b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 30 Jan 2023 09:22:24 -0500
Subject: [PATCH 1341/1854] New package: elfkickers-3.2.

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: #41960 [via git-merge-pr]
---
 .../patches/elfkickers-3.1-AR.patch           |  24 ++++
 ...lfkickers-3.1-respect-CFLAGS-LDFLAGS.patch | 104 ++++++++++++++++++
 .../patches/elfkickers-3.2-cross.patch        |  12 ++
 .../patches/elfkickers-3.2-install.patch      |  24 ++++
 srcpkgs/elfkickers/template                   |  14 +++
 5 files changed, 178 insertions(+)
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch
 create mode 100644 srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch
 create mode 100644 srcpkgs/elfkickers/template

diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch b/srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch
new file mode 100644
index 000000000000..dc1726a7706f
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.1-AR.patch
@@ -0,0 +1,24 @@
+https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/elfkickers/files
+https://bugs.gentoo.org/724258
+--- a/ebfc/Makefile
++++ b/ebfc/Makefile
+@@ -10,7 +10,7 @@ brainfuck.o: brainfuck.c elfparts.h ebfc.h
+ 
+ libelfparts.a: elfparts.o ehdr.o phdrtab.o shdrtab.o progbits.o	\
+                strtab.o symtab.o hash.o rel.o got.o dynamic.o
+-	ar crs libelfparts.a $^
++	$(AR) crs libelfparts.a $^
+ 
+ elfparts.o: elfparts.c elfparts.h gen.h
+ ehdr.o: ehdr.c elfparts.h gen.h
+--- a/elfrw/Makefile
++++ b/elfrw/Makefile
+@@ -6,7 +6,7 @@ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+ 
+ libelfrw.a: $(LIBOBJS)
+-	ar crs $@ $^
++	$(AR) crs $@ $^
+ 
+ elfrw.o: elfrw.c elfrw.h elfrw_int.h
+ elfrw_dyn.o: elfrw_dyn.c elfrw_int.h
diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch b/srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..beedffa94031
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,104 @@
+https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/elfkickers/files
+diff -Naur ELFkickers-3.1.orig/ebfc/Makefile ELFkickers-3.1/ebfc/Makefile
+--- ELFkickers-3.1.orig/ebfc/Makefile	2014-11-17 14:50:34.000000000 -0500
++++ ELFkickers-3.1/ebfc/Makefile	2016-11-16 17:13:53.297033908 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for ebfc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
++CC ?= gcc
++CFLAGS += -Wno-missing-field-initializers
+ 
+ ebfc: ebfc.o brainfuck.o libelfparts.a
+ 
+diff -Naur ELFkickers-3.1.orig/elfls/Makefile ELFkickers-3.1/elfls/Makefile
+--- ELFkickers-3.1.orig/elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.1/elfls/Makefile	2016-11-16 17:12:48.885032137 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for elfls
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ elfls: elfls.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/elfrw/Makefile ELFkickers-3.1/elfrw/Makefile
+--- ELFkickers-3.1.orig/elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.1/elfrw/Makefile	2016-11-16 17:13:06.653032625 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for libelfrw.a
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -O3
++CC ?= gcc
+ 
+ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+diff -Naur ELFkickers-3.1.orig/elftoc/Makefile ELFkickers-3.1/elftoc/Makefile
+--- ELFkickers-3.1.orig/elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.1/elftoc/Makefile	2016-11-16 17:12:57.549032375 -0500
+@@ -1,8 +1,6 @@
+ #  Makefile for elftoc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
+        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
+diff -Naur ELFkickers-3.1.orig/infect/Makefile ELFkickers-3.1/infect/Makefile
+--- ELFkickers-3.1.orig/infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.1/infect/Makefile	2016-11-16 17:12:30.617031634 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.1.orig/objres/Makefile ELFkickers-3.1/objres/Makefile
+--- ELFkickers-3.1.orig/objres/Makefile	2016-11-14 16:46:24.000000000 -0500
++++ ELFkickers-3.1/objres/Makefile	2016-11-16 17:13:40.225033549 -0500
+@@ -1,8 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.o ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/rebind/Makefile ELFkickers-3.1/rebind/Makefile
+--- ELFkickers-3.1.orig/rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.1/rebind/Makefile	2016-11-16 17:13:17.373032920 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for rebind
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ rebind: rebind.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/sstrip/Makefile ELFkickers-3.1/sstrip/Makefile
+--- ELFkickers-3.1.orig/sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.1/sstrip/Makefile	2016-11-16 17:14:05.949034256 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for sstrip
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ sstrip: sstrip.c ../elfrw/libelfrw.a
+ 
diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch b/srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch
new file mode 100644
index 000000000000..2a13f820eec8
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.2-cross.patch
@@ -0,0 +1,12 @@
+--- a/elftoc/Makefile
++++ b/elftoc/Makefile
+@@ -35,7 +35,9 @@
+ 	rm -f ./~elftmp.c
+ 
+ mknames: mknames.o
++	$(CC_FOR_BUILD) -o $@ $^
+ mknames.o: mknames.c
++	$(CC_FOR_BUILD) -c $^ $@
+ 
+ clean:
+ 	rm -f $(OBJS) elftoc elfnames.c mknames mknames.o
diff --git a/srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch b/srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch
new file mode 100644
index 000000000000..9ef65c547a27
--- /dev/null
+++ b/srcpkgs/elfkickers/patches/elfkickers-3.2-install.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,5 @@
+ #  The top-level makefile simply invokes all the other makefiles
+ 
+-prefix = /usr/local
+-
+ PROGRAMS = elfls objres rebind sstrip elftoc ebfc infect
+ 
+ all: $(PROGRAMS)
+@@ -24,10 +22,9 @@
+ infect: bin/infect doc/infect.1
+ 
+ install: $(PROGRAMS)
+-	mkdir -p $(prefix)/bin
+-	cp bin/* $(prefix)/bin/.
+-	mkdir -p $(prefix)/share/man/man1
+-	cp doc/* $(prefix)/share/man/man1/.
++	install -d $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/man/man1
++	install bin/* $(DESTDIR)$(prefix)/bin
++	install -m 644 doc/* $(DESTDIR)$(prefix)/share/man/man1
+ 
+ clean:
+ 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/srcpkgs/elfkickers/template b/srcpkgs/elfkickers/template
new file mode 100644
index 000000000000..977b6e4cd4ef
--- /dev/null
+++ b/srcpkgs/elfkickers/template
@@ -0,0 +1,14 @@
+# Template file for 'elfkickers'
+pkgname=elfkickers
+version=3.2
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Collection of ELF utilities"
+maintainer="Zlice <zlice555@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+distfiles="http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"
+checksum=9b81e6c53e0c94fc198d9882eb737156f36d565152dc32118897c77b06a2687c
+
+disable_parallel_build=yes # makefiles are pretty broken

From 881fa829c30ca8d0fcd41a7d598b030db5834985 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 1342/1854] virtuoso: update to 7.2.10

test suite was failing on revbump

- remove patches that no longer apply
- disable static libraries as we're removing them after install anyway
- disable tgraphql test (fails inside ./xbps-src)
- add which to hostmakedepends
- add missing checkdepends
- update project homepage
---
 .../virtuoso/patches/always-ieee-floats.patch |   46 -
 .../patches/disable-tgraphql-test.patch       |   12 +
 .../virtuoso/patches/fix-utf8-bittest.patch   |   15 -
 srcpkgs/virtuoso/patches/musl-page_size.patch |   34 -
 .../remove-openssl-version-check.patch        |   48 -
 .../virtuoso/patches/ssl-connect-state.patch  |   15 -
 srcpkgs/virtuoso/patches/ssl1.1.patch         | 1400 -----------------
 srcpkgs/virtuoso/patches/ssl1.1_more.patch    |   20 -
 srcpkgs/virtuoso/patches/use-mkstemp.patch    |   18 -
 srcpkgs/virtuoso/template                     |   25 +-
 10 files changed, 23 insertions(+), 1610 deletions(-)
 delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
 create mode 100644 srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
 delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
 delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
 delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
 delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
 delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
 delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
 delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch

diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h>			 /* for ntohl, htonl */
- #endif
- 
--#if defined (i386) || \
--    defined (_WIN64) || \
--    defined (_M_IX86) || \
--    defined (_M_ALPHA) || \
--    defined (mc68000) || \
--    defined (sparc) || \
--    defined (__x86_64) || \
--    defined (__alpha) || \
--    defined (__powerpc) || \
--    defined (mips) || \
--    defined (__OS2__) || \
--    defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
- 
- macro_char_func readtable[256];
- ses_write_func writetable[256];
--- 
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/disable-tgraphql-test.patch b/srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
new file mode 100644
index 000000000000..dbd2c467eb1a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
@@ -0,0 +1,12 @@
+--- a/binsrc/tests/suite/testall.sh	2023-02-27 18:05:33.000000000 +0100
++++ b/binsrc/tests/suite/testall.sh	2023-03-09 14:55:56.918657063 +0100
+@@ -136,8 +136,7 @@
+ rtest \
+ trepl_rdf \
+ tsoap12 \
+-tvspxex \
+-tgraphql "
++tvspxex "
+ 
+ QUICKTEST=1
+ TPCDMODE=local
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c	2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c	2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
-           for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
-           for (c = 128; c < 256; c++)
-             {
--            if ((tcode[c/8] && (1 << (c&7))) != 0)
-+            if ((tcode[c/8] & (1 << (c&7))) != 0)
-               {
-               int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
-               start_bits[d/8] |= (1 << (d&7));    /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
- 
- #include <sys/types.h>
-+#include <unistd.h>
- 
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
- 
- #define DEFAULT_AREA_SIZE (1024*10)
- 
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
- 
- #ifndef WIN32
- #ifdef USE_PRINTF
--- 
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac	2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac	2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl	AM_INIT_AUTOMAKE([1.8])
- dnl	AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
- 
- AM_MAINTAINER_MODE
- 
-@@ -867,32 +867,6 @@
- 	;;
- esac
- 
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old 
--#endif
--    ],[
--      AC_MSG_RESULT([>= 0.9.8e])
--    ],[
--      AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
--    ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
--    ],[
--      AC_MSG_RESULT([< 1.1.0])
--    ],[
--      AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
--    ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c	2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c	2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- 	  cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- 	  sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- 	}
--      ssl->state = SSL_ST_ACCEPT;
-+      SSL_set_accept_state (ssl);
-       while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- 	{
- 	  timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c      |   6 +-
- libsrc/Wi/bif_crypto.c   | 120 ++++++++++--------
- libsrc/Wi/http.c         |   2 +-
- libsrc/Wi/xmlenc.c       | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h       | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c  |   6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
-   unsigned char temp[EVP_MAX_MD_SIZE];
-   unsigned int size = 0;
-   caddr_t res = NULL;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   const EVP_MD *md = EVP_sha1 ();
- 
-   if (alg == 1)
-     md = EVP_ripemd160 ();
- 
--  HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
--  box_hmac_1 (box, &ctx);
--  HMAC_Final (&ctx, temp, &size);
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return res;
-+
-+  HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+  box_hmac_1 (box, ctx);
-+  HMAC_Final (ctx, temp, &size);
-   if (size)
-     {
-       res = dk_alloc_box (size + 1, DV_SHORT_STRING);
-       memcpy (res, temp, size);
-       res[size] = 0;
-     }
-+  HMAC_CTX_free(ctx);
-   return res;
- }
- 
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 	    {
- 	      int ii;
- 
--	      opp = op;
--	      ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
--	      if (ii < 0)
-+	      if (len + hl < 1)
- 		{
- 		  if (BIO_write (bp, "Bad boolean\n", 12))
- 		    goto end;
- 		}
--	      BIO_printf (bp, "%d", ii);
-+	      BIO_printf (bp, "%d", p[0]);
- 	    }
- 	  else if (tag == V_ASN1_BMPSTRING)
- 	    {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 		}
- 	      if (os != NULL)
- 		{
--		  M_ASN1_OCTET_STRING_free (os);
-+		  ASN1_STRING_free (os);
- 		  os = NULL;
- 		}
- 	    }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 		  if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- 		    goto end;
- 		}
--	      M_ASN1_INTEGER_free (bs);
-+	      ASN1_STRING_free (bs);
- 	    }
- 	  else if (tag == V_ASN1_ENUMERATED)
- 	    {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- 		  if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- 		    goto end;
- 		}
--	      M_ASN1_ENUMERATED_free (bs);
-+	      ASN1_STRING_free (bs);
- 	    }
- 	  else if (len > 0 && dump)
- 	    {
-@@ -515,7 +518,7 @@ end:
-   if (o != NULL)
-     ASN1_OBJECT_free (o);
-   if (os != NULL)
--    M_ASN1_OCTET_STRING_free (os);
-+    ASN1_STRING_free (os);
-   *pp = p;
-   return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
-   int len = BIO_get_mem_data (out_bio, &ptr);
-   int to_read = len, readed = 0;
- 
--  to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+  to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
-   BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
-   CATCH_WRITE_FAIL (ses)
-     {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
-       } while (to_read > 0);
-     }
-   END_WRITE_FAIL (ses);
--  ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+  ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
-   BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
-   return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
-   if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
-     {
-       in_bio = strses_to_bio ((dk_session_t *) msg);
--      to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+      to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
-       BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
-     }
-   else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
-       p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
-       if (to_free)
- 	{
--	  ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+	  ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- 	  BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- 	}
-       BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
-     }
- 
-   certs = sk_X509_new_null ();
--  if (store && store->objs)
-+
-+  if (store && X509_STORE_get0_objects(store))
-     {
--      for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+      STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+      for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- 	{
--	  X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
--	  if (obj->type == X509_LU_X509)
--	    sk_X509_push (certs, X509_dup (obj->data.x509));
-+	  X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+	  if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+	    sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- 	}
- 
-     }
-+
-   if (store)
-     X509_STORE_free (store);
-   in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
-     sqlr_new_error ("42000", "CR006", "No recipient certificates");
- 
-   certs = sk_X509_new_null ();
--  if (store && store->objs)
-+
-+  if (store && X509_STORE_get0_objects(store))
-     {
--      for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+      STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+      for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- 	{
--	  X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
--	  if (obj->type == X509_LU_X509)
--	    sk_X509_push (certs, X509_dup (obj->data.x509));
-+	  X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+	  if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+	    sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- 	}
-     }
-+
-   if (store)
-     X509_STORE_free (store);
-   in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
-   char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
-   if (!ok && opts)
-     {
--      switch (ctx->error)
-+      switch (X509_STORE_CTX_get_error(ctx))
- 	{
- 	case X509_V_ERR_CERT_HAS_EXPIRED:
- 	  if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
-   if (!i)
-     {
-       const char *err_str;
--      err_str = X509_verify_cert_error_string (csc->error);
-+      err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
-       *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
-     }
- 
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
- 
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
-   size_t buf_len, n;
-   caddr_t buf;
-   buf_len = (size_t) BN_num_bytes (x);
--  if (buf_len <= BN_BYTES)
--    buf = box_num ((unsigned long) x->d[0]);
--  else
--    {
--      buf = dk_alloc_box (buf_len, DV_BIN);
--      n = BN_bn2bin (x, (unsigned char *) buf);
--      if (n != buf_len)
--	GPF_T;
--    }
-+  /* did not figure out where buf is free()ed */
-+  buf = dk_alloc_box (buf_len, DV_BIN);
-+  n = BN_bn2bin (x, (unsigned char *) buf);
-+  if (n != buf_len)
-+	  GPF_T;
-   return buf;
- }
- 
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- 	int i;
- 	char tmp[1024];
- 	char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
--	STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+	const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- 	for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- 	  {
- 	    X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- 		char *data_ptr;
- 		BIO *mem = BIO_new (BIO_s_mem ());
- 		if (!X509V3_EXT_print (mem, ex, 0, 0))
--		  M_ASN1_OCTET_STRING_print (mem, ex->value);
-+		  ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- 		len = BIO_get_mem_data (mem, &data_ptr);
- 		if (len > 0 && data_ptr)
- 		  {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- 	if (k)
- 	  {
- #ifdef EVP_PKEY_RSA
--	    if (k->type == EVP_PKEY_RSA)
-+	    if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	      {
--		RSA *x = k->pkey.rsa;
--		ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+		const BIGNUM *n, *e;
-+
-+		RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+		ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- 	      }
- 	    else
- #endif
- #ifdef EVP_PKEY_DSA
--	    if (k->type == EVP_PKEY_DSA)
-+	    if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- 	      {
--		DSA *x = k->pkey.dsa;
--		ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+		const BIGNUM *pub_key;
-+
-+		DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+		ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- 	      }
- 	    else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- 	int n, i, len;
- 	char *s, *data_ptr;
- 	BIO *mem = BIO_new (BIO_s_mem ());
--	for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+	for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- 	  {
--	    ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
--	    n = OBJ_obj2nid (ne->object);
-+	    ne = X509_NAME_get_entry(subj, i);
-+	    n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- 	    if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- 	      {
--		i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+		i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- 		s = buffer;
- 	      }
- 	    if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- 		break;
- 	      }
- 	  }
-+
- 	if (ne_ret)
- 	  {
--	    ASN1_STRING_print (mem, ne_ret->value);
-+	    ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- 	    len = BIO_get_mem_data (mem, &data_ptr);
- 	    if (len > 0 && data_ptr)
- 	      {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- 	dk_set_t set = NULL;
- 	caddr_t val;
- 	BIO *mem = BIO_new (BIO_s_mem ());
--	for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+	for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- 	  {
- 	    val = NULL;
--	    ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
--	    n = OBJ_obj2nid (ne->object);
-+	    ne = X509_NAME_get_entry(subj, i);
-+	    n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- 	    if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- 	      {
--		i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+		i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- 		s = buffer;
- 	      }
--	    ASN1_STRING_print (mem, ne->value);
-+	    ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- 	    len = BIO_get_mem_data (mem, &data_ptr);
- 	    if (len > 0 && data_ptr)
- 	      {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- 	  }
- 	BIO_free (mem);
- 	ret = list_to_array (dk_set_nreverse (set));
-+
- 	break;
-       }
-     case 12:
-       {
- 	const unsigned char *s;
- 	int i, n;
--	const ASN1_STRING *sig = cert->signature;
--	X509_ALGOR *sigalg = cert->sig_alg;
-+	const ASN1_STRING *sig;
-+	const X509_ALGOR *sigalg;
-+	const ASN1_OBJECT *sig_alg_algorithm;
- 	char buf[80];
- 	caddr_t val;
- 
--        i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+	X509_get0_signature(&sig, &sigalg, cert);
-+	X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+	i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
- 
- 	n = sig->length;
- 	s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- 	if (k)
- 	  {
- #ifdef EVP_PKEY_RSA
--	    if (k->type == EVP_PKEY_RSA)
-+	    if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	      {
- 		char *data_ptr;
- 		int len;
--		RSA *x = k->pkey.rsa;
-+		RSA *x = EVP_PKEY_get0_RSA(k);
- 		b = BIO_new (BIO_s_mem());
- 		i2d_RSA_PUBKEY_bio (b, x);
- 		len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
- 
- 
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
--  p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
-   RSA *rsa = NULL;
--  int num=1024;
--  unsigned long f4=RSA_F4;
-+  BIGNUM *bn = NULL;
-   int r;
-+
-   xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
-   if (NULL == pkey)
-     SQLR_NEW_KEY_ERROR (name);
- 
--  rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+  rsa = RSA_new();
-+  if (!rsa)
-+	  goto out;
-+  bn = BN_new();
-+  if (!bn)
-+	  goto out;
-+  if (!BN_set_word(bn, RSA_F4))
-+	  goto out;
-+
-+  if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+	  goto out;
-+
-   r = RSA_check_key(rsa);
-+  if (r != 1)
-+	  goto out;
-   pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
--  if (rsa == NULL)
--    {
--      sqlr_new_error ("42000", "XENC06",
--		    "RSA parameters generation error");
--    }
-   pkey->xek_rsa = rsa;
-   pkey->xek_private_rsa = rsa;
-+  BN_free(bn);
-   return 0;
-+out:
-+  if (bn)
-+	  BN_free(bn);
-+  if (rsa)
-+	  RSA_free(rsa);
-+  sqlr_new_error ("42000", "XENC06",
-+		  "RSA parameters generation error");
-+  return -1;
- }
- 
- 
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
- 
-   if (pkey)
-     {
--      switch (EVP_PKEY_type (pkey->type))
-+      switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- 	{
- 	case EVP_PKEY_DSA:
- 	  sign_algoname = DSIG_DSA_SHA1_ALGO;
- 	  enc_algoname = XENC_DSA_ALGO;
--	  dsa = pkey->pkey.dsa;
--	  private_dsa = private_key ? private_key->pkey.dsa : 0;
-+	  dsa = EVP_PKEY_get0_DSA(pkey);
-+	  private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- 	  break;
- 	case EVP_PKEY_RSA:
- 	  sign_algoname = DSIG_RSA_SHA1_ALGO;
- 	  enc_algoname = XENC_RSA_ALGO;
--	  rsa = pkey->pkey.rsa;
--	  private_rsa = private_key ? private_key->pkey.rsa : 0;
-+	  rsa = EVP_PKEY_get0_RSA(pkey);
-+	  private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- 	  break;
- 	default:
- 	  goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
-   return k;
- }
- 
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
--  p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
-       dh = DH_new ();
-       bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
-       bn_g = BN_bin2bn (g_bin, 1, NULL);
--      dh->p = bn_p;
--      dh->g = bn_g;
-+      if (dh)
-+	      DH_set0_pqg(dh, bn_p, NULL, bn_g);
- 
-       dk_free_box (mod_b64);
-       dk_free_box (mod);
-     }
-   else
-     {
--      dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+      dh = DH_new();
-+      if (dh) {
-+	      if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+		      DH_free(dh);
-+		      dh = NULL;
-+	      }
-+      }
-     }
-   if (!dh)
-     {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
-   int n, len;
-   caddr_t buf = NULL, ret, b64;
-   DH *dh;
--  BIGNUM *num;
-+  const BIGNUM *num;
- 
-   mutex_enter (xenc_keys_mtx);
-   key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
-   switch (param)
-     {
-   	case 1:
--	 num = dh->p;
-+	 DH_get0_pqg(dh, &num, NULL, NULL);
- 	 break;
- 	case 2:
--	 num = dh->g;
-+	 DH_get0_pqg(dh, NULL, NULL, &num);
- 	 break;
- 	case 3:
--	 num = dh->pub_key;
-+	 DH_get0_key(dh, &num, NULL);
- 	 break;
- 	case 4:
--	 num = dh->priv_key;
-+	 DH_get0_key(dh, NULL, &num);
- 	 break;
- 	default:
--	 num = dh->pub_key;
-+	 DH_get0_key(dh, &num, NULL);
-     }
- 
-   buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-   xenc_key_t * k;
-   caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
-   int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
--  RSA *rsa = NULL;
-+  RSA *rsa;
-+  BIGNUM *bn;
-+
-+  rsa = RSA_new();
-+  bn = BN_new();
-+  if (!rsa || !bn)
-+	goto out;
-+  if (!BN_set_word(bn, RSA_F4))
-+	goto out;
- 
-   mutex_enter (xenc_keys_mtx);
-   if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-       SQLR_NEW_KEY_EXIST_ERROR (name);
-     }
- 
--  rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
--  if (rsa == NULL)
--    {
--      sqlr_new_error ("42000", "XENC06", "RSA generation error");
--    }
-+  if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+	  mutex_leave (xenc_keys_mtx);
-+	  goto out;
-+  }
-+  BN_free(bn);
- 
-   k->xek_rsa = RSAPublicKey_dup (rsa);
-   k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- 
-   mutex_leave (xenc_keys_mtx);
-   return NULL;
-+out:
-+  if (bn)
-+	  BN_free(bn);
-+  if (rsa)
-+	  RSA_free(rsa);
-+  sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+  return NULL;
- }
- 
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
-     SQLR_NEW_KEY_ERROR (name);
- 
-   RAND_poll ();
--  dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+  dsa = DSA_new();
-+  if (dsa) {
-+	  if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+		  DSA_free(dsa);
-+		  dsa = NULL;
-+	  }
-+  }
-   if (dsa == NULL)
-     {
-       sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
-   if (NULL == pkey)
-     SQLR_NEW_KEY_ERROR (name);
- 
--  dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+  dh = DH_new();
-+  if (dh) {
-+	  if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+		  DH_free(dh);
-+		  dh = NULL;
-+	  }
-+  }
-   if (!dh)
-     {
-       sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-     {
-       in = BIO_new_mem_buf (key_base64, len);
-       pkey = d2i_PUBKEY_bio (in, NULL);
--      if (pkey && pkey->type == EVP_PKEY_RSA)
--	p = pkey->pkey.rsa;
-+      if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+	p = EVP_PKEY_get0_RSA(pkey);
-       BIO_reset (in);
-       pkkey = d2i_PrivateKey_bio (in, NULL);
--      if (pkkey && pkkey->type == EVP_PKEY_RSA)
--	r = pkkey->pkey.rsa;
-+      if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+	r = EVP_PKEY_get0_RSA(pkkey);
-       BIO_free (in);
-     }
-   else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- 
-   if (!p)
-     {
-+      const BIGNUM *n, *e;
-+
-+      RSA_get0_key(r, &n, &e, NULL);
-       p = RSA_new ();
--      p->n = BN_dup (r->n);
--      p->e = BN_dup (r->e);
-+      RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
-     }
- 
-   mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
-   p = RSA_new ();
-   n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
-   e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
--  p->n = n;
--  p->e = e;
-+  RSA_set0_key(p, n, e, NULL);
-   if (pexp)
-     {
-       pk = RSA_new ();
--      pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
--      pk->n = BN_dup (n);
--      pk->e = BN_dup (e);
-+      RSA_set0_key(p, BN_dup(n),
-+		      BN_dup(e),
-+		      BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
-     }
-   mutex_enter (xenc_keys_mtx);
-   k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
- 
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
-  char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
-  char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
-   caddr_t ** array;
-   if (key->xek_type == DSIG_KEY_RSA)
-     {
-+      const BIGNUM *rsa_n, *rsa_e;
-+
-+      RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
-       xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
-       xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
-       xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
- 
--      xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
--      xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+      xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+      xenc_tag_add_child_BN (rsaexponent, rsa_e);
- 
-       xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
-       xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
-       xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
-       xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
-       DSA * dsa = key->ki.dsa.dsa_st;
-+      const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
- 
-+      DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+      DSA_get0_key(dsa, &dsa_pub_key, NULL);
- 
--      xenc_tag_add_child_BN (p, dsa->p);
--      xenc_tag_add_child_BN (p, dsa->q);
--      xenc_tag_add_child_BN (p, dsa->g);
--      xenc_tag_add_child_BN (p, dsa->pub_key);
-+      xenc_tag_add_child_BN (p, dsa_p);
-+      xenc_tag_add_child_BN (p, dsa_q);
-+      xenc_tag_add_child_BN (p, dsa_g);
-+      xenc_tag_add_child_BN (p, dsa_pub_key);
- 
-       xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
-       xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
- 
-   ret = dk_alloc_box (ikeyid->length, DV_BIN);
-   memcpy (ret, ikeyid->data, ikeyid->length);
--  M_ASN1_OCTET_STRING_free(ikeyid);
-+  ASN1_STRING_free(ikeyid);
-   return ret;
- }
- 
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
- 
-   ret = dk_alloc_box (ikeyid->length, DV_BIN);
-   memcpy (ret, ikeyid->data, ikeyid->length);
--  M_ASN1_OCTET_STRING_free(ikeyid);
-+  ASN1_STRING_free(ikeyid);
-   return ret;
- }
- 
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- 	sk_X509_EXTENSION_push(st_exts, ex);
-     }
-   X509_REQ_add_extensions(x, st_exts);
--  if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+  if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
-     {
-       pk = NULL; /* keep one in the xenc_key */
-       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
-       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
-       goto err;
-     }
--  switch (EVP_PKEY_type (cli_pk->type))
-+  switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
-     {
-       case EVP_PKEY_DSA:
- 	  sign_algoname = DSIG_DSA_SHA1_ALGO;
- 	  enc_algoname = XENC_DSA_ALGO;
--	  dsa = cli_pk->pkey.dsa;
-+	  dsa = EVP_PKEY_get0_DSA(cli_pk);
- 	  break;
-       case EVP_PKEY_RSA:
- 	  sign_algoname = DSIG_RSA_SHA1_ALGO;
- 	  enc_algoname = XENC_RSA_ALGO;
--	  rsa = cli_pk->pkey.rsa;
-+	  rsa = EVP_PKEY_get0_RSA(cli_pk);
- 	  break;
-       default:
- 	  *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
-   if (export_chain)
-     {
-       int i;
--      X509_STORE_CTX store_ctx;
--      X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
--      if (X509_verify_cert (&store_ctx) > 0)
--	chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+      X509_STORE_CTX *ctx;
-+      X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+      if (X509_verify_cert (ctx) > 0)
-+	chain = X509_STORE_CTX_get1_chain (ctx);
-       else
- 	{
- 	  const char *err_str;
--	  err_str = X509_verify_cert_error_string (store_ctx.error);
-+	  err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- 	  *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
--	  X509_STORE_CTX_cleanup (&store_ctx);
-+	  X509_STORE_CTX_cleanup (ctx);
- 	  goto err;
- 	}
--      X509_STORE_CTX_cleanup (&store_ctx);
-+      X509_STORE_CTX_cleanup (ctx);
-       if (chain)
- 	{
- 	  certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA *x = EVP_PKEY_get0_RSA(k);
- 	  PEM_write_bio_RSA_PUBKEY (b, x);
- 	}
- #endif
- #ifdef EVP_PKEY_DSA
--      if (k->type == EVP_PKEY_DSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- 	{
--	  DSA * x = k->pkey.dsa;
-+	  DSA * x = EVP_PKEY_get0_DSA(k);
- 	  PEM_write_bio_DSA_PUBKEY (b, x);
- 	}
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA * x = EVP_PKEY_get0_RSA(k);
- 	  i2d_RSA_PUBKEY_bio (b, x);
- 	}
- #endif
- #ifdef EVP_PKEY_DSA
--      if (k->type == EVP_PKEY_DSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- 	{
--	  DSA * x = k->pkey.dsa;
-+	  DSA * x = EVP_PKEY_get0_DSA(k);
- 	  i2d_DSA_PUBKEY_bio (b, x);
- 	}
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
- 
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
-   size_t buf_len, n;
-   caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
-   caddr_t ret;
--  caddr_t n = BN2binbox (x->n); /* modulus */
--  caddr_t e = BN2binbox (x->e); /* public exponent */
-+  caddr_t n;
-+  caddr_t e;
-+  const BIGNUM *rsa_n, *rsa_e;
-+
-+  RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+  n = BN2binbox (rsa_n); /* modulus */
-+  e = BN2binbox (rsa_e); /* public exponent */
-+
-   n = xenc_encode_base64_binbox (n, 1);
-   e = xenc_encode_base64_binbox (e, 1);
-   ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA * x = EVP_PKEY_get0_RSA(k);
- 	  ret = xenc_rsa_pub_magic (x);
- 	}
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
-   static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+  const BIGNUM *rsa_n, *rsa_e;
-   caddr_t ret;
-   int len, pos;
--  caddr_t n = BN2binbox (x->n); /* modulus */
--  caddr_t e = BN2binbox (x->e); /* public exponent */
-+  caddr_t n;
-+  caddr_t e;
-+
-+  RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+  n = BN2binbox (rsa_n); /* modulus */
-+  e = BN2binbox (rsa_e); /* public exponent */
-+
-   len = 11 + 8 + box_length (n) + box_length (e);
-   if (n[0] & 0x80)
-     len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
-     {
-       k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
--      if (k->type == EVP_PKEY_RSA)
-+      if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- 	{
--	  RSA * x = k->pkey.rsa;
-+	  RSA * x = EVP_PKEY_get0_RSA(k);
- 	  ret = xenc_rsa_pub_ssh_export (x);
- 	}
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
-       return NULL;
-     }
-   pk = NETSCAPE_SPKI_get_pubkey (spki);
--  if (!pk || pk->type != EVP_PKEY_RSA)
-+  if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
-     {
-       NETSCAPE_SPKI_free (spki);
-       *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
-   sec_check_dba ((QI*)qst, me);
-   in = BIO_new (BIO_s_mem ());
-   mutex_enter (xenc_keys_mtx);
--  certs = CA_certs->objs;
-+  certs = X509_STORE_get0_objects(CA_certs);
-   len = sk_X509_OBJECT_num (certs);
-   for (i = 0; i < len; i++)
-     {
-       X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
--      if (obj->type == X509_LU_X509)
-+      if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- 	{
--	  X509 *x = obj->data.x509;
-+	  X509 *x = X509_OBJECT_get0_X509(obj);
- 	  caddr_t itm;
- 	  int blen;
- 	  BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
- 
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
- 
- extern dk_mutex_t * xenc_keys_mtx;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+	HMAC_CTX *p;
-+
-+	p = calloc(1, sizeof(HMAC_CTX));
-+	if (!p)
-+		return p;
-+	HMAC_CTX_init(p);
-+	return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+	HMAC_CTX_cleanup(ctx);
-+	free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+				const BIGNUM **e, const BIGNUM **d)
-+{
-+	if (n != NULL)
-+		*n = r->n;
-+	if (e != NULL)
-+		*e = r->e;
-+	if (d != NULL)
-+		*d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+				    const BIGNUM **q)
-+{
-+	if (p != NULL)
-+		*p = r->p;
-+	if (q != NULL)
-+		*q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+	if (pkey->type != EVP_PKEY_RSA)
-+		return NULL;
-+	return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+			       const BIGNUM **priv_key)
-+{
-+	if (pub_key != NULL)
-+		*pub_key = dh->pub_key;
-+	if (priv_key != NULL)
-+		*priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+			       const BIGNUM **g)
-+{
-+	if (p != NULL)
-+		*p = dh->p;
-+	if (q != NULL)
-+		*q = dh->q;
-+	if (g != NULL)
-+		*g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+	if (pkey->type != EVP_PKEY_DSA)
-+		return NULL;
-+	return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+	/* If the fields p and g in d are NULL, the corresponding input
-+	 * parameters MUST be non-NULL.  q may remain NULL.
-+	 */
-+	if ((dh->p == NULL && p == NULL)
-+	    || (dh->g == NULL && g == NULL))
-+		return 0;
-+
-+	if (p != NULL) {
-+		BN_free(dh->p);
-+		dh->p = p;
-+	}
-+	if (q != NULL) {
-+		BN_free(dh->q);
-+		dh->q = q;
-+	}
-+	if (g != NULL) {
-+		BN_free(dh->g);
-+		dh->g = g;
-+	}
-+
-+	if (q != NULL) {
-+		dh->length = BN_num_bits(q);
-+	}
-+
-+	return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+	/* If the fields n and e in r are NULL, the corresponding input
-+	 * parameters MUST be non-NULL for n and e.  d may be
-+	 * left NULL (in case only the public key is used).
-+	 */
-+	if ((r->n == NULL && n == NULL)
-+	    || (r->e == NULL && e == NULL))
-+		return 0;
-+
-+	if (n != NULL) {
-+		BN_free(r->n);
-+		r->n = n;
-+	}
-+	if (e != NULL) {
-+		BN_free(r->e);
-+		r->e = e;
-+	}
-+	if (d != NULL) {
-+		BN_free(r->d);
-+		r->d = d;
-+	}
-+
-+	return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+				const BIGNUM **q, const BIGNUM **g)
-+{
-+	if (p != NULL)
-+		*p = d->p;
-+	if (q != NULL)
-+		*q = d->q;
-+	if (g != NULL)
-+		*g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+				const BIGNUM **priv_key)
-+{
-+	if (pub_key != NULL)
-+		*pub_key = d->pub_key;
-+	if (priv_key != NULL)
-+		*priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+	return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+	return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+	return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+	return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+	if (a == NULL || a->type != X509_LU_X509)
-+		return NULL;
-+	return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
- 
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
-   unsigned char * data;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char key_data[32 * 8];
-   unsigned char md [SHA256_DIGEST_LENGTH + 1];
-   unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
-       default:
- 	  return 0;
-     }
--
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
- 
-   if (hmac_len != SHA256_DIGEST_LENGTH)
-     GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char * data;
-   unsigned char key_data[3 * 8];
-   unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- 	  return 0;
-     }
- 
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
-   dk_free_box ((box_t) data);
- 
-   len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
-   unsigned char * data;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char key_data[32 * 8];
-   unsigned char md [SHA_DIGEST_LENGTH + 1];
-   unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- 	  return 0;
-     }
- 
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
- 
-   if (hmac_len != SHA_DIGEST_LENGTH)
-     GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   unsigned char * data;
-   unsigned char key_data[3 * 8];
-   unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- 	  return 0;
-     }
- 
-+  ctx = HMAC_CTX_new();
-+  if (!ctx)
-+	  return 0;
- 
-   data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
-   CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
-   FAILED
-     {
-       dk_free_box ((box_t) data);
-+      HMAC_CTX_free(ctx);
-       return 0;
-     }
-   END_READ_FAIL (ses_in);
- 
--  HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
--  HMAC_Update(&ctx, data, len);
--  HMAC_Final(&ctx, md, &hmac_len);
--  HMAC_cleanup(&ctx);
-+  HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+  HMAC_Update(ctx, data, len);
-+  HMAC_Final(ctx, md, &hmac_len);
-+  HMAC_CTX_free(ctx);
-   dk_free_box ((box_t) data);
- 
-   len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
-   caddr_t outbuf_beg;
-   int len;
-   caddr_t encoded_out;
--  EVP_CIPHER_CTX ctx;
-+  EVP_CIPHER_CTX *ctx;
-   unsigned char * ivec = &key->ki.aes.iv[0];
- 
-   CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
-   END_READ_FAIL (ses_in);
- 
- #if 1
--  EVP_CIPHER_CTX_init(&ctx);
-+  ctx = EVP_CIPHER_CTX_new();
-   outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
-   memcpy (outbuf_beg, ivec, 16);
-   outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
-   switch (key->ki.aes.bits)
-     {
-     case 128:
--      EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+      EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-       break;
-     case 192:
--      EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+      EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-       break;
-     case 256:
--      EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+      EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-       break;
-     default:
-       GPF_T1 ("Unsupported key size");
-     }
--  if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+  if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-     {
--      EVP_CIPHER_CTX_cleanup(&ctx);
-       dk_free_box (text);
-       dk_free_box (outbuf_beg);
-       xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
-       xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
-       } */
-   /* outlen += tmplen; */
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+  EVP_CIPHER_CTX_free(ctx);
- 
- #else
-   outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
-   int len = 0;
-   int keysize;
-   RSA * rsa = key->xek_private_rsa;
-+  const BIGNUM *p, *q;
- 
-   if (!seslen)
-     {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
-       xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
-       return 0;
-     }
-+  RSA_get0_factors(rsa, &p, &q);
-   if (!rsa ||
--      !rsa->p ||
--      !rsa->q)
-+      !p || !q)
-     {
-       if (key->xek_x509_KI)
- 	key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
--  CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+	CRYPTO_malloc_init ();
-+#else
-+	OPENSSL_malloc_init();
-+#endif
-   ERR_load_crypto_strings();
-   OpenSSL_add_all_algorithms();
- 
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- 		  log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- 		  break;
- 		}
--	      CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+	      X509_up_ref(k->xek_x509);
-               tok = strtok_r (NULL, ",", &tok_s);
- 	    }
- 	  dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
-   }
- #endif
- 
--  SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+  SSLeay_add_all_algorithms();
-+#else
-+  OpenSSL_add_all_algorithms();
-+#endif
-   PKCS12_PBE_add ();		/* stub */
- 
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
-       else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- 	opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
-       else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- 	opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
-       else if (!strcasecmp (name, "ALL"))
- 	opt = SSL_PROTOCOL_ALL;
-       else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c	2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c	2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
-       if (!ses2->ses_file->ses_max_blocks_in_mem)
- 	{
- 	  char fname[PATH_MAX + 1];
-+          int fd;
- 	  snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
--	  mktemp (fname);
-+	  fd = mkstemp (fname);
-+          close (fd);
- 
- #if defined (WIN32)
- # define OPEN_FLAGS  	  O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..263ce542d8df 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,19 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.10
+revision=1
 archs="x86_64* aarch64* ppc64le*"
 build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+configure_args="--without-internal-zlib --with-readline --with-layout=debian"
+hostmakedepends="automake libtool flex gperf net-tools which"
 makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl wget"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
+license="GPL-2.0-only"
+homepage="https://vos.openlinksw.com/owiki/wiki/VOS/"
 distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz"
-checksum=3e4807e94098b8265f8cf00867d1215bb1e9d0d274878e59a420742d2de471c2
+checksum=0379c60cb2ea4fed70ee3ac3f808e5cc9298e48ddcd8d0f4d8cd92711a43e7e5
 # cannot execute binary file: Exec format error
 nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
 
@@ -31,9 +32,7 @@ pre_configure() {
 }
 
 do_configure() {
-	./configure ${configure_args} --without-internal-zlib --with-readline \
-		--with-layout=debian \
-		--program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
+	./configure ${configure_args} --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
 }
 
 post_install() {
@@ -45,8 +44,6 @@ post_install() {
 	rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
 	rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
 	rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
-	# remove static libs.
-	rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
 }
 
 virtuoso-base_package() {
@@ -61,7 +58,7 @@ virtuoso-base_package() {
 			install -Dm755 ${wrksrc}/binsrc/tests/$bin \
 				${PKGDESTDIR}/usr/bin/${bin}-vt
 		done
-		# Remove static libs and libtool archives.
-		rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+		# Remove libtool archives
+		rm -f ${PKGDESTDIR}/usr/lib/*.la
 	}
 }

From fb8ac7a2b0d8427dfe521054b34433e6b3d62398 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 01:04:41 +0530
Subject: [PATCH 1343/1854] clojure: update to 1.11.1.1347.

---
 srcpkgs/clojure/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 7259f25e6e34..9050c50adcaf 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.11.1.1273
+version=1.11.1.1347
 revision=1
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=5f8bafcf24bd148ac9bcbe60a8e7b8093c9ed8eb8e0f387199770e38f0e40ce6
+checksum=d5e6c03e4eb8b49b7f0a9b77a4a7cc4cde7460004a3df96a1b4e797f842ebfe3
 
 do_install() {
 	vmkdir /usr/lib/clojure

From a0fb19440a5fc864d7d493f7bef1341611fca14a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 01:11:41 +0530
Subject: [PATCH 1344/1854] python3-keyring: update to 24.2.0.

---
 srcpkgs/python3-keyring/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 24eb8790ee38..6280ed9d4a2e 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=24.0.1
+version=24.2.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://pypi.org/project/keyring/"
 changelog="https://raw.githubusercontent.com/jaraco/keyring/main/NEWS.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=f77da625a448baa77906b099be9feaa29aa90979547506ac1ec422926085cee0
+checksum=ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509
 make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
 
 pre_check() {

From 2e88f3e2b55502de7f600a06619667ac2c5ebc46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 23:27:50 +0200
Subject: [PATCH 1345/1854] python3-openpyxl: update to 3.1.2.

---
 srcpkgs/python3-openpyxl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-openpyxl/template b/srcpkgs/python3-openpyxl/template
index af6944c3614c..a37d80f18407 100644
--- a/srcpkgs/python3-openpyxl/template
+++ b/srcpkgs/python3-openpyxl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-openpyxl'
 pkgname=python3-openpyxl
-version=3.0.10
+version=3.1.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="MIT"
 homepage="https://openpyxl.readthedocs.io/"
 distfiles="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${version}/openpyxl-${version}.tar.bz2"
-checksum=265ae51674a0b30d5394a437a2c96c520c6cfcaf479a4d3e0f75d829d172664e
+checksum=421e13e7004f6fee7cf84c1b9fa738615bf409ff2b57e2227be75452f7608c12
 
 post_install() {
 	vlicense LICENCE.rst

From 9fc0083d53b121daf496a72d5c48c5658f0b2b69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 23:31:43 +0200
Subject: [PATCH 1346/1854] python3-openai: update to 0.27.8.

---
 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 22adf52a0000..685bbde3e4bc 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.27.5
+version=0.27.8
 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="549c2dab52a49ee074b13edef672ed872915bf5d8852a2750377937380c45285"
+checksum=eef6c823200e2dd5ad8e4c020c1054559dd1c41cc308e146db886543abe79dd1
 make_check=extended # Requires valid API key
 
 post_install() {

From 544275709dadf65da66d1e78ac18e02532ed16d7 Mon Sep 17 00:00:00 2001
From: firefly-cpp <iztok@iztok-jr-fister.eu>
Date: Tue, 23 May 2023 15:00:44 +0200
Subject: [PATCH 1347/1854] New package: python3-niapy-2.0.5

Closes: https://github.com/void-linux/void-packages/pull/44042
---
 srcpkgs/python3-niapy/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-niapy/template

diff --git a/srcpkgs/python3-niapy/template b/srcpkgs/python3-niapy/template
new file mode 100644
index 000000000000..6dfecf858417
--- /dev/null
+++ b/srcpkgs/python3-niapy/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-niapy'
+pkgname=python3-niapy
+version=2.0.5
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-numpy python3-openpyxl python3-pandas python3-matplotlib"
+checkdepends="python3-pytest $depends"
+short_desc="Python microframework for building nature-inspired algorithms"
+maintainer="firefly-cpp <iztok@iztok-jr-fister.eu>"
+license="MIT"
+homepage="https://github.com/NiaOrg/NiaPy"
+distfiles="https://github.com/NiaOrg/NiaPy/archive/${version}.tar.gz"
+checksum=965b2ef884a24bbd17c3f1218a1ffc9b052c0201638dafb12a9e6452d99057c2
+
+post_install() {
+	vlicense LICENSE
+}

From da8c0940a4a209c731a070755809739eb50020e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 25 Jun 2023 23:42:49 +0200
Subject: [PATCH 1348/1854] srcpkgs: orphan packages from inactive maintainer

---
 srcpkgs/arandr/template  | 2 +-
 srcpkgs/httrack/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template
index cc4961dc9915..0d87dbe6e04e 100644
--- a/srcpkgs/arandr/template
+++ b/srcpkgs/arandr/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext python3-setuptools python3-docutils"
 depends="python3-gobject gtk+3 xrandr"
 checkdepends="${depends}"
 short_desc="Graphical frontend for XRandR"
-maintainer="mid-kid <esteve.varela@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://christian.amsuess.com/tools/arandr/"
 distfiles="https://christian.amsuess.com/tools/arandr/files/arandr-${version}.tar.gz"
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 31dcf7ebe1e9..c8cb9300c79d 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 makedepends="zlib-devel openssl-devel"
 short_desc="Free and easy-to-use offline browser utility"
-maintainer="mid-kid <esteve.varela@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"

From e487cd8afa948aeb63cab76436054aa2416fa09d Mon Sep 17 00:00:00 2001
From: AnErrupTion <anerruption@disroot.org>
Date: Sun, 25 Jun 2023 23:18:03 +0200
Subject: [PATCH 1349/1854] bochs: update to 2.7.

Closes: #44632 [via git-merge-pr]
---
 srcpkgs/bochs/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/bochs/template b/srcpkgs/bochs/template
index da32042567aa..a6420800900c 100644
--- a/srcpkgs/bochs/template
+++ b/srcpkgs/bochs/template
@@ -1,17 +1,21 @@
 # Template file for 'bochs'
 pkgname=bochs
-version=2.6.11
+version=2.7
 revision=1
 build_style=gnu-configure
-configure_args="--enable-debugger --enable-disasm --disable-readline"
+configure_args="--with-sdl2 --enable-all-optimizations --enable-e1000
+ --disable-readline --enable-x86-64 --enable-smp --enable-avx --enable-evex
+ --enable-x86-debugger --enable-usb --enable-usb-ohci --enable-usb-ehci
+ --enable-usb-xhci --enable-debugger --enable-debugger-gui"
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libXrandr-devel gtk+-devel"
-short_desc="Highly portable open source IA-32 (x86) PC emulator"
-maintainer="mid-kid <esteve.varela@gmail.com>"
+makedepends="libX11-devel libXrandr-devel SDL2-devel"
+short_desc="Highly portable open source x86(_64) PC emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
-homepage="http://bochs.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/bochs/bochs-${version}.tar.gz"
-checksum=63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862
+homepage="https://bochs.sourceforge.net/"
+changelog="https://raw.githubusercontent.com/bochs-emu/Bochs/master/bochs/CHANGES"
+distfiles="${SOURCEFORGE_SITE}/bochs/bochs-${version}.tar.gz"
+checksum=a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a
 
 pre_build() {
 	vsed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile

From f0e0516efbe7f3b1f13a8380c8d538a05cb44364 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 16:11:16 -0400
Subject: [PATCH 1350/1854] spdx-licenses-list: update to 3.21.

---
 common/scripts/check-custom-licenses |  9 +++++++++
 common/travis/license.lst            | 28 ++++++++++++++++++++++++++++
 srcpkgs/spdx-licenses-list/template  |  7 ++++---
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 common/scripts/check-custom-licenses

diff --git a/common/scripts/check-custom-licenses b/common/scripts/check-custom-licenses
new file mode 100755
index 000000000000..da21c58abdd0
--- /dev/null
+++ b/common/scripts/check-custom-licenses
@@ -0,0 +1,9 @@
+#!/bin/bash
+# checks for licenses that are no longer custom in packages
+
+mapfile -t licenses < common/travis/license.lst
+
+for lic in "${licenses[@]}"; do
+	grep -rl "custom:$lic"'[,"]' --include=template srcpkgs \
+		| cut -d/ -f2 | xargs -rn1 printf "%s: $lic is no longer custom\n"
+done
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 649728a15e51..aab1ca5f69d6 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -22,6 +22,8 @@ APSL-1.0
 APSL-1.1
 APSL-1.2
 APSL-2.0
+ASWF-Digital-Assets-1.0
+ASWF-Digital-Assets-1.1
 Abstyles
 AdaCore-doc
 Adobe-2006
@@ -37,9 +39,11 @@ Artistic-1.0-Perl
 Artistic-1.0-cl8
 Artistic-1.0
 Artistic-2.0
+Asterisk-exception
 Autoconf-exception-2.0
 Autoconf-exception-3.0
 Autoconf-exception-generic
+Autoconf-exception-macro
 BSD-1-Clause
 BSD-2-Clause-Patent
 BSD-2-Clause-Views
@@ -75,6 +79,7 @@ BitTorrent-1.1
 Bitstream-Charter
 Bitstream-Vera
 BlueOak-1.0.0
+Boehm-GC
 Bootloader-exception
 Borceux
 Brian-Gladman-3-Clause
@@ -129,6 +134,7 @@ CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
 CC-BY-SA-3.0-DE
+CC-BY-SA-3.0-IGO
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -234,6 +240,7 @@ GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
 GPL-2.0-or-later
+GPL-3.0-interface-exception
 GPL-3.0-linking-exception
 GPL-3.0-linking-source-exception
 GPL-3.0-only
@@ -265,6 +272,7 @@ ISC
 ImageMagick
 Imlib2
 Info-ZIP
+Inner-Net-2.0
 Intel-ACPI
 Intel
 Interbase-1.0
@@ -286,6 +294,7 @@ LGPL-3.0-linking-exception
 LGPL-3.0-only
 LGPL-3.0-or-later
 LGPLLR
+LLGPL
 LLVM-exception
 LOOP
 LPL-1.0
@@ -298,6 +307,7 @@ LPPL-1.3c
 LZMA-SDK-9.11-to-9.20
 LZMA-SDK-9.22
 LZMA-exception
+Latex2e-translated-notice
 Latex2e
 Leptonica
 LiLiQ-P-1.1
@@ -306,10 +316,14 @@ LiLiQ-Rplus-1.1
 Libpng
 Libtool-exception
 Linux-OpenIB
+Linux-man-pages-1-para
+Linux-man-pages-copyleft-2-para
+Linux-man-pages-copyleft-var
 Linux-man-pages-copyleft
 Linux-syscall-note
 MIT-0
 MIT-CMU
+MIT-Festival
 MIT-Modern-Variant
 MIT-Wu
 MIT-advertising
@@ -344,6 +358,7 @@ NGPL
 NICTA-1.0
 NIST-PD-fallback
 NIST-PD
+NIST-Software
 NLOD-1.0
 NLOD-2.0
 NLPL
@@ -398,8 +413,10 @@ OLDAP-2.5
 OLDAP-2.6
 OLDAP-2.7
 OLDAP-2.8
+OLFL-1.3
 OML
 OPL-1.0
+OPL-UK-3.0
 OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
@@ -443,6 +460,7 @@ SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
+SGP4
 SHL-0.5
 SHL-0.51
 SHL-2.0
@@ -482,6 +500,7 @@ TPL-1.0
 TTWL
 TU-Berlin-1.0
 TU-Berlin-2.0
+TermReadKey
 UCAR
 UCL-1.0
 UPL-1.0
@@ -489,6 +508,7 @@ Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
 Universal-FOSS-exception-1.0
+UnixCrypt
 Unlicense
 VOSTROM
 VSL-1.0
@@ -498,13 +518,16 @@ W3C-20150513
 W3C
 WTFPL
 Watcom-1.0
+Widget-Workshop
 Wsuipa
 WxWindows-exception-3.1
 X11-distribute-modifications-variant
 X11
 XFree86-1.1
 XSkat
+Xdebug-1.03
 Xerox
+Xfig
 Xnet
 YPL-1.0
 YPL-1.1
@@ -521,6 +544,7 @@ bzip2-1.0.6
 checkmk
 copyleft-next-0.3.0
 copyleft-next-0.3.1
+cryptsetup-OpenSSL-exception
 curl
 deprecated_AGPL-1.0
 deprecated_AGPL-3.0
@@ -554,6 +578,7 @@ deprecated_bzip2-1.0.5
 deprecated_eCos-2.0
 deprecated_wxWindows
 diffmark
+dtoa
 dvipdfm
 eCos-exception-2.0
 eGenix
@@ -565,9 +590,11 @@ gnuplot
 i2p-gpl-java-exception
 iMatix
 libpng-2.0
+libpri-OpenH323-exception
 libselinux-1.0
 libtiff
 libutil-David-Nugent
+metamail
 mif-exception
 mpi-permissive
 mpich2
@@ -577,6 +604,7 @@ psfrag
 psutils
 snprintf
 u-boot-exception-2.0
+vsftpd-openssl-exception
 w3m
 x11vnc-openssl-exception
 xinetd
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index 2fc2aba58140..bf5ec7b0f9c8 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -1,15 +1,16 @@
 # Template file for 'spdx-licenses-list'
-
 # common/travis/license.lst should be updated in sync with this package
+# run common/scripts/check-custom-licenses after updating to find
+# license fields in packages that can have 'custom:' removed
 pkgname=spdx-licenses-list
-version=3.20
+version=3.21
 revision=1
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=fba795a26f8d646340b0cef2d22c3fa490158809636b225c7a0c2214a91c156f
+checksum=7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149
 
 do_install() {
 	vmkdir usr/share/spdx

From ee43178d8233b3e5d3439f8706fbaefaee829f5a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 16:11:40 -0400
Subject: [PATCH 1351/1854] tk: TCL license is no longer custom

---
 srcpkgs/tk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
index c40db4cc081e..c91a50aa97d6 100644
--- a/srcpkgs/tk/template
+++ b/srcpkgs/tk/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends="zlib-devel tcl-devel libXext-devel libXScrnSaver-devel libXft-devel"
 short_desc="TK graphical user interface toolkit for TCL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:TCL"
+license="TCL"
 homepage="http://www.tcl.tk"
 distfiles="${SOURCEFORGE_SITE}/tcl/tk${version}-src.tar.gz"
 checksum=2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675

From 49255955d91430d3da795e7bf529e09ae0d822f9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Jun 2023 16:12:26 -0400
Subject: [PATCH 1352/1854] kwallet-cli: MirOS license is no longer custom

---
 srcpkgs/kwallet-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwallet-cli/template b/srcpkgs/kwallet-cli/template
index 563e8eeb7bb7..4da38a361a2c 100644
--- a/srcpkgs/kwallet-cli/template
+++ b/srcpkgs/kwallet-cli/template
@@ -9,7 +9,7 @@ makedepends="kwallet-devel qt5-devel"
 depends="mksh"
 short_desc="Command-line interface to the KDE Wallet"
 maintainer="Louis Dupré Bertoni <contact@louis.xyz>"
-license="custom:MirOS, LGPL-3.0-or-later"
+license="MirOS, LGPL-3.0-or-later"
 homepage="https://www.mirbsd.org/kwalletcli.htm"
 distfiles="http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-${version}.tar.gz"
 checksum=f228e5b179f6eb92289b9635382e676990dd58cd193ce42b61d3150c8a06b12d

From 7d2642f72ab7546128856b3e674f62bd2664f938 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 6 Feb 2021 20:22:15 -0800
Subject: [PATCH 1353/1854] New package: fenrir-1.9.8

Closes: #44417 [via git-merge-pr]
---
 srcpkgs/fenrir/files/fenrir/run |  4 ++++
 srcpkgs/fenrir/template         | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/fenrir/files/fenrir/run
 create mode 100644 srcpkgs/fenrir/template

diff --git a/srcpkgs/fenrir/files/fenrir/run b/srcpkgs/fenrir/files/fenrir/run
new file mode 100644
index 000000000000..5b1548310477
--- /dev/null
+++ b/srcpkgs/fenrir/files/fenrir/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec fenrir ${OPTS}
diff --git a/srcpkgs/fenrir/template b/srcpkgs/fenrir/template
new file mode 100644
index 000000000000..1a728e130e81
--- /dev/null
+++ b/srcpkgs/fenrir/template
@@ -0,0 +1,19 @@
+# Template file for 'fenrir'
+pkgname=fenrir
+version=1.9.8
+revision=1
+build_style=python3-module
+hostmakedepends="python3 python3-setuptools"
+depends="python3-evdev python3-daemonize python3-dbus python3-pyudev
+ python3-pexpect python3-pyte python3-xdg"
+checkdepends="python3-pip ${depends}"
+short_desc="User space console screen reader written in python3"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
+license="LGPL-3.0-only"
+homepage="https://github.com/chrys87/fenrir"
+distfiles="https://github.com/chrys87/fenrir/archive/refs/tags/${version}.tar.gz"
+checksum=08732583eb15eb2b6003f259dfb62e75959106271e28f9d24144830e743527b1
+
+post_install() {
+	vsv fenrir
+}

From 5194ce906afd5d9e007e2d1732448261fabdbd3a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 26 Jun 2023 00:58:44 +0300
Subject: [PATCH 1354/1854] New package: text-engine-0.1.1

---
 common/shlibs                                 |  1 +
 srcpkgs/text-engine-demo                      |  1 +
 srcpkgs/text-engine-devel                     |  1 +
 .../patches/meson-set-soversion.patch         | 23 ++++++++++++++
 srcpkgs/text-engine/template                  | 31 +++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/text-engine-demo
 create mode 120000 srcpkgs/text-engine-devel
 create mode 100644 srcpkgs/text-engine/patches/meson-set-soversion.patch
 create mode 100644 srcpkgs/text-engine/template

diff --git a/common/shlibs b/common/shlibs
index 1cc1b6815e7f..39c868b03148 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4278,3 +4278,4 @@ libgsoapssl++-2.8.124.so gsoap-2.8.124_1
 libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
+libtext-engine-0.1.so.0 text-engine-0.1.1_1
diff --git a/srcpkgs/text-engine-demo b/srcpkgs/text-engine-demo
new file mode 120000
index 000000000000..272d32cfd5a0
--- /dev/null
+++ b/srcpkgs/text-engine-demo
@@ -0,0 +1 @@
+text-engine
\ No newline at end of file
diff --git a/srcpkgs/text-engine-devel b/srcpkgs/text-engine-devel
new file mode 120000
index 000000000000..272d32cfd5a0
--- /dev/null
+++ b/srcpkgs/text-engine-devel
@@ -0,0 +1 @@
+text-engine
\ No newline at end of file
diff --git a/srcpkgs/text-engine/patches/meson-set-soversion.patch b/srcpkgs/text-engine/patches/meson-set-soversion.patch
new file mode 100644
index 000000000000..6935d0c0b9ea
--- /dev/null
+++ b/srcpkgs/text-engine/patches/meson-set-soversion.patch
@@ -0,0 +1,23 @@
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 20 Apr 2022 12:39:45 -0400
+Subject: meson: set soversion
+
+This sets up the symlinked shared library as expected
+
+https://github.com/mjakeman/text-engine/pull/9
+---
+ src/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/meson.build b/src/meson.build
+index faff7ad..92e0a0b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -47,6 +47,7 @@ text_engine_deps = [
+ text_engine_lib = shared_library('text-engine-' + api_version,
+   text_engine_sources,
+   dependencies: text_engine_deps,
++  soversion: 0,
+   install: true,
+ )
+ 
diff --git a/srcpkgs/text-engine/template b/srcpkgs/text-engine/template
new file mode 100644
index 000000000000..fe201dfd92f3
--- /dev/null
+++ b/srcpkgs/text-engine/template
@@ -0,0 +1,31 @@
+# Template file for 'text-engine'
+pkgname=text-engine
+version=0.1.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="libadwaita-devel"
+short_desc="Lightweight rich text framework for GTK"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/mjakeman/text-engine"
+distfiles="https://github.com/mjakeman/text-engine/archive/v${version}.tar.gz"
+checksum=cf540d2c0150a46e8ec81c4532550357707c5d07b6116dc52e3869b1902f515f
+
+text-engine-devel_package() {
+	depends="gtk4-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+text-engine-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/text-engine-demo
+	}
+}

From 3f84baf4b947ad1c52c3a6be2f011001a9dc02ac Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 26 Jun 2023 01:00:11 +0300
Subject: [PATCH 1355/1854] New package: extension-manager-0.4.2

---
 .../patches/disable-backtrace.patch           | 198 ++++++++++++++++++
 srcpkgs/extension-manager/template            |  21 ++
 2 files changed, 219 insertions(+)
 create mode 100644 srcpkgs/extension-manager/patches/disable-backtrace.patch
 create mode 100644 srcpkgs/extension-manager/template

diff --git a/srcpkgs/extension-manager/patches/disable-backtrace.patch b/srcpkgs/extension-manager/patches/disable-backtrace.patch
new file mode 100644
index 000000000000..9f67a043388a
--- /dev/null
+++ b/srcpkgs/extension-manager/patches/disable-backtrace.patch
@@ -0,0 +1,198 @@
+diff -ru a/src/main.c b/src/main.c
+--- a/src/main.c	2023-05-02 04:01:31.000000000 +0300
++++ b/src/main.c	2023-05-25 03:19:55.506674695 +0300
+@@ -17,77 +17,21 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-#include <signal.h>
+ 
+ #include "exm-config.h"
+ #include "exm-application.h"
+ 
+-#include "exm-backtrace.h"
+-#include "exm-error-dialog.h"
+-
+-#define APP_URL "https://github.com/mjakeman/extension-manager"
+-
+-static int pipe_fd[2];
+-
+-void
+-handler (int sig)
+-{
+-    const char *backtrace;
+-
+-    g_print ("A fatal error has occurred.\n");
+-    g_print ("Please report this to '%s' and attach the following crash report:\n\n", APP_URL);
+-
+-    g_print ("START BACKTRACE\n\n");
+-    backtrace = exm_backtrace_print ();
+-    g_print ("%s\n", backtrace);
+-    g_print ("END BACKTRACE\n\n");
+-
+-    if (backtrace)
+-    {
+-        // Send backtrace string over pipe
+-        write (pipe_fd[1], backtrace, strlen (backtrace));
+-    }
+-
+-    close (pipe_fd[1]);
+-
+-    // Terminate process
+-    signal (sig, SIG_DFL);
+-    kill (getpid (), sig);
+-}
+-
+-static void
+-run_crash_reporter (const char *error_text)
+-{
+-    adw_init ();
+-
+-    // Setup CSS
+-    GdkDisplay *display = gdk_display_get_default ();
+-    GtkCssProvider *provider = gtk_css_provider_new ();
+-    gtk_css_provider_load_from_resource (provider, "/com/mattjakeman/ExtensionManager/style.css");
+-    gtk_style_context_add_provider_for_display (display, GTK_STYLE_PROVIDER (provider),
+-                                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+-
+-    // Show error dialog with provided string
+-	ExmErrorDialog *err_dialog;
+-    err_dialog = exm_error_dialog_new (error_text);
+-
+-    gtk_window_present (GTK_WINDOW (err_dialog));
+-
+-    // Iterate main loop until closed
+-    while (g_list_model_get_n_items (gtk_window_get_toplevels ()) > 0)
+-        g_main_context_iteration (NULL, TRUE);
+-}
+-
+-static int
+-run_app (int   argc,
+-         char *argv[])
++int
++main (int   argc,
++      char *argv[])
+ {
+ 	g_autoptr(ExmApplication) app = NULL;
+-    int ret;
++	int ret;
+ 
+-    /* Setup backtrace service */
+-    exm_backtrace_init (argv[0]);
+-    signal (SIGSEGV, handler);
++	/* Set up gettext translations */
++	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
++	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++	textdomain (GETTEXT_PACKAGE);
+ 
+ 	/*
+ 	 * Create a new GtkApplication. The application manages our main loop,
+@@ -110,74 +54,3 @@
+ 
+ 	return ret;
+ }
+-
+-int
+-main (int   argc,
+-      char *argv[])
+-{
+-    gboolean use_crash_reporter;
+-    int pid;
+-
+-    // Either side of the pipe
+-
+-    use_crash_reporter = TRUE;
+-
+-	// Set up gettext translations
+-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+-	textdomain (GETTEXT_PACKAGE);
+-
+-    // Attempt to create the pipe
+-    if (pipe (pipe_fd) == -1)
+-        use_crash_reporter = FALSE;
+-
+-    // Run app normally
+-    if (!use_crash_reporter)
+-        return run_app (argc, argv);
+-
+-    // Run the GUI as a subprocess of the crash reporter. Depending
+-    // on the exit code, we can display the crash dialog.
+-    pid = fork();
+-
+-    // Child process
+-    if (pid == 0)
+-    {
+-        // Close reading end of pipe
+-        close (pipe_fd[0]);
+-
+-        // Run app normally
+-        return run_app (argc, argv);
+-    }
+-
+-    // Parent process
+-    else
+-    {
+-        char ch;
+-        GString *string_builder;
+-        char *error_text;
+-
+-        // Close the writing end of pipe
+-        close (pipe_fd [1]);
+-
+-        string_builder = g_string_new ("");
+-
+-        while (read (pipe_fd[0], &ch, 1) != 0)
+-            g_string_append_c (string_builder, ch);
+-
+-        // Wait for child to finish
+-        waitpid (pid, 0, 0);
+-        close (pipe_fd[0]);
+-
+-        error_text = g_string_free (string_builder, FALSE);
+-
+-        if (strlen (error_text) > 0)
+-        {
+-            // An error has occurred
+-            run_crash_reporter (error_text);
+-            g_free (error_text);
+-            return -1;
+-        }
+-
+-        return 0;
+-    }
+-}
+diff -ru a/src/meson.build b/src/meson.build
+--- a/src/meson.build	2023-05-02 04:01:31.000000000 +0300
++++ b/src/meson.build	2023-05-25 03:13:52.478385702 +0300
+@@ -24,12 +24,12 @@
+   'exm-upgrade-assistant.c',
+   'exm-upgrade-result.c',
+   'exm-install-button.c',
+-  'exm-backtrace.c',
++  #'exm-backtrace.c',
+   'exm-utils.c'
+ ]
+ 
+ cc = meson.get_compiler('c')
+-libbacktrace_dep = cc.find_library('backtrace', required: true)
++#libbacktrace_dep = cc.find_library('backtrace', required: true)
+ 
+ exm_deps = [
+   dependency('gtk4'),
+@@ -38,7 +38,7 @@
+   dependency('json-glib-1.0'),
+   dependency('libsoup-3.0'),
+   dependency('text-engine-0.1'),
+-  libbacktrace_dep
++  #libbacktrace_dep
+ ]
+ 
+ gnome = import('gnome')
+@@ -78,4 +78,4 @@
+ executable('extension-manager', exm_sources,
+   dependencies: exm_deps,
+   install: true,
+-)
+\ No newline at end of file
++)
diff --git a/srcpkgs/extension-manager/template b/srcpkgs/extension-manager/template
new file mode 100644
index 000000000000..34d373819941
--- /dev/null
+++ b/srcpkgs/extension-manager/template
@@ -0,0 +1,21 @@
+# Template file for 'extension-manager'
+pkgname=extension-manager
+version=0.4.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils
+ glib-devel gtk-update-icon-cache"
+makedepends="libadwaita-devel text-engine-devel"
+short_desc="Utility for browsing and installing GNOME Shell Extensions"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mjakeman/extension-manager"
+changelog="https://raw.githubusercontent.com/mjakeman/extension-manager/master/NEWS"
+distfiles="https://github.com/mjakeman/extension-manager/archive/v${version}.tar.gz"
+checksum=c9443755aab4340b6bb31b9ab18d49fdf65d14391bce80e6262cc7ba27e5eab0
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		export GI_TYPELIB_PATH="${XBPS_CROSS_BASE}/usr/lib/girepository-1.0"
+	fi
+}

From 3bebc6a0eee1ecd7f5cb247394ae020a670ad4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 30 May 2023 14:11:21 -0300
Subject: [PATCH 1356/1854] singular: update to 4.3.2p2.

---
 ...773d6c9e2f1d2593a28bc68b7eeab54ed529.patch | 39 +++++++++++++++++++
 srcpkgs/singular/template                     |  6 +--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch

diff --git a/srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch b/srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch
new file mode 100644
index 000000000000..425f2c659a9f
--- /dev/null
+++ b/srcpkgs/singular/patches/8d54773d6c9e2f1d2593a28bc68b7eeab54ed529.patch
@@ -0,0 +1,39 @@
+From 8d54773d6c9e2f1d2593a28bc68b7eeab54ed529 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+Date: Mon, 5 Jun 2023 16:40:16 +0200
+Subject: [PATCH] use DESTDIR for "make install"
+
+---
+ Makefile.am | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 922b21b734..2f1e5a7ec8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,17 +16,17 @@ bin_SCRIPTS = libsingular-config
+ 
+ install-data-local:
+ 	if test -e $(srcdir)/doc/doc.tbz2; then\
+-	   test -e $(prefix)$(datadir) || mkdir -p $(prefix)$(datadir);\
+-	   test -e $(prefix)$(datadir)/info || mkdir $(prefix)$(datadir)/info;\
+-	   test -e $(prefix)$(datadir)/singular || mkdir $(prefix)$(datadir)/singular;\
+-	   test -e $(prefix)$(htmldir) || mkdir -p $(prefix)$(htmldir);\
+-	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(prefix)$(htmldir);tar -jx --no-same-owner -f -));\
+-	   mv  $(prefix)$(htmldir)/singular.info  $(prefix)$(datadir)/info/.;\
+-	   mv  $(prefix)$(htmldir)/singular.idx  $(prefix)$(datadir)/singular/.;\
++	   test -e $(DESTDIR)$(datadir) || mkdir -p $(DESTDIR)$(datadir);\
++	   test -e $(DESTDIR)$(datadir)/info || mkdir $(DESTDIR)$(datadir)/info;\
++	   test -e $(DESTDIR)$(datadir)/singular || mkdir $(DESTDIR)$(datadir)/singular;\
++	   test -e $(DESTDIR)$(htmldir) || mkdir -p $(DESTDIR)$(htmldir);\
++	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(htmldir);tar -jx --no-same-owner -f -));\
++	   mv  $(DESTDIR)$(htmldir)/singular.info  $(DESTDIR)$(datadir)/info/.;\
++	   mv  $(DESTDIR)$(htmldir)/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
+ 	fi
+ 
+ uninstall-local:
+-	-(cd $(prefix)$(datadir); rm -rf singular info/singular.info)
++	-(cd $(prefix); rm -rf singular info/singular.info)
+ 
+ configheaderdir = ${includedir}/singular
+ nodist_configheader_HEADERS = singularconfig.h
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index 0481f6cb1e11..1beb36297a03 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,6 +1,6 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.2
+version=4.3.2p2
 revision=1
 _majver=${version%p*}
 build_style=gnu-configure
@@ -13,14 +13,14 @@ configure_args="--with-readline=ncurses
  --without-python
  --with-libparse
  ac_cv_lib_cddgmp_dd_free_global_constants=yes"
-hostmakedepends="perl tar doxygen"
+hostmakedepends="perl tar doxygen automake"
 makedepends="flintlib-devel cddlib-devel readline-devel graphviz"
 short_desc="Computer algebra system for polynomial computations"
 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=3fd565d1bd4265fa8ba7cc189137a36d9daf9939b5bb411466c2028d9191f6db
+checksum=660ae93ace79db4209203770d93baf16b5b741dc26b6bae06c9b2c98ad188df1
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"

From 841bc98d55aa4000e6507ea58fdb177c9c91cf4c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 25 Jun 2023 13:19:10 +0200
Subject: [PATCH 1357/1854] element-desktop: update to 1.11.34.

---
 ...web_0001-remove-dependency-on-sentry.patch | 34 ++++++-------------
 srcpkgs/element-desktop/template              |  6 ++--
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index e64a3bbb6b37..9919c3963c09 100644
--- a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,47 +1,38 @@
-From 83e08eeed782ba5f0b63f10b27829d031aec74d1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 11 Dec 2021 21:22:44 +0100
-Subject: [PATCH] remove dependency on sentry
-
-This is unused and breaks ppc64 because it downlaods binaries.
----
- package.json      |  1 -
- webpack.config.js | 11 -----------
- 2 files changed, 12 deletions(-)
-
 diff --git a/package.json b/package.json
-index 6d740b00b..e94240911 100644
+index 02a59ee45..b5dd89a2f 100644
 --- a/package.json
 +++ b/package.json
-@@ -87,7 +87,6 @@
+@@ -101,7 +101,6 @@
          "@babel/runtime": "^7.12.5",
          "@casualbot/jest-sonar-reporter": "^2.2.5",
          "@principalstudio/html-webpack-inject-preload": "^1.2.7",
--        "@sentry/webpack-plugin": "^1.18.1",
+-        "@sentry/webpack-plugin": "^2.0.0",
          "@svgr/webpack": "^5.5.0",
          "@testing-library/react": "^12.1.5",
-         "@types/flux": "^3.1.9",
+         "@types/jest": "^29.0.0",
 diff --git a/webpack.config.js b/webpack.config.js
-index 28d60af8a..0018dcdd4 100644
+index 514bf32d0..a17a561b7 100644
 --- a/webpack.config.js
 +++ b/webpack.config.js
 @@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
  const TerserPlugin = require("terser-webpack-plugin");
  const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
  const HtmlWebpackInjectPreload = require("@principalstudio/html-webpack-inject-preload");
--const SentryCliPlugin = require("@sentry/webpack-plugin");
+-const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");
  const crypto = require("crypto");
  
  // XXX: mangle Crypto::createHash to replace md4 with sha256, output.hashFunction is insufficient as multiple bits
-@@ -656,16 +655,6 @@ module.exports = (env, argv) => {
+@@ -658,18 +657,6 @@ module.exports = (env, argv) => {
                  files: [{ match: /.*Inter.*\.woff2$/ }],
              }),
  
 -            // upload to sentry if sentry env is present
 -            process.env.SENTRY_DSN &&
--                new SentryCliPlugin({
+-                sentryWebpackPlugin({
 -                    release: process.env.VERSION,
--                    include: "./webapp/bundles",
+-                    sourcemaps: {
+-                        paths: "./webapp/bundles/**",
+-                    },
 -                    errorHandler: (err, invokeErr, compilation) => {
 -                        compilation.warnings.push("Sentry CLI Plugin: " + err.message);
 -                        console.log(`::warning title=Sentry error::${err.message}`);
@@ -50,6 +41,3 @@ index 28d60af8a..0018dcdd4 100644
              new webpack.EnvironmentPlugin(["VERSION"]),
          ].filter(Boolean),
  
--- 
-2.39.2
-
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 884a022da7f5..9eb59cc50721 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.11.33
+version=1.11.34
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -17,8 +17,8 @@ homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
 distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
-checksum="ac657d25576c6151f4a96ce067363d27bbc0ed940b3c16d79eee5fafc5ce0024
- 4015804125d448065c68e1f9e8673c1fea9f11a2e937159edbdc64113c564d45"
+checksum="5163d11740bb9f9660c919a28c5a6fe2828660849088ce1e6b40b558736afd18
+ 54bfef3484f18135408b427ff253496e36a6ad3788b1df3c6c7ba0655e23e21b"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 29930d7af04051a76b47260e4262174a8ea2f502 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 16 Feb 2023 18:51:22 +0530
Subject: [PATCH 1358/1854] New package: git-delete-merged-branches-7.4.0

---
 srcpkgs/git-delete-merged-branches/template | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/git-delete-merged-branches/template

diff --git a/srcpkgs/git-delete-merged-branches/template b/srcpkgs/git-delete-merged-branches/template
new file mode 100644
index 000000000000..a98dd7cfc047
--- /dev/null
+++ b/srcpkgs/git-delete-merged-branches/template
@@ -0,0 +1,24 @@
+# Template file for 'git-delete-merged-branches'
+pkgname=git-delete-merged-branches
+version=7.4.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-colorama python3-prompt_toolkit"
+checkdepends="${depends} python3-parameterized python3-pytest"
+short_desc="CLI tool to delete merged git branches"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/hartwork/git-delete-merged-branches"
+changelog="https://github.com/hartwork/git-delete-merged-branches/releases"
+distfiles="${PYPI_SITE}/g/git-delete-merged-branches/git-delete-merged-branches-${version}.tar.gz"
+checksum=b976b7b2210a1dab728e654e1b023f8e5309d98dc14730bfb613e893604847e5
+make_check_pre="env PATH=/usr/libexec/chroot-git:${PATH}"
+
+post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/git_delete_merged_branches/tests
+
+	# resolve conflicts against git-extras
+	rm ${DESTDIR}/usr/bin/git-delete-merged-branches
+	rm ${DESTDIR}/usr/share/man/man1/git-delete-merged-branches.1
+}

From 2c0d3461df6bcb6ac670924a8a72e6f2559434f6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Fri, 16 Jun 2023 09:36:53 +0700
Subject: [PATCH 1359/1854] inkscape: update to 1.2.2

closes #35454
---
 ...ibility-with-Poppler-22.03-and-later.patch |  50 ------
 .../Fix-build-with-poppler-21.11.0.patch      |  29 ----
 .../Fix-build-with-poppler-22.04.patch        | 143 ------------------
 .../inkscape-1.2.1-poppler-22.09.0.patch      |  53 -------
 srcpkgs/inkscape/template                     |  25 +--
 5 files changed, 13 insertions(+), 287 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
 delete mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
 delete mode 100644 srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch

diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
deleted file mode 100644
index 297ef677665e..000000000000
--- a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 3dabc94ba2..079b0dc713 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
- 
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
- 
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
deleted file mode 100644
index 5d7f4801273d..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Mon, 1 Nov 2021 21:45:38 +0200
-Subject: [PATCH] Fix build with poppler 21.11.0
-
-GfxFont::tag is now of type std::string instead of GooString *.
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index e3d04d544b..feecefa043 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
-+#if POPPLER_CHECK_VERSION(21,11,0)
-+	   font->getTag().c_str(),
-+#else
- 	   font->getTag()->getCString(),
-+#endif
- 	   font->getName() ? font->getName()->getCString() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
deleted file mode 100644
index f12054268a3c..000000000000
--- a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
- 
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
- 
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
- 
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
- 
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
- 
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index eede668893..901cc8cddb 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
- 
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
- 
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
- 
--    _current_font = font;
-     _invalidated_style = true;
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index fb4e64fa19..e91febd717 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -204,7 +204,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
- 
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch b/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch
deleted file mode 100644
index 36d4192c862f..000000000000
--- a/srcpkgs/inkscape/patches/inkscape-1.2.1-poppler-22.09.0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2f3101417a04721c42b6b101dde07fa961a56f1b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@cmpct.info>
-Date: Tue, 6 Sep 2022 10:10:25 +0000
-Subject: [PATCH] Fix build with Poppler 22.09.0
-
-Adapt to changes in Poppler's getLineDash/setLineDash interface to allow building with Poppler 22.09.0.
----
- src/extension/internal/pdfinput/pdf-parser.cpp  | 4 ++++
- src/extension/internal/pdfinput/svg-builder.cpp | 9 ++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index cca1e84096..80d64c9b86 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
-       _POPPLER_FREE(obj);
-     }
-   }
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+  state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
-+#else
-   state->setLineDash(dash, length, args[1].getNum());
-+#endif
-   builder->updateStyle(state);
- }
- 
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 12f71dd921..9fc56fe63c 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
-     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
- 
-     // Line dash
--    double *dash_pattern;
-     int dash_length;
-     double dash_start;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+    const double *dash_pattern;
-+    const std::vector<double> &dash = state->getLineDash(&dash_start);
-+    dash_pattern = dash.data();
-+    dash_length = dash.size();
-+#else
-+    double *dash_pattern;
-     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-+#endif
-     if ( dash_length > 0 ) {
-         Inkscape::CSSOStringStream os_array;
-         for ( int i = 0 ; i < dash_length ; i++ ) {
--- 
-GitLab
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b1c642e98abc..aa1ab218a442 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,26 +1,27 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.1.1
-revision=9
+version=1.2.2
+revision=1
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
 make_check_target=check
-hostmakedepends="automake pkg-config libtool intltool gettext
- glib-devel perl-XML-Parser which"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-devel
- double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
- poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
- aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-lxml python3-numpy
- python3-scour python3-Pillow"
-checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
+hostmakedepends="automake gettext glib-devel intltool libmagick-devel libtool
+ perl-XML-Parser pkg-config which"
+makedepends="aspell-devel cairomm-devel double-conversion-devel gc-devel
+ gdl-devel gsl-devel gspell-devel gtkmm-devel gtkspell3-devel harfbuzz-devel
+ hunspell-devel libatomic_ops-devel libcdr-devel libgomp-devel libsoup-devel
+ libvisio-devel libwpd-devel libwpd-devel libwpg-devel libxslt-devel pango-devel
+ poppler-devel poppler-glib-devel potrace-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-Pillow python3-appdirs
+ python3-cssselect python3-lxml python3-numpy python3-requests python3-scour"
+checkdepends="$depends ImageMagick cantarell-fonts gtest-devel"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
 distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"
-checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
+checksum=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From dfc737de00223ef398475afd653a7a66a5ca8335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 17:30:20 -0300
Subject: [PATCH 1360/1854] common/build-style: check if go_import_path matches
 go.mod.

Without this check, calling `go install` with a wrong go_import_path
might end up downloading the source code for said package (using git,
for example), instead of building from the provided tarball. The first
line of go.mod should be "module $go_import_path" for Go to not try and
download source code instead of using what it has locally.

Fixes #27690.
---
 common/build-style/go.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index 1315473f9600..f1808b3311a4 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,6 +32,11 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+		# Check if go_import_path matches module
+		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
+		fi
+
 		if [ -z "${go_mod_mode}" ] && [ -d vendor ]; then
 			msg_normal "Using vendor dir for $pkgname Go dependencies.\n"
 			go_mod_mode=vendor

From 3d2f6adfeacf2e9481abf43e590da96073a49089 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 23 Jun 2023 14:54:42 +0200
Subject: [PATCH 1361/1854] docker-compose: update to 2.19.0.

---
 srcpkgs/docker-compose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 7271843da8cf..772cbb1e0f18 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=2.18.1
+version=2.19.0
 revision=1
 build_style=go
 go_import_path="github.com/docker/compose/v2/cmd"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 changelog="https://github.com/docker/compose/releases"
 distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=192c47c177d9bfd8492ed0c49214af0c740586da6db0b7e9c9a07da37c9dc722
+checksum=0be3fd713ef84985f63d76de4c58451401aed1dfbeb235127dd77a57d1890996
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins

From 9343e64592148fa84a23d6a4dcbf1c66aaa120cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 26 Jun 2023 05:17:53 -0400
Subject: [PATCH 1362/1854] docker-compose: fix for go.mod mismatch

---
 srcpkgs/docker-compose/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 772cbb1e0f18..280cca8333d0 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,10 +1,11 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.19.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/docker/compose/v2/cmd"
-go_ldflags="-X github.com/docker/compose/v2/internal.Version=v${version}"
+go_import_path="github.com/docker/compose/v2"
+go_package="${go_import_path}/cmd"
+go_ldflags="-X ${go_import_path}/internal.Version=v${version}"
 depends="docker-cli"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -15,7 +16,7 @@ distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.g
 checksum=0be3fd713ef84985f63d76de4c58451401aed1dfbeb235127dd77a57d1890996
 
 post_install() {
-	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins
+	vmkdir usr/libexec/docker/cli-plugins
 	mv ${DESTDIR}/usr/bin/cmd ${DESTDIR}/usr/libexec/docker/cli-plugins/docker-compose
 	ln -s /usr/libexec/docker/cli-plugins/docker-compose ${DESTDIR}/usr/bin/docker-compose
 }

From 2c4e94cf94ce75daac3eb73fdcba74c99f75cd03 Mon Sep 17 00:00:00 2001
From: Murray <murray.calavera@protonmail.com>
Date: Tue, 20 Jun 2023 10:09:15 +0100
Subject: [PATCH 1363/1854] librepcb: update to 0.1.7.

closes #44535
---
 srcpkgs/librepcb/patches/zlib.patch | 18 ++++++++++++++++++
 srcpkgs/librepcb/template           | 15 ++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/librepcb/patches/zlib.patch

diff --git a/srcpkgs/librepcb/patches/zlib.patch b/srcpkgs/librepcb/patches/zlib.patch
new file mode 100644
index 000000000000..9937d0fe5295
--- /dev/null
+++ b/srcpkgs/librepcb/patches/zlib.patch
@@ -0,0 +1,18 @@
+--- a/libs/quazip/CMakeLists.txt
++++ b/libs/quazip/CMakeLists.txt
+@@ -64,13 +64,8 @@ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
+ 
+-find_package(Qt${QUAZIP_QT_MAJOR_VERSION} OPTIONAL_COMPONENTS Zlib)
+-if (Qt${QUAZIP_QT_MAJOR_VERSION}Zlib_FOUND)
+-	set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} Qt${QUAZIP_QT_MAJOR_VERSION}::Zlib)
+-else()
+-	find_package(ZLIB REQUIRED)
+-	set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ZLIB::ZLIB)
+-endif()
++find_package(ZLIB REQUIRED)
++set(QUAZIP_LIB_LIBRARIES ${QUAZIP_LIB_LIBRARIES} ZLIB::ZLIB)
+ 
+ add_subdirectory(quazip)
+ 
diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index d51ca101381c..207da8137ed0 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -1,15 +1,16 @@
 # Template file for 'librepcb'
 pkgname=librepcb
-version=0.1.5
-revision=2
-build_style=qmake
-configure_args="-r librepcb.pro"
+version=0.1.7
+revision=1
+build_style=cmake
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel qt5-svg-devel zlib-devel"
+makedepends="zlib-devel qt5-devel qt5-tools-devel qt5-plugin-mysql
+ qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ qt5-svg-devel occt-devel glu-devel openssl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://librepcb.org"
-distfiles="https://download.librepcb.org/releases/${version}/${pkgname}-${version}-source.zip"
-checksum=f956dfa5b9ad1faffcab7f5dd03f158c2b97a7c82cfc9a09dc4066cbcf0db76a
+distfiles="https://download.librepcb.org/releases/${version}/librepcb-${version}-source.zip"
+checksum=4c9e90ca61c94e537cab0632e684350873673d693f1c8837c916001d8896a6ad

From fecdb2321deae75d6e2504493a10113723d0bd31 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sun, 30 Apr 2023 12:54:55 +0100
Subject: [PATCH 1364/1854] New package: seer-2.0

Closes: #43682 [via git-merge-pr]
---
 srcpkgs/seer/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/seer/template

diff --git a/srcpkgs/seer/template b/srcpkgs/seer/template
new file mode 100644
index 000000000000..317fc41c5442
--- /dev/null
+++ b/srcpkgs/seer/template
@@ -0,0 +1,28 @@
+# Template file for 'seer'
+pkgname=seer
+version=2.0
+revision=1
+build_style=cmake
+configure_args="-DQTVERSION=QT5"
+build_wrksrc="src"
+hostmakedepends="pkg-config"
+makedepends="qt5-devel qt5-charts-devel"
+depends="gdb"
+short_desc="GUI frontend to gdb"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/epasveer/seer"
+changelog="https://raw.githubusercontent.com/epasveer/seer/main/CHANGELOG.md"
+distfiles="https://github.com/epasveer/seer/archive/v${version}.tar.gz"
+checksum=050df5f356ddbae386617aa92edbac5acef254fa10f4ff5cccabe6c5033e8ff5
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for x in 32x32 64x64 128x128 256x256 512x512; do
+		vinstall "resources/seergdb_${x}.png" 644 "usr/share/icons/hicolor/${x}/apps"
+	done
+	vinstall resources/seergdb.desktop 644 usr/share/applications
+}

From 23bde112d142ed9122a1fa6c04dfac654f83d0d5 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 6 Jan 2023 06:29:47 +0200
Subject: [PATCH 1365/1854] New package: vmaf-2.3.1

---
 common/shlibs         |  1 +
 srcpkgs/vmaf-devel    |  1 +
 srcpkgs/vmaf/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/vmaf-devel
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index 39c868b03148..525c08a30424 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
+libvmaf.so.1 vmaf-2.3.1_1
diff --git a/srcpkgs/vmaf-devel b/srcpkgs/vmaf-devel
new file mode 120000
index 000000000000..61c973c1c892
--- /dev/null
+++ b/srcpkgs/vmaf-devel
@@ -0,0 +1 @@
+vmaf
\ No newline at end of file
diff --git a/srcpkgs/vmaf/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..9a2861f63066
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,30 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=2.3.1
+revision=1
+build_wrksrc=libvmaf
+build_style=meson
+hostmakedepends="nasm xxd"
+short_desc="Perceptual video quality assessment algorithm developed by Netflix"
+maintainer="Eugen Zagorodniy <zag@disroot.org>"
+license=BSD-2-Clause-Patent
+homepage="https://github.com/Netflix/vmaf"
+distfiles="https://github.com/Netflix/vmaf/archive/refs/tags/v${version}.tar.gz"
+checksum=8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2
+
+post_install() {
+	vlicense ../LICENSE
+	# Obsolete compute_vmaf() used by ffmpeg-4.4.3 requires non-built-in models
+	vcopy ../model usr/share/vmaf
+}
+
+vmaf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 1432c4b38f423624450eef8020c3bf685fb57a5e Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 6 Jan 2023 20:50:38 +0200
Subject: [PATCH 1366/1854] ffmpeg: enable vmaf support

Closes: #41489 [via git-merge-pr]
---
 ...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 +++++++++++++++++++
 srcpkgs/ffmpeg/template                       |  8 ++--
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff

diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
new file mode 100644
index 000000000000..aa948f7a8a2d
--- /dev/null
+++ b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
@@ -0,0 +1,40 @@
+#==================================================================================================
+# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
+# From: Christopher Degawa <christopher.degawa@intel.com>
+# Date: Thu, 20 Oct 2022 22:55:27 -0500
+# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
+#
+# compressed_ten_bit_format has been deprecated upstream and has no effect
+# and can be removed. Plus, technically it was never used in the first place
+# since it would require the app (ffmpeg) to set it and do additional
+# processing of the input frames.
+#
+# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
+#
+# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
+#==================================================================================================
+--- a/libavcodec/libsvtav1.c
++++ b/libavcodec/libsvtav1.c
+@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
+ 
+ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
+ {
+-    const int    pack_mode_10bit =
+-        (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
+-    const size_t luma_size_8bit  =
+-        config->source_width * config->source_height * (1 << pack_mode_10bit);
+-    const size_t luma_size_10bit =
+-        (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
++    const size_t luma_size = config->source_width * config->source_height *
++        (config->encoder_bit_depth > 8 ? 2 : 1);
+ 
+     EbSvtIOFormat *in_data;
+ 
+-    svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
++    svt_enc->raw_size = luma_size * 3 / 2;
+ 
+     // allocate buffer for in and out
+     svt_enc->in_buf           = av_mallocz(sizeof(*svt_enc->in_buf));
+-- 
+GitLab
+
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index df4179d1963a..aa058aab9ca9 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.4
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
  speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
- libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel)
+ libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)
  $(vopt_if fdk_aac fdk-aac-devel) $(vopt_if vpx libvpx-devel)
@@ -69,6 +69,8 @@ post_patch() {
 		ppc64le*) ;;
 		ppc*) _apply_patch -p1 ${FILESDIR}/altivec.patch ;;
 	esac
+
+	vsed -i libavfilter/vf_libvmaf.c -e 's!/usr/local/share/model/\(vmaf_v0.6.1\).pkl!/usr/share/vmaf/\1.json!'
 }
 
 do_configure() {
@@ -113,7 +115,7 @@ do_configure() {
 		$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libopenjpeg \
-		--enable-postproc --enable-opencl ${_args} \
+		--enable-postproc --enable-opencl --enable-libvmaf ${_args} \
 		$(vopt_enable x265 libx265) \
 		$(vopt_enable v4l2 libv4l2) \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \

From 574c5f009f5d5075f4de09514fe58d7f0f739653 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 23 Jun 2023 22:12:46 +0200
Subject: [PATCH 1367/1854] linux5.10: update to 5.10.185.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 97c063d99aa2..4d75acd2a144 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.181
+version=5.10.185
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
- c04019da6ab852a66bad81382fd9ba1d3a30d1d1fd784f8a0ca4565516b36098"
+ 46a321e7422e7a20646524f7b3ac883143419096f7d1aa24d0597a9d9c7b2de7"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From b949e3bf3ac4c0f76d07d0dcc092a0d25904c850 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Jun 2023 00:39:54 +0200
Subject: [PATCH 1368/1854] parallel: update to 20230622.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 248f83964721..7b3dfcb07982 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20230522
+version=20230622
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=1af46b7605023b14360bb968845de6413db24bf0f951f5e0208d23803cb64202
+checksum=c03fc076c541efbc98e3148f8c516437567020f8811f043c93d91c0412856f09
 
 pre_configure() {
 	# no html and pdf doc

From 6940edc10c5848bf67e2e3717d56d85e9b2969af Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sun, 25 Jun 2023 09:51:33 +0200
Subject: [PATCH 1369/1854] weechat: update to 4.0.0

---
 srcpkgs/weechat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 30b08a1534c2..ffcbf8b9e5be 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.8
-revision=2
+version=4.0.0
+revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=f7cb65c200f8c090c56f2cf98c0b184051e516e5f7099a4308cacf86f174bf28
+checksum=5bd75ee15f3392a0ad174ee7c54518daece3878477670c07f10d6ebf988240f9
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From 1f76e45726f7dfe70b94b9555e03d0fb9c06557c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 26 Jun 2023 10:16:56 +0200
Subject: [PATCH 1370/1854] dbeaver: update to 23.1.1.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index de239d96902c..a2366c0ed0c8 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=23.1.0
+version=23.1.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://dbeaver.io"
 changelog="https://dbeaver.io/news/"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=85df98086b9984c4379382077f90bee60231fd04e1ccde120e9422e29a462218
+checksum=489dd2dc7b531564f54f915ccdae8ea37889ab8538abead4dba752fbe57623a3
 nopie=true
 
 do_build() {

From 42b27004f4aed8808380d53718ccaaf199af8279 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 26 Jun 2023 14:06:47 +0200
Subject: [PATCH 1371/1854] bmake: update to 20230622.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index b0bb26e6daf0..d928b7526251 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20230601
+version=20230622
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=8d0b2e593946539065530a241040b0b0525ebb2b924ed67fc497ad17845a5a09
+checksum=b404c99d60289d78362d0ba0468f541d8a9b4215befee2fbe5750534849cec00
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From b4c3eab4b91e1ef7afd5fda879fceb0ef746e955 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 26 Jun 2023 14:31:53 +0200
Subject: [PATCH 1372/1854] parallel: fix checksum.

---
 srcpkgs/parallel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 7b3dfcb07982..a17eb481e640 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c03fc076c541efbc98e3148f8c516437567020f8811f043c93d91c0412856f09
+checksum=de3a24ad702198a642115ceb9b280625fd49c6dd8842b08685ff057c6b84238e
 
 pre_configure() {
 	# no html and pdf doc

From 697ef37516954160a6a2e7eedbe9426edcafe66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 1 Jun 2023 16:12:06 -0300
Subject: [PATCH 1373/1854] maxima: update to 5.47.0.

---
 srcpkgs/maxima/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index f67b469e3dda..04f732dbb0fe 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,6 +1,6 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.46.0
+version=5.47.0
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
 changelog="https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${version%.*}.md?format=raw"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07
+checksum=9104021b24fd53e8c03a983509cb42e937a925e8c0c85c335d7709a14fd40f7a
 nocross=yes
 
 # maxima-sbcl is nopie and should NOT be stripped or it won't work

From 2220617b958989a9ad89323716b53ae0bbacb7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 1 Jun 2023 20:38:14 -0300
Subject: [PATCH 1374/1854] sagemath: patch and rebuild for maxima 5.47.0

Also:
 - patch for singular 4.3.2p2
 - patch for numpy 1.25.0
 - patch for setuptools 68.0.0
---
 .../patches/35619-maxima_5.46.0.patch         |  29 +-
 .../patches/35707-maxima_5.47.0.patch         | 879 ++++++++++++++++++
 .../patches/35825-singular_4.3.2p2.patch      |  24 +
 .../sagemath/patches/35826-numpy_1.25.0.patch |  83 ++
 .../patches/35831-setuptools_68.0.0.patch     |  13 +
 srcpkgs/sagemath/patches/get_patches          |  12 +-
 srcpkgs/sagemath/template                     |   2 +-
 7 files changed, 1033 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch
 create mode 100644 srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch
 create mode 100644 srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch

diff --git a/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
index 0220b4300c30..970de6e5beb6 100644
--- a/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
+++ b/srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
@@ -48,7 +48,7 @@ index ee1667aec16..72083337942 100644
  
  sdh_configure $SAGE_CONFIGURE_GMP \
 diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4
-index 5859e35f12e..b677184b7be 100644
+index 5859e35f12e..53e3a8301cd 100644
 --- a/build/pkgs/giac/spkg-configure.m4
 +++ b/build/pkgs/giac/spkg-configure.m4
 @@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([giac], [
@@ -56,10 +56,17 @@ index 5859e35f12e..b677184b7be 100644
         AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
           AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
 -            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
-+            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n -1)
++            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n 1)
              AS_IF([test -n "$giac_version"], [
                  AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
                      AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [
+diff --git a/build/pkgs/info/distros/fedora.txt b/build/pkgs/info/distros/fedora.txt
+index 283aa462f74..c0d8f74e0ad 100644
+--- a/build/pkgs/info/distros/fedora.txt
++++ b/build/pkgs/info/distros/fedora.txt
+@@ -1 +1 @@
+-texinfo
++texinfo info
 diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
 index 0980a4b8ef8..85fe1ea4731 100644
 --- a/build/pkgs/info/spkg-configure.m4
@@ -108,6 +115,16 @@ index a804c7b831f..0f594389fe6 100644
 +md5=3c01f1daa6936e11d8713fef7751d3fe
 +cksum=2420393096
  upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
+diff --git a/build/pkgs/maxima/dependencies b/build/pkgs/maxima/dependencies
+index fffb89e2050..55c7e0d8d14 100644
+--- a/build/pkgs/maxima/dependencies
++++ b/build/pkgs/maxima/dependencies
+@@ -1,4 +1,4 @@
+-ecl
++ecl info
+ 
+ ----------
+ All lines of this file are ignored except the first.
 diff --git a/build/pkgs/maxima/distros/arch.txt b/build/pkgs/maxima/distros/arch.txt
 index 6400290f44d..6ac052fa62b 100644
 --- a/build/pkgs/maxima/distros/arch.txt
@@ -198,7 +215,7 @@ index 74db62e7f9f..00000000000
 - 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
 diff --git a/build/pkgs/maxima/spkg-configure.m4 b/build/pkgs/maxima/spkg-configure.m4
 new file mode 100644
-index 00000000000..dc54525320e
+index 00000000000..86de8c1dfc1
 --- /dev/null
 +++ b/build/pkgs/maxima/spkg-configure.m4
 @@ -0,0 +1,46 @@
@@ -209,7 +226,7 @@ index 00000000000..dc54525320e
 +    dnl we still use pexpect to communicate with it in a few places.
 +    AC_CACHE_CHECK([for Maxima >= $SAGE_MAXIMA_MINVER], [ac_cv_path_MAXIMA], [
 +        AC_PATH_PROGS_FEATURE_CHECK([MAXIMA], [maxima], [
-+            maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n -1\
++            maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n 1\
 +                | $SED -n -e 's/Maxima *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
 +            AS_IF([test -n "$maxima_version"], [
 +                AX_COMPARE_VERSION([$maxima_version], [ge], [SAGE_MAXIMA_MINVER], [
@@ -282,7 +299,7 @@ index 3ae6382f9ba..cdb6fbf2069 100644
  
  sdh_make
 diff --git a/build/pkgs/tox/spkg-configure.m4 b/build/pkgs/tox/spkg-configure.m4
-index 7d8ade4c14b..3de0b9b710d 100644
+index 7d8ade4c14b..5a260439cdd 100644
 --- a/build/pkgs/tox/spkg-configure.m4
 +++ b/build/pkgs/tox/spkg-configure.m4
 @@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([tox], [
@@ -290,7 +307,7 @@ index 7d8ade4c14b..3de0b9b710d 100644
         AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [
           AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [
 -            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -1)
-+            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n -1)
++            tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n 1)
              AS_IF([test -n "$tox_version"], [
                  AX_COMPARE_VERSION([$tox_version], [lt], [4], [
                      AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [
diff --git a/srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch b/srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch
new file mode 100644
index 000000000000..de10df8cb73c
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35707-maxima_5.47.0.patch
@@ -0,0 +1,879 @@
+diff --git a/src/doc/de/tutorial/interfaces.rst b/src/doc/de/tutorial/interfaces.rst
+index edb4f383363..d83225b5315 100644
+--- a/src/doc/de/tutorial/interfaces.rst
++++ b/src/doc/de/tutorial/interfaces.rst
+@@ -272,8 +272,8 @@ deren :math:`i,j` Eintrag gerade :math:`i/j` ist, für :math:`i,j=1,\ldots,4`.
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Hier ein anderes Beispiel:
+ 
+@@ -332,12 +332,9 @@ Und der letzte ist die berühmte Kleinsche Flasche:
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:     '[plot_format, openmath]')
+diff --git a/src/doc/de/tutorial/tour_algebra.rst b/src/doc/de/tutorial/tour_algebra.rst
+index baba2553a25..59eed8f1888 100644
+--- a/src/doc/de/tutorial/tour_algebra.rst
++++ b/src/doc/de/tutorial/tour_algebra.rst
+@@ -209,9 +209,12 @@ Lösung: Berechnen Sie die Laplace-Transformierte der ersten Gleichung
+ 
+ ::
+ 
+-    sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Das ist schwierig zu lesen, es besagt jedoch, dass
+ 
+@@ -226,8 +229,8 @@ Laplace-Transformierte der zweiten Gleichung:
+ ::
+ 
+     sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: lde2 = de2.laplace("t","s"); lde2.sage()
++    s^2*laplace(y(t), t, s) - s*y(0) - 2*laplace(x(t), t, s) + 2*laplace(y(t), t, s) - D[0](y)(0)
+ 
+ Dies besagt
+ 
+diff --git a/src/doc/en/constructions/linear_algebra.rst b/src/doc/en/constructions/linear_algebra.rst
+index 8894de9a5fd..4e76c65ad0a 100644
+--- a/src/doc/en/constructions/linear_algebra.rst
++++ b/src/doc/en/constructions/linear_algebra.rst
+@@ -277,8 +277,8 @@ Another approach is to use the interface with Maxima:
+ 
+     sage: A = maxima("matrix ([1, -4], [1, -1])")
+     sage: eig = A.eigenvectors()
+-    sage: eig
+-    [[[-sqrt(3)*%i,sqrt(3)*%i],[1,1]], [[[1,(sqrt(3)*%i+1)/4]],[[1,-(sqrt(3)*%i-1)/4]]]]
++    sage: eig.sage()
++    [[[-I*sqrt(3), I*sqrt(3)], [1, 1]], [[[1, 1/4*I*sqrt(3) + 1/4]], [[1, -1/4*I*sqrt(3) + 1/4]]]]
+ 
+ This tells us that :math:`\vec{v}_1 = [1,(\sqrt{3}i + 1)/4]` is
+ an eigenvector of :math:`\lambda_1 = - \sqrt{3}i` (which occurs
+diff --git a/src/doc/en/tutorial/interfaces.rst b/src/doc/en/tutorial/interfaces.rst
+index b0e55345669..19c28f636d4 100644
+--- a/src/doc/en/tutorial/interfaces.rst
++++ b/src/doc/en/tutorial/interfaces.rst
+@@ -267,8 +267,8 @@ whose :math:`i,j` entry is :math:`i/j`, for
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Here's another example:
+ 
+@@ -320,8 +320,8 @@ The next plot is the famous Klein bottle (do not type the ``....:``)::
+ 
+     sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+     5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
++    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)").sage()
++    -5*(cos(1/2*x)*cos(y) + sin(1/2*x)*sin(2*y) + 3.0)*sin(x)
+     sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]",  # not tested
+diff --git a/src/doc/en/tutorial/tour_algebra.rst b/src/doc/en/tutorial/tour_algebra.rst
+index 2e872cc9059..225606a729f 100644
+--- a/src/doc/en/tutorial/tour_algebra.rst
++++ b/src/doc/en/tutorial/tour_algebra.rst
+@@ -216,9 +216,12 @@ the notation :math:`x=x_{1}`, :math:`y=x_{2}`):
+ 
+ ::
+ 
+-    sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ This is hard to read, but it says that
+ 
+@@ -232,8 +235,8 @@ Laplace transform of the second equation:
+ ::
+ 
+     sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: lde2 = de2.laplace("t","s"); lde2.sage()
++    s^2*laplace(y(t), t, s) - s*y(0) - 2*laplace(x(t), t, s) + 2*laplace(y(t), t, s) - D[0](y)(0)
+ 
+ This says
+ 
+diff --git a/src/doc/es/tutorial/tour_algebra.rst b/src/doc/es/tutorial/tour_algebra.rst
+index dc1a7a96719..42c818fe8d7 100644
+--- a/src/doc/es/tutorial/tour_algebra.rst
++++ b/src/doc/es/tutorial/tour_algebra.rst
+@@ -197,8 +197,8 @@ la notación :math:`x=x_{1}`, :math:`y=x_{2}`):
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ El resultado puede ser difícil de leer, pero significa que
+ 
+@@ -211,9 +211,12 @@ Toma la transformada de Laplace de la segunda ecuación:
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Esto dice
+ 
+diff --git a/src/doc/fr/tutorial/interfaces.rst b/src/doc/fr/tutorial/interfaces.rst
+index 1cd662f3083..2cb14e772eb 100644
+--- a/src/doc/fr/tutorial/interfaces.rst
++++ b/src/doc/fr/tutorial/interfaces.rst
+@@ -273,8 +273,8 @@ pour :math:`i,j=1,\ldots,4`.
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Un deuxième exemple :
+ 
+@@ -334,12 +334,9 @@ Et la fameuse bouteille de Klein (n'entrez pas les ``....:``):
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:     '[plot_format, openmath]')
+diff --git a/src/doc/fr/tutorial/tour_algebra.rst b/src/doc/fr/tutorial/tour_algebra.rst
+index 658894b2e8b..267bd1dd4f9 100644
+--- a/src/doc/fr/tutorial/tour_algebra.rst
++++ b/src/doc/fr/tutorial/tour_algebra.rst
+@@ -182,8 +182,8 @@ Solution : Considérons la transformée de Laplace de la première équation
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ La réponse n'est pas très lisible, mais elle signifie que
+ 
+@@ -196,9 +196,12 @@ la seconde équation :
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Ceci signifie
+ 
+diff --git a/src/doc/it/tutorial/tour_algebra.rst b/src/doc/it/tutorial/tour_algebra.rst
+index 5a5311e9b1c..cde427d3090 100644
+--- a/src/doc/it/tutorial/tour_algebra.rst
++++ b/src/doc/it/tutorial/tour_algebra.rst
+@@ -183,8 +183,8 @@ la notazione :math:`x=x_{1}`, :math:`y=x_{2}`:
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Questo è di difficile lettura, ma dice che
+ 
+@@ -197,9 +197,12 @@ trasformata di Laplace della seconda equazione:
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ che significa
+ 
+diff --git a/src/doc/ja/tutorial/interfaces.rst b/src/doc/ja/tutorial/interfaces.rst
+index 9c16b2eba08..892fc6f852f 100644
+--- a/src/doc/ja/tutorial/interfaces.rst
++++ b/src/doc/ja/tutorial/interfaces.rst
+@@ -239,8 +239,8 @@ Sage/Maximaインターフェイスの使い方を例示するため,ここで
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ 
+ 使用例をもう一つ示す:
+@@ -299,11 +299,8 @@ Sage/Maximaインターフェイスの使い方を例示するため,ここで
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]",  # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]", '[plot_format, openmath]')
+diff --git a/src/doc/ja/tutorial/tour_algebra.rst b/src/doc/ja/tutorial/tour_algebra.rst
+index 784fd0d5c40..746cbb4475c 100644
+--- a/src/doc/ja/tutorial/tour_algebra.rst
++++ b/src/doc/ja/tutorial/tour_algebra.rst
+@@ -213,8 +213,8 @@ Sageを使って常微分方程式を研究することもできる. :math:`x'
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ この出力は読みにくいけれども,意味しているのは
+ 
+@@ -226,9 +226,12 @@ Sageを使って常微分方程式を研究することもできる. :math:`x'
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ 意味するところは
+ 
+diff --git a/src/doc/pt/tutorial/interfaces.rst b/src/doc/pt/tutorial/interfaces.rst
+index 386ef6456e5..5badb31ab35 100644
+--- a/src/doc/pt/tutorial/interfaces.rst
++++ b/src/doc/pt/tutorial/interfaces.rst
+@@ -269,8 +269,8 @@ entrada :math:`i,j` é :math:`i/j`, para :math:`i,j=1,\ldots,4`.
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Aqui vai outro exemplo:
+ 
+@@ -330,13 +330,10 @@ E agora a famosa garrafa de Klein:
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)"
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)"
+     ....:        "- 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:               "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:               '[plot_format, openmath]')
+diff --git a/src/doc/pt/tutorial/tour_algebra.rst b/src/doc/pt/tutorial/tour_algebra.rst
+index baeb37b1c71..170e0d8a367 100644
+--- a/src/doc/pt/tutorial/tour_algebra.rst
++++ b/src/doc/pt/tutorial/tour_algebra.rst
+@@ -205,8 +205,8 @@ equação (usando a notação :math:`x=x_{1}`, :math:`y=x_{2}`):
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ O resultado é um pouco difícil de ler, mas diz que
+ 
+@@ -219,9 +219,12 @@ calcule a transformada de Laplace da segunda equação:
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ O resultado significa que
+ 
+diff --git a/src/doc/ru/tutorial/interfaces.rst b/src/doc/ru/tutorial/interfaces.rst
+index ea84527f478..061818ca4a5 100644
+--- a/src/doc/ru/tutorial/interfaces.rst
++++ b/src/doc/ru/tutorial/interfaces.rst
+@@ -264,8 +264,8 @@ gnuplot, имеет методы решения и манипуляции мат
+     matrix([1,1/2,1/3,1/4],[0,0,0,0],[0,0,0,0],[0,0,0,0])
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+-    sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    sage: A.eigenvectors().sage()
++    [[[0, 4], [3, 1]], [[[1, 0, 0, -4], [0, 1, 0, -2], [0, 0, 1, -4/3]], [[1, 2, 3, 4]]]]
+ 
+ Вот другой пример:
+ 
+@@ -323,12 +323,9 @@ gnuplot, имеет методы решения и манипуляции мат
+ 
+ ::
+ 
+-    sage: maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
+-    5*cos(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)-10.0
+-    sage: maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
+-    -5*sin(x)*(sin(x/2)*sin(2*y)+cos(x/2)*cos(y)+3.0)
+-    sage: maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+-    5*(cos(x/2)*sin(2*y)-sin(x/2)*cos(y))
++    sage: _ = maxima("expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0) - 10.0")
++    sage: _ = maxima("expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y)+ 3.0)")
++    sage: _ = maxima("expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))")
+     sage: maxima.plot3d ("[expr_1, expr_2, expr_3]", "[x, -%pi, %pi]", # not tested
+     ....:     "[y, -%pi, %pi]", "['grid, 40, 40]",
+     ....:     '[plot_format, openmath]')
+diff --git a/src/doc/ru/tutorial/tour_algebra.rst b/src/doc/ru/tutorial/tour_algebra.rst
+index 9f08c41d118..bc0d4926f83 100644
+--- a/src/doc/ru/tutorial/tour_algebra.rst
++++ b/src/doc/ru/tutorial/tour_algebra.rst
+@@ -199,8 +199,8 @@ Sage может использоваться для решения диффер
+ ::
+ 
+     sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)")
+-    sage: lde1 = de1.laplace("t","s"); lde1
+-    2*((-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s) -2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s)
++    sage: lde1 = de1.laplace("t","s"); lde1.sage()
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Данный результат тяжело читаем, однако должен быть понят как
+ 
+@@ -210,9 +210,12 @@ Sage может использоваться для решения диффер
+ 
+ ::
+ 
+-    sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)")
+-    sage: lde2 = de2.laplace("t","s"); lde2
+-    (-%at('diff(y(t),t,1),t = 0))+s^2*'laplace(y(t),t,s) +2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s) -y(0)*s
++    sage: t,s = SR.var('t,s')
++    sage: x = function('x')
++    sage: y = function('y')
++    sage: f = 2*x(t).diff(t,2) + 6*x(t) - 2*y(t)
++    sage: f.laplace(t,s)
++    2*s^2*laplace(x(t), t, s) - 2*s*x(0) + 6*laplace(x(t), t, s) - 2*laplace(y(t), t, s) - 2*D[0](x)(0)
+ 
+ Результат:
+ 
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index c707530b9f1..f7ce8b95727 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -783,7 +783,7 @@ def nintegral(ex, x, a, b,
+     Now numerically integrating, we see why the answer is wrong::
+ 
+         sage: f.nintegrate(x,0,1)
+-        (-480.0000000000001, 5.32907051820075...e-12, 21, 0)
++        (-480.000000000000..., 5.32907051820075...e-12, 21, 0)
+ 
+     It is just because every floating point evaluation of return -480.0
+     in floating point.
+@@ -1336,7 +1336,7 @@ def limit(ex, dir=None, taylor=False, algorithm='maxima', **argv):
+         sage: limit(floor(x), x=0, dir='+')
+         0
+         sage: limit(floor(x), x=0)
+-        und
++        ...nd
+ 
+     Maxima gives the right answer here, too, showing
+     that :trac:`4142` is fixed::
+diff --git a/src/sage/calculus/desolvers.py b/src/sage/calculus/desolvers.py
+index e0c31925f44..6e91f7e2bb4 100644
+--- a/src/sage/calculus/desolvers.py
++++ b/src/sage/calculus/desolvers.py
+@@ -295,7 +295,7 @@ def desolve(de, dvar, ics=None, ivar=None, show_method=False, contrib_ode=False,
+     Clairaut equation: general and singular solutions::
+ 
+         sage: desolve(diff(y,x)^2+x*diff(y,x)-y==0,y,contrib_ode=True,show_method=True)
+-        [[y(x) == _C^2 + _C*x, y(x) == -1/4*x^2], 'clairault']
++        [[y(x) == _C^2 + _C*x, y(x) == -1/4*x^2], 'clairau...']
+ 
+     For equations involving more variables we specify an independent variable::
+ 
+@@ -1325,7 +1325,7 @@ def desolve_rk4(de, dvar, ics=None, ivar=None, end_points=None, step=0.1, output
+ 
+         sage: x,y = var('x,y')
+         sage: desolve_rk4(x*y*(2-y),y,ics=[0,1],end_points=1,step=0.5)
+-        [[0, 1], [0.5, 1.12419127424558], [1.0, 1.461590162288825]]
++        [[0, 1], [0.5, 1.12419127424558], [1.0, 1.46159016228882...]]
+ 
+     Variant 1 for input - we can pass ODE in the form used by
+     desolve function In this example we integrate backwards, since
+@@ -1333,7 +1333,7 @@ def desolve_rk4(de, dvar, ics=None, ivar=None, end_points=None, step=0.1, output
+ 
+         sage: y = function('y')(x)
+         sage: desolve_rk4(diff(y,x)+y*(y-1) == x-2,y,ics=[1,1],step=0.5, end_points=0)
+-        [[0.0, 8.904257108962112], [0.5, 1.909327945361535], [1, 1]]
++        [[0.0, 8.904257108962112], [0.5, 1.90932794536153...], [1, 1]]
+ 
+     Here we show how to plot simple pictures. For more advanced
+     applications use list_plot instead. To see the resulting picture
+diff --git a/src/sage/functions/bessel.py b/src/sage/functions/bessel.py
+index 95405c3d72f..48607c49f56 100644
+--- a/src/sage/functions/bessel.py
++++ b/src/sage/functions/bessel.py
+@@ -293,9 +293,6 @@ class Function_Bessel_J(BuiltinFunction):
+         sage: f = bessel_J(2, x)
+         sage: f.integrate(x)
+         1/24*x^3*hypergeometric((3/2,), (5/2, 3), -1/4*x^2)
+-        sage: m = maxima(bessel_J(2, x))
+-        sage: m.integrate(x)
+-        (hypergeometric([3/2],[5/2,3],-_SAGE_VAR_x^2/4)*_SAGE_VAR_x^3)/24
+ 
+     Visualization (set plot_points to a higher value to get more detail)::
+ 
+@@ -1118,11 +1115,11 @@ def Bessel(*args, **kwds):
+     Conversion to other systems::
+ 
+         sage: x,y = var('x,y')
+-        sage: f = maxima(Bessel(typ='K')(x,y))
+-        sage: f.derivative('_SAGE_VAR_x')
+-        (%pi*csc(%pi*_SAGE_VAR_x) *('diff(bessel_i(-_SAGE_VAR_x,_SAGE_VAR_y),_SAGE_VAR_x,1) -'diff(bessel_i(_SAGE_VAR_x,_SAGE_VAR_y),_SAGE_VAR_x,1))) /2 -%pi*bessel_k(_SAGE_VAR_x,_SAGE_VAR_y)*cot(%pi*_SAGE_VAR_x)
+-        sage: f.derivative('_SAGE_VAR_y')
+-        -(bessel_k(_SAGE_VAR_x+1,_SAGE_VAR_y)+bessel_k(_SAGE_VAR_x-1, _SAGE_VAR_y))/2
++        sage: f = Bessel(typ='K')(x,y)
++        sage: expected = f.derivative(y)
++        sage: actual = maxima(f).derivative('_SAGE_VAR_y').sage()
++        sage: bool(actual == expected)
++        True
+ 
+     Compute the particular solution to Bessel's Differential Equation that
+     satisfies `y(1) = 1` and `y'(1) = 1`, then verify the initial conditions
+diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py
+index 752b8422fc6..fc2fb5875ce 100644
+--- a/src/sage/functions/hypergeometric.py
++++ b/src/sage/functions/hypergeometric.py
+@@ -19,8 +19,11 @@
+     sage: sum(((2*I)^x/(x^3 + 1)*(1/4)^x), x, 0, oo)
+     hypergeometric((1, 1, -1/2*I*sqrt(3) - 1/2, 1/2*I*sqrt(3) - 1/2),...
+     (2, -1/2*I*sqrt(3) + 1/2, 1/2*I*sqrt(3) + 1/2), 1/2*I)
+-    sage: sum((-1)^x/((2*x + 1)*factorial(2*x + 1)), x, 0, oo)
++    sage: res = sum((-1)^x/((2*x + 1)*factorial(2*x + 1)), x, 0, oo)
++    sage: res  # not tested - depends on maxima version
+     hypergeometric((1/2,), (3/2, 3/2), -1/4)
++    sage: res in [hypergeometric((1/2,), (3/2, 3/2), -1/4), sin_integral(1)]
++    True
+ 
+ Simplification (note that ``simplify_full`` does not yet call
+ ``simplify_hypergeometric``)::
+diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py
+index 7398c763971..6127f5d9490 100644
+--- a/src/sage/functions/orthogonal_polys.py
++++ b/src/sage/functions/orthogonal_polys.py
+@@ -974,7 +974,7 @@ def __init__(self):
+             sage: chebyshev_U(x, x)._sympy_()
+             chebyshevu(x, x)
+             sage: maxima(chebyshev_U(2,x, hold=True))
+-            3*((-(8*(1-_SAGE_VAR_x))/3)+(4*(1-_SAGE_VAR_x)^2)/3+1)
++            3*(...-...(8*(1-_SAGE_VAR_x))/3)+(4*(1-_SAGE_VAR_x)^2)/3+1)
+             sage: maxima(chebyshev_U(n,x, hold=True))
+             chebyshev_u(_SAGE_VAR_n,_SAGE_VAR_x)
+         """
+diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
+index 3e2570e889e..5a0f06a27f8 100644
+--- a/src/sage/functions/other.py
++++ b/src/sage/functions/other.py
+@@ -498,10 +498,10 @@ def __init__(self):
+             <class 'sage.rings.integer.Integer'>
+             sage: var('x')
+             x
+-            sage: a = floor(5.4 + x); a
+-            floor(x + 5.40000000000000)
++            sage: a = floor(5.25 + x); a
++            floor(x + 5.25000000000000)
+             sage: a.simplify()
+-            floor(x + 0.4000000000000004) + 5
++            floor(x + 0.25) + 5
+             sage: a(x=2)
+             7
+ 
+diff --git a/src/sage/functions/special.py b/src/sage/functions/special.py
+index faa6a73cc7e..d72e780836a 100644
+--- a/src/sage/functions/special.py
++++ b/src/sage/functions/special.py
+@@ -455,9 +455,8 @@ class EllipticE(BuiltinFunction):
+         sage: z = var("z")
+         sage: elliptic_e(z, 1)
+         elliptic_e(z, 1)
+-        sage: # this is still wrong: must be abs(sin(z)) + 2*round(z/pi)
+-        sage: elliptic_e(z, 1).simplify()
+-        2*round(z/pi) + sin(z)
++        sage: elliptic_e(z, 1).simplify() # not tested - gives wrong answer with maxima < 5.47
++        2*round(z/pi) - sin(pi*round(z/pi) - z)
+         sage: elliptic_e(z, 0)
+         z
+         sage: elliptic_e(0.5, 0.1)  # abs tol 2e-15
+diff --git a/src/sage/interfaces/interface.py b/src/sage/interfaces/interface.py
+index 6baa4eb597c..f8237d3ad94 100644
+--- a/src/sage/interfaces/interface.py
++++ b/src/sage/interfaces/interface.py
+@@ -1579,20 +1579,20 @@ def _mul_(self, right):
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)') # not a function!
++            sage: g = maxima('cos(x)') # not a function!
+             sage: f*g
+-            -cos(x)*sin(x)
++            cos(x)*sin(x)
+             sage: _(2)
+-            -cos(2)*sin(2)
++            cos(2)*sin(2)
+ 
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)')
++            sage: g = maxima('cos(x)')
+             sage: g*f
+-            -cos(x)*sin(x)
++            cos(x)*sin(x)
+             sage: _(2)
+-            -cos(2)*sin(2)
++            cos(2)*sin(2)
+             sage: 2*f
+             2*sin(x)
+         """
+@@ -1612,20 +1612,20 @@ def _div_(self, right):
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)')
++            sage: g = maxima('cos(x)')
+             sage: f/g
+-            -sin(x)/cos(x)
++            sin(x)/cos(x)
+             sage: _(2)
+-            -sin(2)/cos(2)
++            sin(2)/cos(2)
+ 
+         ::
+ 
+             sage: f = maxima.function('x','sin(x)')
+-            sage: g = maxima('-cos(x)')
++            sage: g = maxima('cos(x)')
+             sage: g/f
+-            -cos(x)/sin(x)
++            cos(x)/sin(x)
+             sage: _(2)
+-            -cos(2)/sin(2)
++            cos(2)/sin(2)
+             sage: 2/f
+             2/sin(x)
+         """
+diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py
+index 4829560f98b..959e75459a2 100644
+--- a/src/sage/interfaces/maxima.py
++++ b/src/sage/interfaces/maxima.py
+@@ -49,9 +49,14 @@
+ 
+ ::
+ 
++    sage: x,y = SR.var('x,y')
+     sage: F = maxima.factor('x^5 - y^5')
+-    sage: F
+-    -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    sage: F # not tested - depends on maxima version
++    -((y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4))
++    sage: actual = F.sage()
++    sage: expected = -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    sage: bool(actual == expected)
++    True
+     sage: type(F)
+     <class 'sage.interfaces.maxima.MaximaElement'>
+ 
+@@ -71,18 +76,19 @@
+ 
+ ::
+ 
++    sage: F = maxima('x * y')
+     sage: repr(F)
+-    '-(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)'
++    'x*y'
+     sage: F.str()
+-    '-(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)'
++    'x*y'
+ 
+ The ``maxima.eval`` command evaluates an expression in
+ maxima and returns the result as a *string* not a maxima object.
+ 
+ ::
+ 
+-    sage: print(maxima.eval('factor(x^5 - y^5)'))
+-    -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    sage: print(maxima.eval('factor(x^5 - 1)'))
++    (x-1)*(x^4+x^3+x^2+x+1)
+ 
+ We can create the polynomial `f` as a Maxima polynomial,
+ then call the factor method on it. Notice that the notation
+@@ -91,11 +97,11 @@
+ 
+ ::
+ 
+-    sage: f = maxima('x^5 - y^5')
++    sage: f = maxima('x^5 + y^5')
+     sage: f^2
+-    (x^5-y^5)^2
++    (y^5+x^5)^2
+     sage: f.factor()
+-    -(y-x)*(y^4+x*y^3+x^2*y^2+x^3*y+x^4)
++    (y+x)*(y^4-x*y^3+x^2*y^2-x^3*y+x^4)
+ 
+ Control-C interruption works well with the maxima interface,
+ because of the excellent implementation of maxima. For example, try
+@@ -161,20 +167,20 @@
+ 
+     sage: eqn = maxima(['a+b*c=1', 'b-a*c=0', 'a+b=5'])
+     sage: s = eqn.solve('[a,b,c]'); s
+-    [[a = -(sqrt(79)*%i-11)/4,b = (sqrt(79)*%i+9)/4, c = (sqrt(79)*%i+1)/10], [a = (sqrt(79)*%i+11)/4,b = -(sqrt(79)*%i-9)/4, c = -(sqrt(79)*%i-1)/10]]
++    [[a = -...(sqrt(79)*%i-11)/4...,b = (sqrt(79)*%i+9)/4, c = (sqrt(79)*%i+1)/10], [a = (sqrt(79)*%i+11)/4,b = -...(sqrt(79)*%i-9)/4..., c = -...(sqrt(79)*%i-1)/10...]]
+ 
+ Here is an example of solving an algebraic equation::
+ 
+     sage: maxima('x^2+y^2=1').solve('y')
+     [y = -sqrt(1-x^2),y = sqrt(1-x^2)]
+     sage: maxima('x^2 + y^2 = (x^2 - y^2)/sqrt(x^2 + y^2)').solve('y')
+-    [y = -sqrt(((-y^2)-x^2)*sqrt(y^2+x^2)+x^2), y = sqrt(((-y^2)-x^2)*sqrt(y^2+x^2)+x^2)]
++    [y = -sqrt((...-y^2...-x^2)*sqrt(y^2+x^2)+x^2), y = sqrt((...-y^2...-x^2)*sqrt(y^2+x^2)+x^2)]
+ 
+ 
+ You can even nicely typeset the solution in latex::
+ 
+     sage: latex(s)
+-    \left[ \left[ a=-{{\sqrt{79}\,i-11}\over{4}} , b={{\sqrt{79}\,i+9  }\over{4}} , c={{\sqrt{79}\,i+1}\over{10}} \right]  , \left[ a={{  \sqrt{79}\,i+11}\over{4}} , b=-{{\sqrt{79}\,i-9}\over{4}} , c=-{{  \sqrt{79}\,i-1}\over{10}} \right]  \right]
++    \left[ \left[ a=-...{{\sqrt{79}\,i-11}\over{4}}... , b={{...\sqrt{79}\,i+9...}\over{4}} , c={{\sqrt{79}\,i+1}\over{10}} \right]  , \left[ a={{...\sqrt{79}\,i+11}\over{4}} , b=-...{{\sqrt{79}\,i-9...}\over{4}}... , c=-...{{...\sqrt{79}\,i-1}\over{10}}... \right]  \right]
+ 
+ To have the above appear onscreen via ``xdvi``, type
+ ``view(s)``. (TODO: For OS X should create pdf output
+@@ -200,7 +206,7 @@
+     sage: f.diff('x')
+     k*x^3*%e^(k*x)*sin(w*x)+3*x^2*%e^(k*x)*sin(w*x)+w*x^3*%e^(k*x) *cos(w*x)
+     sage: f.integrate('x')
+-    (((k*w^6+3*k^3*w^4+3*k^5*w^2+k^7)*x^3 +(3*w^6+3*k^2*w^4-3*k^4*w^2-3*k^6)*x^2+((-18*k*w^4)-12*k^3*w^2+6*k^5)*x-6*w^4 +36*k^2*w^2-6*k^4) *%e^(k*x)*sin(w*x) +(((-w^7)-3*k^2*w^5-3*k^4*w^3-k^6*w)*x^3 +(6*k*w^5+12*k^3*w^3+6*k^5*w)*x^2+(6*w^5-12*k^2*w^3-18*k^4*w)*x-24*k*w^3 +24*k^3*w) *%e^(k*x)*cos(w*x)) /(w^8+4*k^2*w^6+6*k^4*w^4+4*k^6*w^2+k^8)
++    (((k*w^6+3*k^3*w^4+3*k^5*w^2+k^7)*x^3 +(3*w^6+3*k^2*w^4-3*k^4*w^2-3*k^6)*x^2+(...-...18*k*w^4)-12*k^3*w^2+6*k^5)*x-6*w^4 +36*k^2*w^2-6*k^4) *%e^(k*x)*sin(w*x) +((...-w^7...-3*k^2*w^5-3*k^4*w^3-k^6*w)*x^3...+(6*k*w^5+12*k^3*w^3+6*k^5*w)*x^2...+(6*w^5-12*k^2*w^3-18*k^4*w)*x-24*k*w^3 +24*k^3*w) *%e^(k*x)*cos(w*x)) /(w^8+4*k^2*w^6+6*k^4*w^4+4*k^6*w^2+k^8)
+ 
+ ::
+ 
+@@ -234,7 +240,7 @@
+     sage: A.eigenvalues()
+     [[0,4],[3,1]]
+     sage: A.eigenvectors()
+-    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-4/3]],[[1,2,3,4]]]]
++    [[[0,4],[3,1]],[[[1,0,0,-4],[0,1,0,-2],[0,0,1,-...4/3...]],[[1,2,3,4]]]]
+ 
+ We can also compute the echelon form in Sage::
+ 
+@@ -287,12 +293,12 @@
+ ::
+ 
+     sage: maxima("laplace(diff(x(t),t,2),t,s)")
+-    (-%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s
++    ...-...%at('diff(x(t),t,1),t = 0))+s^2*'laplace(x(t),t,s)-x(0)*s
+ 
+ It is difficult to read some of these without the 2d
+ representation::
+ 
+-    sage: print(maxima("laplace(diff(x(t),t,2),t,s)"))
++    sage: print(maxima("laplace(diff(x(t),t,2),t,s)")) # not tested - depends on maxima version
+                              !
+                     d        !          2
+                  (- -- (x(t))!     ) + s  laplace(x(t), t, s) - x(0) s
+@@ -396,7 +402,7 @@
+ 
+     sage: g = maxima('exp(3*%i*x)/(6*%i) + exp(%i*x)/(2*%i) + c')
+     sage: latex(g)
+-    -{{i\,e^{3\,i\,x}}\over{6}}-{{i\,e^{i\,x}}\over{2}}+c
++    -...{{i\,e^{3\,i\,x}}\over{6}}...-{{i\,e^{i\,x}}\over{2}}+c
+ 
+ Long Input
+ ----------
+@@ -684,7 +690,7 @@ def _expect_expr(self, expr=None, timeout=None):
+             sage: maxima.assume('a>0')
+             [a > 0]
+             sage: maxima('integrate(1/(x^3*(a+b*x)^(1/3)),x)')
+-            (-(b^2*log((b*x+a)^(2/3)+a^(1/3)*(b*x+a)^(1/3)+a^(2/3)))/(9*a^(7/3))) +(2*b^2*atan((2*(b*x+a)^(1/3)+a^(1/3))/(sqrt(3)*a^(1/3))))/(3^(3/2)*a^(7/3)) +(2*b^2*log((b*x+a)^(1/3)-a^(1/3)))/(9*a^(7/3)) +(4*b^2*(b*x+a)^(5/3)-7*a*b^2*(b*x+a)^(2/3)) /(6*a^2*(b*x+a)^2-12*a^3*(b*x+a)+6*a^4)
++            ...-...(b^2*log((b*x+a)^(2/3)+a^(1/3)*(b*x+a)^(1/3)+a^(2/3)))/(9*a^(7/3))) +(2*b^2*atan((2*(b*x+a)^(1/3)+a^(1/3))/(sqrt(3)*a^(1/3))))/(3^(3/2)*a^(7/3)) +(2*b^2*log((b*x+a)^(1/3)-a^(1/3)))/(9*a^(7/3)) +(4*b^2*(b*x+a)^(5/3)-7*a*b^2*(b*x+a)^(2/3)) /(6*a^2*(b*x+a)^2-12*a^3*(b*x+a)+6*a^4)
+             sage: maxima('integrate(x^n,x)')
+             Traceback (most recent call last):
+             ...
+diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py
+index 4f6306ba4fc..aecfcba5e23 100644
+--- a/src/sage/interfaces/maxima_abstract.py
++++ b/src/sage/interfaces/maxima_abstract.py
+@@ -856,9 +856,9 @@ def de_solve(self, de, vars, ics=None):
+             sage: maxima.de_solve('diff(y,x,2) + 3*x = y', ['x','y'])
+             y = %k1*%e^x+%k2*%e^-x+3*x
+             sage: maxima.de_solve('diff(y,x) + 3*x = y', ['x','y'])
+-            y = (%c-3*((-x)-1)*%e^-x)*%e^x
++            y = (%c-3*(...-x...-1)*%e^-x)*%e^x
+             sage: maxima.de_solve('diff(y,x) + 3*x = y', ['x','y'],[1,1])
+-            y = -%e^-1*(5*%e^x-3*%e*x-3*%e)
++            y = -...%e^-1*(5*%e^x-3*%e*x-3*%e)...
+         """
+         if not isinstance(vars, str):
+             str_vars = '%s, %s'%(vars[1], vars[0])
+@@ -1572,8 +1572,9 @@ def integral(self, var='x', min=None, max=None):
+ 
+         ::
+ 
+-            sage: f = maxima('exp(x^2)').integral('x',0,1); f
+-            -(sqrt(%pi)*%i*erf(%i))/2
++            sage: f = maxima('exp(x^2)').integral('x',0,1)
++            sage: f.sage()
++            -1/2*I*sqrt(pi)*erf(I)
+             sage: f.numer()
+             1.46265174590718...
+         """
+diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
+index bba8504aa92..cd1be891872 100644
+--- a/src/sage/interfaces/maxima_lib.py
++++ b/src/sage/interfaces/maxima_lib.py
+@@ -134,10 +134,11 @@
+ else:
+     ecl_eval("(require 'maxima)")
+ ecl_eval("(in-package :maxima)")
+-ecl_eval("(setq $nolabels t))")
+-ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
+ ecl_eval("(set-locale-subdir)")
+ 
++# This workaround has to happen before any call to (set-pathnames).
++# To be safe please do not call anything other than
++# (set-locale-subdir) before this block.
+ try:
+     ecl_eval("(set-pathnames)")
+ except RuntimeError:
+@@ -154,6 +155,8 @@
+     # Call `(set-pathnames)` again to complete its job.
+     ecl_eval("(set-pathnames)")
+ 
++ecl_eval("(initialize-runtime-globals)")
++ecl_eval("(setq $nolabels t))")
+ 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/src/sage/matrix/matrix1.pyx b/src/sage/matrix/matrix1.pyx
+index f38c429d994..47df9fc80a5 100644
+--- a/src/sage/matrix/matrix1.pyx
++++ b/src/sage/matrix/matrix1.pyx
+@@ -248,7 +248,7 @@ cdef class Matrix(Matrix0):
+             sage: a = maxima(m); a
+             matrix([0,1,2],[3,4,5],[6,7,8])
+             sage: a.charpoly('x').expand()
+-            (-x^3)+12*x^2+18*x
++            ...-x^3...+12*x^2+18*x
+             sage: m.charpoly()
+             x^3 - 12*x^2 - 18*x
+         """
+diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx
+index 0532ea0c9bd..6ea2bd4473d 100644
+--- a/src/sage/modules/free_module_element.pyx
++++ b/src/sage/modules/free_module_element.pyx
+@@ -4053,7 +4053,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
+             sage: t=var('t')
+             sage: r=vector([t,t^2,sin(t)])
+             sage: vec,answers=r.nintegral(t,0,1)
+-            sage: vec
++            sage: vec # abs tol 1e-15
+             (0.5, 0.3333333333333334, 0.4596976941318602)
+             sage: type(vec)
+             <class 'sage.modules.vector_real_double_dense.Vector_real_double_dense'>
+diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
+index a72ab547c76..51dcaf8d847 100644
+--- a/src/sage/symbolic/relation.py
++++ b/src/sage/symbolic/relation.py
+@@ -657,7 +657,7 @@ def solve(f, *args, **kwds):
+     equations, at times approximations will be given by Maxima, due to the
+     underlying algorithm::
+ 
+-        sage: sols = solve([x^3==y,y^2==x], [x,y]); sols[-1], sols[0]
++        sage: sols = solve([x^3==y,y^2==x], [x,y]); sols[-1], sols[0] # abs tol 1e-15
+         ([x == 0, y == 0],
+          [x == (0.3090169943749475 + 0.9510565162951535*I),
+           y == (-0.8090169943749475 - 0.5877852522924731*I)])
diff --git a/srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch b/srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch
new file mode 100644
index 000000000000..4d01eeabee6c
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35825-singular_4.3.2p2.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
+index ea027e8a716..a1fe036917e 100644
+--- a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
++++ b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
+@@ -1251,7 +1251,7 @@ def leinartas_decomposition(self):
+             sage: H = R(f.denominator())
+             sage: ff = FFPD(G, H.factor())
+             sage: decomp = ff.leinartas_decomposition()
+-            sage: decomp
++            sage: decomp  # random - non canonical depends on singular version
+             (0, []) +
+             (-(x*y^2*sin(x) + x^2*y + x*y + y*sin(x) + x)*y, [(y, 1)]) +
+             ((x*y^2*sin(x) + x^2*y + x*y + y*sin(x) + x)*x*y, [(x*y + 1, 1)]) +
+@@ -1611,9 +1611,7 @@ def asymptotics(self, p, alpha, N, asy_var=None, numerical=0,
+             (-16, [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 2)])
+             sage: alpha = [3, 3, 2]
+             sage: decomp = F.asymptotic_decomposition(alpha); decomp
+-            (0, []) +
+-            (16*r*(3/x - 2/z) + 16/x - 16/z,
+-             [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 1)])
++            (0, []) + (..., [(x + 2*y + z - 4, 1), (2*x + y + z - 4, 1)])
+             sage: F1 = decomp[1]
+             sage: p = {x: 1, y: 1, z: 1}
+             sage: asy = F1.asymptotics(p, alpha, 2, verbose=True) # long time
diff --git a/srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch b/srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch
new file mode 100644
index 000000000000..426f841ebbab
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35826-numpy_1.25.0.patch
@@ -0,0 +1,83 @@
+diff --git a/src/sage/calculus/desolvers.py b/src/sage/calculus/desolvers.py
+index 55ed3a0fe10..4cfa22a97e4 100644
+--- a/src/sage/calculus/desolvers.py
++++ b/src/sage/calculus/desolvers.py
+@@ -1598,7 +1598,7 @@ def desolve_odeint(des, ics, times, dvars, ivar=None, compute_jac=False, args=()
+         sage: ic=epsilon
+         sage: t=srange(0,2/epsilon,1)
+         sage: sol=desolve_odeint(f,ic,t,y,rtol=1e-9,atol=1e-10,compute_jac=True)
+-        sage: p=points(zip(t,sol))
++        sage: p=points(zip(t,sol[:,0]))
+         sage: p.show()
+ 
+     Another stiff system with some optional parameters with no
+@@ -1637,7 +1637,7 @@ def desolve_odeint_inner(ivar):
+                 J = fast_float(J, dvar, ivar)
+ 
+                 def Dfun(y, t):
+-                    return [J(y, t)]
++                    return [J(y.item(), t)]
+ 
+         # n-dimensional systems:
+         else:
+diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx
+index d5402d5c3b0..a00912951c5 100644
+--- a/src/sage/matrix/matrix2.pyx
++++ b/src/sage/matrix/matrix2.pyx
+@@ -430,12 +430,12 @@ cdef class Matrix(Matrix1):
+             try:
+                 return self.transpose().solve_right(B, check=check)
+             except ValueError as e:
+-                raise ValueError(str(e).replace('row', 'column'))
++                raise e.__class__(str(e).replace('row', 'column'))
+         else:
+             try:
+                 return self.transpose().solve_right(B.transpose(), check=check).transpose()
+             except ValueError as e:
+-                raise ValueError(str(e).replace('row', 'column'))
++                raise e.__class__(str(e).replace('row', 'column'))
+ 
+     def solve_right(self, B, check=True):
+         r"""
+diff --git a/src/sage/matrix/matrix_numpy_dense.pyx b/src/sage/matrix/matrix_numpy_dense.pyx
+index 5b75ed133ff..17867f9a65c 100644
+--- a/src/sage/matrix/matrix_numpy_dense.pyx
++++ b/src/sage/matrix/matrix_numpy_dense.pyx
+@@ -382,8 +382,9 @@ cdef class Matrix_numpy_dense(Matrix_dense):
+             sage: m = matrix(RDF,[[1,2],[3,4]])
+             sage: n = m.numpy()
+             sage: import numpy
+-            sage: numpy.linalg.eig(n)
+-            (array([-0.37228132,  5.37228132]), array([[-0.82456484, -0.41597356],
++            sage: tuple(numpy.linalg.eig(n))
++            (array([-0.37228132,  5.37228132]),
++             array([[-0.82456484, -0.41597356],
+                    [ 0.56576746, -0.90937671]]))
+             sage: m = matrix(RDF, 2, range(6)); m
+             [0.0 1.0 2.0]
+diff --git a/src/sage/plot/plot3d/list_plot3d.py b/src/sage/plot/plot3d/list_plot3d.py
+index d64b766001e..0158f856dbb 100644
+--- a/src/sage/plot/plot3d/list_plot3d.py
++++ b/src/sage/plot/plot3d/list_plot3d.py
+@@ -602,7 +602,7 @@ def g(x, y):
+         from .parametric_surface import ParametricSurface
+ 
+         def g(x, y):
+-            z = f([x, y])
++            z = f([x, y]).item()
+             return (x, y, z)
+         G = ParametricSurface(g, (list(numpy.r_[xmin:xmax:num_points * j]),
+                                   list(numpy.r_[ymin:ymax:num_points * j])),
+diff --git a/src/sage/plot/plot3d/plot3d.py b/src/sage/plot/plot3d/plot3d.py
+index e9bbfaa8370..9ba89595d70 100644
+--- a/src/sage/plot/plot3d/plot3d.py
++++ b/src/sage/plot/plot3d/plot3d.py
+@@ -378,7 +378,7 @@ def to_cartesian(self, func, params=None):
+             ....: [ 0.16763356,  0.19993708,  0.31403568,  0.47359696, 0.55282422],
+             ....: [ 0.16763356,  0.25683223,  0.16649297,  0.10594339, 0.55282422]])
+             sage: import scipy.interpolate
+-            sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r)
++            sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev
+             sage: spherical_plot3d(f,(0,2*pi),(0,pi))
+             Graphics3d Object
+ 
diff --git a/srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch b/srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch
new file mode 100644
index 000000000000..dec7851e027d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35831-setuptools_68.0.0.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sage/all__sagemath_repl.py b/src/sage/all__sagemath_repl.py
+index 6800eb9a27b..8d0b43679ca 100644
+--- a/src/sage/all__sagemath_repl.py
++++ b/src/sage/all__sagemath_repl.py
+@@ -44,7 +44,7 @@
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+     message='pkg_resources is deprecated as an API|'
+             'Deprecated call to `pkg_resources.declare_namespace(.*)`',
+-    module='pkg_resources')
++    module='pkg_resources|setuptools.sandbox')
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+     message='msvccompiler is deprecated and slated to be removed',
+     module='distutils.msvccompiler')
diff --git a/srcpkgs/sagemath/patches/get_patches b/srcpkgs/sagemath/patches/get_patches
index 049694826d20..888c66f779e0 100755
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@@ -18,10 +18,18 @@ get_pr() {
 # run from patches dir
 cd $(dirname "$0")
 
-# positive review
+# merged in 10.0.beta0
 get_pr 35584 "networkx 3.1"
+
+# merged in 10.0.beta1
 get_pr 35612 "linbox 1.7.0"
 get_pr 35635 "sympy 1.12"
+get_pr 35619 "maxima 5.46.0"
+
+# positive review
+get_pr 35707 "maxima 5.47.0"
+get_pr 35831 "setuptools 68.0.0"
 
 # needs review
-get_pr 35619 "maxima 5.46.0"
+get_pr 35825 "singular 4.3.2p2"
+get_pr 35826 "numpy 1.25.0"
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 6fc7c3b2b4a8..2491d77dbc8d 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=10.0
-revision=1
+revision=2
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
 _bindir=/usr/lib/sagemath/$version/bin

From 7ce370c11f500525e824687ce538c84d13381433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 19 Jun 2023 23:21:53 -0300
Subject: [PATCH 1375/1854] python3-numpy: update to 1.25.0.

---
 .../patches/fix-pytest-warning.patch          |  8 +++++
 srcpkgs/python3-numpy/template                | 35 ++++++++++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/python3-numpy/patches/fix-pytest-warning.patch

diff --git a/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch b/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
new file mode 100644
index 000000000000..990ab8019754
--- /dev/null
+++ b/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
@@ -0,0 +1,8 @@
+--- a/pytest.ini	2023-06-16 22:48:37.211072200 -0300
++++ b/pytest.ini	2023-06-19 22:52:00.230063231 -0300
+@@ -27,3 +27,5 @@
+     ignore:\n\n  `numpy.distutils`:DeprecationWarning
+ # Ignore mypy >= 0.971 DeprecationWarnings
+     ignore:path is deprecated\. Use files\(\) instead:DeprecationWarning:mypy
++# Ignore warning raised when importing setuptools.command.
++    ignore:pkg_resources is deprecated as an API:DeprecationWarning
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 30e5ca3a3e58..a0a479ac89da 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,21 +1,21 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.24.3
+version=1.25.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
 makedepends="python3-devel
  $(vopt_if openblas 'openblas-devel' 'lapack-devel cblas-devel')"
 depends="python3-setuptools"
+checkdepends="python3-pytest-xdist python3-hypothesis python3-pytz"
 short_desc="Fast and sophisticated array facility to Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
-distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=0d78333b35bd704826892a56e2af71af69139ee02fa155c8c83aeec58bee4744
+changelog="https://numpy.org/doc/stable/release.html"
+distfiles="${PYPI_SITE}/n/numpy/numpy-${version}.tar.gz"
+checksum=f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19
 alternatives="numpy:f2py:/usr/bin/f2py3"
-# Tests do not function propery in a build directory
-make_check="no"
 
 build_options="openblas"
 
@@ -67,6 +67,31 @@ pre_build() {
 	done
 }
 
+do_check() {
+	local testjobs="-n $XBPS_MAKEJOBS"
+	local _skip
+
+	case $XBPS_TARGET_MACHINE in
+		# this triggers a known bug in musl libm, fixed in:
+		# https://git.musl-libc.org/cgit/musl/commit/?id=aa2d23e57c9c95f0ffeb80cb035e5a5be52d8ef0
+		*-musl) _skip+="or(test_against_cmath)" ;;
+	esac
+
+	if [ ${XBPS_TARGET_MACHINE%-musl} = "i686" ]; then
+		# see: https://github.com/numpy/numpy/issues/18388
+		_skip+="or(test_float_remainder_overflow)"
+		_skip+="or(test_identityless_reduction_huge_array)"
+		_skip+="or((TestKind)and(test_int))"
+		# these 3 fail in CI but not locally
+		_skip+="or(test_einsum_sums_int8)"
+		_skip+="or(test_einsum_sums_uint8)"
+		_skip+="or(test_einsum_sums_int16)"
+	fi
+
+	echo python3 runtests.py -- ${testjobs} ${_skip+-k "not(${_skip#or})"}
+	python3 runtests.py -- ${testjobs} ${_skip+-k "not(${_skip#or})"}
+}
+
 post_install() {
 	rm ${DESTDIR}/usr/bin/f2py
 

From b451ea788e53afabfc5a693dd3c3c6b5b870eb0f Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Mon, 26 Jun 2023 15:18:18 +0000
Subject: [PATCH 1376/1854] ZMusic: update to version 1.1.12.

---
 srcpkgs/ZMusic/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index 8a66744e49cd..e35e9cb5bc61 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,6 +1,6 @@
 # Template file for 'ZMusic'
 pkgname=ZMusic
-version=1.1.10
+version=1.1.12
 revision=1
 build_style=cmake
 configure_args="-DDYN_SNDFILE=OFF -DDYN_FLUIDSYNTH=OFF -DDYN_MPG123=OFF"
@@ -10,8 +10,8 @@ short_desc="GZDoom's music system"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/coelckers/ZMusic"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=378435b35f02a3123ee9e01b5e7990017f9bc1244b788e3bf54b37b34a2985ba
+distfiles="https://github.com/coelckers/ZMusic/archive/${version}.tar.gz"
+checksum=da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel"

From 65ffcefcc2e279a29a6f1d1553439f3e3750281c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Jun 2023 12:58:36 -0400
Subject: [PATCH 1377/1854] linux5.10: fix config for arm64

---
 srcpkgs/linux5.10/files/arm64-dotconfig | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index d545af941df9..4c08cd766b1e 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,12 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.159 Kernel Configuration
+# Linux/arm64 5.10.185 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120200
 CONFIG_LD_VERSION=239000000
 CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23900
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -79,8 +81,6 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
-CONFIG_CONTEXT_TRACKING=y
-# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
@@ -92,8 +92,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 #
 # CPU/Task time and stats accounting
 #
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_SCHED_THERMAL_PRESSURE=y
@@ -1660,7 +1659,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1735,7 +1733,6 @@ CONFIG_NET_SCH_ETS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -2571,7 +2568,6 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -2744,6 +2740,7 @@ CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
@@ -4363,7 +4360,6 @@ CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
@@ -6724,7 +6720,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_RCAR_DW_HDMI=m
-CONFIG_DRM_RCAR_LVDS=m
+# CONFIG_DRM_RCAR_USE_LVDS is not set
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y

From 25e033517bdc13456f852dd9e4a044f451cabfcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Jun 2023 19:39:35 +0200
Subject: [PATCH 1378/1854] ocl-icd: update to 2.3.2.

fixes a FTBFS due to opencl2-headers-2023.04.17_1
---
 srcpkgs/ocl-icd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
index 552b0618f78b..829692e27dbf 100644
--- a/srcpkgs/ocl-icd/template
+++ b/srcpkgs/ocl-icd/template
@@ -1,6 +1,6 @@
 # Template file for 'ocl-icd'
 pkgname=ocl-icd
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="ruby xmlto asciidoc automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://forge.imag.fr/projects/ocl-icd/"
 distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
-checksum=a32b67c2d52ffbaf490be9fc18b46428ab807ab11eff7664d7ff75e06cfafd6d
+checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
 
 provides="libOpenCL-1.2_1"
 replaces="libOpenCL>=0"

From 79e28b9ececa510ab8d98cded766c75d13232d1d Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Mon, 26 Jun 2023 13:26:47 -0400
Subject: [PATCH 1379/1854] tea: add update file

---
 srcpkgs/tea/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/tea/update

diff --git a/srcpkgs/tea/update b/srcpkgs/tea/update
new file mode 100644
index 000000000000..07e104e7333e
--- /dev/null
+++ b/srcpkgs/tea/update
@@ -0,0 +1,2 @@
+site=https://gitea.com/gitea/tea/tags
+pkgname=v

From e5277a6faa49caedc766917083598345dac36e6f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 26 Jun 2023 13:49:34 -0400
Subject: [PATCH 1380/1854] azote: update to 1.12.1, adopt

---
 srcpkgs/azote/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 319a5f5b3ad8..463489ff115a 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,17 +1,17 @@
 # Template file for 'azote'
 pkgname=azote
-version=1.12.0
+version=1.12.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="gtk+3 libappindicator python3 python3-cairo python3-gobject
  python3-Pillow python3-send2trash python3-yaml"
 short_desc="Wallpaper & color manager for Sway, i3 and other WMs"
-maintainer="Piotr Miller <nwg.piotr@gmail.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/azote"
 distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/v${version}.tar.gz"
-checksum=f36962755f266ab3adf21fe997ad0df7ff4c372b6d9e7437d6c815e75ad479dc
+checksum=dd47f2d954446fbb344b5c458b43ce8a9432bab4581ec78d7816449e731489a4
 make_check=no # no tests provided
 
 post_install() {

From b2bdf40a0b8fd5a9580764e98d5fd70bc6f810e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Jun 2023 14:10:35 -0400
Subject: [PATCH 1381/1854] python3-pyopencl: update to 2023.1.1.

---
 srcpkgs/python3-pyopencl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 4b76973a5312..572ea9213bf5 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2023.1
+version=2023.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=d9de607272919a507a9c24c3dfeeeafe72c05f7cd6c9e37b2119e8ee3c53a891
+checksum=0ad92578a94a0be0dedd5ca4fcb6e27b5a75de4e5fac757f04c9044bd9d42444
 # Tests require a working OpenCL platform
 make_check=no
 

From 6576c29384fb7ddf31f4377a656fa512c12f7cb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Jun 2023 14:10:51 -0400
Subject: [PATCH 1382/1854] python3-redis: update to 4.6.0.

---
 srcpkgs/python3-redis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index 8df9f112be2e..214b7c421e9a 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-redis'
 pkgname=python3-redis
-version=4.5.5
+version=4.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/redis/redis-py"
 changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES"
 distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880
+checksum=585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d
 replaces="python3-aioredis<=2.0.1_1"
 make_check=no # tests require a running redis server
 

From 56c70546aa1f4b7d2d20475f41d6974bf3f52f11 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 19:20:12 +0530
Subject: [PATCH 1383/1854] *: orphan packages by k4leg

---
 srcpkgs/autopep8/template                   | 2 +-
 srcpkgs/exfatprogs/template                 | 2 +-
 srcpkgs/kgpg/template                       | 2 +-
 srcpkgs/python3-binaryornot/template        | 2 +-
 srcpkgs/python3-boolean.py/template         | 2 +-
 srcpkgs/python3-debian/template             | 2 +-
 srcpkgs/python3-license-expression/template | 2 +-
 srcpkgs/python3-parameterized/template      | 2 +-
 srcpkgs/python3-platformdirs/template       | 2 +-
 srcpkgs/python3-tokenize-rt/template        | 2 +-
 srcpkgs/reuse/template                      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/autopep8/template b/srcpkgs/autopep8/template
index e110c4f1587e..9cd4a3d944a3 100644
--- a/srcpkgs/autopep8/template
+++ b/srcpkgs/autopep8/template
@@ -9,7 +9,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-pycodestyle"
 checkdepends="python3-pytest $depends"
 short_desc="Automatically formats Python code to conform to the PEP 8 style guide"
-maintainer="k4leg <d0xi@inbox.ru>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/hhatto/autopep8"
 changelog="https://github.com/hhatto/autopep8/releases"
diff --git a/srcpkgs/exfatprogs/template b/srcpkgs/exfatprogs/template
index 6277c079ba50..4e259e11490c 100644
--- a/srcpkgs/exfatprogs/template
+++ b/srcpkgs/exfatprogs/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 build_style=gnu-configure
 short_desc="Tools to create, check and label exFAT filesystems"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/exfatprogs/exfatprogs"
 changelog="https://raw.githubusercontent.com/exfatprogs/exfatprogs/master/NEWS"
diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
index 0c551394f9f1..6523169a182d 100644
--- a/srcpkgs/kgpg/template
+++ b/srcpkgs/kgpg/template
@@ -13,7 +13,7 @@ makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel
 depends="gnupg"
 checkdepends="gnupg"
 short_desc="Simple interface for GnuPG, a powerful encryption utility"
-maintainer="k4leg <d0xi@inbox.ru>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.kgpg"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kgpg"
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
index e247e5dd23a3..7009d0373881 100644
--- a/srcpkgs/python3-binaryornot/template
+++ b/srcpkgs/python3-binaryornot/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-chardet"
 checkdepends="python3-hypothesis $depends"
 short_desc="Pure Python package to check if a file is binary or text"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/audreyfeldroy/binaryornot"
 changelog="https://raw.githubusercontent.com/audreyfeldroy/binaryornot/master/HISTORY.rst"
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
index 5d295b5d8dcd..57be72b1cd46 100644
--- a/srcpkgs/python3-boolean.py/template
+++ b/srcpkgs/python3-boolean.py/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Small library implementing a boolean algebra"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/bastikr/boolean.py"
 changelog="https://raw.githubusercontent.com/bastikr/boolean.py/master/CHANGELOG.rst"
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
index f2a8388a361b..0f25ebc788df 100644
--- a/srcpkgs/python3-debian/template
+++ b/srcpkgs/python3-debian/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-chardet"
 checkdepends="${depends} dpkg tar python3-pytest"
 short_desc="Python modules work with Debian-related data formats"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pypi.org/project/python-debian"
 changelog="https://salsa.debian.org/python-debian-team/python-debian/raw/master/debian/changelog"
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
index e6064d349a3a..13e57606dd20 100644
--- a/srcpkgs/python3-license-expression/template
+++ b/srcpkgs/python3-license-expression/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-setuptools_scm"
 depends="python3-boolean.py"
 checkdepends="python3-pytest $depends"
 short_desc="Library to parse, normalize and compare license expressions"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/nexB/license-expression"
 changelog="https://raw.githubusercontent.com/nexB/license-expression/master/CHANGELOG.rst"
diff --git a/srcpkgs/python3-parameterized/template b/srcpkgs/python3-parameterized/template
index 713a11c570e6..2536cba37950 100644
--- a/srcpkgs/python3-parameterized/template
+++ b/srcpkgs/python3-parameterized/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-mock python3-nose"
 short_desc="Parameterized testing with any Python test framework"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause-Views"
 homepage="https://github.com/wolever/parameterized"
 changelog="https://raw.githubusercontent.com/wolever/parameterized/master/CHANGELOG.txt"
diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index c9f34973027b..9aa52606afdb 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -7,7 +7,7 @@ hostmakedepends="hatchling hatch-vcs"
 depends="python3"
 checkdepends="python3-appdirs python3-pytest python3-pytest-mock"
 short_desc="Library to determine platform-specific system directories"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
diff --git a/srcpkgs/python3-tokenize-rt/template b/srcpkgs/python3-tokenize-rt/template
index 1253a28ff309..37253ddac20e 100644
--- a/srcpkgs/python3-tokenize-rt/template
+++ b/srcpkgs/python3-tokenize-rt/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Wrapper around the stdlib \`tokenize\` which roundtrips"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pypi.org/project/tokenize-rt"
 # Don't use PyPI because tests are missing.
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
index 375ff79fed94..be82ae7323cb 100644
--- a/srcpkgs/reuse/template
+++ b/srcpkgs/reuse/template
@@ -12,7 +12,7 @@ depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
  python3-license-expression python3-requests python3-setuptools"
 checkdepends="python3-pytest $depends git mercurial"
 short_desc="Helper tool for compliance with REUSE Specification"
-maintainer="k4leg <python.bogdan@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0, Apache-2.0, CC-BY-SA-4.0"
 homepage="https://reuse.software"
 changelog="https://raw.githubusercontent.com/fsfe/reuse-tool/master/CHANGELOG.md"

From 081d7a3c7670258fde4c92c7a017ab5f47637fab Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:20:36 +0200
Subject: [PATCH 1384/1854] duktape: fix update-check

---
 srcpkgs/duktape/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/duktape/update

diff --git a/srcpkgs/duktape/update b/srcpkgs/duktape/update
new file mode 100644
index 000000000000..94aec26a2143
--- /dev/null
+++ b/srcpkgs/duktape/update
@@ -0,0 +1 @@
+site="https://duktape.org/download.html"

From 48c72007edfe6a19c60f376d4195f1db84e2a1c6 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:29:45 +0200
Subject: [PATCH 1385/1854] exempi: fix update-check

---
 srcpkgs/exempi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template
index d664f7dc4d80..bb3758f029e4 100644
--- a/srcpkgs/exempi/template
+++ b/srcpkgs/exempi/template
@@ -8,7 +8,7 @@ makedepends="zlib-devel expat-devel boost-devel"
 short_desc="Library for easy parsing of XMP metadata"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://libopenraw.freedesktop.org/wiki/Exempi"
+homepage="https://libopenraw.freedesktop.org/exempi/"
 distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2"
 checksum=4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d
 

From d12e239a12acc7e372d377b1b9e5097af1db09f1 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:32:54 +0200
Subject: [PATCH 1386/1854] expat: fix update-check

---
 srcpkgs/expat/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/expat/update b/srcpkgs/expat/update
index 86244456f40c..79a0b1dff130 100644
--- a/srcpkgs/expat/update
+++ b/srcpkgs/expat/update
@@ -1 +1 @@
-site='https://github.com/libexpat/libexpat/releases'
+pattern='R_\K[\d_]+'

From b2049cc727c30f326f5b6e3690b514dcf50a6446 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:37:16 +0200
Subject: [PATCH 1387/1854] font-alef: fix update-check

---
 srcpkgs/font-alef/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/font-alef/update

diff --git a/srcpkgs/font-alef/update b/srcpkgs/font-alef/update
new file mode 100644
index 000000000000..85d038ef823c
--- /dev/null
+++ b/srcpkgs/font-alef/update
@@ -0,0 +1 @@
+pkgname="alef"

From d25f1bbd7fc562ab0b6ef6b785e9a84ec8983772 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 13:46:47 +0200
Subject: [PATCH 1388/1854] glibc: fix update-check

---
 srcpkgs/glibc/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/glibc/update

diff --git a/srcpkgs/glibc/update b/srcpkgs/glibc/update
new file mode 100644
index 000000000000..37c14e80bba9
--- /dev/null
+++ b/srcpkgs/glibc/update
@@ -0,0 +1 @@
+pattern='\K[\d.]+(?= released)'

From 48ecee199e2ce3f51ba7bffc8808bb35c1926bb6 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:01:53 +0200
Subject: [PATCH 1389/1854] libcloudproviders: fix update-check

---
 srcpkgs/libcloudproviders/template | 2 +-
 srcpkgs/libcloudproviders/update   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/libcloudproviders/update

diff --git a/srcpkgs/libcloudproviders/template b/srcpkgs/libcloudproviders/template
index 65b920a0cc2a..3b429a93b378 100644
--- a/srcpkgs/libcloudproviders/template
+++ b/srcpkgs/libcloudproviders/template
@@ -10,7 +10,7 @@ makedepends="libglib-devel"
 short_desc="DBus API for cloud storage sync clients to expose their services"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/Incubator/libcloudproviders"
+homepage="https://gitlab.gnome.org/World/libcloudproviders"
 distfiles="${homepage}/-/archive/${version}/libcloudproviders-${version}.tar.gz"
 checksum=bd00e7b85d84d201bd36f6e460555d8ba41246d63d5f3607ff7542a257f27236
 
diff --git a/srcpkgs/libcloudproviders/update b/srcpkgs/libcloudproviders/update
deleted file mode 100644
index f176e54e6b9d..000000000000
--- a/srcpkgs/libcloudproviders/update
+++ /dev/null
@@ -1 +0,0 @@
-site=https://gitlab.gnome.org/Incubator/libcloudproviders/tags

From 4d1000ff58b9690a7448e557e7f99abc2a6fe36a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:15:26 +0200
Subject: [PATCH 1390/1854] libnl3: fix update-check

---
 srcpkgs/libnl3/update | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libnl3/update b/srcpkgs/libnl3/update
index d33f5a4a1ec1..1c19d54f2795 100644
--- a/srcpkgs/libnl3/update
+++ b/srcpkgs/libnl3/update
@@ -1,2 +1 @@
-site=https://github.com/thom311/libnl/releases
-pattern="libnl-\K[\d.]*(?=\.tar\.gz)"
+pattern="libnl\K[\d_]+"

From cf321af2e37be0d1c4b36958fc4f37328ce019a8 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:17:33 +0200
Subject: [PATCH 1391/1854] libopenal: fix update-check

---
 srcpkgs/libopenal/update | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libopenal/update b/srcpkgs/libopenal/update
index fdfad4e3c438..616d2425c8d8 100644
--- a/srcpkgs/libopenal/update
+++ b/srcpkgs/libopenal/update
@@ -1,2 +1 @@
 pkgname=openal-soft
-site=https://github.com/kcat/openal-soft/releases

From e5ae18a6eb26ddb0dfa60ae6394d751233da491f Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:26:11 +0200
Subject: [PATCH 1392/1854] libsamplerate: fix update-check

---
 srcpkgs/libsamplerate/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/libsamplerate/update

diff --git a/srcpkgs/libsamplerate/update b/srcpkgs/libsamplerate/update
deleted file mode 100644
index 8ccb86344234..000000000000
--- a/srcpkgs/libsamplerate/update
+++ /dev/null
@@ -1 +0,0 @@
-site="${homepage}/download.html"

From eb3a8a662b2718b68b8b91ea625c1aae0f56d1e1 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:28:48 +0200
Subject: [PATCH 1393/1854] libupnp: fix update-check

---
 srcpkgs/libupnp/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/libupnp/update

diff --git a/srcpkgs/libupnp/update b/srcpkgs/libupnp/update
new file mode 100644
index 000000000000..1f149c440447
--- /dev/null
+++ b/srcpkgs/libupnp/update
@@ -0,0 +1 @@
+pkgname="release"

From daa0729357fe2f029e1488e4a6ec77e7f2b79b73 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:33:59 +0200
Subject: [PATCH 1394/1854] libxcvt: fix update-check

---
 srcpkgs/libxcvt/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/libxcvt/update

diff --git a/srcpkgs/libxcvt/update b/srcpkgs/libxcvt/update
new file mode 100644
index 000000000000..fb7e1c566b6c
--- /dev/null
+++ b/srcpkgs/libxcvt/update
@@ -0,0 +1,2 @@
+site="https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/tags"
+pattern="libxcvt-\K[\d.]+(?=</a>)"

From 5b286db91712bf48e8d622b4491c6f573074e08a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:39:47 +0200
Subject: [PATCH 1395/1854] lm_sensors: fix update-check

---
 srcpkgs/lm_sensors/template | 2 +-
 srcpkgs/lm_sensors/update   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lm_sensors/update

diff --git a/srcpkgs/lm_sensors/template b/srcpkgs/lm_sensors/template
index f03b80aa45bf..6e5091c9f9be 100644
--- a/srcpkgs/lm_sensors/template
+++ b/srcpkgs/lm_sensors/template
@@ -10,7 +10,7 @@ depends="perl"
 short_desc="Utilities to read temperature/voltage/fan sensors"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://github.com/lm-sensors/lm-sensors"
+homepage="https://hwmon.wiki.kernel.org/lm_sensors"
 distfiles="https://github.com/lm-sensors/lm-sensors/archive/V${version//./-}.tar.gz"
 checksum=0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197
 
diff --git a/srcpkgs/lm_sensors/update b/srcpkgs/lm_sensors/update
new file mode 100644
index 000000000000..2900125842b6
--- /dev/null
+++ b/srcpkgs/lm_sensors/update
@@ -0,0 +1 @@
+pattern='V\K[\d-]+(?=</a>)'

From f16370e4680355e5046f5bfb1ec90ad48853c32a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 14:44:31 +0200
Subject: [PATCH 1396/1854] ocl-icd: fix update-check

---
 srcpkgs/ocl-icd/template | 2 +-
 srcpkgs/ocl-icd/update   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/ocl-icd/update

diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template
index 829692e27dbf..2581cd299929 100644
--- a/srcpkgs/ocl-icd/template
+++ b/srcpkgs/ocl-icd/template
@@ -8,7 +8,7 @@ makedepends="opencl2-headers"
 short_desc="Generic OpenCL ICD loader/demultiplexer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://forge.imag.fr/projects/ocl-icd/"
+homepage="https://github.com/OCL-dev/ocl-icd"
 distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz"
 checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5
 
diff --git a/srcpkgs/ocl-icd/update b/srcpkgs/ocl-icd/update
deleted file mode 100644
index fdf6b37ed231..000000000000
--- a/srcpkgs/ocl-icd/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern=$pkgname' \K[\d.]+'

From 5d2737e4551998f35ac815ae4da544506c0a5874 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:23:17 +0200
Subject: [PATCH 1397/1854] soundtouch: fix update-check

---
 srcpkgs/soundtouch/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/soundtouch/update

diff --git a/srcpkgs/soundtouch/update b/srcpkgs/soundtouch/update
new file mode 100644
index 000000000000..4de4fc8fe297
--- /dev/null
+++ b/srcpkgs/soundtouch/update
@@ -0,0 +1,2 @@
+site="https://codeberg.org/soundtouch/soundtouch/tags"
+pattern='/soundtouch/soundtouch/archive/\K[\d.]+(?=tar.gz)'

From e6eedf361247049863847a0e7df31bebbd78477a Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:24:54 +0200
Subject: [PATCH 1398/1854] source-sans-pro: fix update-check

---
 srcpkgs/source-sans-pro/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/source-sans-pro/update

diff --git a/srcpkgs/source-sans-pro/update b/srcpkgs/source-sans-pro/update
deleted file mode 100644
index 9166ab654134..000000000000
--- a/srcpkgs/source-sans-pro/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="source-sans-pro/archive/\K[.\d]+"

From 66e1b157be697717f67f5e218cd35d9a306d0bc3 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:29:23 +0200
Subject: [PATCH 1399/1854] usbredir: fix update-check

---
 srcpkgs/usbredir/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/usbredir/update

diff --git a/srcpkgs/usbredir/update b/srcpkgs/usbredir/update
new file mode 100644
index 000000000000..24b023face73
--- /dev/null
+++ b/srcpkgs/usbredir/update
@@ -0,0 +1 @@
+pkgname="usbredir-usbredir"

From cbb035fe94f88ad3ba1e8ef5f5eea46aaccbc5b5 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 15:39:34 +0200
Subject: [PATCH 1400/1854] wayland-protocols: fix update-check

---
 srcpkgs/wayland-protocols/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/wayland-protocols/update

diff --git a/srcpkgs/wayland-protocols/update b/srcpkgs/wayland-protocols/update
deleted file mode 100644
index 264a5c715ffc..000000000000
--- a/srcpkgs/wayland-protocols/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/wayland-project/wayland-protocols/releases
-pkgname=

From 01ecc9b5d27ef4d2332ff4ae54e89262716f90d1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 Jan 2023 23:59:17 +0000
Subject: [PATCH 1401/1854] black: ignore alpha and beta releases.

---
 srcpkgs/black/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/black/update

diff --git a/srcpkgs/black/update b/srcpkgs/black/update
new file mode 100644
index 000000000000..e957dc43055f
--- /dev/null
+++ b/srcpkgs/black/update
@@ -0,0 +1 @@
+ignore="*a* *b*"

From 376d4d42ff24bd01daf14105705d06e7caaf060a Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 14 Jun 2023 01:00:44 -0400
Subject: [PATCH 1402/1854] srcpkgs/*: remove all cryptocurrency/blockchain
 packages

---
 CONTRIBUTING.md                               |   1 +
 common/shlibs                                 |   1 -
 srcpkgs/Electron-Cash/template                |  28 -----
 srcpkgs/bitcoin-devel                         |   1 -
 srcpkgs/bitcoin-qt                            |   1 -
 srcpkgs/bitcoin/patches/fix-test.patch        |  22 ----
 srcpkgs/bitcoin/template                      |  74 ------------
 srcpkgs/bitcoin/update                        |   2 -
 srcpkgs/cointop/template                      |  12 --
 srcpkgs/cpuminer/template                     |  13 ---
 srcpkgs/electrum-ltc/patches/no-certifi.patch |  97 ----------------
 srcpkgs/electrum-ltc/template                 |  19 ----
 srcpkgs/electrum/files/README.voidlinux       |   3 -
 srcpkgs/electrum/template                     |  31 -----
 srcpkgs/electrum/update                       |   3 -
 srcpkgs/geth                                  |   1 -
 srcpkgs/go-ethereum/template                  |  27 -----
 srcpkgs/libbitcoin-secp256k1-devel            |   1 -
 srcpkgs/libbitcoin-secp256k1/template         |  35 ------
 srcpkgs/litecoin/patches/fix-include.patch    |  61 ----------
 srcpkgs/litecoin/template                     |  34 ------
 srcpkgs/monero-devel                          |   1 -
 srcpkgs/monero-gui/INSTALL.msg                |   4 -
 srcpkgs/monero-gui/files                      |   1 -
 srcpkgs/monero-gui/template                   | 106 ------------------
 srcpkgs/monero-gui/update                     |   2 -
 srcpkgs/monero/files/monerod/run              |   3 -
 srcpkgs/monero/patches/easylogging.patch      |  11 --
 srcpkgs/monero/patches/fix-include.patch      |  29 -----
 srcpkgs/monero/patches/march_cross.patch      |  13 ---
 srcpkgs/monero/patches/system-miniupnpc.patch | 106 ------------------
 srcpkgs/monero/template                       |  94 ----------------
 srcpkgs/monero/update                         |   2 -
 srcpkgs/namecoin/patches/boost-1.80.patch     |  57 ----------
 srcpkgs/namecoin/patches/fix-include.patch    |  77 -------------
 srcpkgs/namecoin/template                     |  32 ------
 srcpkgs/namecoin/update                       |   1 -
 srcpkgs/nxt/files/bin/nxt                     |   2 -
 srcpkgs/nxt/files/bin/nxt-tor                 |   2 -
 srcpkgs/nxt/files/nxt-tor/run                 |   4 -
 srcpkgs/nxt/files/nxt/run                     |   3 -
 srcpkgs/nxt/template                          |  25 -----
 srcpkgs/removed-packages/template             |  19 +++-
 srcpkgs/swarm/template                        |  13 ---
 44 files changed, 19 insertions(+), 1055 deletions(-)
 delete mode 100644 srcpkgs/Electron-Cash/template
 delete mode 120000 srcpkgs/bitcoin-devel
 delete mode 120000 srcpkgs/bitcoin-qt
 delete mode 100644 srcpkgs/bitcoin/patches/fix-test.patch
 delete mode 100644 srcpkgs/bitcoin/template
 delete mode 100644 srcpkgs/bitcoin/update
 delete mode 100644 srcpkgs/cointop/template
 delete mode 100644 srcpkgs/cpuminer/template
 delete mode 100644 srcpkgs/electrum-ltc/patches/no-certifi.patch
 delete mode 100644 srcpkgs/electrum-ltc/template
 delete mode 100644 srcpkgs/electrum/files/README.voidlinux
 delete mode 100644 srcpkgs/electrum/template
 delete mode 100644 srcpkgs/electrum/update
 delete mode 120000 srcpkgs/geth
 delete mode 100644 srcpkgs/go-ethereum/template
 delete mode 120000 srcpkgs/libbitcoin-secp256k1-devel
 delete mode 100644 srcpkgs/libbitcoin-secp256k1/template
 delete mode 100644 srcpkgs/litecoin/patches/fix-include.patch
 delete mode 100644 srcpkgs/litecoin/template
 delete mode 120000 srcpkgs/monero-devel
 delete mode 100644 srcpkgs/monero-gui/INSTALL.msg
 delete mode 120000 srcpkgs/monero-gui/files
 delete mode 100644 srcpkgs/monero-gui/template
 delete mode 100644 srcpkgs/monero-gui/update
 delete mode 100644 srcpkgs/monero/files/monerod/run
 delete mode 100644 srcpkgs/monero/patches/easylogging.patch
 delete mode 100644 srcpkgs/monero/patches/fix-include.patch
 delete mode 100644 srcpkgs/monero/patches/march_cross.patch
 delete mode 100644 srcpkgs/monero/patches/system-miniupnpc.patch
 delete mode 100644 srcpkgs/monero/template
 delete mode 100644 srcpkgs/monero/update
 delete mode 100644 srcpkgs/namecoin/patches/boost-1.80.patch
 delete mode 100644 srcpkgs/namecoin/patches/fix-include.patch
 delete mode 100644 srcpkgs/namecoin/template
 delete mode 100644 srcpkgs/namecoin/update
 delete mode 100644 srcpkgs/nxt/files/bin/nxt
 delete mode 100644 srcpkgs/nxt/files/bin/nxt-tor
 delete mode 100644 srcpkgs/nxt/files/nxt-tor/run
 delete mode 100644 srcpkgs/nxt/files/nxt/run
 delete mode 100644 srcpkgs/nxt/template
 delete mode 100644 srcpkgs/swarm/template

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bc9ff3e9d5d3..a8f58bbb3744 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,6 +20,7 @@ while not meeting any of the following requirements, is a good candidate for the
 In particular, new themes are highly unlikely to be accepted.
 Simple shell scripts are unlikely to be accepted unless they provide considerable value to a broad user base.
 New fonts may be accepted if they provide value beyond aesthetics (e.g. they contain glyphs for a script missing in already packaged fonts).
+Packages related to cryptocurrencies (wallets, miners, nodes, etc) are not accepted.
 
 Browser forks, including those based on Chromium and Firefox, are generally not accepted.
 Such forks require heavy patching, maintenance and hours of build time.
diff --git a/common/shlibs b/common/shlibs
index 525c08a30424..754c2aa23049 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3671,7 +3671,6 @@ libdwarves_emit.so.1 pahole-1.12_1
 libdwarves_reorganize.so.1 pahole-1.12_1
 libclthreads.so.2 clthreads-2.4.2_1
 libclxclient.so.3 clxclient-3.9.2_1
-libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1
 libltc.so.11 libltc-1.3.1_1
 libvpd-2.2.so.2 libvpd-2.2.6_1
 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
deleted file mode 100644
index 38ca3449b093..000000000000
--- a/srcpkgs/Electron-Cash/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'Electron-Cash'
-pkgname=Electron-Cash
-version=4.2.10
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
-depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil
- python3-jsonrpclib python3-protobuf
- python3-dnspython python3-requests python3-pysocks python3-stem
- python3-ecdsa python3-pyaes python3-pycryptodomex libbitcoin-secp256k1 libzbar
- python3-cryptography>=2.6 python3-pathvalidate python3-psutil"
-short_desc="Lightweight Bitcoin Cash client"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://electroncash.org"
-distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz"
-checksum=2c77258c0e8ccdc42d16cd9bdbc26b47f94b92d9ba8a86d63c25a17ec832b324
-make_check=no # Depends on unpackaged SimpleWebSocketServer
-
-post_install() {
-	# TODO: build these binaries instead of having to remove pre-built ones
-	rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/tor/bin/tor"
-
-	for lib in zbar secp256k1; do
-		rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
-	done
-	vlicense LICENCE
-}
diff --git a/srcpkgs/bitcoin-devel b/srcpkgs/bitcoin-devel
deleted file mode 120000
index f3c13956326c..000000000000
--- a/srcpkgs/bitcoin-devel
+++ /dev/null
@@ -1 +0,0 @@
-bitcoin
\ No newline at end of file
diff --git a/srcpkgs/bitcoin-qt b/srcpkgs/bitcoin-qt
deleted file mode 120000
index f3c13956326c..000000000000
--- a/srcpkgs/bitcoin-qt
+++ /dev/null
@@ -1 +0,0 @@
-bitcoin
\ No newline at end of file
diff --git a/srcpkgs/bitcoin/patches/fix-test.patch b/srcpkgs/bitcoin/patches/fix-test.patch
deleted file mode 100644
index 0004fd7358a5..000000000000
--- a/srcpkgs/bitcoin/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: bitcoin-22.0/src/wallet/test/init_tests.cpp
-===================================================================
---- bitcoin-22.0.orig/src/wallet/test/init_tests.cpp
-+++ bitcoin-22.0/src/wallet/test/init_tests.cpp
-@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(walletinit_verify_w
-     BOOST_CHECK(result == true);
-     fs::path walletdir = gArgs.GetArg("-walletdir", "");
-     fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
--    BOOST_CHECK_EQUAL(walletdir, expected_path);
-+    BOOST_TEST(fs::equivalent(walletdir, expected_path));
- }
- 
- BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_no_trailing2)
-@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(walletinit_verify_w
-     BOOST_CHECK(result == true);
-     fs::path walletdir = gArgs.GetArg("-walletdir", "");
-     fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
--    BOOST_CHECK_EQUAL(walletdir, expected_path);
-+    BOOST_TEST(fs::equivalent(walletdir, expected_path));
- }
- 
- BOOST_AUTO_TEST_SUITE_END()
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
deleted file mode 100644
index cf464ce35c46..000000000000
--- a/srcpkgs/bitcoin/template
+++ /dev/null
@@ -1,74 +0,0 @@
-# Template file for 'bitcoin'
-pkgname=bitcoin
-version=22.0
-revision=5
-build_style=gnu-configure
-configure_args="--with-incompatible-bdb --disable-ccache --disable-static
- --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
-hostmakedepends="automake libtool pkg-config yasm"
-makedepends="db-devel boost-devel miniupnpc-devel qt5-tools-devel
- libevent-devel qrencode-devel libatomic-devel sqlite-devel"
-short_desc="Bitcoin is a peer-to-peer network based digital currency"
-maintainer="Daniel A. Maierhofer <git@damadmai.at>"
-license="MIT"
-homepage="https://bitcoin.org/"
-distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
- https://raw.githubusercontent.com/bitcoin-core/packaging/${version%.*}.x/debian/bitcoin-qt.desktop
- https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
-checksum="d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b
- 0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
- ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
-conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
-skip_extraction="bitcoin-qt.desktop bitcoin128.png"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools"
-fi
-
-pre_configure() {
-	autoreconf -fi
-	case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		CFLAGS=${CFLAGS/armv8-a/armv8-a+crc+crypto}
-		CXXFLAGS=${CXXFLAGS/armv8-a/armv8-a+crc+crypto}
-		;;
-	esac
-}
-
-pre_build() {
-	export BITCOIN_GENBUILD_NO_GIT=1
-}
-
-post_install() {
-	rm "${DESTDIR}"/usr/bin/{test,bench}_bitcoin
-
-	for b in bitcoind bitcoin-cli bitcoin-tx; do
-		vcompletion contrib/${b}.bash-completion bash $b
-	done
-
-	vlicense COPYING
-}
-
-bitcoin-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vdoc doc/shared-libraries.md # Provides information on libbitcoinconsensus
-	}
-}
-
-bitcoin-qt_package() {
-	depends="desktop-file-utils"
-	short_desc+=" - QT GUI"
-	pkg_install() {
-		vmove usr/bin/bitcoin-qt
-		vmove usr/share/man/man1/bitcoin-qt.1
-		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin-qt.desktop 644 usr/share/applications
-		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin128.png 644 usr/share/pixmaps
-		vlicense COPYING
-		rm "${DESTDIR}"/usr/bin/test_bitcoin-qt
-	}
-}
diff --git a/srcpkgs/bitcoin/update b/srcpkgs/bitcoin/update
deleted file mode 100644
index b28ea45c0898..000000000000
--- a/srcpkgs/bitcoin/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitcoin.org/bin/"
-pattern='bitcoin-core-\K[\d.]+'
diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
deleted file mode 100644
index 343f2ad20a49..000000000000
--- a/srcpkgs/cointop/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'cointop'
-pkgname=cointop
-version=1.6.10
-revision=1
-build_style=go
-go_import_path="github.com/cointop-sh/cointop"
-short_desc="Terminal based application for tracking cryptocurrencies"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/cointop-sh/cointop"
-distfiles="https://github.com/cointop-sh/cointop/archive/v${version}.tar.gz"
-checksum=18da0d25288deec7156ddd1d6923960968ab4adcdc917f85726b97d555d9b1b7
diff --git a/srcpkgs/cpuminer/template b/srcpkgs/cpuminer/template
deleted file mode 100644
index 8afb7a5c4877..000000000000
--- a/srcpkgs/cpuminer/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'cpuminer'
-pkgname=cpuminer
-version=2.5.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config yasm"
-makedepends="libcurl-devel ncurses-devel jansson-devel"
-short_desc="Multi-threaded CPU miner for Litecoin and Bitcoin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/pooler/cpuminer"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/pooler-${pkgname}-${version}.tar.gz"
-checksum=337f04fdb32f34b85819d09d59f6d3cf62991ac2e656735c43661dd3d4c57631
diff --git a/srcpkgs/electrum-ltc/patches/no-certifi.patch b/srcpkgs/electrum-ltc/patches/no-certifi.patch
deleted file mode 100644
index 9d68378996ba..000000000000
--- a/srcpkgs/electrum-ltc/patches/no-certifi.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/electrum_ltc/interface.py b/electrum_ltc/interface.py
-index b5eac439c..14bbd7ab9 100644
---- a/electrum_ltc/interface.py
-+++ b/electrum_ltc/interface.py
-@@ -40,7 +40,6 @@ from aiorpcx import RPCSession, Notification, NetAddress
- from aiorpcx.curio import timeout_after, TaskTimeout
- from aiorpcx.jsonrpc import JSONRPC, CodeMessageError
- from aiorpcx.rawsocket import RSClient
--import certifi
- 
- from .util import ignore_exceptions, log_exceptions, bfh, SilentTaskGroup
- from . import util
-@@ -57,7 +56,7 @@ if TYPE_CHECKING:
-     from .network import Network
- 
- 
--ca_path = certifi.where()
-+ca_path = '/etc/ssl/certs/ca-certificates.crt'
- 
- BUCKET_NAME_OF_ONION_SERVERS = 'onion'
- 
-diff --git a/electrum_ltc/paymentrequest.py b/electrum_ltc/paymentrequest.py
-index 149065bf3..9580c8d48 100644
---- a/electrum_ltc/paymentrequest.py
-+++ b/electrum_ltc/paymentrequest.py
-@@ -29,7 +29,6 @@ import traceback
- import json
- from typing import Optional
- 
--import certifi
- import urllib.parse
- import aiohttp
- 
-@@ -54,7 +53,7 @@ _logger = get_logger(__name__)
- REQUEST_HEADERS = {'Accept': 'application/litecoin-paymentrequest', 'User-Agent': 'Electrum'}
- ACK_HEADERS = {'Content-Type':'application/litecoin-payment','Accept':'application/litecoin-paymentack','User-Agent':'Electrum'}
- 
--ca_path = certifi.where()
-+ca_path = '/etc/ssl/certs/ca-certificates.crt'
- ca_list = None
- ca_keyID = None
- 
-diff --git a/electrum_ltc/util.py b/electrum_ltc/util.py
-index bc69800dc..9c32a195a 100644
---- a/electrum_ltc/util.py
-+++ b/electrum_ltc/util.py
-@@ -44,7 +44,6 @@ import ssl
- import aiohttp
- from aiohttp_socks import SocksConnector, SocksVer
- from aiorpcx import TaskGroup
--import certifi
- 
- from .i18n import _
- from .logging import get_logger, Logger
-@@ -62,7 +61,7 @@ def inv_dict(d):
-     return {v: k for k, v in d.items()}
- 
- 
--ca_path = certifi.where()
-+ca_path = '/etc/ssl/certs/ca-certificates.crt'
- 
- 
- base_units = {'LTC':8, 'mLTC':5, 'uLTC':2, 'sat':0}
-diff --git a/electrum_ltc/x509.py b/electrum_ltc/x509.py
-index c38edc77a..e745e4878 100644
---- a/electrum_ltc/x509.py
-+++ b/electrum_ltc/x509.py
-@@ -343,7 +343,6 @@ def load_certificates(ca_path):
- 
- 
- if __name__ == "__main__":
--    import certifi
- 
--    ca_path = certifi.where()
-+    ca_path = '/etc/ssl/certs/ca-certificates.crt'
-     ca_list, ca_keyID = load_certificates(ca_path)
-diff --git a/run_electrum b/run_electrum
-index 978e5fb2f..e8fc3888c 100755
---- a/run_electrum
-+++ b/run_electrum
-@@ -58,7 +58,6 @@ def check_imports():
-         import dns
-         import pyaes
-         import ecdsa
--        import certifi
-         import qrcode
-         import google.protobuf
-         import jsonrpclib
-@@ -72,7 +71,7 @@ def check_imports():
-     from google.protobuf import descriptor_pb2
-     from jsonrpclib import SimpleJSONRPCServer
-     # make sure that certificates are here
--    assert os.path.exists(certifi.where())
-+    assert os.path.exists('/etc/ssl/certs/ca-certificates.crt')
- 
- 
- if not is_android:
diff --git a/srcpkgs/electrum-ltc/template b/srcpkgs/electrum-ltc/template
deleted file mode 100644
index f476e2de0ed6..000000000000
--- a/srcpkgs/electrum-ltc/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'electrum-ltc'
-pkgname=electrum-ltc
-version=3.3.8.1
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
-depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
- python3-dnspython python3-ecdsa python3-jsonrpclib python3-protobuf
- python3-pyaes python3-pycryptodome python3-PyQt5 python3-qrcode"
-short_desc="Lightweight Litecoin port of the Electrum Bitcoin wallet"
-maintainer="Young Jin Park <youngjinpark20@gmail.com>"
-license="MIT"
-homepage="https://electrum-ltc.org/"
-distfiles="https://github.com/pooler/electrum-ltc/archive/${version}.tar.gz"
-checksum="6f4049abacfdb125b968e841ec9bc01e386e475f3fac8534103ffea1257b0f0f"
-
-post_install() {
-	vlicense LICENCE
-}
diff --git a/srcpkgs/electrum/files/README.voidlinux b/srcpkgs/electrum/files/README.voidlinux
deleted file mode 100644
index 9ba377487dac..000000000000
--- a/srcpkgs/electrum/files/README.voidlinux
+++ /dev/null
@@ -1,3 +0,0 @@
-Some optional packages must be installed for additional functionality:
-
-- python3-matplotlib: plot transaction history in graphical mode
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
deleted file mode 100644
index dcabed755423..000000000000
--- a/srcpkgs/electrum/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'electrum'
-pkgname=electrum
-version=4.2.0
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
-depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
- python3-bitstring python3-dnspython python3-ecdsa python3-jsonrpclib
- python3-protobuf python3-pyaes python3-pycryptodomex python3-PyQt5
- python3-qrcode python3-socks python3-cryptography libbitcoin-secp256k1
- python3-certifi"
-# Optional dependencies:
-#  btchip - BTChip hardware wallet support
-#  trezor - TREZOR hardware wallet support
-#  keepkey - KeepKey hardware wallet support
-#  qdarkstyle - Dark theme
-checkdepends="$depends python3-pytest"
-short_desc="Lightweight Bitcoin wallet"
-maintainer="Charles E. Lehner <cel@celehner.com>"
-license="MIT"
-homepage="https://electrum.org/"
-distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=3a24c7ed7a2bb47888f308380b8624a3fff3cf3882fd63d904cd9c3ec543fb3b
-
-post_install() {
-	vsed -i -e 's|electrum %u|electrum|' \
-		-e 's|testnet %u|testnet|' \
-		${DESTDIR}/usr/share/applications/electrum.desktop
-	vlicense LICENCE
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/electrum/update b/srcpkgs/electrum/update
deleted file mode 100644
index 4b1b69c33225..000000000000
--- a/srcpkgs/electrum/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://download.electrum.org"
-pattern='<a href="\K[\d.]+(?=/">)'
-
diff --git a/srcpkgs/geth b/srcpkgs/geth
deleted file mode 120000
index 643fd89ff2c6..000000000000
--- a/srcpkgs/geth
+++ /dev/null
@@ -1 +0,0 @@
-go-ethereum
\ No newline at end of file
diff --git a/srcpkgs/go-ethereum/template b/srcpkgs/go-ethereum/template
deleted file mode 100644
index 1377f4c3ac3f..000000000000
--- a/srcpkgs/go-ethereum/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'go-ethereum'
-pkgname=go-ethereum
-version=1.10.1
-revision=2
-build_style=go
-go_import_path=github.com/ethereum/go-ethereum
-go_package="${go_import_path}/cmd/abigen
- ${go_import_path}/cmd/bootnode
- ${go_import_path}/cmd/evm
- ${go_import_path}/cmd/geth
- ${go_import_path}/cmd/puppeth
- ${go_import_path}/cmd/rlpdump
- ${go_import_path}/cmd/clef"
-depends="geth"
-short_desc="Full suite of Go Ethereum utilities"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="GPL-3.0-only"
-homepage="https://github.com/ethereum/go-ethereum"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=485ff7b9e5a34457ab424d7e2cb8d377dc571e8daf666e065a0a327b9e413cab
-
-geth_package() {
-	short_desc="Official Go implementation of the Ethereum protocol"
-	pkg_install() {
-		vmove usr/bin/geth
-	}
-}
diff --git a/srcpkgs/libbitcoin-secp256k1-devel b/srcpkgs/libbitcoin-secp256k1-devel
deleted file mode 120000
index 527eb8d59d7e..000000000000
--- a/srcpkgs/libbitcoin-secp256k1-devel
+++ /dev/null
@@ -1 +0,0 @@
-libbitcoin-secp256k1
\ No newline at end of file
diff --git a/srcpkgs/libbitcoin-secp256k1/template b/srcpkgs/libbitcoin-secp256k1/template
deleted file mode 100644
index 42f5ad1ded0e..000000000000
--- a/srcpkgs/libbitcoin-secp256k1/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'libbitcoin-secp256k1'
-pkgname=libbitcoin-secp256k1
-version=0.1.0.13
-revision=1
-build_style=gnu-configure
-configure_args="--disable-benchmark --disable-coverage --disable-jni
- --disable-openssl-tests --enable-exhaustive-tests --enable-module-recovery
- --enable-tests --with-gnu-ld"
-hostmakedepends="autoconf automake libtool m4 pkg-config"
-short_desc="Optimized C library for EC operations on curve secp256k1"
-maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
-license="MIT"
-homepage="https://github.com/libbitcoin/secp256k1"
-distfiles="https://github.com/libbitcoin/secp256k1/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=9e48dbc88d0fb5646d40ea12df9375c577f0e77525e49833fb744d3c2a69e727
-
-pre_configure() {
-	./autogen.sh
-}
-
-post_install() {
-	vlicense COPYING
-	vdoc README.md
-}
-
-libbitcoin-secp256k1-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/litecoin/patches/fix-include.patch b/srcpkgs/litecoin/patches/fix-include.patch
deleted file mode 100644
index b540db326b87..000000000000
--- a/srcpkgs/litecoin/patches/fix-include.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: litecoin-0.18.1/src/bench/block_assemble.cpp
-===================================================================
---- litecoin-0.18.1.orig/src/bench/block_assemble.cpp
-+++ litecoin-0.18.1/src/bench/block_assemble.cpp
-@@ -20,7 +20,9 @@
- 
- #include <boost/thread.hpp>
- 
-+#include <array>
- #include <list>
-+#include <memory>
- #include <vector>
- 
- static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey)
-Index: litecoin-0.18.1/src/net_processing.cpp
-===================================================================
---- litecoin-0.18.1.orig/src/net_processing.cpp
-+++ litecoin-0.18.1/src/net_processing.cpp
-@@ -30,7 +30,9 @@
- #include <util/moneystr.h>
- #include <util/strencodings.h>
- 
-+#include <array>
- #include <memory>
-+#include <utility>
- 
- #if defined(NDEBUG)
- # error "Litecoin cannot be compiled without assertions."
-Index: litecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-===================================================================
---- litecoin-0.18.1.orig/src/qt/sendcoinsdialog.cpp
-+++ litecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-@@ -32,6 +32,8 @@
- #include <QSettings>
- #include <QTextDocument>
- 
-+#include <array>
-+
- static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
- int getConfTargetForIndex(int index) {
-     if (index+1 > static_cast<int>(confTargets.size())) {
---- a/src/httpserver.cpp	2019-04-08 09:28:20.000000000 +0200
-+++ b/src/httpserver.cpp	2019-04-08 09:28:20.000000000 +0200
-@@ -17,6 +17,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <deque>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
---- a/src/qt/trafficgraphwidget.cpp	2019-04-08 09:28:20.000000000 +0200
-+++ b/src/qt/trafficgraphwidget.cpp	2019-04-08 09:28:20.000000000 +0200
-@@ -6,6 +6,7 @@
- #include <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
deleted file mode 100644
index a7ed18603c20..000000000000
--- a/srcpkgs/litecoin/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'litecoin'
-pkgname=litecoin
-version=0.18.1
-revision=11
-build_style=gnu-configure
-configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-openssl"
-hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
- qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
-short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://www.litecoin.org/"
-distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"
-checksum=2d67cba11adc5890b9698ccddeb68dd3c2ff6af19bf3ed0f1c719348b914042f
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools protobuf"
-	configure_args+=" --with-boost=${XBPS_CROSS_BASE}"
-fi
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	vsconf share/examples/litecoin.conf
-	vman doc/man/litecoind.1 litecoind.1
-	vlicense COPYING
-	vmkdir usr/share/bash-completion/completions/${pkgname}
-	vcopy contrib/*.bash-completion usr/share/bash-completion/completions/${pkgname}
-}
diff --git a/srcpkgs/monero-devel b/srcpkgs/monero-devel
deleted file mode 120000
index 772084db0203..000000000000
--- a/srcpkgs/monero-devel
+++ /dev/null
@@ -1 +0,0 @@
-monero
\ No newline at end of file
diff --git a/srcpkgs/monero-gui/INSTALL.msg b/srcpkgs/monero-gui/INSTALL.msg
deleted file mode 100644
index 06ac937bb78f..000000000000
--- a/srcpkgs/monero-gui/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-For monero-gui to connect to the network, it needs access to a monero node.
-You may either enter a remote node in the application itself or provide
-a locally running node for it to work with. The necessary daemon software
-to run a local node is available in the 'monero' package.
diff --git a/srcpkgs/monero-gui/files b/srcpkgs/monero-gui/files
deleted file mode 120000
index 0dc85055cb8b..000000000000
--- a/srcpkgs/monero-gui/files
+++ /dev/null
@@ -1 +0,0 @@
-../monero/patches
\ No newline at end of file
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
deleted file mode 100644
index 0f4e06d5c55f..000000000000
--- a/srcpkgs/monero-gui/template
+++ /dev/null
@@ -1,106 +0,0 @@
-# Template file for 'monero-gui'
-pkgname=monero-gui
-version=0.18.1.2
-revision=4
-_monero_version=0.18.1.2
-# the revision monero uses as a submodule for the specific version
-_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
-_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
-build_style=cmake
-configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
-hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
- qt5-svg-devel qtchooser"
-makedepends="boost-devel libunwind-devel miniupnpc-devel
-qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
- qt5-svg-devel libgcrypt-devel zeromq-devel"
-depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
-short_desc="GUI for the core Monero implementation"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://getmonero.org"
-distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
- https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
- https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
- https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
- https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz
- https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz>quirc-${_quirc_gitrev}.tar.gz"
-checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
- f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
- 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
- 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
- b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
- c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz RandomX-${_randomx_gitrev}.tar.gz quirc-${_quirc_gitrev}.tar.gz"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	CFLAGS+=" -latomic"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" -DSTACK_TRACE=OFF"
-esac
-
-case "$XBPS_TARGET_MACHINE" in
-	armv7*) configure_args+=" -DARCH=armv7" ;;
-	armv6*) configure_args+=" -DARCH=armv6" ;;
-	armv5*) configure_args+=" -DARCH=armv5" ;;
-	aarch64*) configure_args+=" -DARCH=aarch64" ;;
-	mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" ;;
-	ppc64le*) configure_args+=" -DARCH=ppc64le" ;;
-	ppc64*) configure_args+=" -DARCH=ppc64" ;;
-	ppc*) configure_args+=" -DARCH=ppc"     ;;
-	*) configure_args+=" -DARCH=default" ;;
-esac
-
-post_extract() {
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/quirc-${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
-}
-
-post_patch() {
-	cd monero
-	for f in "${FILESDIR}"/*.patch; do
-		echo "Applying $f"
-		patch -Np1 -i "$f"
-	done
-}
-
-pre_configure() {
-	echo "var GUI_VERSION = \"${version}\"" > version.js
-	echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -i monero/CMakeLists.txt -e \
-			'/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
-	fi
-}
-
-pre_build() {
-	cd src/zxcvbn-c
-	cmake .
-	cd ../..
-	if [ "$CROSS_BUILD" ]; then
-		# The dictgen binary is executed during the build to generate code
-		# but is not included in the binary package. It thus needs to be
-		# built for the host
-		CXX=${CXX_host} CXXFLAGS="${XBPS_CXXFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make ${makejobs} -C src/zxcvbn-c
-		# The generate_translations_header binary is executed during the build
-		# but is not included in the binary package. It thus needs to be
-		# built for the host
-		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			ninja -C build ${makejobs} generate_translations_header
-
-	fi
-	make ${makejobs} -C src/zxcvbn-c
-}
-
-do_install() {
-	vbin build/bin/monero-wallet-gui
-	vlicense LICENSE
-}
diff --git a/srcpkgs/monero-gui/update b/srcpkgs/monero-gui/update
deleted file mode 100644
index 5254358a1411..000000000000
--- a/srcpkgs/monero-gui/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/monero-project/monero-gui/tags"
-pattern='/archive/refs/tags/(v?|\Qmonero-gui\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/monero/files/monerod/run b/srcpkgs/monero/files/monerod/run
deleted file mode 100644
index f485e63659fa..000000000000
--- a/srcpkgs/monero/files/monerod/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec chpst -u monero:monero /usr/bin/monerod --non-interactive --config-file /etc/monerod.conf
diff --git a/srcpkgs/monero/patches/easylogging.patch b/srcpkgs/monero/patches/easylogging.patch
deleted file mode 100644
index 5e611672aa71..000000000000
--- a/srcpkgs/monero/patches/easylogging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/external/easylogging++/easylogging++.h	2020-05-23 09:03:47.678880438 +0200
-+++ b/external/easylogging++/easylogging++.h	2020-05-23 09:04:31.757371549 +0200
-@@ -221,7 +221,7 @@
- #  define ELPP_INTERNAL_INFO(lvl, msg)
- #endif  // (defined(ELPP_DEBUG_INFO))
- #if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
--#  if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
-+#  if ( __has_include(<execinfo.h>) && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
- #    define ELPP_STACKTRACE 1
- #  else
- #    define ELPP_STACKTRACE 0
diff --git a/srcpkgs/monero/patches/fix-include.patch b/srcpkgs/monero/patches/fix-include.patch
deleted file mode 100644
index f5ba9fa25d08..000000000000
--- a/srcpkgs/monero/patches/fix-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: monero-0.18.1.2/src/common/dns_utils.cpp
-===================================================================
---- monero-0.18.1.2.orig/src/common/dns_utils.cpp
-+++ monero-0.18.1.2/src/common/dns_utils.cpp
-@@ -38,6 +38,12 @@
- #include <boost/algorithm/string/join.hpp>
- #include <boost/optional.hpp>
- #include <boost/utility/string_ref.hpp>
-+
-+#include <deque>
-+#include <map>
-+#include <set>
-+#include <string>
-+
- using namespace epee;
- 
- #undef MONERO_DEFAULT_LOG_CATEGORY
-Index: monero-0.18.1.2/src/common/threadpool.h
-===================================================================
---- monero-0.18.1.2.orig/src/common/threadpool.h
-+++ monero-0.18.1.2/src/common/threadpool.h
-@@ -31,6 +31,7 @@
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
- #include <cstddef>
-+#include <deque>
- #include <functional>
- #include <utility>
- #include <vector>
diff --git a/srcpkgs/monero/patches/march_cross.patch b/srcpkgs/monero/patches/march_cross.patch
deleted file mode 100644
index 20c3ae90c477..000000000000
--- a/srcpkgs/monero/patches/march_cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index 953707657..394e8cb32 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -581,7 +581,7 @@ else()
-     set_default_arch()
-   endif()
-   message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
--  if(ARCH STREQUAL "default")
-+  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
-     set(ARCH_FLAG "")
-   elseif(PPC64LE)
-     set(ARCH_FLAG "-mcpu=power8")
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
deleted file mode 100644
index 6da9a92d491e..000000000000
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b05c087cf..4f1a20101 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- add_subdirectory(external)
- 
-+# Final setup for miniupnpc
-+if(UPNP_STATIC OR IOS)
-+  add_definitions("-DUPNP_STATIC")
-+else()
-+  add_definitions("-DUPNP_DYNAMIC")
-+  include_directories(${UPNP_INCLUDE})
-+endif()
-+
- # Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE_DIR})
- 
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 5b7f69a56..00ef3f43d 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -34,24 +34,47 @@
- # We always compile if we are building statically to reduce static dependency issues...
- # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
- # others.
-+if(NOT IOS)
-+    find_package(Miniupnpc QUIET)
-+endif()
- 
--find_package(Miniupnpc REQUIRED)
--
--message(STATUS "Using in-tree miniupnpc")
- set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
--if(MSVC)
--  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
--elseif(NOT MSVC)
--  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-+# If we have the correct shared version and we're not building static, use it
-+if(STATIC OR IOS)
-+ set(USE_SHARED_MINIUPNPC false)
-+elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+ set(USE_SHARED_MINIUPNPC true)
- endif()
-+
-+
-+if(USE_SHARED_MINIUPNPC)
-+  message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}")
-+
-+  set(UPNP_STATIC false PARENT_SCOPE)
-+  set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
-+  set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
-+else()
-+  if(STATIC)
-+    message(STATUS "Using miniupnpc from local source tree for static build")
-+  else()
-+    message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)")
-+  endif()
-+  add_subdirectory(miniupnp/miniupnpc)
-+
-+  set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-+  if(MSVC)
-+    set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-+  elseif(NOT MSVC)
-+    set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-+  endif()
-+
- if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
- 	set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
- endif()
- 
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+  set(UPNP_STATIC true PARENT_SCOPE)
-+  set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+endif()
- 
- find_package(Unbound)
- 
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index f33ce977d..87d23a1e1 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -60,9 +60,16 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
- 
--#include <miniupnp/miniupnpc/miniupnpc.h>
--#include <miniupnp/miniupnpc/upnpcommands.h>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+  #include <miniupnp/miniupnpc/miniupnpc.h>
-+  #include <miniupnp/miniupnpc/upnpcommands.h>
-+  #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+  #include "miniupnpc.h"
-+  #include "upnpcommands.h"
-+  #include "upnperrors.h"
-+#endif
- 
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
deleted file mode 100644
index 93a3c82fe4d6..000000000000
--- a/srcpkgs/monero/template
+++ /dev/null
@@ -1,94 +0,0 @@
-# Template file for 'monero'
-pkgname=monero
-version=0.18.1.2
-revision=4
-# the revision monero uses as a submodule for the specific version
-_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
-_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-build_style=cmake
-conf_files="/etc/monerod.conf"
-make_dirs="
- /var/lib/monero 0750 monero monero
- /var/log/monero 0755 monero monero"
-hostmakedepends="pkg-config"
-makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
- readline-devel unbound-devel miniupnpc-devel expat-devel
- cppzmq czmq-devel libsodium-devel"
-short_desc="Private, secure, untraceable, decentralised digital currency"
-maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
-license="BSD-3-Clause"
-homepage="https://getmonero.org"
-distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
- https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
- https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
- https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz"
-checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
- 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
- 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
- b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="RandomX-${_randomx_gitrev}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz"
-system_accounts="monero"
-
-case "$XBPS_TARGET_MACHINE" in
-	armv7*) configure_args+=" -DARCH=armv7" ;;
-	armv6*) configure_args+=" -DARCH=armv6" ;;
-	armv5*) configure_args+=" -DARCH=armv5" ;;
-	aarch64*) configure_args+=" -DARCH=aarch64" ;;
-	mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" ;;
-	ppc64le*) configure_args+=" -DARCH=ppc64le" ;;
-	ppc64*) configure_args+=" -DARCH=ppc64" ;;
-	ppc*) configure_args+=" -DARCH=ppc"	;;
-	*) configure_args+=" -DARCH=default" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	CFLAGS+=" -latomic"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" -DSTACK_TRACE=OFF"
-esac
-
-post_extract() {
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz \
-		--strip-components=1 -C ${wrksrc}/external/randomx
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz \
-		--strip-components=1 -C ${wrksrc}/external/rapidjson
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz \
-		--strip-components=1 -C ${wrksrc}/external/supercop
-}
-
-pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		sed -i CMakeLists.txt -e \
-			'/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# The generate_translations_header binary is executed during the build
-		# but is not included in the binary package. It thus needs to be
-		# built for the host
-		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			ninja -C build ${makejobs} generate_translations_header
-	fi
-}
-
-post_install() {
-	vlicense LICENSE
-	vbin build/bin/monero-blockchain-import
-	vbin build/bin/monero-blockchain-export
-	vinstall utils/conf/monerod.conf 644 etc
-	vsv monerod
-}
-
-monero-devel_package() {
-	short_desc+=" - development files"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/monero/update b/srcpkgs/monero/update
deleted file mode 100644
index 2f68aaf68b71..000000000000
--- a/srcpkgs/monero/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/monero-project/monero/tags"
-pattern='/archive/refs/tags/(v?|\Qmonero\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/namecoin/patches/boost-1.80.patch b/srcpkgs/namecoin/patches/boost-1.80.patch
deleted file mode 100644
index 5a250af68487..000000000000
--- a/srcpkgs/namecoin/patches/boost-1.80.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/names/main.cpp
-+++ b/src/names/main.cpp
-@@ -365,12 +365,14 @@ ConflictTrackerNotifyEntryRemoved (CName
- CNameConflictTracker::CNameConflictTracker (CTxMemPool &p)
-   : txNameConflicts(std::make_shared<std::vector<CTransactionRef>>()), pool(p)
- {
-+  using namespace boost::placeholders;
-   pool.NotifyEntryRemoved.connect (
-     boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2));
- }
- 
- CNameConflictTracker::~CNameConflictTracker ()
- {
-+  using namespace boost::placeholders;
-   pool.NotifyEntryRemoved.disconnect (
-     boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2));
- }
---- a/src/wallet/test/init_test_fixture.cpp
-+++ b/src/wallet/test/init_test_fixture.cpp
-@@ -29,7 +29,7 @@ InitWalletDirTestingSetup::InitWalletDir
-     fs::create_directories(m_walletdir_path_cases["default"]);
-     fs::create_directories(m_walletdir_path_cases["custom"]);
-     fs::create_directories(m_walletdir_path_cases["relative"]);
--    std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
-+    std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
-     f.close();
- }
- 
-@@ -41,4 +41,4 @@ InitWalletDirTestingSetup::~InitWalletDi
- void InitWalletDirTestingSetup::SetWalletDir(const fs::path& walletdir_path)
- {
-     gArgs.ForceSetArg("-walletdir", walletdir_path.string());
--}
-\ No newline at end of file
-+}
---- a/src/wallet/test/db_tests.cpp
-+++ b/src/wallet/test/db_tests.cpp
-@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
-     std::string test_name = "test_name.dat";
-     fs::path datadir = SetDataDir("tempdir");
-     fs::path file_path = datadir / test_name;
--    std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
-+    std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
-     f.close();
- 
-     std::string filename;
---- a/src/fs.cpp
-+++ b/src/fs.cpp
-@@ -206,7 +206,7 @@ void ofstream::close()
- }
- #else // __GLIBCXX__
- 
--static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
-+static_assert(sizeof(BOOST_FILESYSTEM_C_STR(*fs::path())) == sizeof(wchar_t),
-     "Warning: This build is using boost::filesystem ofstream and ifstream "
-     "implementations which will fail to open paths containing multibyte "
-     "characters. You should delete this static_assert to ignore this warning, "
diff --git a/srcpkgs/namecoin/patches/fix-include.patch b/srcpkgs/namecoin/patches/fix-include.patch
deleted file mode 100644
index b923004ffa7a..000000000000
--- a/srcpkgs/namecoin/patches/fix-include.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: namecoin-0.18.1/src/bench/block_assemble.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/bench/block_assemble.cpp
-+++ namecoin-0.18.1/src/bench/block_assemble.cpp
-@@ -20,7 +20,9 @@
- 
- #include <boost/thread.hpp>
- 
-+#include <array>
- #include <list>
-+#include <memory>
- #include <vector>
- 
- static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey)
-Index: namecoin-0.18.1/src/net_processing.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/net_processing.cpp
-+++ namecoin-0.18.1/src/net_processing.cpp
-@@ -30,7 +30,9 @@
- #include <util/moneystr.h>
- #include <util/strencodings.h>
- 
-+#include <array>
- #include <memory>
-+#include <utility>
- 
- #if defined(NDEBUG)
- # error "Bitcoin cannot be compiled without assertions."
-Index: namecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/qt/sendcoinsdialog.cpp
-+++ namecoin-0.18.1/src/qt/sendcoinsdialog.cpp
-@@ -32,6 +32,8 @@
- #include <QSettings>
- #include <QTextDocument>
- 
-+#include <array>
-+
- static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
- int getConfTargetForIndex(int index) {
-     if (index+1 > static_cast<int>(confTargets.size())) {
-Index: namecoin-0.18.1/src/qt/trafficgraphwidget.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/qt/trafficgraphwidget.cpp
-+++ namecoin-0.18.1/src/qt/trafficgraphwidget.cpp
-@@ -6,6 +6,7 @@
- #include <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
-Index: namecoin-0.18.1/src/httpserver.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/httpserver.cpp
-+++ namecoin-0.18.1/src/httpserver.cpp
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <deque>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: namecoin-0.18.1/src/test/cuckoocache_tests.cpp
-===================================================================
---- namecoin-0.18.1.orig/src/test/cuckoocache_tests.cpp
-+++ namecoin-0.18.1/src/test/cuckoocache_tests.cpp
-@@ -7,6 +7,7 @@
- #include <test/test_bitcoin.h>
- #include <random.h>
- #include <thread>
-+#include <deque>
- 
- /** Test Suite for CuckooCache
-  *
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
deleted file mode 100644
index 5a77aabf8e5a..000000000000
--- a/srcpkgs/namecoin/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'namecoin'
-pkgname=namecoin
-version=0.18.1
-revision=9
-build_style=gnu-configure
-configure_args="--with-incompatible-bdb --disable-static
- --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config yasm automake libtool which"
-makedepends="libevent-devel db-devel protobuf-devel boost-devel
- miniupnpc-devel qrencode-devel"
-short_desc="Distributed key/value database"
-maintainer="ananteris <ananteris@protonmail.ch>"
-license="MIT"
-homepage="https://namecoin.org"
-distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz"
-checksum=7117a0a0b8f48d49e4abf3577660f8a4eb9a4dea753281d19d9470725fc75d8e
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-pre_configure() {
-	./autogen.sh
-	sed -i src/compat.h -e "s;<sys/fcntl.h>;<fcntl.h>;"
-}
-
-post_install() {
-	vlicense COPYING
-	# They don't bother to rename from bitcoin
-	rm -rf $DESTDIR/usr/share/man/man1
-}
diff --git a/srcpkgs/namecoin/update b/srcpkgs/namecoin/update
deleted file mode 100644
index 10eae03a7eb4..000000000000
--- a/srcpkgs/namecoin/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/(nc|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/nxt/files/bin/nxt b/srcpkgs/nxt/files/bin/nxt
deleted file mode 100644
index efc4319206d2..000000000000
--- a/srcpkgs/nxt/files/bin/nxt
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd /usr/lib/nxt && bash run.sh
diff --git a/srcpkgs/nxt/files/bin/nxt-tor b/srcpkgs/nxt/files/bin/nxt-tor
deleted file mode 100644
index 4b4104ceca97..000000000000
--- a/srcpkgs/nxt/files/bin/nxt-tor
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd /usr/lib/nxt && bash run-tor.sh
diff --git a/srcpkgs/nxt/files/nxt-tor/run b/srcpkgs/nxt/files/nxt-tor/run
deleted file mode 100644
index c14f448c4950..000000000000
--- a/srcpkgs/nxt/files/nxt-tor/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv check tor >/dev/null || exit 1
-exec nxt-tor > /dev/null
diff --git a/srcpkgs/nxt/files/nxt/run b/srcpkgs/nxt/files/nxt/run
deleted file mode 100644
index a3479cc97b11..000000000000
--- a/srcpkgs/nxt/files/nxt/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec nxt > /dev/null
diff --git a/srcpkgs/nxt/template b/srcpkgs/nxt/template
deleted file mode 100644
index fb6f3eb9f121..000000000000
--- a/srcpkgs/nxt/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nxt'
-pkgname=nxt
-version=1.12.2
-revision=1
-hostmakedepends="unzip"
-depends="virtual?java-runtime"
-short_desc="Client for the NXT cryptocurrency"
-maintainer="Fabio Krapohl <Krapohl.f@gmx.de>"
-license="custom:Jelurida Public License 1.1"
-homepage="https://nxt.org"
-distfiles="https://bitbucket.org/Jelurida/${pkgname}/downloads/${pkgname}-client-${version}.zip"
-checksum=83689f6d85e59be44920328d99aa934bb8998f4b5c7ea8088c83ab4503b49a42
-
-do_install() {
-	vbin ${FILESDIR}/bin/${pkgname}
-	vbin ${FILESDIR}/bin/${pkgname}-tor
-
-	vsv ${pkgname}
-	vsv ${pkgname}-tor
-
-	vlicense LICENSE.txt
-
-	vmkdir usr/lib/${pkgname}
-	vcopy . usr/lib/${pkgname}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2e2535fa1cc3..eca6eb49018e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230516
+version=0.1.20230618
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -10,6 +10,7 @@ homepage="https://voidlinux.org"
 
 replaces="
  6cord<=9.6_1
+ Electron-Cash<=4.2.10_3
  FeedReader<=2.11.0_2
  ImageMagick6<=6.9.12.12_2
  Lidarr<=0.5.0.583_1
@@ -39,6 +40,7 @@ replaces="
  avogadro<=1.2.0_9
  beignet<=1.3.2_10
  bgc<=1.0.1_1
+ bitcoin<=22.0_5
  bokken<=1.8_3
  bomi<=0.9.11_17
  burp-client<=1.4.40_13
@@ -58,6 +60,8 @@ replaces="
  cgminer<=4.11.1_1
  clamz<=0.5_4
  clementine-spotify<=1.4.0rc1-343-gb49afcc5b
+ cpuminer<=2.5.1_1
+ cointop<=1.6.10_1
  compton-conf<=0.15.0_1
  couchdb<=1.7.1_2
  couchpotato<=3.0.1_3
@@ -101,6 +105,8 @@ replaces="
  electron13<=13.6.7_1
  electron7<=7.3.3_1
  electron9<=9.4.1_1
+ electrum<=4.2.0_3
+ electrum-ltc<=3.3.8.1_4
  emacs-gtk2<=27.2_1
  empathy<=3.12.14_4
  enventor<=1.0.0_2
@@ -122,6 +128,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gespeaker<=0.8.6_3
+ geth<=1.10.1_2
  getmail<=5.14_2
  gfbgraph<=0.2.5_1
  giti<=1.0.0_1
@@ -141,6 +148,7 @@ replaces="
  gnome-twitch<=0.4.2_2
  go-gdm<=1.4_7
  go-langserver<=2.0.0_1
+ go-ethereum<=1.10.1_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -289,6 +297,8 @@ replaces="
  libbitcoin-node<=3.6.0_10
  libbitcoin-protocol-devel<=3.6.0_10
  libbitcoin-protocol<=3.6.0_10
+ libbitcoin-secp256k1-devel<=0.1.0.13_1
+ libbitcoin-secp256k1<=0.1.0.13_1
  libbitcoin-server-devel<=3.6.0_10
  libbitcoin-server<=3.6.0_10
  libbitcoin-system-devel<=3.6.0_10
@@ -342,6 +352,7 @@ replaces="
  libxnoise<=0.2.21_4
  libxslt-python<=1.1.34_5
  libzapojit<=0.0.3_10
+ litecoin<=0.18.1_11
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
@@ -359,6 +370,9 @@ replaces="
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1
+ monero<=0.18.1.2_4
+ monero-devel<=0.18.1.2_4
+ monero-gui<=0.18.1.2_4
  mongroup<=0.4.1_2
  mopidy-spotify<=4.0.1_5
  mozjs68<=68.11.0_1
@@ -368,6 +382,7 @@ replaces="
  mpir-devel<=3.0.0_1
  mpir<=3.0.0_1
  mutagen<=1.43.0_3
+ namecoin<=0.18.1_9
  nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5
@@ -376,6 +391,7 @@ replaces="
  nvidia340-libs<=340.108_4
  nvidia340-opencl<=340.108_4
  nvidia340<=340.108_4
+ nxt<=1.12.2_1
  ocaml-lablgtk2-gnomecanvas<=2.18.10_5
  ocaml-lablgtk2-gtksourceview2<=2.18.10_5
  ocaml-lablgtk2-gtkspell<=2.18.10_5
@@ -545,6 +561,7 @@ replaces="
  sqlite-replication<=3.32.3_2
  srw<=0.7_1
  steam-fonts<=1.0.0_5
+ swarm<=0.5.7_2
  tagainijisho<=1.0.3_1
  taizen<=0.0.0.20180808_4
  terminal_markdown_viewer<=1.6.3_4
diff --git a/srcpkgs/swarm/template b/srcpkgs/swarm/template
deleted file mode 100644
index fcc7dc54c098..000000000000
--- a/srcpkgs/swarm/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'swarm'
-pkgname=swarm
-version=0.5.7
-revision=2
-build_style=go
-go_import_path=github.com/ethersphere/swarm
-go_package="${go_import_path}/cmd/swarm"
-short_desc="Censorship resistant storage and communication infrastructure"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="GPL-3.0-only"
-homepage="https://swarm.ethereum.org"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=027521fc7eec4d579406edefdd6c37b3af5009295bae24597bb26fc1f6844ce7

From 0f848dea547eff38338a49ce7cbe1b17d0b00f12 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 26 Jun 2023 14:53:26 +0200
Subject: [PATCH 1403/1854] bottom: update to 0.9.3.

---
 srcpkgs/bottom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index 14ba5d3219cc..0f41e6bf5e05 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 changelog="https://raw.githubusercontent.com/ClementTsang/bottom/master/CHANGELOG.md"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=c6b1f6eefa814607cbc6f1ebf6358a070293413d09583963970d650b724a3b3a
+checksum=53a1466c3d2ed8f38401e8929cf2da796e703e4d70339d215f855b2304c07f72
 
 pre_build() {
 	export BTM_GENERATE=true

From b015d4e47c8af524b6816b70f452a11dc921e16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 22 Jun 2023 22:48:23 +0200
Subject: [PATCH 1404/1854] scrcpy: update to 2.1.

---
 srcpkgs/scrcpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index ee6e698e387f..06208c389ca9 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=2.0
+version=2.1
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="https://github.com/Genymobile/scrcpy/archive/v${version}.tar.gz
  https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="a256241dd178ab103e4a119d0387f348c10ac513f25a7ca4859bd53ca5e7d43f
- 9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2"
+checksum="57a277238d19d3471f37003d0d567bb8cde0a2b487b5cf91416129b463d9e8d5
+ 5b8bf1940264b930c71a1c614c57da2247f52b2d4240bca865cc6d366dff6688"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From 76ec5b233e4250363877d4cecf053e38a4113da0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 27 Jun 2023 02:14:35 +0530
Subject: [PATCH 1405/1854] python3-platformdirs: update to 3.8.0.

Adopt.
---
 srcpkgs/python3-platformdirs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template
index 9aa52606afdb..723be614b2b9 100644
--- a/srcpkgs/python3-platformdirs/template
+++ b/srcpkgs/python3-platformdirs/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-platformdirs'
 pkgname=python3-platformdirs
-version=3.6.0
+version=3.8.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling hatch-vcs"
 depends="python3"
 checkdepends="python3-appdirs python3-pytest python3-pytest-mock"
 short_desc="Library to determine platform-specific system directories"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://platformdirs.rtfd.io/"
 changelog="https://raw.githubusercontent.com/platformdirs/platformdirs/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/platformdirs/platformdirs-${version}.tar.gz"
-checksum=57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640
+checksum=b0cabcb11063d21a0b261d557acb0a9d2126350e63b70cdf7db6347baea456dc
 make_check_pre="env PYTHONPATH=src"
 
 post_install() {

From 7a5c44c21674cef6a567c30f8e2d9541cedfe4cb Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 16:56:39 +0100
Subject: [PATCH 1406/1854] removed-packages: add versioned libpoppler
 packages.

closes #44592
---
 srcpkgs/removed-packages/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index eca6eb49018e..5b2a3dc26088 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230618
+version=0.1.20230626
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -60,11 +60,11 @@ replaces="
  cgminer<=4.11.1_1
  clamz<=0.5_4
  clementine-spotify<=1.4.0rc1-343-gb49afcc5b
- cpuminer<=2.5.1_1
  cointop<=1.6.10_1
  compton-conf<=0.15.0_1
  couchdb<=1.7.1_2
  couchpotato<=3.0.1_3
+ cpuminer<=2.5.1_1
  cracklib-python<=2.9.7_1
  crystal<=0.34.0_4
  csync-devel<=0.50.0_5
@@ -105,8 +105,8 @@ replaces="
  electron13<=13.6.7_1
  electron7<=7.3.3_1
  electron9<=9.4.1_1
- electrum<=4.2.0_3
  electrum-ltc<=3.3.8.1_4
+ electrum<=4.2.0_3
  emacs-gtk2<=27.2_1
  empathy<=3.12.14_4
  enventor<=1.0.0_2
@@ -146,9 +146,9 @@ replaces="
  gnome-recipes<=2.0.4_2
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_2
+ go-ethereum<=1.10.1_2
  go-gdm<=1.4_7
  go-langserver<=2.0.0_1
- go-ethereum<=1.10.1_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -326,6 +326,14 @@ replaces="
  libpipewire0.2-devel<=0.2.7_2
  libpipewire0.2<=0.2.7_2
  libpng12<=1.2.59_1
+ libpoppler102<=20.09.0_1
+ libpoppler110<=21.05.0_1
+ libpoppler83<=0.72.0_1
+ libpoppler84<=0.73.0_1
+ libpoppler85<=0.74.0_1
+ libpoppler86<=0.75.0_1
+ libpoppler87<=0.76.0_1
+ libpoppler89<=0.80.0_1
  libproxy-python<=0.4.18_1
  libpyside-python3<=5.15.0_2
  libqmatrixclient-devel<=0.5.3.2_1
@@ -370,9 +378,9 @@ replaces="
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1
- monero<=0.18.1.2_4
  monero-devel<=0.18.1.2_4
  monero-gui<=0.18.1.2_4
+ monero<=0.18.1.2_4
  mongroup<=0.4.1_2
  mopidy-spotify<=4.0.1_5
  mozjs68<=68.11.0_1

From 20379c26fd0244588178f3c9b0bd4bbf62f76f6b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 27 Jun 2023 02:12:47 +0530
Subject: [PATCH 1407/1854] cargo-modules: update to 0.9.0.

---
 srcpkgs/cargo-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-modules/template b/srcpkgs/cargo-modules/template
index e5b5e5428650..7461ac595a0e 100644
--- a/srcpkgs/cargo-modules/template
+++ b/srcpkgs/cargo-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-modules'
 pkgname=cargo-modules
-version=0.8.0
+version=0.9.0
 revision=1
 build_style=cargo
 short_desc="Cargo plugin to render crate's module/item structure as a tree or graph"
@@ -9,4 +9,4 @@ license="MPL-2.0"
 homepage="https://github.com/regexident/cargo-modules"
 changelog="https://raw.githubusercontent.com/regexident/cargo-modules/main/CHANGELOG.md"
 distfiles="https://github.com/regexident/cargo-modules/archive/refs/tags/${version}.tar.gz"
-checksum=998132b0953bf8f2a0c998c2a9542996e035b8a535c0742da1f04ad0af96bcb7
+checksum=06605e1c0e7e0764bcfab473290ac55590737299695af1f0858b1544a57d632e

From f4a574ef20ed6308f24d0b607227b28ee76d0584 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Jun 2023 01:06:31 +0530
Subject: [PATCH 1408/1854] moar: update to 1.15.2.

---
 srcpkgs/moar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index 381454967d4e..63dcb738e2ae 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,6 +1,6 @@
 # Template file for 'moar'
 pkgname=moar
-version=1.13.0
+version=1.15.2
 revision=1
 build_style=go
 go_import_path=github.com/walles/moar
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/walles/moar"
 changelog="https://github.com/waller/moar/releases"
 distfiles="https://github.com/walles/moar/archive/refs/tags/v${version}.tar.gz"
-checksum=65eac0d4f8a40f0198a93f0888a60a28e8466b2ee9d0437f143db5c25d5e9319
+checksum=45374ead069d9aa797b329a633241e3de07625242d951be49dbdd959c6c60153
 conflicts="MoarVM"
 
 post_install() {

From b36ae8c66912af751d4c716e0c76cf17d5cde0b7 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Thu, 22 Jun 2023 21:16:10 -0500
Subject: [PATCH 1409/1854] mesa: update to 23.1.3.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 2ebb1cff2013..b07f38864ea8 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=23.1.2
+version=23.1.3
 revision=1
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e
+checksum=2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9
 
 build_options="wayland"
 build_options_default="wayland"

From 0c9f715794f1889d7b4ce7c1fc76b2cab11dcbaf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 01:46:03 -0400
Subject: [PATCH 1410/1854] stdm: fix checksum, lockfile

---
 srcpkgs/stdm/patches/cargo.lock.patch | 11 +++++++++++
 srcpkgs/stdm/template                 |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/stdm/patches/cargo.lock.patch

diff --git a/srcpkgs/stdm/patches/cargo.lock.patch b/srcpkgs/stdm/patches/cargo.lock.patch
new file mode 100644
index 000000000000..f628f9f14e17
--- /dev/null
+++ b/srcpkgs/stdm/patches/cargo.lock.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -148,7 +148,7 @@
+ 
+ [[package]]
+ name = "stdm"
+-version = "0.1.0"
++version = "0.1.1"
+ dependencies = [
+  "dialoguer",
+  "glob",
diff --git a/srcpkgs/stdm/template b/srcpkgs/stdm/template
index 40f6fe5d763c..65867468ba82 100644
--- a/srcpkgs/stdm/template
+++ b/srcpkgs/stdm/template
@@ -1,14 +1,14 @@
 # Template file for 'stdm'
 pkgname=stdm
 version=0.1.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Simple terminal display manager"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="AGPL-3.0-only"
 homepage="https://git.jcg.re/jcgruenhage/stdm"
 distfiles="https://git.jcg.re/jcgruenhage/stdm/archive/v${version}.tar.gz"
-checksum=c70ac589898199e68bf69f8d361accdc50e9fc3e3d7e530fc3a790315af2f489
+checksum=7570b30d50081d4438aff731fba4fdc3f268cb65f9c61d1fa93352d89bc52f2f
 
 post_install() {
 	vmkdir etc/profile.d

From 9a5a6f7eaade825f56acb811052ca473b82bb380 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:12:41 -0400
Subject: [PATCH 1411/1854] ntdsextract2: generate missing lockfile

---
 srcpkgs/ntdsextract2/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index d30f0463ac07..abee7376d1ad 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,7 +1,7 @@
 # Template file for 'ntdsextract2'
 pkgname=ntdsextract2
 version=0.9.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Display contents of Active Directory database files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -9,3 +9,8 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/janstarke/ntdsextract2"
 distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
 checksum=75b3731dac5e3d2f6d3149f60f4336d3bd2732a1843bfff6e1fcb8d1cc46fc45
+
+post_patch() {
+	# https://github.com/janstarke/ntdsextract2/pull/8
+	cargo generate-lockfile
+}

From 6cda11311c3966b22f194526e6dbb13d7791d4c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:16:31 -0400
Subject: [PATCH 1412/1854] openpgp-ca: fix lockfile

---
 srcpkgs/openpgp-ca/patches/cargo.lock.patch | 11 +++++++++++
 srcpkgs/openpgp-ca/template                 |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/openpgp-ca/patches/cargo.lock.patch

diff --git a/srcpkgs/openpgp-ca/patches/cargo.lock.patch b/srcpkgs/openpgp-ca/patches/cargo.lock.patch
new file mode 100644
index 000000000000..3982458637e5
--- /dev/null
+++ b/srcpkgs/openpgp-ca/patches/cargo.lock.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1697,7 +1697,7 @@
+ 
+ [[package]]
+ name = "openpgp-ca-restd"
+-version = "0.12.0-pre"
++version = "0.12.0"
+ dependencies = [
+  "anyhow",
+  "chrono",
diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
index 8ed3249de058..9c0d92a12aa1 100644
--- a/srcpkgs/openpgp-ca/template
+++ b/srcpkgs/openpgp-ca/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgp-ca'
 pkgname=openpgp-ca
 version=0.12.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path openpgp-ca-bin"
 hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"

From 87dc558ff4b7a60f40408a2b69e758dd10f2e839 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:19:59 -0400
Subject: [PATCH 1413/1854] sandboxfs: generate missing lockfile

---
 srcpkgs/sandboxfs/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/sandboxfs/template b/srcpkgs/sandboxfs/template
index 143416c325e5..0f0684eef7e8 100644
--- a/srcpkgs/sandboxfs/template
+++ b/srcpkgs/sandboxfs/template
@@ -1,7 +1,7 @@
 # Template file for 'sandboxfs'
 pkgname=sandboxfs
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="fuse-devel"
@@ -12,6 +12,11 @@ homepage="https://github.com/bazelbuild/sandboxfs"
 distfiles="https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-${version}.tar.gz"
 checksum=bff68e7d33ae56a3f34a79a74b2576599f5ccc381a237bbc10b5a3c3ea106b60
 
+post_patch() {
+	# https://github.com/bazelbuild/sandboxfs/pull/115
+	cargo generate-lockfile
+}
+
 post_install() {
 	vman man/sandboxfs.1
 }

From 9748c3c86902cad9dbb3069c29e563c5763f5046 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 02:28:05 -0400
Subject: [PATCH 1414/1854] openpgp-card-tools: fix checksum, generate missing
 lockfile

closes #43482
---
 srcpkgs/openpgp-card-tools/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openpgp-card-tools/template b/srcpkgs/openpgp-card-tools/template
index 4aabb1f4e847..2b913a0c399c 100644
--- a/srcpkgs/openpgp-card-tools/template
+++ b/srcpkgs/openpgp-card-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgp-card-tools'
 pkgname=openpgp-card-tools
 version=0.9.2
-revision=1
+revision=2
 build_wrksrc="tools"
 build_style=cargo
 hostmakedepends="pkg-config llvm clang"
@@ -11,8 +11,13 @@ short_desc="Tools for inspecting, configuring and using OpenPGP cards"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://gitlab.com/openpgp-card/openpgp-card"
-distfiles="${homepage}/-/archive/tools/v${version}/${wrksrc}.tar.gz"
-checksum=a0276c4fb73cd4b8411963eb4ac8f74956ccbe6f8fc1900e38e20c6e917028d0
+distfiles="https://gitlab.com/openpgp-card/openpgp-card/-/archive/tools/v${version}/openpgp-card-tools-v${version}.tar.gz"
+checksum=33c27b011aebf57ee1b660f65868bfcb8ffea28c89809414c8654004d4e16706
+
+post_patch() {
+	# https://gitlab.com/openpgp-card/openpgp-card/-/issues/63
+	cargo generate-lockfile
+}
 
 post_install() {
 	vlicense "../LICENSES/MIT.txt"

From a6fc9f01e3b57ca91db175aeba02bdb723443b8c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 03:05:40 -0400
Subject: [PATCH 1415/1854] ntdsextract2: fix build

if only we had a lock file...
---
 srcpkgs/ntdsextract2/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index abee7376d1ad..ce95b7a42748 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -13,4 +13,5 @@ checksum=75b3731dac5e3d2f6d3149f60f4336d3bd2732a1843bfff6e1fcb8d1cc46fc45
 post_patch() {
 	# https://github.com/janstarke/ntdsextract2/pull/8
 	cargo generate-lockfile
+	cargo update --package libesedb@0.1.4 --precise 0.1.3
 }

From e35e08ada02e2d382e5a3398a43d66c4f8519243 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 27 Jun 2023 00:33:57 +0200
Subject: [PATCH 1416/1854] transmission: don't use deprecated --log-error

Also link to system libraries when possible
---
 srcpkgs/transmission/files/transmission-daemon/run | 2 +-
 srcpkgs/transmission/template                      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/transmission/files/transmission-daemon/run b/srcpkgs/transmission/files/transmission-daemon/run
index ed988af16556..6cdb40001497 100755
--- a/srcpkgs/transmission/files/transmission-daemon/run
+++ b/srcpkgs/transmission/files/transmission-daemon/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -u transmission:transmission transmission-daemon -f --log-error
+exec chpst -u transmission:transmission transmission-daemon -f --log-level=error
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 3b9dc2e0cb7e..2e83bcdc11a3 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,13 +1,14 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=4.0.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF"
 hostmakedepends="autoconf automake intltool glib-devel
  libtool pkg-config qt5-host-tools qt5-qmake"
 makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel
- libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel"
+ libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel
+ libdeflate-devel miniupnpc-devel"
 short_desc="Fast, easy and free BitTorrent client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-2.0-or-later"

From caeaf9dcbaaf18afa728a96cb1b878d0749ef162 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 27 Jun 2023 08:29:29 +0100
Subject: [PATCH 1417/1854] python3-greenlet: ignore alphas and release
 candidates.

---
 srcpkgs/python3-greenlet/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/python3-greenlet/update

diff --git a/srcpkgs/python3-greenlet/update b/srcpkgs/python3-greenlet/update
new file mode 100644
index 000000000000..f7dcfce5eacb
--- /dev/null
+++ b/srcpkgs/python3-greenlet/update
@@ -0,0 +1 @@
+ignore="*a* *rc*"

From 14ba351bc92747358089d9064db1f235785617d7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 11 Jun 2023 23:08:08 +0530
Subject: [PATCH 1418/1854] python3-SQLAlchemy2: update to 2.0.16.

---
 srcpkgs/python3-SQLAlchemy2/template | 4 ++--
 srcpkgs/python3-SQLAlchemy2/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-SQLAlchemy2/update

diff --git a/srcpkgs/python3-SQLAlchemy2/template b/srcpkgs/python3-SQLAlchemy2/template
index d445ccb52fe2..2f4d5d279601 100644
--- a/srcpkgs/python3-SQLAlchemy2/template
+++ b/srcpkgs/python3-SQLAlchemy2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-SQLAlchemy2'
 pkgname=python3-SQLAlchemy2
-version=2.0.9
+version=2.0.16
 revision=1
 build_style=python3-pep517
 make_install_target="dist/SQLAlchemy-${version}-*-*-*.whl"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.sqlalchemy.org"
 changelog="https://docs.sqlalchemy.org/en/20/changelog/"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=95719215e3ec7337b9f57c3c2eda0e6a7619be194a5166c07c1e599f6afc20fa
+checksum=1e2caba78e7d1f5003e88817b7a1754d4e58f4a8f956dc423bf8e304c568ab09
 
 conflicts="python3-SQLAlchemy"
 
diff --git a/srcpkgs/python3-SQLAlchemy2/update b/srcpkgs/python3-SQLAlchemy2/update
new file mode 100644
index 000000000000..bc4a3e03c20e
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy2/update
@@ -0,0 +1,2 @@
+pkgname="SQLAlchemy"
+ignore="*rc* *b* *a*"

From cc0cc44bd12bc53f601de5e3dbadafabf67c0d5f Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Tue, 23 May 2023 03:15:55 -0400
Subject: [PATCH 1419/1854] preload: generate manpage

this also adds psmisc to checkdepends
(the test script uses killall to end the tests)
---
 srcpkgs/preload/patches/qemu-help2man.patch | 30 +++++++++++++++++++++
 srcpkgs/preload/template                    |  6 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/preload/patches/qemu-help2man.patch

diff --git a/srcpkgs/preload/patches/qemu-help2man.patch b/srcpkgs/preload/patches/qemu-help2man.patch
new file mode 100644
index 000000000000..c2fa7068bb2d
--- /dev/null
+++ b/srcpkgs/preload/patches/qemu-help2man.patch
@@ -0,0 +1,30 @@
+--- preload-0.6.4/src/Makefile.in	2009-04-15 17:49:28.000000000 -0400
++++ preload-0.6.4.new/src/Makefile.in	2023-05-30 22:23:16.820648202 -0400
+@@ -222,6 +222,12 @@
+ dist_man_MANS = preload.8
+ RUNPREQ = preload preload.conf.debug
+ RUNCMD = ./preload -c preload.conf.debug -s preload.state -d $(ARGS)
++preload_binary = `if [ -n "$$CROSS_BUILD" ]; then \
++				 	echo "qemu-$$XBPS_TARGET_QEMU_MACHINE-static ./preload"; \
++				else \
++				 	echo './preload'; \
++				fi;`
++
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -678,11 +684,11 @@
+ 	@$(top_builddir)/missing --run \
+ 	   help2man --no-info --section=8 --include=preload.8.i \
+ 	   	    --help-option="-H" --output="$@.tmp" \
+-		    --name 'Adaptive readahead daemon' ./preload \
++		    --name 'Adaptive readahead daemon' "$(preload_binary)" \
+ 	 && mv "$@.tmp" "$@" \
+ 	  || ($(RM) "$@"; \
+-	      echo Failed to update preload.8, the man page may be outdated >&2; \
+-	      (test -f "$@" || echo help2man is required to generate this file. >> "$@"));
++	      echo Failed to create preload.8 >&2; \
++		  exit 1);
+ 
+ install-data-hook:
+ 	@cd "$(DESTDIR)$(man8dir)" && gzip -c preload.8 > preload.8.gz.tmp && mv preload.8.gz.tmp preload.8.gz && $(RM) preload.8
diff --git a/srcpkgs/preload/template b/srcpkgs/preload/template
index 9623aed0e6eb..2efe74d46b6c 100644
--- a/srcpkgs/preload/template
+++ b/srcpkgs/preload/template
@@ -1,10 +1,12 @@
 # Template file for 'preload'
 pkgname=preload
 version=0.6.4
-revision=11
+revision=12
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+build_helper=qemu
+hostmakedepends="pkg-config help2man"
 makedepends="libglib-devel"
+checkdepends="psmisc"
 short_desc="Adaptive readahead daemon"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="GPL-2.0-or-later"

From 31c87b855538675d1eedea6ed1406e74d7a014e3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Wed, 7 Jun 2023 17:36:51 +0200
Subject: [PATCH 1420/1854] pan: updated checksum, enabled libsecret

---
 srcpkgs/pan/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template
index ea773b31bb01..db9204cd0770 100644
--- a/srcpkgs/pan/template
+++ b/srcpkgs/pan/template
@@ -1,12 +1,12 @@
 # Template file for 'pan'
 pkgname=pan
 version=0.154
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gnutls --enable-libnotify --enable-gkr"
 hostmakedepends="gettext pkg-config yelp-tools autoconf gettext-devel-tools automake libtool"
 makedepends="gmime3-devel gnutls-devel gtk+3-devel libsecret-devel gtkspell3-devel libnotify-devel
- glib-devel enchant2-devel"
+ glib-devel enchant2-devel gcr-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Usenet newsreader that's good at both text and binaries"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,7 +14,7 @@ license="GFDL-1.1-or-later, GPL-2.0-only"
 homepage="http://pan.rebelbase.com"
 changelog="https://gitlab.gnome.org/GNOME/pan/-/raw/master/NEWS"
 distfiles="https://gitlab.gnome.org/GNOME/pan/-/archive/v${version}/pan-v${version}.tar.bz2"
-checksum=87721838dfa59f05f5c2c2fec8742606dad13d920f9fa8884497c4513a8d72b9
+checksum=440317954df7217689100df3dfb68865770f5aed1b8ed2b45432d771bb80a8c9
 
 if [ -n "$CROSS_BUILD" ]; then
 		hostmakedepends+=" gdk-pixbuf-devel"

From 7af0aefdb8c6103567377bb96cf94c66f0ffab87 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 4 Apr 2023 14:08:44 +0200
Subject: [PATCH 1421/1854] python3-docstring-to-markdown: update to 0.12.

---
 srcpkgs/python3-docstring-to-markdown/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-docstring-to-markdown/template b/srcpkgs/python3-docstring-to-markdown/template
index e932bde7357f..fd06c23f1385 100644
--- a/srcpkgs/python3-docstring-to-markdown/template
+++ b/srcpkgs/python3-docstring-to-markdown/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-docstring-to-markdown'
 pkgname=python3-docstring-to-markdown
-version=0.11
+version=0.12
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3"
-short_desc="Python implementation of the Language Server Protocol"
+short_desc="On the fly conversion of Python docstrings to markdown"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/docstring-to-markdown/"
 changelog="https://github.com/python-lsp/docstring-to-markdown/releases"
 distfiles="${PYPI_SITE}/d/docstring-to-markdown/docstring-to-markdown-${version}.tar.gz"
-checksum=5b1da2c89d9d0d09b955dec0ee111284ceadd302a938a03ed93f66e09134f9b5
+checksum=40004224b412bd6f64c0f3b85bb357a41341afd66c4b4896709efa56827fb2bb

From 04e6a87a11f73b838da4cd80631abf4390fa5503 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 18 Mar 2023 02:24:33 -0400
Subject: [PATCH 1422/1854] LGOGDownloader: update to 3.11

---
 .../LGOGDownloader/patches/curl-7.87.patch    | 90 -------------------
 srcpkgs/LGOGDownloader/template               |  6 +-
 2 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 srcpkgs/LGOGDownloader/patches/curl-7.87.patch

diff --git a/srcpkgs/LGOGDownloader/patches/curl-7.87.patch b/srcpkgs/LGOGDownloader/patches/curl-7.87.patch
deleted file mode 100644
index 02f17429663e..000000000000
--- a/srcpkgs/LGOGDownloader/patches/curl-7.87.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Force destruction of downloader before curl_global_cleanup
-See: https://github.com/Sude-/lgogdownloader/commit/6ce6aeb1dc06f8af1508c5ce6ee71775b8d188b3
-Index: LGOGDownloader-3.9/main.cpp
-===================================================================
---- LGOGDownloader-3.9.orig/main.cpp
-+++ LGOGDownloader-3.9/main.cpp
-@@ -607,9 +607,10 @@ int main(int argc, char *argv[])
-         std::cerr << std::endl;
-     }
- 
-+    int res = 0;
-     // Init curl globally
-     curl_global_init(CURL_GLOBAL_ALL);
--
-+    {
-     Downloader downloader;
- 
-     int iLoginTries = 0;
-@@ -636,8 +637,8 @@ int main(int argc, char *argv[])
-     // Login failed, cleanup
-     if (!bLoginOK && !bIsLoggedin)
-     {
--        curl_global_cleanup();
--        return 1;
-+        res = 1;
-+        goto end;
-     }
- 
-     // Make sure that config file and cookie file are only readable/writable by owner
-@@ -699,15 +700,14 @@ int main(int argc, char *argv[])
-                 Util::setFilePermissions(Globals::globalConfig.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
-             if (Globals::globalConfig.bSaveConfig)
-             {
--                curl_global_cleanup();
--                return 0;
-+                goto end;
-             }
-         }
-         else
-         {
-             std::cerr << "Failed to create config: " << Globals::globalConfig.sConfigFilePath << std::endl;
--            curl_global_cleanup();
--            return 1;
-+            res = 1;
-+            goto end;
-         }
-     }
-     else if (Globals::globalConfig.bResetConfig)
-@@ -719,26 +719,23 @@ int main(int argc, char *argv[])
-             if (!Globals::globalConfig.bRespectUmask)
-                 Util::setFilePermissions(Globals::globalConfig.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
- 
--            curl_global_cleanup();
--            return 0;
-+            goto end;
-         }
-         else
-         {
-             std::cerr << "Failed to create config: " << Globals::globalConfig.sConfigFilePath << std::endl;
--            curl_global_cleanup();
--            return 1;
-+            res = 1;
-+            goto end;
-         }
-     }
- 
-     bool bInitOK = downloader.init();
-     if (!bInitOK)
-     {
--        curl_global_cleanup();
--        return 1;
-+        res = 1;
-+        goto end;
-     }
- 
--    int res = 0;
--
-     if (Globals::globalConfig.bShowWishlist)
-         downloader.showWishlist();
-     else if (Globals::globalConfig.bUpdateCache)
-@@ -801,7 +798,8 @@ int main(int argc, char *argv[])
-     // Orphan check was called at the same time as download. Perform it after download has finished
-     if (!Globals::globalConfig.sOrphanRegex.empty() && Globals::globalConfig.bDownload)
-         downloader.checkOrphans();
--
-+    }
-+end:
-     curl_global_cleanup();
- 
-     return res;
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index f9d281820035..2284da4a3747 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
-version=3.9
-revision=5
+version=3.11
+revision=1
 build_style=cmake
 configure_args="$(vopt_bool qt USE_QT_GUI)"
 hostmakedepends="pkg-config"
@@ -14,7 +14,7 @@ maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"
 homepage="https://github.com/Sude-/lgogdownloader"
 distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
-checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1
+checksum=01c9556287d5f49662c2219365b9d306482e8efadc805c3dbb9381d5110df719
 
 build_options="qt"
 desc_option_qt="Include QT WebEngine to support solving captchas"

From e5be58edcde63d95d6deddc54083575ceb55008a Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 21 Feb 2023 18:23:42 +0100
Subject: [PATCH 1423/1854] python3-pikepdf: update to 7.2.0.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index b960df1c63f0..ff8be484aea1 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=7.0.0
+version=7.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-wheel"
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 changelog="https://raw.githubusercontent.com/pikepdf/pikepdf/master/docs/releasenotes/version${version%%.*}.rst"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=5d812d4777a9eb86f19db3484adb34620e31880838dcbe1ce8d60305f9d46710
+checksum=ad82b836faed0376c725e19d0f8a7c7bef389e8c46683c11bbfc70410bc2e3ee
 
 pre_check() {
 	cp -r src/pikepdf.egg-info "$(cd build/lib* && pwd)"

From f80dc171ced252602ed5ba4de456a9f3ae64fb7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 20 Jun 2023 18:16:31 -0700
Subject: [PATCH 1424/1854] gnome-shell: add gnome-menus dependency

This fixes translations for the default folders i.e. X-GNOME-Utilities.
---
 srcpkgs/gnome-shell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3fc7eb89d17d..0ea458bb66dd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=44.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false -Dtests=false"
@@ -12,8 +12,8 @@ makedepends="gnome-control-center-devel at-spi2-atk-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
  gnome-bluetooth-devel pipewire-devel gstreamer1-devel gcr4-devel"
-depends="elogind gnome-control-center gsettings-desktop-schemas upower
- gstreamer1-pipewire gst-plugins-good1"
+depends="elogind gnome-control-center gsettings-desktop-schemas gnome-menus
+ upower gstreamer1-pipewire gst-plugins-good1"
 checkdepends="xvfb-run mesa-dri $depends"
 short_desc="GNOME core user interface"
 maintainer="Michal Vasilek <michal@vasilek.cz>"

From 5588a775a83224269d3f9d3911fa560d79517359 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 20 Jun 2023 18:23:39 -0700
Subject: [PATCH 1425/1854] gnome-menus: remove unused intltool dependency

https://gitlab.gnome.org/GNOME/gnome-menus/-/commit/b3f51d8577cf7ed00f5a53569b4f022b9ff30fda
---
 srcpkgs/gnome-menus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index e787fb8de6bc..f2e65f8fa580 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config gettext-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel"
 short_desc="GNOME menu specifications"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2019dc9a6e7c284f7999b4b6df6ab9c1df2f3d12 Mon Sep 17 00:00:00 2001
From: Gabriel Hondet <gabriel.hondet@tweag.io>
Date: Thu, 16 Feb 2023 16:57:48 +0100
Subject: [PATCH 1426/1854] nix: increase open files limit

---
 srcpkgs/nix/files/nix-daemon/run | 2 +-
 srcpkgs/nix/template             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/files/nix-daemon/run b/srcpkgs/nix/files/nix-daemon/run
index 052cf9d45a8d..1a57c15efdc2 100644
--- a/srcpkgs/nix/files/nix-daemon/run
+++ b/srcpkgs/nix/files/nix-daemon/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec nix-daemon
+exec prlimit --nofile=1048576 nix-daemon
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index ee2f9f148354..20eb0d85fdaf 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.11.0
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper=qemu
 # Use /nix/var as suggested by the official Manual.

From 0252c2576e859174f20d8cc0ac1d1de6b5618a26 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 27 Jun 2023 11:13:40 +0200
Subject: [PATCH 1427/1854] lesspass: add python3-requests dependency

---
 srcpkgs/lesspass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lesspass/template b/srcpkgs/lesspass/template
index 5194852fe64c..edec1927f8e5 100644
--- a/srcpkgs/lesspass/template
+++ b/srcpkgs/lesspass/template
@@ -1,11 +1,11 @@
 # Template file for 'lesspass'
 pkgname=lesspass
 version=10.2.1
-revision=1
+revision=2
 build_wrksrc="cli"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3-requests"
 checkdepends="python3-pexpect python3-mock python3-requests"
 short_desc="Stateless password generator"
 maintainer="Eloi Torrents <eloitor@disroot.org>"

From 7bb3fa0481481bea3d89e634c43f05814efe5c87 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 14 May 2023 17:42:50 -0400
Subject: [PATCH 1428/1854] New package: hyprpicker-0.1.1

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: #43873 [via git-merge-pr]
---
 srcpkgs/hyprpicker/patches/build-no-git.patch | 53 +++++++++++++++++++
 srcpkgs/hyprpicker/patches/fix-musl.patch     | 10 ++++
 srcpkgs/hyprpicker/template                   | 24 +++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 srcpkgs/hyprpicker/patches/build-no-git.patch
 create mode 100644 srcpkgs/hyprpicker/patches/fix-musl.patch
 create mode 100644 srcpkgs/hyprpicker/template

diff --git a/srcpkgs/hyprpicker/patches/build-no-git.patch b/srcpkgs/hyprpicker/patches/build-no-git.patch
new file mode 100644
index 000000000000..b7007d8fd593
--- /dev/null
+++ b/srcpkgs/hyprpicker/patches/build-no-git.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,31 +7,6 @@
+ 
+ message(STATUS "Configuring hyprpicker!")
+ 
+-# Get git info
+-# hash and branch
+-execute_process(
+-    COMMAND git rev-parse --abbrev-ref HEAD
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_BRANCH
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-execute_process(
+-    COMMAND git rev-parse HEAD
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_COMMIT_HASH
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-execute_process(
+-    COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1"
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_COMMIT_MESSAGE
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-execute_process(
+-    COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\""
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    OUTPUT_VARIABLE GIT_DIRTY
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+ #
+ #
+ 
+@@ -47,11 +22,6 @@
+ 
+ add_executable(hyprpicker ${SRCFILES})
+ 
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_MESSAGE=\"${GIT_COMMIT_MESSAGE}\"")
+-target_compile_definitions(hyprpicker PRIVATE "-DGIT_DIRTY=\"${GIT_DIRTY}\"")
+-
+ target_link_libraries(hyprpicker rt)
+ 
+ set(CPACK_PROJECT_NAME ${PROJECT_NAME})
+@@ -75,4 +45,4 @@
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin")
+     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin")
+     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin")
+-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+\ No newline at end of file
++ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
diff --git a/srcpkgs/hyprpicker/patches/fix-musl.patch b/srcpkgs/hyprpicker/patches/fix-musl.patch
new file mode 100644
index 000000000000..f25bb702b187
--- /dev/null
+++ b/srcpkgs/hyprpicker/patches/fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/src/includes.hpp
++++ b/src/includes.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#include <sys/types.h>
++
+ #include <vector>
+ #include <deque>
+ #include <iostream>
diff --git a/srcpkgs/hyprpicker/template b/srcpkgs/hyprpicker/template
new file mode 100644
index 000000000000..27143133a14a
--- /dev/null
+++ b/srcpkgs/hyprpicker/template
@@ -0,0 +1,24 @@
+# Template file for 'hyprpicker'
+pkgname=hyprpicker
+version=0.1.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config cmake ninja wayland-devel"
+makedepends="wayland-devel wayland-protocols cairo-devel pango-devel libjpeg-turbo-devel wlroots-devel"
+short_desc="wlroots-compatible Wayland color picker that does not suck"
+maintainer="RAR27 <rar27@tuta.io>"
+license="BSD-3-Clause"
+homepage="https://github.com/hyprwm/hyprpicker"
+changelog="https://github.com/hyprwm/hyprpicker/releases"
+distfiles="https://github.com/hyprwm/hyprpicker/archive/refs/tags/v${version}.tar.gz"
+checksum=f6a5e57dc69e3b0499a34f4533583bd7d7770f5a1a9834f521b532f0d1ec26e0
+
+pre_build() {
+	make protocols
+}
+
+do_install() {
+	vbin build/hyprpicker
+	vman doc/hyprpicker.1
+	vlicense LICENSE
+}

From 973cf85126282cf58571d7eb37e83ef2d95b7fdf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Jun 2023 13:08:25 +0200
Subject: [PATCH 1429/1854] passwdqc: update to 2.0.3.

---
 srcpkgs/passwdqc/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index d5ec411bd2ae..180af752b570 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,6 +1,6 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
-version=2.0.2
+version=2.0.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"
 homepage="http://www.openwall.com/passwdqc/"
 distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab
+checksum=53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4
 
 do_build() {
 	make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
@@ -25,6 +25,8 @@ passwdqc-devel_package() {
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
 	}
 }

From f667e5f0a3b4b2a72d29396c5cbd24fd61888506 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 27 Jun 2023 13:09:41 +0200
Subject: [PATCH 1430/1854] knot: update to 3.2.8.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index bfb53410c2e2..42d474ab4e8f 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.2.7
+version=3.2.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -21,7 +21,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b
+checksum=ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 9087cc6dd9487d66426fa373ca5c994c8d0a59a6 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 12 Oct 2022 02:08:04 -0400
Subject: [PATCH 1431/1854] usbguard: update to 1.1.2.

---
 srcpkgs/usbguard/patches/musl.patch | 73 -----------------------------
 srcpkgs/usbguard/template           |  8 ++--
 2 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 6ce934444841..cc2190720595 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,18 +1,5 @@
 --- a/src/CLI/usbguard.cpp	2019-06-13 11:51:53.787863657 +0000
 +++ b/src/CLI/usbguard.cpp	2019-08-23 01:52:34.233056882 +0000
-@@ -26,10 +26,8 @@
- #include <map>
- #include <iostream>
- 
--#ifndef _GNU_SOURCE
--  #define _GNU_SOURCE
--#endif
--#include <cstring> /* GNU version of basename(3) */
-+#include <cstring>
-+#include <libgen.h>
- 
- #include "usbguard.hpp"
- #include "usbguard-get-parameter.hpp"
 @@ -99,7 +97,7 @@
  
    static int usbguard_cli(int argc, char* argv[])
@@ -22,63 +9,3 @@
  
      if (argc == 1) {
        showTopLevelHelp();
---- a/src/CLI/usbguard-rule-parser.cpp	2019-06-13 11:51:53.783863704 +0000
-+++ b/src/CLI/usbguard-rule-parser.cpp	2019-08-23 01:52:34.234056870 +0000
-@@ -24,10 +24,8 @@
- #include "RuleParser.hpp"
- 
- #include <iostream>
--#ifndef _GNU_SOURCE
--  #define _GNU_SOURCE
--#endif
- #include <cstring>
-+#include <libgen.h>
- #include <fstream>
- 
- #include <getopt.h>
-@@ -43,8 +41,10 @@
- 
- static void showHelp(std::ostream& stream, const char* usbguard_arg0)
- {
--  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
--  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
-+  char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
-+  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
-+  free(usbguard_arg0_copy);
-   stream << std::endl;
-   stream << " Options:" << std::endl;
-   stream << "  -f, --file       Interpret the argument as a path to a file that should be parsed." << std::endl;
---- a/src/DBus/gdbus-server.cpp	2019-06-28 08:45:27.616687137 +0000
-+++ b/src/DBus/gdbus-server.cpp	2019-08-23 01:52:34.274056367 +0000
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <getopt.h>
-+#include <libgen.h>
- #include "DBusBridge.hpp"
- 
- static usbguard::DBusBridge* dbus_bridge = nullptr;
-@@ -208,7 +209,9 @@
- 
- static void showHelp(std::ostream& stream)
- {
--  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
-+  char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
-+  free(usbguard_arg0_copy);
-   stream << std::endl;
-   stream << " Options:" << std::endl;
-   stream << "  -s, --system   Listen on the system bus." << std::endl;
---- a/src/Library/public/usbguard/Exception.hpp	2019-06-28 08:45:27.620687089 +0000
-+++ b/src/Library/public/usbguard/Exception.hpp	2019-08-23 01:52:34.323055751 +0000
-@@ -116,7 +116,8 @@
-     static std::string reasonFromErrno(const int errno_value)
-     {
-       char buffer[1024];
--      return std::string(strerror_r(errno_value, buffer, sizeof buffer));
-+      strerror_r(errno_value, buffer, sizeof buffer);
-+      return std::string(buffer);
-     }
-   };
- 
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f6671163b6c4..8625c80a7eda 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
 # Template file for 'usbguard'
 pkgname=usbguard
-version=1.0.0
-revision=8
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
 conf_files="/etc/usbguard/*"
@@ -14,11 +14,13 @@ short_desc="Tool for whitelisting and blacklisting USB devices"
 maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://usbguard.github.io"
+changelog="https://raw.githubusercontent.com/USBGuard/usbguard/main/CHANGELOG.md"
 distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
-checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
+checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934
 
 post_install() {
 	vsv usbguard
+	vcompletion scripts/usbguard-zsh-completion zsh
 }
 
 usbguard-devel_package() {

From f0b9ca4a844308c7dc494eda39606272961e8c6a Mon Sep 17 00:00:00 2001
From: Karl R Grose <karlgrose@gromar.org>
Date: Tue, 10 Jan 2023 23:22:00 -0800
Subject: [PATCH 1432/1854] 1password: update to 8.10.7.

---
 srcpkgs/1password/INSTALL    |  6 ++++
 srcpkgs/1password/files/EULA |  1 +
 srcpkgs/1password/template   | 61 +++++++++++++++++++++++-------------
 3 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 srcpkgs/1password/files/EULA

diff --git a/srcpkgs/1password/INSTALL b/srcpkgs/1password/INSTALL
index 131b1fae2096..3a8529a27e3c 100644
--- a/srcpkgs/1password/INSTALL
+++ b/srcpkgs/1password/INSTALL
@@ -7,5 +7,11 @@ post)
 	chmod g+s opt/1Password/1Password-KeyringHelper
 	chown :_onepassword opt/1Password/1Password-BrowserSupport
 	chmod g+s opt/1Password/1Password-BrowserSupport
+	export POLICY_OWNERS
+	POLICY_OWNERS="$(cut -d: -f1,3 etc/passwd | grep -E ':[0-9]{4}$' | cut -d: -f1 | head -n 10 | sed 's/^/unix-user:/' | tr '\n' ' ')"
+	eval "cat <<EOF
+$(cat opt/1Password/com.1password.1Password.policy.tpl)
+EOF" > opt/1Password/com.1password.1Password.policy
+	install -Dm0644 opt/1Password/com.1password.1Password.policy -t usr/share/polkit-1/actions/
 	;;
 esac
diff --git a/srcpkgs/1password/files/EULA b/srcpkgs/1password/files/EULA
new file mode 100644
index 000000000000..1d939047fedc
--- /dev/null
+++ b/srcpkgs/1password/files/EULA
@@ -0,0 +1 @@
+The current version can be found at: https://1password.com/legal/terms-of-service/
diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index 293ac7dc4461..e4a929e497ae 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,21 +1,34 @@
 # Template file for '1password'
 pkgname=1password
-version=8.4.1
+version=8.10.7
 revision=1
-archs="x86_64"
-hostmakedepends="w3m gnupg"
+archs="x86_64 aarch64"
+hostmakedepends="gnupg"
 short_desc="Password manager"
 maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
 license="custom:Proprietary"
 homepage="https://www.1password.com"
-distfiles="https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz
- https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz.sig"
-checksum="f5c2468127c363b3a3d2fa5857b6ff0979eeaf1485c1afb114b3929c1fc4a7df
- 0739424395377f56c9528c1169ef72d6a941e21f1bc9d728481bf5de8563bf01"
-_filename="1password-${version}.x64.tar.gz"
+
+case "${XBPS_TARGET_MACHINE}" in
+	aarch64)
+		_arch="arm64"
+		checksum="4e6a1ffa66b54893104525754f97e52de5df7ba5b56b6536998ce2f8caf1bc93
+ 31dd56227da961b346c5e00aebfe44b065cecb06314c144c3572033777d5c6d0"
+		;;
+
+	x86_64)
+		_arch="x64"
+		checksum="e4a300cecb683e636015e8e9db547c3dc76b994b645f7ab11d85f7ad5e49ab21
+ 572508224d18cceb7efe66ed2db3c52f2cfd7f572c7e107e9d7b8439340d17ac"
+		;;
+esac
+
+distfiles="https://downloads.1password.com/linux/tar/stable/${XBPS_TARGET_MACHINE}/1password-${version}.${_arch}.tar.gz
+ https://downloads.1password.com/linux/tar/stable/${XBPS_TARGET_MACHINE}/1password-${version}.${_arch}.tar.gz.sig"
+_filename="1password-${version}.${_arch}.tar.gz"
 _1passworddir="${_filename%.tar.*}"
-_license_checksum=b8f6ff9297488416f3d8063a151109ed5e8a2df6fa546856a4beaa715cbc0fda
 _gpg_key=3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+_resources="opt/1Password/resources"
 system_groups="_onepassword"
 repository=nonfree
 restricted=yes
@@ -33,24 +46,28 @@ post_extract() {
 	then
 		msg_error "gpg verify failed\n"
 	fi
-
-	# verify EULA
-	$XBPS_FETCH_CMD -o eula https://1password.com/legal/terms-of-service/
-	cat eula |
-		w3m -dump -I utf-8 -T text/html |
-		sed -n '/Service Agreement for 1Password/,/We clarified what happens if we part ways./p' > EULA
-	filesum="$($XBPS_DIGEST_CMD EULA)"
-	if [ "$filesum" != "$_license_checksum" ]; then
-		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
-	fi
 }
 
 do_install() {
 	vmkdir opt/1Password
-	vlicense EULA
-	rm -f EULA eula
+	vlicense ${FILESDIR}/EULA
 	vcopy "*" opt/1Password
-	vinstall com.1password.1Password.policy 644 usr/share/polkit-1/actions/
+
+	# Install the icons
+	for _s in 32 64 256 512; do
+		# Create xdg directory
+		vmkdir usr/share/icons/hicolor/${_s}x${_s}/apps
+
+		# Copy the 1Password icon
+		mv  ${DESTDIR}/${_resources}/icons/hicolor/${_s}x${_s}/apps/1password.png \
+		    ${DESTDIR}/usr/share/icons/hicolor/${_s}x${_s}/apps/1password.png
+	done
+
+	# Install the .desktop file
+	vmkdir usr/share/applications
+	mv ${DESTDIR}/${_resources}/1password.desktop \
+	   ${DESTDIR}/usr/share/applications/1password.desktop
+
 	vinstall resources/custom_allowed_browsers 644 usr/share/doc/1password/examples/
 	vbin "${FILESDIR}/1password"
 }

From 2e764a495630df890d99e0fe6a6eaa7b3fa98090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 20 Feb 2023 22:53:33 +0100
Subject: [PATCH 1433/1854] i2pd: update to 2.48.0.

Closes: #42385 [via git-merge-pr]
---
 srcpkgs/i2pd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 68bfd051faee..f4e21928b9dc 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,18 +1,18 @@
 # Template file for 'i2pd'
 pkgname=i2pd
-version=2.46.0
-revision=3
+version=2.48.0
+revision=1
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
 makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
-maintainer="Obosob <obosob@riseup.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://i2pd.website/"
 changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog"
 distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"
-checksum=daa5e47bb2b80fbdaa3836b209e869017893421f5225dfe019e5d43d3f8a86d4
+checksum=ccf417aa66ce37f72ea15b7fbcff4c71e823566ea74bda696b9c1e19aae08739
 
 conf_files="
  /etc/i2pd/i2pd.conf

From f9cbf2c5b4fb3822d00830e72b092c03be1fd555 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Sun, 5 Feb 2023 13:42:32 -0500
Subject: [PATCH 1434/1854] New package: media-downloader-3.1.0

Closes: #42095 [via git-merge-pr]
---
 srcpkgs/media-downloader/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/media-downloader/template

diff --git a/srcpkgs/media-downloader/template b/srcpkgs/media-downloader/template
new file mode 100644
index 000000000000..0d2193b3b001
--- /dev/null
+++ b/srcpkgs/media-downloader/template
@@ -0,0 +1,14 @@
+# Template file for 'media-downloader'
+pkgname=media-downloader
+version=3.1.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel"
+short_desc="Qt/C++ frontend to youtube-dl"
+maintainer="Owen Law <owenlaw222@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/mhogomchungu/media-downloader"
+changelog="https://github.com/mhogomchungu/media-downloader/blob/main/changelog"
+distfiles="https://github.com/mhogomchungu/media-downloader/archive/refs/tags/${version}.tar.gz"
+checksum=72c677d8974cbd20ae2ff2085ce2e45c75c057f4e0097848fed55521ca3a3437

From 627ee1892c17d70f2a1a513e9b17771e3fcc5df2 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sat, 14 Jan 2023 09:06:48 +0900
Subject: [PATCH 1435/1854] xastir: update to 2.1.8.

---
 srcpkgs/xastir/patches/fix-mutex.patch | 15 +++++++++++++++
 srcpkgs/xastir/template                | 14 ++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/xastir/patches/fix-mutex.patch

diff --git a/srcpkgs/xastir/patches/fix-mutex.patch b/srcpkgs/xastir/patches/fix-mutex.patch
new file mode 100644
index 000000000000..129cd38b4d11
--- /dev/null
+++ b/srcpkgs/xastir/patches/fix-mutex.patch
@@ -0,0 +1,15 @@
+--- a/src/util.c	2019-07-15 00:30:31.000000000 +0200
++++ b/src/util.c	2019-08-31 15:56:13.580212122 +0200
+@@ -5457,10 +5457,10 @@
+   // NON_LSB VERSION
+   // Check first for newer pthread function
+ #  ifdef HAVE_PTHREAD_MUTEXATTR_SETTYPE
+-  (void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
++  (void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+ #  else
+   // Use older, deprecated pthread function
+-  (void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
++  (void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_ERRORCHECK);
+ #  endif  // HAVE_PTHREAD_MUTEXATTR_SETTYPE
+ # endif  // __LSB__
+ 
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index f3a315e821cd..e32b98690a2b 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -1,15 +1,21 @@
 # Template file for 'xastir'
 pkgname=xastir
-version=2.1.6
+version=2.1.8
 revision=1
-archs="i686 x86_64 ppc64le"
 build_style=gnu-configure
-makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel motif-devel libax25-devel"
+configure_args="ac_cv_file__usr_bin_gm_exe=no ac_cv_file__usr_bin_convert_exe=no"
+hostmakedepends="autoconf automake"
+makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel
+ motif-devel libax25-devel"
 short_desc="X Amateur Station Tracking and Information Reporting"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xastir.org"
 distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
-checksum=5a71af2936d4d237c779b1c3a519211f8e3cd03b9873a260c849ddc8950e1a3e
+checksum=aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	./bootstrap.sh
+}

From 329ddbd7847333f37a4aa53617ede111438a3eeb Mon Sep 17 00:00:00 2001
From: g33k <68657906+geekdiop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 18:50:29 +0100
Subject: [PATCH 1436/1854] liferea: update to 1.14.5.

---
 srcpkgs/liferea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/liferea/template b/srcpkgs/liferea/template
index bc903237928e..4c42fa49fe03 100644
--- a/srcpkgs/liferea/template
+++ b/srcpkgs/liferea/template
@@ -1,6 +1,6 @@
 # Template file for 'liferea'
 pkgname=liferea
-version=1.12.9
+version=1.14.5
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://lzone.de/liferea/"
 changelog="https://raw.githubusercontent.com/lwindolf/liferea/master/ChangeLog"
 distfiles="https://github.com/lwindolf/liferea/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=d8180695f0d378ad2799b36230bc8662916667d8a09b2e7144393a2a79c8cb1b
+checksum=2244e78d8f6b6e28f411a3554d61496a012d5fe1392fe1b475978ecfd8c61177
 lib32disabled=yes
 
 build_options="gir"

From 4244a8de5ca348d76def1711af54a2873a82e89b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sat, 11 Mar 2023 20:10:15 +0100
Subject: [PATCH 1437/1854] New package: graphwar-1.0.0

---
 srcpkgs/graphwar/files/graphwar              |  2 ++
 srcpkgs/graphwar/files/graphwar-globalServer |  2 ++
 srcpkgs/graphwar/files/graphwar-roomServer   |  2 ++
 srcpkgs/graphwar/template                    | 24 ++++++++++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/graphwar/files/graphwar
 create mode 100644 srcpkgs/graphwar/files/graphwar-globalServer
 create mode 100644 srcpkgs/graphwar/files/graphwar-roomServer
 create mode 100644 srcpkgs/graphwar/template

diff --git a/srcpkgs/graphwar/files/graphwar b/srcpkgs/graphwar/files/graphwar
new file mode 100644
index 000000000000..7cbd7e668554
--- /dev/null
+++ b/srcpkgs/graphwar/files/graphwar
@@ -0,0 +1,2 @@
+#! /bin/sh
+java -jar /usr/share/java/graphwar/graphwar.jar "$@"
diff --git a/srcpkgs/graphwar/files/graphwar-globalServer b/srcpkgs/graphwar/files/graphwar-globalServer
new file mode 100644
index 000000000000..ac962e012d71
--- /dev/null
+++ b/srcpkgs/graphwar/files/graphwar-globalServer
@@ -0,0 +1,2 @@
+#! /bin/sh
+java -jar /usr/share/java/graphwar/globalServer.jar "$@"
diff --git a/srcpkgs/graphwar/files/graphwar-roomServer b/srcpkgs/graphwar/files/graphwar-roomServer
new file mode 100644
index 000000000000..23d885fa24de
--- /dev/null
+++ b/srcpkgs/graphwar/files/graphwar-roomServer
@@ -0,0 +1,2 @@
+#! /bin/sh
+java -jar /usr/share/java/graphwar/roomServer.jar "$@"
diff --git a/srcpkgs/graphwar/template b/srcpkgs/graphwar/template
new file mode 100644
index 000000000000..91dbc1b6f021
--- /dev/null
+++ b/srcpkgs/graphwar/template
@@ -0,0 +1,24 @@
+# Template file for 'graphwar'
+pkgname=graphwar
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="openjdk11"
+depends="virtual?java-environment"
+short_desc="Hit your enemies using mathematical functions"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="http://www.graphwar.com/"
+distfiles="https://github.com/catabriga/graphwar/archive/refs/tags/${version}.tar.gz"
+checksum=53011a55adf3577d22dd2a190356d7fff7dc1379e4b8736dfd4933b47ab1e4e9
+
+do_install() {
+	vmkdir usr/share/java
+	vmkdir usr/share/java/${pkgname}
+	vinstall globalServer.jar 644 usr/share/java/${pkgname}
+	vinstall graphwar.jar 644 usr/share/java/${pkgname}
+	vinstall roomServer.jar 644 usr/share/java/${pkgname}
+	vbin "${FILESDIR}/${pkgname}"
+	vbin "${FILESDIR}/${pkgname}-globalServer"
+	vbin "${FILESDIR}/${pkgname}-roomServer"
+}

From 174935c968f5d143ee811465181a60e5c612ca2d Mon Sep 17 00:00:00 2001
From: Lunar Starstrum <lunar@forsaken-borders.net>
Date: Wed, 1 Mar 2023 01:32:52 -0600
Subject: [PATCH 1438/1854] New package: libdpp-10.0.23_1

Closes: https://github.com/void-linux/void-packages/pull/42521
---
 srcpkgs/dpp-devel    |  1 +
 srcpkgs/dpp/template | 26 ++++++++++++++++++++++++++
 srcpkgs/dpp/update   |  2 ++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/dpp-devel
 create mode 100644 srcpkgs/dpp/template
 create mode 100644 srcpkgs/dpp/update

diff --git a/srcpkgs/dpp-devel b/srcpkgs/dpp-devel
new file mode 120000
index 000000000000..cb34bf275a0a
--- /dev/null
+++ b/srcpkgs/dpp-devel
@@ -0,0 +1 @@
+dpp
\ No newline at end of file
diff --git a/srcpkgs/dpp/template b/srcpkgs/dpp/template
new file mode 100644
index 000000000000..4b01e0342af4
--- /dev/null
+++ b/srcpkgs/dpp/template
@@ -0,0 +1,26 @@
+# Template file for 'dpp'
+pkgname=dpp
+version=10.0.23
+revision=1
+build_style=cmake
+configure_args="-DDPP_USE_EXTERNAL_JSON=ON"
+cmake_builddir=build
+hostmakedepends="pkg-config"
+makedepends="libsodium-devel opus-devel zlib-devel openssl-devel json-c++"
+short_desc="C++ Discord API Library for Bots"
+maintainer="Lunar Starstrum <lunar@forsaken-borders.net>"
+license=Apache-2.0
+homepage="https://dpp.dev"
+distfiles="https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${version}.tar.gz"
+checksum=8f9db61c3586a492ada378235300c509e3bc2fc090cef32de0a8241741038df0
+
+dpp-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/dpp/update b/srcpkgs/dpp/update
new file mode 100644
index 000000000000..f88d641f9275
--- /dev/null
+++ b/srcpkgs/dpp/update
@@ -0,0 +1,2 @@
+site="https://github.com/brainboxdotcc/DPP/tags"
+pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'

From 1e612c1f3202753e7e0a8723a26a2c484615c246 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sat, 1 Apr 2023 22:06:10 +0200
Subject: [PATCH 1439/1854] New package: caph-1.1

Closes: #43234 [via git-merge-pr]
---
 srcpkgs/caph/files/caph.desktop |  8 ++++++++
 srcpkgs/caph/template           | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/caph/files/caph.desktop
 create mode 100644 srcpkgs/caph/template

diff --git a/srcpkgs/caph/files/caph.desktop b/srcpkgs/caph/files/caph.desktop
new file mode 100644
index 000000000000..a2141b58899f
--- /dev/null
+++ b/srcpkgs/caph/files/caph.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Caph
+Comment=Drawing and physics sandbox game
+Comment[ca]=Trencaclosques de dibuix i física
+Exec=caph
+Icon=caph.png
+Categories=Game;LogicGame;
diff --git a/srcpkgs/caph/template b/srcpkgs/caph/template
new file mode 100644
index 000000000000..a0d6f8211a03
--- /dev/null
+++ b/srcpkgs/caph/template
@@ -0,0 +1,29 @@
+# Template file for 'caph'
+pkgname=caph
+version=1.1
+revision=1
+build_wrksrc="src"
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="-f caph.mk"
+hostmakedepends="which pkg-config"
+makedepends="SDL-devel libpng-devel"
+short_desc="Drawing and physics sandbox game"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://caphgame.sourceforge.net/"
+changelog="https://sourceforge.net/p/caphgame/code/ci/master/tree/doc/caph/CHANGELOG?format=raw"
+distfiles="https://sourceforge.net/projects/caphgame/files/caph/caphgame-${version}/caph-${version}.tar.bz2"
+checksum=6415970e7d32aefc6da2740f931052be8741d3f6663910a36962400b7b9a7ae8
+
+do_configure() {
+	./confg
+}
+
+do_install() {
+	vbin caph
+	vmkdir usr/share/caph
+	vcopy ../share/caph usr/share
+	vinstall ../share/caph/brush.png 644 usr/share/pixmaps caph.png
+	vinstall "${FILESDIR}/caph.desktop" 644 usr/share/applications
+}

From 15857db79cdde8e644658e15f7355816da6a7a98 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Apr 2023 11:00:11 -0400
Subject: [PATCH 1440/1854] New package: trurl-0.8

---
 srcpkgs/trurl/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/trurl/template

diff --git a/srcpkgs/trurl/template b/srcpkgs/trurl/template
new file mode 100644
index 000000000000..8dba44303254
--- /dev/null
+++ b/srcpkgs/trurl/template
@@ -0,0 +1,19 @@
+# Template file for 'trurl'
+pkgname=trurl
+version=0.8
+revision=1
+build_style=gnu-makefile
+make_check_target="test"
+makedepends="libcurl-devel"
+checkdepends="python3"
+short_desc="Command line tool for URL parsing and manipulation"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/curl/trurl"
+changelog="https://raw.githubusercontent.com/curl/trurl/master/RELEASE-NOTES"
+distfiles="https://github.com/curl/trurl/archive/refs/tags/trurl-${version}.tar.gz"
+checksum=7baccde1620062cf8c670121125480269b41bdc81bd4015b7aabe33debb022c6
+
+post_install() {
+	vlicense COPYING
+}

From 269b363d4434a47432d487ef40c63eb15dc16a32 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Tue, 27 Jun 2023 14:06:50 +0200
Subject: [PATCH 1441/1854] shotgun: update to 2.5.1

---
 srcpkgs/shotgun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shotgun/template b/srcpkgs/shotgun/template
index dcefbb2cccb4..f1723b3c8cb8 100644
--- a/srcpkgs/shotgun/template
+++ b/srcpkgs/shotgun/template
@@ -1,6 +1,6 @@
 # Template file for 'shotgun'
 pkgname=shotgun
-version=2.5.0
+version=2.5.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ maintainer="Emil Miler <em@0x45.cz>"
 license="MPL-2.0"
 homepage="https://github.com/nexromancers/shotgun"
 distfiles="https://github.com/neXromancers/shotgun/archive/refs/tags/v${version}.tar.gz"
-checksum=862b9d6f1c418181d37375153e3ceadf87b738f5a48fcbd7257e07cd78b622a0
+checksum=4f95fd9d97c50bfd17228b5f59c7ed69b42ed6b50ae45b0a15d202ec1e89a1c6
 
 post_extract() {
 	rm build.rs

From 3f42cab08f011e583e9c975fa169dd55b4063960 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 27 Jun 2023 15:21:57 +0200
Subject: [PATCH 1442/1854] github-cli: split go_import_path into go_package

---
 srcpkgs/github-cli/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 89ffc67e39fe..343c399b5213 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -4,7 +4,8 @@ version=2.31.0
 revision=1
 build_style=go
 build_helper=qemu
-go_import_path="github.com/cli/cli/v2/cmd/gh"
+go_import_path="github.com/cli/cli/v2"
+go_package="${go_import_path}/cmd/gh"
 go_ldflags="-X github.com/cli/cli/v2/internal/build.Version=v${version}"
 short_desc="GitHub CLI tool"
 maintainer="shizonic <realtiaz@gmail.com>"

From aa3022b5b03e6e2d836c3a00933d65300b1f4bb3 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Thu, 16 Mar 2023 02:52:49 -0300
Subject: [PATCH 1443/1854] New package: rogue-5.4.4

---
 srcpkgs/rogue/patches/desktop-icon.patch | 15 +++++++++++++++
 srcpkgs/rogue/template                   | 19 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/rogue/patches/desktop-icon.patch
 create mode 100644 srcpkgs/rogue/template

diff --git a/srcpkgs/rogue/patches/desktop-icon.patch b/srcpkgs/rogue/patches/desktop-icon.patch
new file mode 100644
index 000000000000..7bb78c25c98a
--- /dev/null
+++ b/srcpkgs/rogue/patches/desktop-icon.patch
@@ -0,0 +1,15 @@
+diff --git a/rogue.desktop b/rogue.desktop
+index 74f9518..34b02f4 100644
+--- a/rogue.desktop
++++ b/rogue.desktop
+@@ -2,9 +2,9 @@
+ Encoding=UTF-8
+ Name=Rogue
+ GenericName=Rogue
+ Comment=The original curses-based adventure game
+ Exec=rogue
+-Icon=rogue.png
++Icon=rogue
+ Terminal=true
+ Type=Application
+ Categories=Game;RolePlaying;
diff --git a/srcpkgs/rogue/template b/srcpkgs/rogue/template
new file mode 100644
index 000000000000..98ad61b87990
--- /dev/null
+++ b/srcpkgs/rogue/template
@@ -0,0 +1,19 @@
+# Template file for 'rogue'
+pkgname=rogue
+version=5.4.4
+revision=1
+build_style=gnu-configure
+configure_args="--enable-scorefile=/var/games/rogue/rogue.scr"
+makedepends="ncurses-devel"
+short_desc="Dungeon crawl game from the 80s"
+maintainer="sirkhancision <jsantiago12tone@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://rogue.rogueforge.net/"
+distfiles="https://gitlab.com/philhsmith/rogue/-/archive/v${version}/rogue-v${version}.tar.gz"
+checksum=df9f837817ceeededb77395ba990d83894f992ed7f534f3baab2ca4a80921b63
+
+post_install() {
+	vinstall rogue.desktop 644 usr/share/applications
+	vinstall rogue.png 644 usr/share/pixmaps
+	vlicense LICENSE.TXT
+}

From 070f70979341a9dceca0ef16104ce55ee9cd9f81 Mon Sep 17 00:00:00 2001
From: Jason Elswick <jason@jasondavid.tv>
Date: Tue, 27 Jun 2023 08:49:32 -0500
Subject: [PATCH 1444/1854] unflac: update to 1.1.

---
 srcpkgs/unflac/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 1c7dba20f527..37af4634493b 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,16 +1,16 @@
 # Template file for 'unflac'
 pkgname=unflac
-version=1.0
-revision=2
+version=1.1
+revision=1
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"
 short_desc="Command line tool for audio image + cue sheet splitting"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Jason Elswick <jason@jasondavid.tv>"
 license="MIT"
 homepage="https://git.sr.ht/~ft/unflac"
 distfiles="https://git.sr.ht/~ft/${pkgname}/archive/${version}.tar.gz"
-checksum=a09c54d04127707c3f556836590de5d2ae6a78bf17a99472b602ef983f89b7b4
+checksum=a79aa3625bae55286f382909a899f6304d71e7ce206e0234c40d944c74932caf
 
 post_install() {
 	vlicense LICENSE

From 0b00c4c614703427b0aba7f32e9a2b245dfc12e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Feb 2023 09:41:50 -0500
Subject: [PATCH 1445/1854] python3-scipy: update to 1.11.0, build with meson

---
 .../python3-scipy/patches/numpy-version.patch | 14 ++++
 srcpkgs/python3-scipy/template                | 72 +++++++++++--------
 2 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/python3-scipy/patches/numpy-version.patch

diff --git a/srcpkgs/python3-scipy/patches/numpy-version.patch b/srcpkgs/python3-scipy/patches/numpy-version.patch
new file mode 100644
index 000000000000..74f9b4a919b0
--- /dev/null
+++ b/srcpkgs/python3-scipy/patches/numpy-version.patch
@@ -0,0 +1,14 @@
+There doesn't seem to be a valid reason for this restriction, and it doesn't
+impede building anyway.
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -40,7 +40,7 @@
+     # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6
+     # (see oldest-supported-numpy issues gh-28 and gh-45)
+     "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'",
+-    "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'",
++    "numpy>=1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'",
+ 
+     # For Python versions which aren't yet officially supported,
+     # we specify an unpinned NumPy which allows source distributions
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 1871a8a30a9c..e0e0fdec2aa8 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,26 +1,35 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.10.1
+version=1.11.0
 revision=1
-build_style=python3-module
-build_helper="numpy"
-make_check_args="--force"
-hostmakedepends="gcc-fortran python3-setuptools
- pythran python3-Cython python3-pybind11"
-makedepends="python3-devel python3-pybind11
+build_style=meson
+build_helper="python3"
+hostmakedepends="python3-build python3-installer python3-meson-python
+ python3-wheel python3-Cython python3-pybind11 pythran python3-numpy
+ gcc-fortran pkg-config"
+makedepends="python3-devel python3-pybind11 python3-numpy pythran
  $(vopt_if openblas openblas-devel lapack-devel)"
 depends="python3-numpy"
-checkdepends="python3-pytest-xdist python3-pooch"
 short_desc="Scientific library for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
-distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.gz"
-checksum=2cf9dfb80a7b4589ba4c40ce7588986d6d5cebc5457cad2c2880f6bc2d42f3a5
-make_check="ci-skip" # Tests require downloaded data and take a long time
+distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz"
+checksum=f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d
+make_check="no" # Tests need an installed copy to run and meson makes this tough
 
 build_options="openblas"
 
+if [ "$CROSS_BUILD" ]; then
+	_pybind11_dir="${py3_sitelib}/pybind11"
+	configure_args="--cross-file=python.cross"
+	export PKG_CONFIG_PATH="${XBPS_CROSS_BASE}/${_pybind11_dir}/share/pkgconfig"
+	# pybind11 uses a path relative to the pkgconfig file to set $prefix,
+	# which causes the wrapper to double-include $XBPS_CROSS_BASE; override
+	# so that the wrapper properly points to the right location
+	export PKG_CONFIG_PYBIND11_PREFIX="/${_pybind11_dir}"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
 		# Prefer accelerated routines where available
@@ -36,29 +45,34 @@ if [ "$build_option_openblas" ]; then
 	esac
 fi
 
-# Tell numpy to build in parallel
-export NPY_NUM_BUILD_JOBS="${XBPS_MAKEJOBS}"
+pre_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		# Meson can't tolerate $CC with arguments as set by the build helper
+		CC="${XBPS_CROSS_TRIPLET}-gcc"
+		# CXX needs to know where to find Python headers
+		CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+}
 
-pre_build() {
-	# Find the right linear algebra subroutines on the target arch
-	: > site.cfg
-	for _blaslib in $(vopt_if openblas openblas "lapack blas"); do
-		cat >> site.cfg <<-EOF
-		[$_blaslib]
-		libraries = ${_blaslib}
-		include_dirs = ${XBPS_CROSS_BASE}/usr/include
-		library_dirs = ${XBPS_CROSS_BASE}/usr/lib
-		runtime_library_dirs = ${XBPS_CROSS_BASE}/usr/lib
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}"
+		cat > python.cross <<-EOF
+		[properties]
+		numpy-include-dir = '${_xpy}/numpy/core/include'
+		pythran-include-dir = '${_xpy}/pythran'
 		EOF
-	done
+	fi
 }
 
-do_check() {
-	touch .coveragerc
-	python3 ./runtests.py --verbose ${makejobs}
+do_build() {
+	# Use the build directory already configured by xbps-src for meson
+	python3 -m build --no-isolation --wheel \
+		-Cbuilddir="./build" -Ccompile-args="${makejobs}" .
 }
 
-post_install() {
-	rm ${DESTDIR}/${py3_sitelib}/scipy/*.txt
+do_install() {
+	python3 -m installer --destdir "${DESTDIR}" \
+		--no-compile-bytecode dist/*.whl
 	vlicense LICENSE.txt
 }

From d2ac5b12e2b54e2a0ebdd4adcf6ee09aa2c5461c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:36:34 +0200
Subject: [PATCH 1446/1854] ImageMagick: update to 7.1.1.12.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index dbfcc264cae7..bbf69e216155 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
-version=7.1.1.11
+version=7.1.1.12
 revision=1
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
@@ -20,7 +20,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org"
 changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=98bb2783da7d5b06e7543529bd07b50d034fba611ff15e8817a0f4f73957d934
+checksum=51567d11fcbca5bd591d191ce9fdf821e2ed1b12c1ad8bc2a2f13da5c6313f33
 
 subpackages="libmagick libmagick-devel"
 

From a89e2bd410bf41a7fbb84d57c76bc6d2c99f696a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:41:45 +0200
Subject: [PATCH 1447/1854] php8.0-imagick: revbump for ImageMagick-7.1.1.12

---
 srcpkgs/php8.0-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
index ae1823ab75d2..88d260b973d3 100644
--- a/srcpkgs/php8.0-imagick/template
+++ b/srcpkgs/php8.0-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0-imagick'
 pkgname=php8.0-imagick
 version=3.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.0"

From af3a0563b4fc655b78b99ab073d1df5b435f0cba Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:41:45 +0200
Subject: [PATCH 1448/1854] php8.1-imagick: revbump for ImageMagick-7.1.1.12

---
 srcpkgs/php8.1-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
index dbf7cae1d74a..b2faf0ba9402 100644
--- a/srcpkgs/php8.1-imagick/template
+++ b/srcpkgs/php8.1-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1-imagick'
 pkgname=php8.1-imagick
 version=3.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.1"

From 7e76f892c13fa81d6db358595b4cd7e0b60b319f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 27 Jun 2023 10:41:45 +0200
Subject: [PATCH 1449/1854] php8.2-imagick: revbump for ImageMagick-7.1.1.12

---
 srcpkgs/php8.2-imagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2-imagick/template b/srcpkgs/php8.2-imagick/template
index 09b11989c52a..ef7a78f70771 100644
--- a/srcpkgs/php8.2-imagick/template
+++ b/srcpkgs/php8.2-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2-imagick'
 pkgname=php8.2-imagick
 version=3.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
  --with-php-config=/usr/bin/php-config8.2"

From 764074ebf81d970490585d1013ec208b41ed3ef7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 27 Jun 2023 12:26:00 +0200
Subject: [PATCH 1450/1854] topgrade: update to 12.0.0

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index a62587dcb8de..2808df268529 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=11.0.2
+version=12.0.0
 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=29cd1d870dafbfa46d07c4056ba229a98755660a2e37804f12e1507fdde7d237
+checksum=c99bb88995da5e7d86055d10eced8950740fa2ed986f0b9b159e64a22a0842ed
 
 post_install() {
 	local topgrade="${DESTDIR}/usr/bin/topgrade"

From b68351627706959e6cd481f446e2d0ced5597d76 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 15:26:33 -0400
Subject: [PATCH 1451/1854] *: orphan st3r4g's packages

---
 srcpkgs/intel-gmmlib/template       | 2 +-
 srcpkgs/intel-media-driver/template | 2 +-
 srcpkgs/libglvnd/template           | 2 +-
 srcpkgs/python3-pycdio/template     | 2 +-
 srcpkgs/python3-pytaglib/template   | 2 +-
 srcpkgs/whipper/template            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index 8ed6ed3cf56c..04e407b1de4d 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -14,7 +14,7 @@ build_style=cmake
 # compilers flag in use.
 configure_args="-Wno-dev"
 short_desc="Intel Graphics Memory Management Library"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/intel/gmmlib"
 distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz"
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 1ca94569e117..a5bab06ac947 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -8,7 +8,7 @@ configure_args="-Wno-dev -DENABLE_NONFREE_KERNELS=$(vopt_if nonfree ON OFF)"
 hostmakedepends="pkg-config"
 makedepends="libva-devel libX11-devel intel-gmmlib-devel libpciaccess-devel"
 short_desc="Intel Media Driver for VAAPI (Broadwell+)"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
diff --git a/srcpkgs/libglvnd/template b/srcpkgs/libglvnd/template
index a2522106cfd6..93983d36cd45 100644
--- a/srcpkgs/libglvnd/template
+++ b/srcpkgs/libglvnd/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libXext-devel libX11-devel xorgproto"
 checkdepends="xvfb-run"
 short_desc="GL Vendor-Neutral Dispatch library"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-alike"
 homepage="https://gitlab.freedesktop.org/glvnd/libglvnd"
 distfiles="https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v${version}/libglvnd-v${version}.tar.gz"
diff --git a/srcpkgs/python3-pycdio/template b/srcpkgs/python3-pycdio/template
index cfaca61046d4..6fdcf7503980 100644
--- a/srcpkgs/python3-pycdio/template
+++ b/srcpkgs/python3-pycdio/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools pkg-config swig"
 makedepends="libcdio-devel python3-devel"
 depends="python3"
 short_desc="Python OO interface to libcdio (CD Input and Control library)"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libcdio"
 distfiles="${GNU_SITE}/libcdio/pycdio-${version}.tar.gz"
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f1d9db569131..ebbdc90cf28f 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel taglib-devel"
 depends="python3"
 short_desc="Python bindings for the TagLib C++ library"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/supermihi/pytaglib"
 distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index cd7f851f8c4d..256c7d83ef80 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -10,7 +10,7 @@ depends="libcdio-paranoia cdrdao python3-gobject python3-musicbrainzngs
  python3-setuptools python3-ruamel.yaml flac sox"
 checkdepends="$depends python3-pytest python3-Twisted"
 short_desc="Python CD-DA ripper preferring accuracy over speed"
-maintainer="Stefano Ragni <st3r4g@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/whipper-team/whipper"
 distfiles="https://github.com/whipper-team/whipper/archive/v${version}.tar.gz"

From 13ecb5a50dffd7fe4a6bbbc485187e0bf7ea6b6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Jun 2023 15:32:42 -0400
Subject: [PATCH 1452/1854] python3-scipy: fix homepage, builds without
 openblas

---
 srcpkgs/python3-scipy/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index e0e0fdec2aa8..c5a8e1f212bd 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -8,12 +8,12 @@ hostmakedepends="python3-build python3-installer python3-meson-python
  python3-wheel python3-Cython python3-pybind11 pythran python3-numpy
  gcc-fortran pkg-config"
 makedepends="python3-devel python3-pybind11 python3-numpy pythran
- $(vopt_if openblas openblas-devel lapack-devel)"
+ $(vopt_if openblas openblas-devel "lapack-devel cblas-devel")"
 depends="python3-numpy"
 short_desc="Scientific library for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
-homepage="https://scipy.org/scipylib/"
+homepage="https://scipy.org/"
 distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz"
 checksum=f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d
 make_check="no" # Tests need an installed copy to run and meson makes this tough
@@ -43,6 +43,8 @@ if [ "$build_option_openblas" ]; then
 		ppc64*) ;;
 		ppc*) broken="numpy can't be built with openblas";;
 	esac
+else
+	configure_args+=" -Dblas=blas -Dlapack=lapack"
 fi
 
 pre_patch() {

From 2a3d9d4c6a50d87eb60e787e8029616e39d6e7a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 15:38:05 -0400
Subject: [PATCH 1453/1854] *: orphan RinsedSloth's packages

---
 srcpkgs/python3-hjson/template | 2 +-
 srcpkgs/qmk/template           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hjson/template b/srcpkgs/python3-hjson/template
index 9ee5fb90dbe1..2c1841424d7b 100644
--- a/srcpkgs/python3-hjson/template
+++ b/srcpkgs/python3-hjson/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="User interface for JSON"
-maintainer="RinsedSloth <afernandezh@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/hjson/hjson-py"
 distfiles="${PYPI_SITE}/h/hjson/hjson-${version}.tar.gz"
diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template
index 5067857b53f3..5c1bc5ecda2e 100644
--- a/srcpkgs/qmk/template
+++ b/srcpkgs/qmk/template
@@ -11,7 +11,7 @@ depends="avr-gcc avrdude cross-arm-none-eabi dfu-programmer dfu-util
  python3-dotty-dict python3-hid python3-hjson python3-jsonschema python3-milc
  python3-nose2 python3-usb python3-yapf"
 short_desc="CLI tool for working with QMK firmware of mechanical keyboards"
-maintainer="RinsedSloth <afernandezh@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/qmk/qmk_cli"
 distfiles="${PYPI_SITE}/q/qmk/qmk-${version}.tar.gz"

From 30e42ca023759be2b7ee2d34f45d7e7b78f69847 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 00:51:09 +0530
Subject: [PATCH 1454/1854] python3-yapf: update to 0.40.1.

Adopt.
---
 srcpkgs/python3-yapf/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template
index 7dbea9f8cf77..81fa11d73539 100644
--- a/srcpkgs/python3-yapf/template
+++ b/srcpkgs/python3-yapf/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-yapf'
 pkgname=python3-yapf
-version=0.33.0
-revision=2
+version=0.40.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-tomli"
+depends="python3-importlib_metadata python3-platformdirs python3-tomli"
+checkdepends="${depends} python3-pytest"
 short_desc="Formatter for Python code"
-maintainer="RinsedSloth <afernandezh@protonmail.com>"
+maintainer="icp <pangolin@vivaldi.net>"
 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=da62bdfea3df3673553351e6246abed26d9fe6780e548a5af9e70f6d2b4f5b9a
+checksum=958587eb5c8ec6c860119a9c25d02addf30a44f75aa152a4220d30e56a98037c
 
 post_install() {
 	chmod -R a+r "${DESTDIR}/${py3_sitelib}/yapf-${version}-py${py3_ver}.egg-info/"

From 12f94ccc02bc8104cb6d6ace8413b0d4b7e325a6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 15:43:58 -0400
Subject: [PATCH 1455/1854] pipewire: update to 0.3.72, adopt

---
 .../patches/jack-fix-notify-skip.patch        | 50 -------------------
 srcpkgs/pipewire/template                     | 14 +++---
 2 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch

diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
deleted file mode 100644
index fed37727a636..000000000000
--- a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 18 May 2023 09:59:26 +0200
-Subject: [PATCH] jack: update bufsize and samplerate when skipping notify
-
-When we skip the notify because we are not active or we don't have a
-callback, still update the buffer_size and sample_rate fields or else
-we will keep on trying forever.
-
-Fixes #3226
----
- pipewire-jack/src/pipewire-jack.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
-index 0c8363ea3..20feb2462 100644
---- a/pipewire-jack/src/pipewire-jack.c
-+++ b/pipewire-jack/src/pipewire-jack.c
-@@ -1027,8 +1027,6 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
- 	struct notify *notify;
- 	bool emit = false;;
- 
--	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
--		return 0;
- 	switch (type) {
- 	case NOTIFY_TYPE_REGISTRATION:
- 		emit = c->registration_callback != NULL && o != NULL;
-@@ -1060,8 +1058,18 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
- 	default:
- 		break;
- 	}
-+	if ((type & NOTIFY_ACTIVE_FLAG) && !c->active)
-+		emit = false;
- 	if (!emit) {
--		pw_log_debug("%p: skip notify %d", c, type);
-+		switch (type) {
-+		case NOTIFY_TYPE_BUFFER_FRAMES:
-+			c->buffer_frames = arg1;
-+			break;
-+		case NOTIFY_TYPE_SAMPLE_RATE:
-+			c->sample_rate = arg1;
-+			break;
-+		}
-+		pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active);
- 		if (o != NULL && arg1 == 0 && o->removing) {
- 			o->removing = false;
- 			free_object(c, o);
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 3e0cffb69a3c..5320cb07f6a4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.71
-revision=3
+version=0.3.72
+revision=1
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -16,6 +16,7 @@ configure_args="
  -Dbluez5-codec-lc3plus=disabled
  -Dsession-managers=[]
  -Drlimits-match=@_pipewire
+ -Dlibffado=$(vopt_if ffado enabled disabled)
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -23,22 +24,23 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel opus-devel"
+ libmysofa-devel opus-devel $(vopt_if ffado libffado-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
-maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363
+checksum=eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
-build_options="sdl2"
+build_options="ffado sdl2"
+desc_option_ffado="Enable support for FireWire based audio devices"
 
 replaces="libpulseaudio-pipewire>=0"
 

From f87ce1c4bab8272fd89f5cc6431a400435182107 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 00:40:44 +0530
Subject: [PATCH 1456/1854] memray: update to 1.8.1.

---
 srcpkgs/memray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/memray/template b/srcpkgs/memray/template
index 8c73d35d25e0..f84c81b3a174 100644
--- a/srcpkgs/memray/template
+++ b/srcpkgs/memray/template
@@ -1,6 +1,6 @@
 # Template file for 'memray'
 pkgname=memray
-version=1.7.0
+version=1.8.1
 revision=1
 build_style=python3-pep517
 make_check_target="tests/unit"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://bloomberg.github.io/memray/"
 changelog="https://bloomberg.github.io/memray/changelog.html"
 distfiles="https://github.com/bloomberg/memray/archive/refs/tags/v${version}.tar.gz"
-checksum=0c735753d6d8a9050c9313c55ee41bfca271c3dec7cc37d2ed01eba5d358a7d6
+checksum=523792161623c80934904a7ff80eac53be6256f530cff179f834c6e33192fd54
 make_check_pre="env PYTHONPATH=src"
 
 pre_build() {

From 3841712cc5b60852c045a820fe961dab2660ac43 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Sat, 17 Jun 2023 12:01:00 +0200
Subject: [PATCH 1457/1854] libasr: remove, discontinued upstream and unused

closes #44487
---
 common/shlibs                     |  1 -
 srcpkgs/libasr-devel              |  1 -
 srcpkgs/libasr/template           | 34 -------------------------------
 srcpkgs/removed-packages/template |  4 +++-
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 120000 srcpkgs/libasr-devel
 delete mode 100644 srcpkgs/libasr/template

diff --git a/common/shlibs b/common/shlibs
index 754c2aa23049..8e97f561bae8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2210,7 +2210,6 @@ libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
-libasr.so.0 libasr-1.0.0_1
 libssr-glinject.so ssr-0.3.1_1
 libgdict-1.0.so.10 gnome-dictionary-3.18.1_1
 libasignify.so.1 asignify-1.0_1
diff --git a/srcpkgs/libasr-devel b/srcpkgs/libasr-devel
deleted file mode 120000
index 213782918378..000000000000
--- a/srcpkgs/libasr-devel
+++ /dev/null
@@ -1 +0,0 @@
-libasr
\ No newline at end of file
diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
deleted file mode 100644
index fdd5986a740b..000000000000
--- a/srcpkgs/libasr/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'libasr'
-pkgname=libasr
-version=1.0.4
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool"
-short_desc="Simple and portable asynchronous resolver library"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-Clause"
-homepage="https://www.opensmtpd.org/"
-distfiles="https://github.com/OpenSMTPD/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=19fb6bed10d15c9775c8d008cd1130155917ae4e801c729fe85e6d88a545dab4
-
-if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
-	CFLAGS="-DHAVE_RES_RANDOMID"
-fi
-
-pre_configure() {
-	./bootstrap
-}
-
-post_install() {
-	vlicense LICENCE
-}
-
-libasr-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5b2a3dc26088..d138d1155589 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230626
+version=0.1.20230627
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -281,6 +281,8 @@ replaces="
  libantimicrox-devel<=3.1.3_1
  libantimicrox<=3.1.3_1
  libapp<=20140527_2
+ libasr-devel<=1.0.4_1
+ libasr<=1.0.4_1
  libbitcoin-blockchain-devel<=3.6.0_10
  libbitcoin-blockchain<=3.6.0_10
  libbitcoin-client-devel<=3.6.0_10

From eef142f65dfda734d38835ff806ca219dbb2661c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 16:44:13 -0400
Subject: [PATCH 1458/1854] *: orphan kruceter's packages

---
 srcpkgs/ipsvd/template         | 2 +-
 srcpkgs/socklog-ucspi/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipsvd/template b/srcpkgs/ipsvd/template
index c1e118fb4c40..fd68cef65da5 100644
--- a/srcpkgs/ipsvd/template
+++ b/srcpkgs/ipsvd/template
@@ -4,7 +4,7 @@ version=1.0.0
 revision=1
 build_wrksrc="${pkgname}-${version}"
 short_desc="Set of internet protocol service daemons for Unix"
-maintainer="Krul Ceter <kruceter@proton.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://smarden.org/ipsvd"
 distfiles="http://smarden.org/ipsvd/ipsvd-${version}.tar.gz"
diff --git a/srcpkgs/socklog-ucspi/template b/srcpkgs/socklog-ucspi/template
index 6fa8a209f0dc..288397041365 100644
--- a/srcpkgs/socklog-ucspi/template
+++ b/srcpkgs/socklog-ucspi/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meta
 depends="socklog ipsvd"
 short_desc="UCSPI-TCP services for socklog"
-maintainer="Krul Ceter <kruceter@proton.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="http://smarden.org/socklog"
 

From 001052f076ccb7f6e4e2df3ee79c1909c395dd02 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 15 Jun 2023 11:41:24 +0200
Subject: [PATCH 1459/1854] coreboot-utils: update to 4.20.1.

---
 .../coreboot-utils/patches/ectool-musl.patch  | 11 ----------
 .../patches/inteltool-musl-2.patch            | 10 ---------
 .../patches/inteltool-musl.patch              | 11 ----------
 .../patches/nvramtool-musl-2.patch            | 11 ----------
 .../patches/nvramtool-musl.patch              | 11 ----------
 .../patches/superiotool-musl.patch            | 22 -------------------
 srcpkgs/coreboot-utils/template               |  7 +++---
 7 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/coreboot-utils/patches/ectool-musl.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
 delete mode 100644 srcpkgs/coreboot-utils/patches/superiotool-musl.patch

diff --git a/srcpkgs/coreboot-utils/patches/ectool-musl.patch b/srcpkgs/coreboot-utils/patches/ectool-musl.patch
deleted file mode 100644
index 85abc55c428c..000000000000
--- a/srcpkgs/coreboot-utils/patches/ectool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/ectool/Makefile	2020-05-20 15:20:52.396213112 +0200
-+++ b/util/ectool/Makefile	2020-05-20 15:20:52.396213112 +0200
-@@ -15,6 +15,8 @@
- LDFLAGS = -l$(shell uname -p)
- endif
- 
-+LDFLAGS = -lgcc
-+
- all: $(PROGRAM)
- 
- $(PROGRAM): ec.o ectool.o
diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
deleted file mode 100644
index a27523bc9734..000000000000
--- a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/arch/x86/include/arch/mmio.h	2020-05-20 14:43:31.750138013 +0200
-+++ b/src/arch/x86/include/arch/mmio.h	2020-05-20 14:43:13.438137399 +0200
-@@ -4,6 +4,7 @@
- #define __ARCH_MMIO_H__
-
- #include <stdint.h>
-+#define __always_inline  inline __attribute__((always_inline))
-
- static __always_inline uint8_t read8(
- 	const volatile void *addr)
diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch
deleted file mode 100644
index 509d2dcb6077..000000000000
--- a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/inteltool/inteltool.h	2018-08-27 12:35:48.049321340 +0200
-+++ b/util/inteltool/inteltool.h	2018-08-27 12:30:27.434969376 +0200
-@@ -21,7 +21,7 @@
- 
- #include <stdint.h>
- 
--#if defined(__GLIBC__)
-+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) ||defined(__NetBSD__) || defined(__DARWIN__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
deleted file mode 100644
index e6142739cfee..000000000000
--- a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/nvramtool/Makefile	2020-05-20 15:19:20.652210037 +0200
-+++ b/util/nvramtool/Makefile	2020-05-20 15:19:20.652210037 +0200
-@@ -34,6 +34,8 @@
- CFLAGS += -D__GLIBC__
- endif
- 
-+LDFLAGS = -lgcc
-+
- all: dep $(PROGRAM)
- 
- $(PROGRAM): $(OBJS)
diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
deleted file mode 100644
index a3e6c7c17835..000000000000
--- a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/nvramtool/accessors/cmos-hw-unix.c	2018-08-27 12:20:14.139599118 +0200
-+++ b/util/nvramtool/accessors/cmos-hw-unix.c	2018-08-27 12:19:45.558280906 +0200
-@@ -11,7 +11,7 @@
- #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); })
- #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); })
- #else
--#if defined(__GLIBC__) && (defined(__i386__) || defined(__x86_64__))
-+#if (defined(__i386__) || defined(__x86_64__)) && !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch
deleted file mode 100644
index 195660c8c602..000000000000
--- a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/util/superiotool/Makefile	2018-05-16 21:00:17.000000000 +0200
-+++ b/util/superiotool/Makefile	2018-08-27 12:56:28.070741476 +0200
-@@ -25,7 +25,7 @@
- VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
- 
- CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
--         -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
-+         -Werror-implicit-function-declaration -pedantic $(VERSION)
- LDFLAGS += -lz
- 
- OBJS = superiotool.o serverengines.o ali.o exar.o fintek.o ite.o nsc.o \
---- a/util/superiotool/superiotool.h	2018-05-16 21:00:17.000000000 +0200
-+++ b/util/superiotool/superiotool.h	2018-08-27 12:50:25.627387315 +0200
-@@ -25,7 +25,7 @@
- #include <stdint.h>
- #include <string.h>
- #include <getopt.h>
--#if defined(__GLIBC__)
-+#if  !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index d01eb38b29c9..f91a0f0c7f87 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
-version=4.17
-revision=2
+version=4.20.1
+revision=1
 archs="i686* x86_64*"
 build_wrksrc="util"
 build_style=gnu-makefile
@@ -11,7 +11,8 @@ maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://coreboot.org"
 distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz"
-checksum=95da11d1c6a450385101a68799258a398ce965f4e46cce6fe8d5ebd74e50c125
+checksum=b41539a8c2eab2fec752157eb4acbd0e2a637a7203530c12e66b43a5c3c3a931
+CFLAGS="-D_GNU_SOURCE"
 
 do_build() {
 	for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \

From 52cded5efcc9e585e88d1ae973be495cfed82022 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 27 Jun 2023 01:42:46 +0530
Subject: [PATCH 1460/1854] rust-analyzer: update to 2023.06.26.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 6c417b01509d..6ae7cd38d4fb 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.06.19
+version=2023.06.26
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=3365b6a8de1929a73af198520f3169f146ab882b47b41146045ea8217fcdcd61
+checksum=2a22d552e98820dacf34aa84816dff1d83e9c56c997470e917c9d77f150069b4
 # tests require Rust source code
 make_check=no
 

From 9c212141ea50d038eb6a422345335fa80e8658b7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 00:45:45 +0530
Subject: [PATCH 1461/1854] hurl: update to 3.0.1.

---
 srcpkgs/hurl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hurl/template b/srcpkgs/hurl/template
index 77634e4f2065..5881b444a7af 100644
--- a/srcpkgs/hurl/template
+++ b/srcpkgs/hurl/template
@@ -1,6 +1,6 @@
 # Template file for 'hurl'
 pkgname=hurl
-version=3.0.0
+version=3.0.1
 revision=1
 build_style=cargo
 make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://hurl.dev"
 changelog="https://raw.githubusercontent.com/Orange-OpenSource/hurl/master/CHANGELOG.md"
 distfiles="https://github.com/Orange-OpenSource/hurl/archive/refs/tags/${version}.tar.gz"
-checksum=7ad9a1043129edb4850727c085a83010b916b3515c2af5afddd0809c1e2bd85c
+checksum=551a730ed23150bc0a120781abe8c36b2989abc03c97c3e79191eea87cca5632
 
 if [[ "$XBPS_WORDSIZE" -eq 32 ]]; then
 	make_check=no # https://github.com/Orange-OpenSource/hurl/issues/1220

From 4478ea4e60a44f777e0f5e0a4ca89b15e30d5052 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 17:59:12 -0400
Subject: [PATCH 1462/1854] *: orphan Ulf's packages

inactive since 2021
---
 srcpkgs/Thunar/template                         | 2 +-
 srcpkgs/gphoto2/template                        | 2 +-
 srcpkgs/hidapi/template                         | 2 +-
 srcpkgs/io.elementary.videos/template           | 2 +-
 srcpkgs/lxtask/template                         | 2 +-
 srcpkgs/lxterminal/template                     | 2 +-
 srcpkgs/mobile-broadband-provider-info/template | 2 +-
 srcpkgs/pianobar/template                       | 2 +-
 srcpkgs/python3-chromecast/template             | 2 +-
 srcpkgs/qsynth/template                         | 2 +-
 srcpkgs/rooster/template                        | 2 +-
 srcpkgs/xfce4-taskmanager/template              | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 91ef58fa0a17..dde94cfe4d1e 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config intltool glib-devel"
 makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Thunar File Manager"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
diff --git a/srcpkgs/gphoto2/template b/srcpkgs/gphoto2/template
index 73b706b7a99f..97f03f9097e7 100644
--- a/srcpkgs/gphoto2/template
+++ b/srcpkgs/gphoto2/template
@@ -8,7 +8,7 @@ configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev
 hostmakedepends="automake gettext-devel libtool pkg-config"
 makedepends="libgphoto2-devel libjpeg-turbo-devel popt-devel readline-devel"
 short_desc="Digital camera CLI iinterface to libgphoto"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gphoto.org"
 distfiles="${SOURCEFORGE_SITE}/gphoto/gphoto2-${version}.tar.bz2"
diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index c9cef86a126c..365e8eac36ca 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libusb-devel"
 short_desc="Simple library for communicating with USB and Bluetooth HID devices"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/libusb/hidapi"
 changelog="https://github.com/libusb/hidapi/releases"
diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index d843b038a7da..d83a9ca928be 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext pkg-config vala AppStream"
 makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
  gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
 short_desc="Video player and library app designed for elementary OS"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template
index f35f9e772f4a..dcb7017e1715 100644
--- a/srcpkgs/lxtask/template
+++ b/srcpkgs/lxtask/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
 short_desc="LXDE Task Manager"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template
index 22cf17c65436..f7c44102a515 100644
--- a/srcpkgs/lxterminal/template
+++ b/srcpkgs/lxterminal/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel vte3-devel"
 depends="desktop-file-utils"
 short_desc="LXDE Terminal emulator"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 68c0a965ec48..dd2879934180 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libxslt"
 checkdepends="libxml2"
 short_desc="Database of mobile broadband service providers"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Creative Commons Public Domain"
 homepage="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/"
 distfiles="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/${version}/mobile-broadband-provider-info-${version}.tar.bz2"
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index a9b29e91993f..e3febb821a45 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
  libcurl-devel libgcrypt-devel"
 short_desc="Free/open-source, console-based client for Pandora radio"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://6xq.net/pianobar/"
 changelog="https://raw.githubusercontent.com/PromyLOPh/pianobar/master/ChangeLog"
diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index 982b2a72a7eb..ff32ad6f11f1 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-ca
 depends="python3-protobuf python3-zeroconf python3-casttube"
 checkdepends="python3-flake8 python3-pylint black"
 short_desc="Python3 library to communicate with Google Chromecast"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 1b8712148464..19f39132fc38 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"
 depends="fluidsynth jack desktop-file-utils hicolor-icon-theme"
 short_desc="Qt GUI Interface for FluidSynth"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://qsynth.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index 2dcfca0af324..281f32d3f531 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/rooster"
 distfiles="https://static.crates.io/crates/rooster/rooster-${version}.crate"
diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 85323727cb53..785abf6f7acd 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE task manager plugin"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-taskmanager/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"

From 2c2f2948acadc63727194c021d01b08728e50d33 Mon Sep 17 00:00:00 2001
From: cassaundra <cass@cassaundra.org>
Date: Tue, 7 Mar 2023 21:47:06 -0800
Subject: [PATCH 1463/1854] opentmpfiles: remove package

Upstream no longer maintained. Also has a privilege escalation vulnerability
that will likely not be fixed.

Not depended upon by any other packages.

See also: https://github.com/OpenRC/opentmpfiles/issues/19

closes #42655
---
 srcpkgs/opentmpfiles/template     | 16 ----------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/opentmpfiles/template

diff --git a/srcpkgs/opentmpfiles/template b/srcpkgs/opentmpfiles/template
deleted file mode 100644
index 2e5be496e00b..000000000000
--- a/srcpkgs/opentmpfiles/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'opentmpfiles'
-pkgname=opentmpfiles
-version=0.3.1
-revision=1
-build_style=meson
-configure_args="-Drootbindir=/usr/bin"
-short_desc="Standalone utility for handling systemd-style tmpfiles.d settings"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/OpenRC/opentmpfiles"
-distfiles="https://github.com/OpenRC/opentmpfiles/archive/${version}.tar.gz"
-checksum=47d651ccda53a204463285044a9d34b1bd54d927509dac43994a9d6341be084a
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d138d1155589..bdd9a27b2906 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1.20230627
-revision=1
+revision=2
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -411,6 +411,7 @@ replaces="
  onionshare<=2.2_5
  opencl-clhpp<=2.0.15_1
  openlierox<=0.58.rc5_2
+ opentmpfiles<=0.3.1_1
  orage<=4.12.1_7
  parallel-rust<=0.11.3_2
  paraview<=5.8.1_3

From 819d486672dc68baeb37aeac316577961316e51e Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Tue, 7 Mar 2023 09:23:23 -0500
Subject: [PATCH 1464/1854] python3-pytest-qt: update to 4.2.0.

closes #42640
---
 srcpkgs/python3-pytest-qt/template | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index 6cef70df550d..5ba9ead78008 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,29 +1,18 @@
 # Template file for 'python3-pytest-qt'
 pkgname=python3-pytest-qt
-version=3.3.0
-revision=5
+version=4.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-pytest"
-checkdepends="$depends python3-pyside2 python3-PyQt5 python3-pytest-xvfb
- xdpyinfo"
 short_desc="Pytest support for PyQt and PySide applications"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pytest-qt"
+changelog="https://raw.githubusercontent.com/pytest-dev/pytest-qt/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-qt/pytest-qt-${version}.tar.gz"
-checksum=714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925
-
-do_check() {
-	# testing for some configuration in test_basics.py,
-	# isn't those 2 below tests are the real test for envvar
-	# Why does it run just fine?
-	local _skip='test_qapp_args or test_qt_api_ini_config or test_invalid_qt_api_envvar'
-	PYTHONPATH=$(pwd)/build/lib \
-		PYTEST_QT_API=pyside2 python3 -m pytest -k "not ($_skip)"
-	PYTHONPATH=$(pwd)/build/lib \
-		PYTEST_QT_API=pyqt5 python3 -m pytest -k "not ($_skip)"
-}
+checksum=00a17b586dd530b6d7a9399923a40489ca4a9a309719011175f55dc6b5dc8f41
+make_check=no # tests only run in a venv with tox, not useful for checking package correctness
 
 post_install() {
 	vlicense LICENSE

From a483ba19df9ddf91a038522bb202cd66eddd7892 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 7 May 2023 17:35:55 +0200
Subject: [PATCH 1465/1854] openresolv: update distfiles url

closes #43790
---
 srcpkgs/openresolv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 3ed997c5fc58..1cdeff328ee7 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -9,8 +9,8 @@ short_desc="Management framework for resolv.conf"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/openresolv"
-distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
-checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
+distfiles="https://github.com/NetworkConfiguration/openresolv/archive/refs/tags/v${version}.tar.gz"
+checksum=f4c43bdfe20fddb56a5371647e7ae05bad3c1e089a1c5a056ab445f43dd2eb53
 conf_files="/etc/resolvconf.conf"
 
 post_install() {

From 64c0f6f9ecaa27f62123644d300398c2ed3a8286 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 14 Apr 2023 16:54:50 -0400
Subject: [PATCH 1466/1854] hardinfo: revbump for remove_linefeed fixes

---
 srcpkgs/hardinfo/patches/fix-runtime.patch | 36 +++++++++++++---------
 srcpkgs/hardinfo/template                  |  4 +--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/hardinfo/patches/fix-runtime.patch b/srcpkgs/hardinfo/patches/fix-runtime.patch
index 2d9afa04526c..b9c7a1d9c355 100644
--- a/srcpkgs/hardinfo/patches/fix-runtime.patch
+++ b/srcpkgs/hardinfo/patches/fix-runtime.patch
@@ -1,19 +1,19 @@
-diff --git hardinfo.h hardinfo.h
-index 9f52f63..aeb84d9 100644
---- a/hardinfo.h
-+++ b/hardinfo.h
-@@ -64,8 +64,8 @@ struct _ModuleAbout {
+--- a/hardinfo.h	2023-04-14 16:50:28.324202873 -0400
++++ b/hardinfo.h	2023-04-14 16:51:11.470129493 -0400
+@@ -64,9 +64,9 @@
  };
  
  /* String utility functions */
 -inline void  remove_quotes(gchar *str);
 -inline char *strend(gchar *str, gchar chr);
+-inline void  remove_linefeed(gchar *str);
 +void  remove_quotes(gchar *str);
 +char *strend(gchar *str, gchar chr);
- inline void  remove_linefeed(gchar *str);
++void  remove_linefeed(gchar *str);
  gchar       *strreplace(gchar *string, gchar *replace, gchar new_char);
  
-@@ -91,7 +91,7 @@ gpointer __idle_free(gpointer ptr, gchar *f, gint l);
+ /* Widget utility functions */
+@@ -91,7 +91,7 @@
  
  
  gchar	     *find_program(gchar *program_name);
@@ -22,11 +22,9 @@ index 9f52f63..aeb84d9 100644
  void          nonblock_sleep(guint msec);
  void          open_url(gchar *url);
  GSList	     *modules_load_selected(void);
-diff --git util.c util.c
-index 266ce4e..e6c81fd 100644
---- a/util.c
-+++ b/util.c
-@@ -111,7 +111,7 @@ gchar *seconds_to_string(unsigned int seconds)
+--- a/util.c 16:50:36.611380820 -0400
++++ b/util.c	2023-04-14 16:51:25.031420828 -0400
+@@ -111,7 +111,7 @@
  			   plural(hours), minutes, plural(minutes));
  }
  
@@ -35,7 +33,7 @@ index 266ce4e..e6c81fd 100644
  {
      if (size < KiB)
  	return g_strdup_printf("%.1f B", size);
-@@ -123,7 +123,7 @@ inline gchar *size_human_readable(gfloat size)
+@@ -123,7 +123,7 @@
      return g_strdup_printf("%.1f GiB", size / GiB);
  }
  
@@ -44,7 +42,7 @@ index 266ce4e..e6c81fd 100644
  {
      if (!str)
  	return NULL;
-@@ -135,7 +135,7 @@ inline char *strend(gchar * str, gchar chr)
+@@ -135,7 +135,7 @@
      return str;
  }
  
@@ -53,4 +51,12 @@ index 266ce4e..e6c81fd 100644
  {
      if (!str)
  	return;
-
+@@ -146,7 +146,7 @@
+     strend(str, '"');
+ }
+ 
+-inline void remove_linefeed(gchar * str)
++void remove_linefeed(gchar * str)
+ {
+     strend(str, '\n');
+ }
diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template
index 6c2745d675c3..087687bfa06c 100644
--- a/srcpkgs/hardinfo/template
+++ b/srcpkgs/hardinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'hardinfo'
 pkgname=hardinfo
 version=0.5.1
-revision=12
+revision=13
 build_style=gnu-configure
 hostmakedepends="pkg-config which"
 makedepends="gtk+-devel libsoup-devel desktop-file-utils"
@@ -9,7 +9,7 @@ depends="desktop-file-utils"
 short_desc="System information and benchmark tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://sourceforge.net/projects/hardinfo.berlios/"
+homepage="https://www.berlios.de/software/hardinfo/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.bz2"
 checksum=a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a
 lib32disabled=yes

From 4d086a580c2b454f368c7456444abca83139e89e Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Tue, 27 Jun 2023 20:16:20 -0300
Subject: [PATCH 1467/1854] bash-language-server: update to 4.10.1.

---
 srcpkgs/bash-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bash-language-server/template b/srcpkgs/bash-language-server/template
index 16a86de435aa..5705ecbaf6fc 100644
--- a/srcpkgs/bash-language-server/template
+++ b/srcpkgs/bash-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'bash-language-server'
 pkgname=bash-language-server
-version=4.9.2
+version=4.10.1
 revision=1
 hostmakedepends="jq yarn"
 depends="nodejs"
@@ -9,7 +9,7 @@ maintainer="sirkhancision <jsantiago12tone@gmail.com>"
 license="MIT"
 homepage="https://github.com/bash-lsp/bash-language-server"
 distfiles="https://github.com/bash-lsp/bash-language-server/archive/refs/tags/server-${version}.tar.gz"
-checksum=7d162baf072ba8807f4253d7fdbe7210507e5b0106e94cc0373668dd40a25fee
+checksum=f8c7fed6812e166dadefceb156ba8e1737e57914f9f06b4bba06f93bed7dc9b4
 
 do_build() {
 	yarn install

From d839a4da5a02267dadda080a3ebc2e06afffd3ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 25 Jun 2023 18:17:37 -0400
Subject: [PATCH 1468/1854] void-docs: update to 2023.06.28.

---
 srcpkgs/void-docs/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/void-docs/template b/srcpkgs/void-docs/template
index ee9e185c1aad..2d8b05ab6873 100644
--- a/srcpkgs/void-docs/template
+++ b/srcpkgs/void-docs/template
@@ -1,21 +1,21 @@
 # Template file for 'void-docs'
 pkgname=void-docs
-version=2021.10.06
+version=2023.06.28
 revision=1
-hostmakedepends="mdBook lowdown texlive perl perl-JSON librsvg-utils"
+hostmakedepends="mdBook lowdown texlive perl perl-JSON perl-File-Which librsvg-utils"
 short_desc="Documentation for Void Linux"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="CC-BY-SA-4.0"
 homepage="https://github.com/void-linux/void-docs"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5f3db259b20242642e607a6241fdc6d64e89fb4e3546080deaa9faf0fec99bb3
+distfiles="https://github.com/void-linux/void-docs/archive/refs/tags/${version}.tar.gz"
+checksum=2d0ba314a5ee9d8f13ddcf430580de1bd56bd7c46346111c8f3ca114d934f6cf
 
 do_build() {
 	PREFIX=/usr res/build.sh
 }
 
 do_install() {
-	PREFIX=/usr DESTDIR=$DESTDIR res/install.sh
+	PREFIX=/usr DESTDIR="$DESTDIR" res/install.sh
 }
 
 void-docs-browse_package() {

From eccfe345e05f5a7e3b848009cbab9bdefa5af472 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:12 +0100
Subject: [PATCH 1469/1854] libcotp: update to 2.0.1, adopt

---
 common/shlibs                            |  2 +-
 srcpkgs/libcotp/patches/fix-cflags.patch | 14 --------------
 srcpkgs/libcotp/template                 | 14 +++++++-------
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/libcotp/patches/fix-cflags.patch

diff --git a/common/shlibs b/common/shlibs
index 8e97f561bae8..ef71bae3f9a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3558,7 +3558,7 @@ libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots0.15-0.15.1_1
 libwlroots.so.11 wlroots-0.16.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.12 libcotp-1.2.1_1
+libcotp.so.2 libcotp-2.0.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
diff --git a/srcpkgs/libcotp/patches/fix-cflags.patch b/srcpkgs/libcotp/patches/fix-cflags.patch
deleted file mode 100644
index 397b3960e9f4..000000000000
--- a/srcpkgs/libcotp/patches/fix-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libcotp-1.2.2/CMakeLists.txt
-===================================================================
---- libcotp-1.2.2.orig/CMakeLists.txt
-+++ libcotp-1.2.2/CMakeLists.txt
-@@ -25,8 +25,7 @@ set(CMAKE_C_STANDARD 11)
- set(COTP_HEADERS src/cotp.h)
- set(SOURCE_FILES src/otp.c)
- 
--set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wno-format-truncation -fstack-protector-strong -fPIC")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-format-truncation -fstack-protector-strong -fPIC")
- 
- add_library(cotp SHARED ${SOURCE_FILES})
- 
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 8a1d6c0cdfca..2e1596e89fc4 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,19 +1,19 @@
 # Template file for 'libcotp'
 pkgname=libcotp
-version=1.2.8
-revision=2
+version=2.0.1
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libbaseencode-devel libgcrypt-devel"
+makedepends="libgcrypt-devel"
 short_desc="Library for generating TOTP and HOTP"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Miler <em@0x45.cz>"
 license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libcotp"
-distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
-checksum=78dab6a2ee08e73f1d052dcb7c1ad069cc37fdf600f3f660d8e6299e11218f0b
+distfiles="https://github.com/paolostivanin/libcotp/archive/refs/tags/v${version}.tar.gz"
+checksum=b111d528bbde7c1a0a392f49293b25ae33e6e78fbcbe378e0cf8bc6d59743d11
 
 libcotp-devel_package() {
-	depends="libcotp-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ac55b6130d30714625580b319e779352ccf13db7 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 6 Mar 2023 15:34:39 +0100
Subject: [PATCH 1470/1854] OTPClient: update to 3.1.8, adopt

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 17 -----------------
 srcpkgs/OTPClient/template                 | 13 +++++++------
 2 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/OTPClient/patches/fix-cflags.patch

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
deleted file mode 100644
index 5474d055d57f..000000000000
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: OTPClient-2.4.4/CMakeLists.txt
-===================================================================
---- OTPClient-2.4.4.orig/CMakeLists.txt
-+++ OTPClient-2.4.4/CMakeLists.txt
-@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
- option(BUILD_CLI "Build the CLI" ON)
- 
- set(CMAKE_C_STANDARD 11)
--set(CMAKE_C_FLAGS "-Wall -Wextra -O2 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
- if(CMAKE_COMPILER_IS_GNUCC)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
- endif()
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index a5f068ffa976..9d65d4e0794f 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,15 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.4.8
-revision=2
+version=3.1.8
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
- libzip-devel libcotp-devel libzbar-devel jansson-devel"
+ libcotp-devel libzbar-devel jansson-devel protobuf-devel protobuf-c-devel
+ libuuid-devel libsecret-devel qrencode-devel"
 short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="Ulf <void@uw.anonaddy.com>"
+maintainer="Emil Miler <em@0x45.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
-distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=252dd4cad71ea19f26686a8c6cfdb12fb25100cb98694fd36eec1a4d28f39a23
+distfiles="https://github.com/paolostivanin/OTPClient/archive/refs/tags/v${version}.tar.gz"
+checksum=5b85aefa4bd10d96c7866a6b77264b416124f272b3082fb7b854e68762129c14

From 7f5178b59052d6d85fe7c85291f73f33456906a6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 9 Mar 2023 00:42:46 +0530
Subject: [PATCH 1471/1854] mps-youtube: rename to yewtube, update to 2.10.4.

---
 srcpkgs/mps-youtube          |  1 +
 srcpkgs/mps-youtube/template | 14 --------------
 srcpkgs/yewtube/template     | 26 ++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/mps-youtube
 delete mode 100644 srcpkgs/mps-youtube/template
 create mode 100644 srcpkgs/yewtube/template

diff --git a/srcpkgs/mps-youtube b/srcpkgs/mps-youtube
new file mode 120000
index 000000000000..9223c39c3000
--- /dev/null
+++ b/srcpkgs/mps-youtube
@@ -0,0 +1 @@
+yewtube
\ No newline at end of file
diff --git a/srcpkgs/mps-youtube/template b/srcpkgs/mps-youtube/template
deleted file mode 100644
index 92b190949861..000000000000
--- a/srcpkgs/mps-youtube/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'mps-youtube'
-pkgname=mps-youtube
-version=0.2.8
-revision=6
-build_style=python3-module
-pycompile_module="mps_youtube"
-hostmakedepends="python3-setuptools"
-depends="python3-pafy python3-setuptools"
-short_desc="Terminal based YouTube player and downloader"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/mps-youtube/mps-youtube/"
-distfiles="https://github.com/mps-youtube/${pkgname}/archive/v${version}.tar.gz"
-checksum=d5f2c4bc1f57f0566242c4a0a721a5ceaa6d6d407f9d6dd29009a714a0abec74
diff --git a/srcpkgs/yewtube/template b/srcpkgs/yewtube/template
new file mode 100644
index 000000000000..b8d240443863
--- /dev/null
+++ b/srcpkgs/yewtube/template
@@ -0,0 +1,26 @@
+# Template file for 'yewtube'
+pkgname=yewtube
+version=2.10.4
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-pyperclip python3-youtubesearch python3-pylast yt-dlp
+ python3-mutagen python3-pycryptodomex python3-websockets python3-Brotli python3-certifi"
+checkdepends="${depends} python3-pip python3-dbus python3-gobject python3-pytest-xdist"
+short_desc="Terminal based YouTube player and downloader"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mps-youtube/yewtube"
+changelog="https://raw.githubusercontent.com/mps-youtube/yewtube/master/CHANGELOG.md"
+distfiles="https://github.com/mps-youtube/yewtube/archive/refs/tags/v${version}.tar.gz"
+checksum=e7b93f3929f9266ecb32317d0c23acdd8966626f83015e361ef44cff1089fa32
+
+post_install() {
+	vbin yt
+}
+
+mps-youtube_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}

From 8b728543f070d7365341fe1d1eba526b2dafd4c5 Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Wed, 28 Jun 2023 13:06:03 +0530
Subject: [PATCH 1472/1854] google-chrome: update to 114.0.5735.198.

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ffef308cdec8..bc0562fe21ef 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=114.0.5735.133
+version=114.0.5735.198
 revision=1
 _channel=stable
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:chrome"
 homepage="https://www.google.com/chrome/"
 distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb"
-checksum=6f700ff90db3a0f72ed9fb7ccbce31bd2f937366ed9b80d3ee0dafab7ba0693e
+checksum=22f9403f4ebe8c814cfcf8343b6b6cae4629a7fd357ebdc008b29f2ff4d4c70c
 _license_checksum=8023b18fb5118ef65d586363e53909861bd1a9676e5eb83c20fd3ac6e33ea0be
 
 skiprdeps="/opt/google/chrome/libqt5_shim.so"

From f910dfb6dafebce490a7689fa0e397213fb243f2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 17 Jun 2023 13:39:53 +0100
Subject: [PATCH 1473/1854] libuv: update to 1.45.0.

---
 srcpkgs/libuv/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index be3143e33156..3181808b90b3 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,31 +1,28 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.44.2
+version=1.45.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config"
 short_desc="Multi-platform support library with a focus on asynchronous I/O"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, CC-BY-SA-4.0"
+license="MIT, BSD-2-Clause, ISC"
 homepage="https://libuv.org/"
 changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
-distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz"
-checksum=e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da
+distfiles="https://dist.libuv.org/dist/v${version}/libuv-v${version}-dist.tar.gz"
+checksum=3793d8c0d6fa587721d010d0555b7e82443fd4e8b3c91e529eb6607592f52b87
 # the tests fail when run as root and as such break in the CI containers
-make_check="extended"
+make_check=ci-skip
 
 LDFLAGS="-pthread"
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 post_install() {
 	vlicense LICENSE
+	vlicense LICENSE-extra
 }
 
 libuv-devel_package() {
-	depends="libuv>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From b0d7452ea6c47d744ff4fc7f32a6f702b4e93724 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 28 Jun 2023 17:18:39 +0200
Subject: [PATCH 1474/1854] kdeconnect: add missing dep on kirigami-addons

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 89b073be13d3..48b0ff77038c 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
  qqc2-desktop-style-devel pulseaudio-qt-devel modemmanager-qt5-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols
- breeze-icons kpeoplevcard"
+ breeze-icons kpeoplevcard kirigami-addons"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
 maintainer="John <me@johnnynator.dev>"

From 062bcff85d1938c36556a4a1e645aec46b08afb3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 21:47:38 +0100
Subject: [PATCH 1475/1854] libbytesize: update to 2.8.

---
 srcpkgs/libbytesize/patches/musl-fix-test.diff | 17 +++++++++++++++++
 srcpkgs/libbytesize/template                   | 17 +++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libbytesize/patches/musl-fix-test.diff

diff --git a/srcpkgs/libbytesize/patches/musl-fix-test.diff b/srcpkgs/libbytesize/patches/musl-fix-test.diff
new file mode 100644
index 000000000000..51877fe68417
--- /dev/null
+++ b/srcpkgs/libbytesize/patches/musl-fix-test.diff
@@ -0,0 +1,17 @@
+diff --git a/tests/locale_utils.py b/tests/locale_utils.py
+index 7e4f369..c16f1bd 100644
+--- a/tests/locale_utils.py
++++ b/tests/locale_utils.py
+@@ -4,7 +4,11 @@ import subprocess
+ """Helper functions, decorators,... for working with locales"""
+ 
+ def get_avail_locales():
+-    return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()}
++    try:
++        return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()}
++    except FileNotFoundError:
++        # musl and some other libc's don't support locales beyond what POSIX requires.
++        return {"C.UTF-8"}
+ 
+ 
+ def missing_locales(required, available):
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 2aabc29dcc64..d1fa531256b3 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,9 +1,9 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
-version=2.7
+version=2.8
 revision=1
 build_style=gnu-configure
-hostmakedepends="gettext python3"
+hostmakedepends="pkg-config gettext python3"
 makedepends="mpfr-devel pcre2-devel"
 checkdepends="python3-six"
 short_desc="Library for operations with sizes in bytes"
@@ -12,9 +12,12 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libbytesize"
 changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
 distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz"
-checksum=8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e
-# checks fails in libbytesize_unittest.sh
-make_check=no
+checksum=d87aef5a37e189b1cc827530e0feafa6529331fcbe2aabf330a01ad8ec95e1a0
+
+pre_check() {
+	# Requires python3-pocketlint, which is not packaged yet.
+	vsed -e 's/canary_tests.sh$//g' -i tests/Makefile
+}
 
 libbytesize-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -30,6 +33,8 @@ libbytesize-python3_package() {
 	depends="python3-six ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Python3 bindings"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
+		# Requires the Python module.
+		vmove usr/bin/bscalc
 	}
 }

From 962e604141ddbffb207695d98fb8b5ad8074ebe5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 28 Jun 2023 18:00:39 +0200
Subject: [PATCH 1476/1854] xsnow: update to 3.7.5.

---
 srcpkgs/xsnow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 6c2fdbc25672..fe06007c0d12 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,6 +1,6 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=3.7.4
+version=3.7.5
 revision=1
 build_style=gnu-configure
 build_helper=qemu
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
-checksum=541d3d54add3c20f69069b1af4c2e974e3668a80de731ff0b89bd9093be9e657
+checksum=c1e086b9237ee2485a6faff09e7cba7a299fabf290238928d37b6d76fe38dda3
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then

From b58d332e61cf9f395c6c699ab92b1544fb90f4bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 28 Jun 2023 13:17:12 -0400
Subject: [PATCH 1477/1854] libbytesize: put bscalc man page in the same
 package as the script

---
 srcpkgs/libbytesize/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index d1fa531256b3..ca2593ee4bc4 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config gettext python3"
 makedepends="mpfr-devel pcre2-devel"
@@ -36,5 +36,6 @@ libbytesize-python3_package() {
 		vmove "usr/lib/python3*"
 		# Requires the Python module.
 		vmove usr/bin/bscalc
+		vmove usr/share/man/man1/bscalc.1
 	}
 }

From c22a8f2f380892763724082f43d9ca0fe9b35ce0 Mon Sep 17 00:00:00 2001
From: T0mstone <realt0mstone@gmail.com>
Date: Sat, 18 Mar 2023 22:36:22 +0100
Subject: [PATCH 1478/1854] New package: logiops-0.3.2

Co-authored-by: Duncaen <duncaen@voidlinux.org>
Closes: https://github.com/void-linux/void-packages/pull/42849
---
 srcpkgs/logiops/files/logid/run |  5 +++++
 srcpkgs/logiops/template        | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/logiops/files/logid/run
 create mode 100644 srcpkgs/logiops/template

diff --git a/srcpkgs/logiops/files/logid/run b/srcpkgs/logiops/files/logid/run
new file mode 100644
index 000000000000..610a27239ba4
--- /dev/null
+++ b/srcpkgs/logiops/files/logid/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+modprobe -q hid_logitech_hidpp || exit 1
+exec logid ${OPTS}
diff --git a/srcpkgs/logiops/template b/srcpkgs/logiops/template
new file mode 100644
index 000000000000..f0fdb5a4ec01
--- /dev/null
+++ b/srcpkgs/logiops/template
@@ -0,0 +1,29 @@
+# Template file for 'logiops'
+pkgname=logiops
+version=0.3.2
+revision=1
+_ipcgull_rev=4f22a43e3380dc1e9c0a490201f4d745390b623f
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libevdev-devel eudev-libudev-devel libconfig-devel libconfig++-devel
+ glib-devel"
+short_desc="Unofficial userspace driver for HID++ Logitech devices"
+maintainer="T0mstone <realt0mstone@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/PixlOne/logiops"
+changelog="https://github.com/PixlOne/logiops/releases/tag/v${version}"
+distfiles="https://github.com/PixlOne/logiops/archive/refs/tags/v${version}.tar.gz
+ https://github.com/PixlOne/ipcgull/archive/${_ipcgull_rev}.tar.gz"
+checksum="6c7210a84f9695a7530030dba9fff7e44765c971c7ef06461ff9c8646a64c036
+ 67068523dc0ea4750d501309d8041ca3511fa3e22fa1c453a3bc9f2ea5c95f45"
+skip_extraction="${_ipcgull_rev}.tar.gz"
+
+post_extract() {
+	bsdtar xzf "$XBPS_SRCDISTDIR/$pkgname-$version/$_ipcgull_rev.tar.gz" \
+		--strip-components=1 -C "$wrksrc/src/ipcgull"
+}
+
+post_install() {
+	vsconf logid.example.cfg logid.cfg
+	vsv logid
+}

From 3016cdc5305aa381cd110d4bb46327a8b6b6b5ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jun 2023 19:49:51 +0200
Subject: [PATCH 1479/1854] logiops: add missing patch

---
 srcpkgs/logiops/patches/musl-fixes.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/logiops/patches/musl-fixes.patch

diff --git a/srcpkgs/logiops/patches/musl-fixes.patch b/srcpkgs/logiops/patches/musl-fixes.patch
new file mode 100644
index 000000000000..5b8c7c027416
--- /dev/null
+++ b/srcpkgs/logiops/patches/musl-fixes.patch
@@ -0,0 +1,10 @@
+--- a/src/logid/config/types.h
++++ b/src/logid/config/types.h
+@@ -18,6 +18,7 @@
+ #ifndef LOGID_CONFIG_PRIMITIVE_H
+ #define LOGID_CONFIG_PRIMITIVE_H
+ 
++#include <sys/types.h>
+ #include <config/map.h>
+ #include <config/group.h>
+ #include <ipcgull/property.h>

From ec587046ce0db08446cff4e9d4b41ebefda35f4d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jun 2023 19:51:47 +0200
Subject: [PATCH 1480/1854] logiops: build with musl patch

---
 srcpkgs/logiops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/logiops/template b/srcpkgs/logiops/template
index f0fdb5a4ec01..fef28166c308 100644
--- a/srcpkgs/logiops/template
+++ b/srcpkgs/logiops/template
@@ -1,7 +1,7 @@
 # Template file for 'logiops'
 pkgname=logiops
 version=0.3.2
-revision=1
+revision=2
 _ipcgull_rev=4f22a43e3380dc1e9c0a490201f4d745390b623f
 build_style=cmake
 hostmakedepends="pkg-config"

From 918f8dd1af73179549a9598d575b1c427329d43b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 20:49:10 +0300
Subject: [PATCH 1481/1854] ghex: update to 44.1

---
 srcpkgs/ghex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index eb96a61631f3..adbff1a1bdfb 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,6 +1,6 @@
 # Template file for 'ghex'
 pkgname=ghex
-version=44.0
+version=44.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -16,7 +16,7 @@ license="GPL-2.0-only, GFDL-1.1-only"
 homepage="https://gitlab.gnome.org/GNOME/ghex"
 changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-44/NEWS"
 distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-${version}.tar.xz"
-checksum=58aa47cfdbed1280a3c131951c1a24596129404a0b0d347a3dbfffb6ff683976
+checksum=404bdf649eaa13922a80ae32f19fe40e71f0ee0f461c45edac72888a00ead6c2
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 4b307cab215045adcb508f2514210073a2f938ba Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 28 Jun 2023 19:32:46 +0300
Subject: [PATCH 1482/1854] nemo: update to 5.8.3.

---
 srcpkgs/nemo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index e54d98c677e5..25a7a6651cc9 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=5.8.2
+version=5.8.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 changelog="https://raw.githubusercontent.com/linuxmint/nemo/master/debian/changelog"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=6a53fb8cec225f08a364e551b442a3e4cfbbad8812ef4bd77494a0236544f387
+checksum=7d89eb3eaa3310b19bc7361f3214d3c60888b6e8fa1237ecc0d565f06c5a362c
 python_version=3
 # Requires xvfb-run and dbus-run-session
 make_check=no # can't be run inside chroot due to fusermount3

From d7cf5c171a5916f5bfbcbc918f2b4d19250d122c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 16 Jun 2023 15:29:38 +0100
Subject: [PATCH 1483/1854] harfbuzz: update to 7.3.0.

---
 srcpkgs/harfbuzz/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 1114c37e82ce..29901df47ad2 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=7.1.0
-revision=2
+version=7.3.0
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
@@ -14,7 +14,13 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
+checksum=20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=enabled"
+else
+	configure_args+=" -Dtests=disabled"
+fi
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From 0638123a80750ef42b6a7c04ab31fa965f508650 Mon Sep 17 00:00:00 2001
From: Philip Linde <philip@text.garden>
Date: Tue, 13 Jun 2023 18:21:55 +0200
Subject: [PATCH 1484/1854] New package: cpmtools-2.23

Closes: #44412 [via git-merge-pr]
---
 srcpkgs/cpmtools/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/cpmtools/template

diff --git a/srcpkgs/cpmtools/template b/srcpkgs/cpmtools/template
new file mode 100644
index 000000000000..882eccd3975c
--- /dev/null
+++ b/srcpkgs/cpmtools/template
@@ -0,0 +1,12 @@
+# Template file for 'cpmtools'
+pkgname=cpmtools
+version=2.23
+revision=1
+build_style=gnu-configure
+makedepends="ncurses-devel"
+short_desc="CP/M file exchange tools"
+maintainer="Philip Linde <philip@text.garden>"
+license="GPL-3.0-or-later"
+homepage="http://www.moria.de/~michael/cpmtools/"
+distfiles="http://www.moria.de/~michael/cpmtools/files/cpmtools-${version}.tar.gz"
+checksum=7839b19ac15ba554e1a1fc1dbe898f62cf2fd4db3dcdc126515facc6b929746f

From 119b12939e0e75ac041ba8d3c3deed4dee494bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 28 Jun 2023 20:25:24 +0200
Subject: [PATCH 1485/1854] exiftool: update to 12.64.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b2524e18874b..90af830ac64f 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.63
+version=12.64
 revision=1
 build_style=perl-module
 short_desc="Reader and rewriter of EXIF information that supports raw files"
@@ -9,4 +9,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=15162912ac37cdc6a7018498435a8348b5e6d7a10385f38b75e053695c9b5658
+checksum=8368034ec7a984823e30a7df6fb980090098b2648dda69d8069f4b06283d9f43

From 83ef35f7bc6e6d579dcb88413de9c46d63cf2f3e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 21:05:58 +0300
Subject: [PATCH 1486/1854] gnome-chess: update to 43.2

---
 srcpkgs/gnome-chess/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 327de9bfac64..8c1985d06617 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-chess'
 pkgname=gnome-chess
-version=43.1
+version=43.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 changelog="https://gitlab.gnome.org/GNOME/gnome-chess/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-chess/${version%.*}/gnome-chess-${version}.tar.xz"
-checksum=734f092d95fc60409eeaca3427b5a48cb9b599da11995119d85baa99653e0292
+checksum=348508f8f6e7451c07344ffa7a09a990cf1d2883bccf533409dbe029268d49f2

From 92d44f680996e48beacfcf0b3584e9da5c5932ed Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Sun, 14 May 2023 22:27:15 +0200
Subject: [PATCH 1487/1854] New package: autorestic-1.7.7

---
 srcpkgs/autorestic/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/autorestic/template

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
new file mode 100644
index 000000000000..b97290c2a386
--- /dev/null
+++ b/srcpkgs/autorestic/template
@@ -0,0 +1,14 @@
+# Template file for 'autorestic'
+pkgname=autorestic
+version=1.7.7
+revision=1
+build_style=go
+go_import_path="github.com/cupcakearmy/autorestic"
+depends="restic"
+short_desc="Config driven, easy backup cli for restic"
+maintainer="Emil Miler <em@0x45.cz>"
+license="Apache-2.0"
+homepage="https://autorestic.vercel.app/"
+changelog="https://github.com/cupcakearmy/autorestic/blob/master/CHANGELOG.md"
+distfiles="https://github.com/cupcakearmy/autorestic/archive/refs/tags/v${version}.tar.gz"
+checksum=f2c38729882e7d0529347ab115e7ce068f6062677a63c92eb4bd0efc1ae67cbb

From 228d498a445210806b09fa2c8f7ab3422ff7b816 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Wed, 26 Apr 2023 08:05:55 +0700
Subject: [PATCH 1488/1854] New package: isoimagewriter-1.0.0

---
 srcpkgs/isoimagewriter/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/isoimagewriter/template

diff --git a/srcpkgs/isoimagewriter/template b/srcpkgs/isoimagewriter/template
new file mode 100644
index 000000000000..8af5fd6f3167
--- /dev/null
+++ b/srcpkgs/isoimagewriter/template
@@ -0,0 +1,17 @@
+# Template file for 'isoimagewriter'
+pkgname=isoimagewriter
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext kworkspace python3 qt5-host-tools
+ qt5-qmake"
+makedepends="gpgmepp-devel gpgmeqt-devel kcoreaddons-devel kcrash-devel
+ ki18n-devel kiconthemes-devel ksolid-devel kwidgetsaddons-devel qt5-devel"
+depends="gpgmeqt kiconthemes"
+short_desc="Program to write hybrid ISO files onto USB disks"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
+license="GPL-3.0-or-later"
+homepage="https://apps.kde.org/isoimagewriter"
+distfiles="${KDE_SITE}/isoimagewriter/${version}/isoimagewriter-${version}.tar.xz"
+checksum=a69022303ec1beb6b7b4f0d68e59e4199d3c9868767cb9eb23c6dd1999e06a5d
+python_version=3

From 32671c026490e11d4d87ea1614d46a0bec5be4a5 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Wed, 28 Jun 2023 07:07:43 +0100
Subject: [PATCH 1489/1854] clifm: update to 1.12.

---
 srcpkgs/clifm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clifm/template b/srcpkgs/clifm/template
index 824f00db336e..f122362a26be 100644
--- a/srcpkgs/clifm/template
+++ b/srcpkgs/clifm/template
@@ -1,6 +1,6 @@
 # Template file for 'clifm'
 pkgname=clifm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-makefile
 make_install_args="MANDIR=/usr/share/man"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/leo-arch/clifm"
 changelog="https://raw.githubusercontent.com/leo-arch/clifm/master/CHANGELOG"
 distfiles="https://github.com/leo-arch/clifm/releases/download/v${version}/clifm-${version}.tar.gz"
-checksum=32f69ab2215bfcf10e8fe3920c5b4ffd6e699a68463577b32c39f9189d5a9c56
+checksum=a4cd97d7aa184a60e3e42ff33e6a31161818149c80caa92282cd2118e73319eb

From f1589a111a15e08e323244cc80a86fa774e5e39a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:13:46 +0530
Subject: [PATCH 1490/1854] glab: update to 1.31.0.

---
 srcpkgs/glab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 377848060f69..5772901e6039 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
 # Template file for 'glab'
 pkgname=glab
-version=1.30.0
+version=1.31.0
 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=d3c1a9ba723d94a0be10fc343717cf7b61732644f5c42922f1c8d81047164b99
+checksum=5648e88e7d6cc993227f5a4e80238af189bed09c7aed1eb12be7408e9a042747
 
 post_install() {
 	for shell in bash fish zsh; do

From 4aff56f93546de3c9bf9958f3d308efdb9469b0b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Apr 2023 14:56:13 +0200
Subject: [PATCH 1491/1854] New package: fend-1.2.0

---
 srcpkgs/fend/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/fend/template

diff --git a/srcpkgs/fend/template b/srcpkgs/fend/template
new file mode 100644
index 000000000000..328a33b2e494
--- /dev/null
+++ b/srcpkgs/fend/template
@@ -0,0 +1,21 @@
+# Template file for 'fend'
+pkgname=fend
+version=1.2.0
+revision=1
+build_style=cargo
+make_install_args="--path cli"
+short_desc="Arbitrary-precision unit-aware calculator"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://printfn.github.io/fend/"
+changelog="https://raw.githubusercontent.com/printfn/fend/main/CHANGELOG.md"
+distfiles="https://github.com/printfn/fend/archive/refs/tags/v${version}.tar.gz
+ https://github.com/printfn/fend/releases/download/v${version}/fend.1"
+checksum="d2781dfdbaed22b38fabea6897ff2249ac804f9021c921cd67603f3b609994e2
+ 160310c64fa39ed677d22e905b6f6358dff2526e2f60dad6821be6517512d35f"
+skip_extraction="fend.1"
+
+post_install() {
+	vlicense LICENSE.md
+	vman ${XBPS_SRCDISTDIR}/${pkgname}-${version}/fend.1
+}

From 37027afef67a53b701bf01035e17dc80be031bd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jun 2023 21:52:10 +0200
Subject: [PATCH 1492/1854] wireshark: update to 4.0.6.

---
 srcpkgs/wireshark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index 759556a6fc7d..72ce6863fd39 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=4.0.4
+version=4.0.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 changelog="https://www.wireshark.org/news/"
 distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b
+checksum=0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884
 system_groups="wireshark"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"

From 5575b2525c4d49eb22ccf5784a4f3518b07aeba8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 3 Aug 2022 15:21:21 -0400
Subject: [PATCH 1493/1854] New package: pyotherside-1.6.0

---
 srcpkgs/pyotherside/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/pyotherside/template

diff --git a/srcpkgs/pyotherside/template b/srcpkgs/pyotherside/template
new file mode 100644
index 000000000000..97dc745b4d6c
--- /dev/null
+++ b/srcpkgs/pyotherside/template
@@ -0,0 +1,21 @@
+# Template file for 'pyotherside'
+pkgname=pyotherside
+version=1.6.0
+revision=1
+build_style=qmake
+configure_args="PYTHON_CONFIG=${XBPS_CROSS_BASE}/usr/bin/python3-config"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="python3-devel qt5-svg-devel qt5-declarative-devel"
+short_desc="Asynchronous Python 3 Bindings for Qt 5"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="ISC"
+homepage="https://thp.io/2011/pyotherside/"
+distfiles="https://github.com/thp/pyotherside/archive/${version}.tar.gz"
+checksum=ead71d0a549acb6664d72745fae5b1d4e433274c64be6a680ceeeef0754451ab
+
+post_install() {
+	vlicense LICENSE
+
+	# remove tests polluting /usr
+	rm ${DESTDIR}/usr/tests/qtquicktests/qtquicktests
+}

From 779e287b25cca77e96eff1774770f96a7efb38ff Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 31 May 2022 10:26:17 -0400
Subject: [PATCH 1494/1854] New package: modrana-0.57.3

---
 srcpkgs/modrana/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/modrana/template

diff --git a/srcpkgs/modrana/template b/srcpkgs/modrana/template
new file mode 100644
index 000000000000..1b168d867eb7
--- /dev/null
+++ b/srcpkgs/modrana/template
@@ -0,0 +1,30 @@
+# Template file for 'modrana'
+pkgname=modrana
+version=0.57.3
+revision=1
+# releases aren't tagged in git
+_version_commit=dbd558d407abe7a3a4a352c96b618147cade4bd9
+build_style=gnu-makefile
+build_helper=qmake
+make_build_target="VersionFile all rsync launcher"
+make_use_env=yes
+hostmakedepends="rsync qt5-qmake qt5-host-tools"
+makedepends="qt5-declarative-devel"
+depends="pyotherside qt5-quickcontrols2"
+short_desc="Flexible GPS navigation system for mobile devices"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://modrana.org"
+distfiles="https://github.com/M4rtinK/modrana/archive/${_version_commit}.tar.gz"
+checksum=7f93e4660997a8cba4194709c4566dec667da1c99ae45dd66ea6df71b8c637a6
+python_version=3
+disable_parallel_build=yes
+
+post_install() {
+	# not sure why the gtk binary is still here, only qt is supported/working
+	rm ${DESTDIR}/usr/bin/modrana-gtk
+	# broken, tries to invoke QT launcher with wrong path (/usr/modrana), just
+	# use modrana-qt5
+	rm ${DESTDIR}/usr/bin/modrana
+	rm ${DESTDIR}/usr/share/applications/modrana.desktop
+}

From 82c2d136b43ac860f86daa190a0a4053501ae89f Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 26 Apr 2023 14:57:46 +0200
Subject: [PATCH 1495/1854] New package: hydrus-525a

---
 srcpkgs/hydrus/template | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/hydrus/template

diff --git a/srcpkgs/hydrus/template b/srcpkgs/hydrus/template
new file mode 100644
index 000000000000..5b6b7f47572a
--- /dev/null
+++ b/srcpkgs/hydrus/template
@@ -0,0 +1,40 @@
+# Template file for 'hydrus'
+pkgname=hydrus
+version=525a
+revision=1
+pycompile_dirs="usr/lib/hydrus"
+hostmakedepends="python3"
+depends="python3 libopencv-python3 python3-BeautifulSoup4 python3-yaml python3-lz4
+ python3-numpy python3-Twisted python3-Pillow python3-pysocks python3-psutil
+ python3-send2trash python3-html5lib python3-requests python3-QtPy noto-fonts-emoji
+ python3-mpv python3-service_identity python3-PyQt5 fmt python3-pyside2 ffmpeg
+ miniupnpc desktop-file-utils python3-cloudscraper python3-openssl python3-packaging"
+short_desc="Danbooru-like image tagging and searching system for the desktop"
+maintainer="fanyx <fanyx+github@posteo.net>"
+license="WTFPL"
+homepage="https://hydrusnetwork.github.io/hydrus/"
+distfiles="https://github.com/hydrusnetwork/hydrus/archive/refs/tags/v${version}.tar.gz"
+checksum=67ee32f9ccb2ba5d1a8730d3033bb7850dc43b07628e2635847256e2820f9448
+
+python_version="3"
+
+do_install() {
+	vsed -i hydrus/core/HydrusConstants.py -e 's|^LICENSE_PATH.*|LICENSE_PATH = "/usr/share/licenses/hydrus/license.txt"|'
+	chmod +x server.py
+
+	vmkdir usr/lib/hydrus
+	vcopy hydrus usr/lib/hydrus/
+	vcopy static usr/lib/hydrus/
+	vcopy client.pyw usr/lib/hydrus/
+	vcopy server.py usr/lib/hydrus/
+
+	vmkdir usr/bin
+	ln -sf /usr/lib/hydrus/client.pyw ${DESTDIR}/usr/bin/hydrus-client
+	ln -sf /usr/lib/hydrus/server.py ${DESTDIR}/usr/bin/hydrus-server
+
+	vmkdir usr/share/applications
+	ln -sf /usr/lib/hydrus/static/hydrus.desktop ${DESTDIR}/usr/share/applications
+
+	vlicense COPYING
+	vlicense license.txt
+}

From 84b169291edeefe7865fd73710e0fb042066e20b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 01:14:33 +0530
Subject: [PATCH 1496/1854] qsv: update to 0.108.0.

---
 srcpkgs/qsv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index 068d261bbd0f..344cfd2060fb 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.107.0
+version=0.108.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,4 +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=628b18a3ea9ebd0b5e82e3fd9db05348c0c6aa32b43b32bdd12c0217443d88be
+checksum=6f191a72b9b6040805c27ec6dc1d2fa037088970eb4c42af950cf701fa2bdc8a

From 0b0c92a210143dd48190aeb3aef8ba3a516ebb36 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:26:13 +0530
Subject: [PATCH 1497/1854] pre-commit: update to 3.3.3.

---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 53c3d6716f24..4b96548b173b 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=3.3.2
+version=3.3.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pre-commit.com/"
 changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=66e37bec2d882de1f17f88075047ef8962581f83c234ac08da21a0c58953d1f0
+checksum=a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023
 make_check=no # unpackaged: pytest-env re-assert
 
 post_install() {

From f53770c917c97892e57c2693b5c76eafe3067192 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 28 Jun 2023 21:33:49 +0200
Subject: [PATCH 1498/1854] gspell: update to 1.12.1.

---
 srcpkgs/gspell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 751a09c4f129..06cc8718242f 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.12.0
-revision=2
+version=1.12.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gspell"
 changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad
+checksum=8ec44f32052e896fcdd4926eb814a326e39a5047e251eec7b9056fbd9444b0f1
 make_check_pre="xvfb-run"
 
 # Package build options

From 674bc688a97ee32327983909db4b2ad9786c8f7d Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 12:38:56 +0900
Subject: [PATCH 1499/1854] shake: fix build on musl

Closes: #44674 [via git-merge-pr]
---
 srcpkgs/shake/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/shake/template b/srcpkgs/shake/template
index 08790572f3c4..eccaccd75649 100644
--- a/srcpkgs/shake/template
+++ b/srcpkgs/shake/template
@@ -12,11 +12,11 @@ homepage="http://vleu.net/shake/"
 distfiles="https://github.com/unbrice/$pkgname/archive/v$version.tar.gz"
 checksum=ac5a57bd8d55e197734852bf66318ecf39b4c5c298e43a259ba1d8a4b7a2ced3
 
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
-	broken="musl does not provide error.h required by this package"
-	;;
-esac
+CFLAGS="-D_GNU_SOURCE"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" shake"

From f84bd10643a2b91b0d3ad68b43c391c9b3417436 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH 1500/1854] thrift: update to 0.18.1, patch out old tls and
 broken tests

---
 srcpkgs/thrift/patches/network-tests.patch    | 39 ++++++++++++++++
 .../thrift/patches/skip-old-tls-tests.patch   | 44 +++++++++++++++++++
 srcpkgs/thrift/template                       | 24 ++++++----
 3 files changed, 98 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thrift/patches/network-tests.patch
 create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch

diff --git a/srcpkgs/thrift/patches/network-tests.patch b/srcpkgs/thrift/patches/network-tests.patch
new file mode 100644
index 000000000000..49aa667752b7
--- /dev/null
+++ b/srcpkgs/thrift/patches/network-tests.patch
@@ -0,0 +1,39 @@
+From https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/thrift/files/thrift-0.16.0-network-tests.patch
+
+diff --git a/lib/cpp/test/ToStringTest.cpp b/lib/cpp/test/ToStringTest.cpp
+index 736b33c0a..f66909873 100644
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -41,31 +41,6 @@ BOOST_AUTO_TEST_CASE(base_types_to_string) {
+   BOOST_CHECK_EQUAL(to_string("abc"), "abc");
+ }
+ 
+-// NOTE: Currently (as of 2021.08.12) the locale-based tests do not work on
+-// Windows in the AppVeyor Thrift CI build correctly. Therefore disabled on
+-// Windows:
+-#ifndef _WIN32
+-BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+-#ifdef _WIN32
+-  std::locale::global(std::locale("en-US.UTF-8"));
+-#else
+-  std::locale::global(std::locale("en_US.UTF-8"));
+-#endif
+-  BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+-}
+-
+-BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+-#ifdef _WIN32
+-  std::locale::global(std::locale("de-DE.UTF-8"));
+-#else
+-  std::locale::global(std::locale("de_DE.UTF-8"));
+-#endif
+-  BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+-  BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+-  BOOST_CHECK_EQUAL(to_string(1.5L), "1.5");
+-}
+-#endif
+-
+ BOOST_AUTO_TEST_CASE(empty_vector_to_string) {
+   std::vector<int> l;
+   BOOST_CHECK_EQUAL(to_string(l), "[]");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+         }
+ #endif
+
++        if (si == 3 || ci == 3) {
++          // Skip all TLSv1_0 cases - protocol not supported
++          continue;
++        }
++
++        if (si == 4 || ci == 4) {
++          // Skip all TLSv1_1 cases - protocol not supported
++          continue;
++        }
++
+         boost::mutex::scoped_lock lock(mMutex);
+
+         BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+                 }
+ #endif
+
++                if (si == 3 || ci == 3)
++                {
++                    // Skip all TLSv1_0 cases - protocol not supported
++                    continue;
++                }
++
++                if (si == 4 || ci == 4)
++                {
++                    // Skip all TLSv1_1 cases - protocol not supported
++                    continue;
++                }
++
+                 boost::mutex::scoped_lock lock(mMutex);
+
+                 BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..1912cfb7ed33 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
 # Template file for 'thrift'
 pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.18.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
 makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=9cea30b9700153329ae1926cc05a20bbe3e8451ae270b0c8c5c5fe9929924cb3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --disable-tests --disable-tutorial"
+	configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
 fi
 
 post_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64*) ;;
 		ppc*)
-			sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+			vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
 			;;
 	esac
 }
@@ -35,8 +41,8 @@ thrift-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 	}
 }

From c6e5ee4b6e8d75ec758b9a38d2fd438862184d11 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 28 Jun 2023 20:36:47 -0400
Subject: [PATCH 1501/1854] python3-scipy: fix determinant regression and
 openblas option handling

---
 .../patches/determinant-fix.patch             | 74 +++++++++++++++++++
 srcpkgs/python3-scipy/template                |  7 +-
 2 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-scipy/patches/determinant-fix.patch

diff --git a/srcpkgs/python3-scipy/patches/determinant-fix.patch b/srcpkgs/python3-scipy/patches/determinant-fix.patch
new file mode 100644
index 000000000000..ed31163f8950
--- /dev/null
+++ b/srcpkgs/python3-scipy/patches/determinant-fix.patch
@@ -0,0 +1,74 @@
+From 61d892c9faa543ad80bd5e2d0bf69821188487e0 Mon Sep 17 00:00:00 2001
+From: Ilhan Polat <ilhanpolat@gmail.com>
+Date: Tue, 27 Jun 2023 12:00:38 +0200
+Subject: [PATCH] MAINT:linalg.det:Return scalars for singleton inputs (#18763)
+
+---
+ scipy/linalg/_basic.py           | 17 ++++++++++++-----
+ scipy/linalg/tests/test_basic.py | 17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/scipy/linalg/_basic.py b/scipy/linalg/_basic.py
+index 327ba1ca36ce..6faa3898f720 100644
+--- a/scipy/linalg/_basic.py
++++ b/scipy/linalg/_basic.py
+@@ -1001,7 +1001,8 @@ def det(a, overwrite_a=False, check_finite=True):
+     det : (...) float or complex
+         Determinant of `a`. For stacked arrays, a scalar is returned for each
+         (m, m) slice in the last two dimensions of the input. For example, an
+-        input of shape (p, q, m, m) will produce a result of shape (p, q).
++        input of shape (p, q, m, m) will produce a result of shape (p, q). If
++        all dimensions are 1 a scalar is returned regardless of ndim.
+ 
+     Notes
+     -----
+@@ -1066,11 +1067,17 @@ def det(a, overwrite_a=False, check_finite=True):
+ 
+     # Scalar case
+     if a1.shape[-2:] == (1, 1):
+-        if a1.dtype.char in 'dD':
+-            return np.squeeze(a1)
++        # Either ndarray with spurious singletons or a single element
++        if max(*a1.shape) > 1:
++            temp = np.squeeze(a1)
++            if a1.dtype.char in 'dD':
++                return temp
++            else:
++                return (temp.astype('d') if a1.dtype.char == 'f' else
++                        temp.astype('D'))
+         else:
+-            return (np.squeeze(a1).astype('d') if a1.dtype.char == 'f' else
+-                    np.squeeze(a1).astype('D'))
++            return (np.float64(a1.item()) if a1.dtype.char in 'fd' else
++                    np.complex128(a1.item()))
+ 
+     # Then check overwrite permission
+     if not _datacopied(a1, a):  # "a"  still alive through "a1"
+diff --git a/scipy/linalg/tests/test_basic.py b/scipy/linalg/tests/test_basic.py
+index 983530b63ff2..40308500ec4a 100644
+--- a/scipy/linalg/tests/test_basic.py
++++ b/scipy/linalg/tests/test_basic.py
+@@ -930,6 +930,23 @@ class TestDet:
+     def setup_method(self):
+         self.rng = np.random.default_rng(1680305949878959)
+ 
++    def test_1x1_all_singleton_dims(self):
++        a = np.array([[1]])
++        deta = det(a)
++        assert deta.dtype.char == 'd'
++        assert np.isscalar(deta)
++        assert deta == 1.
++        a = np.array([[[[1]]]], dtype='f')
++        deta = det(a)
++        assert deta.dtype.char == 'd'
++        assert np.isscalar(deta)
++        assert deta == 1.
++        a = np.array([[[1 + 3.j]]], dtype=np.complex64)
++        deta = det(a)
++        assert deta.dtype.char == 'D'
++        assert np.isscalar(deta)
++        assert deta == 1.+3.j
++
+     def test_1by1_stacked_input_output(self):
+         a = self.rng.random([4, 5, 1, 1], dtype=np.float32)
+         deta = det(a)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index c5a8e1f212bd..fdf39578fc9f 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,9 +1,10 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
 version=1.11.0
-revision=1
+revision=2
 build_style=meson
 build_helper="python3"
+configure_args="$(vopt_if openblas "" "-Dblas=blas -Dlapack=lapack")"
 hostmakedepends="python3-build python3-installer python3-meson-python
  python3-wheel python3-Cython python3-pybind11 pythran python3-numpy
  gcc-fortran pkg-config"
@@ -22,7 +23,7 @@ build_options="openblas"
 
 if [ "$CROSS_BUILD" ]; then
 	_pybind11_dir="${py3_sitelib}/pybind11"
-	configure_args="--cross-file=python.cross"
+	configure_args+=" --cross-file=python.cross"
 	export PKG_CONFIG_PATH="${XBPS_CROSS_BASE}/${_pybind11_dir}/share/pkgconfig"
 	# pybind11 uses a path relative to the pkgconfig file to set $prefix,
 	# which causes the wrapper to double-include $XBPS_CROSS_BASE; override
@@ -43,8 +44,6 @@ if [ "$build_option_openblas" ]; then
 		ppc64*) ;;
 		ppc*) broken="numpy can't be built with openblas";;
 	esac
-else
-	configure_args+=" -Dblas=blas -Dlapack=lapack"
 fi
 
 pre_patch() {

From 9654ac473e4ec38d7ea0f2d333de49d2d537c1fb Mon Sep 17 00:00:00 2001
From: lzcoder <lzcoder@proton.me>
Date: Thu, 29 Jun 2023 00:39:34 -0300
Subject: [PATCH 1502/1854] git-cola: Add python3-packaging to depends

---
 srcpkgs/git-cola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 383eb23f1b68..17e41aad7743 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,10 +1,10 @@
 # Template file for 'git-cola'
 pkgname=git-cola
 version=4.2.1
-revision=1
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
-depends="git qt5-svg python3-PyQt5-webkit python3-QtPy"
+depends="git qt5-svg python3-PyQt5-webkit python3-QtPy python3-packaging"
 short_desc="Highly caffeinated Git GUI"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"

From 382d61eda14df7b29e35dd89695f38df9e5c3a57 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 20:05:30 +0900
Subject: [PATCH 1503/1854] gogglesmm: update to 1.2.4.

---
 srcpkgs/gogglesmm/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 459e26041c51..0716a841d357 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,6 +1,6 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
-version=1.2.3
+version=1.2.4
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
@@ -15,13 +15,9 @@ license="GPL-3.0-or-later"
 homepage="https://gogglesmm.github.io/"
 changelog="https://raw.githubusercontent.com/gogglesmm/gogglesmm/master/ChangeLog"
 distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
-checksum=4315ea4d9894fa2c7f160c73e5464b91b7a00f22964910adb77e1e9b94273006
+checksum=e23a49ac1d7b4cf87a4c1730d06c816af2c540ad457148328b52702b8d347223
 nocross="Tries to execute compiled code"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="PTHREAD_RWLOCK_PREFER_WRITER_NP usage" ;;
-esac
-
 # this plugin has little endian only code
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	configure_args+=" -DWITH_MAD=OFF"

From 48742cb5fd5f2d1de15a72b49c611331ae5d3564 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 13:36:13 +0300
Subject: [PATCH 1504/1854] io.elementary.videos: update to 2.9.1

---
 srcpkgs/io.elementary.videos/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index d83a9ca928be..55bd6bc9e5a7 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.videos'
 pkgname=io.elementary.videos
-version=2.8.3
+version=2.9.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala AppStream"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
+checksum=11204b2bc4cedb8561dfb4d9906a2b9a747f551b25f88a0472436daf60e8d4e4

From 26b3fd3439d5e6eb1886e478eeaa53781597da1c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:22:26 +0530
Subject: [PATCH 1505/1854] dasel: update to 2.3.4.

---
 srcpkgs/dasel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index e45a61d3f874..ec258642a32f 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
 # Template file for 'dasel'
 pkgname=dasel
-version=2.2.0
+version=2.3.4
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://daseldocs.tomwright.me/"
 changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
 distfiles="https://github.com/TomWright/dasel/archive/refs/tags/v${version}.tar.gz"
-checksum=7d64e3e6e37b358948ccd3479b54610b87fbcc562049ca96c0bcb4fcefeea350
+checksum=7c9a2f41d02f4d1717dcf0d9fb4b977308da89c074d2abcf064adf00980e5d0d
 
 post_install() {
 	vlicense LICENSE

From ef43ea3a4154487d2c17817dc802d3edfc04ebb1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 28 Jun 2023 21:42:52 +0200
Subject: [PATCH 1506/1854] AppStream: update to 0.16.2.

---
 srcpkgs/AppStream/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 23a285497ad6..bee74dee2db8 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.16.1
+version=0.16.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=266c75a302064ad7e50905a365fa64537268c318cb1cf19dd003911a781d6797
+checksum=9a2ebe660704878ab795470a72cd53049408ddd9da6e9cb45232cf0ed6505660
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From b891831c3e34252e819ce149fc23967d15a91c47 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 23:37:19 +0300
Subject: [PATCH 1507/1854] gnome-nibbles: update to 3.38.3

---
 srcpkgs/gnome-nibbles/patches/vala.patch  | 178 ----------------------
 srcpkgs/gnome-nibbles/patches/vala2.patch |  66 --------
 srcpkgs/gnome-nibbles/template            |   7 +-
 3 files changed, 4 insertions(+), 247 deletions(-)
 delete mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch
 delete mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
deleted file mode 100644
index 48c565303196..000000000000
--- a/srcpkgs/gnome-nibbles/patches/vala.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 17 Mar 2021 11:25:05 +0100
-Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
- must be unowned
-
----
- src/controls.vala           | 20 ++++++++++----------
- src/nibbles-window.vala     | 26 +++++++++++++-------------
- src/players.vala            |  6 +++---
- src/preferences-dialog.vala | 30 +++++++++++++++---------------
- src/scoreboard.vala         |  6 +++---
- 5 files changed, 44 insertions(+), 44 deletions(-)
-
-diff --git a/src/controls.vala b/src/controls.vala
-index 584c9ff..f95d210 100644
---- a/src/controls.vala
-+++ b/src/controls.vala
-@@ -22,7 +22,7 @@ using Gtk;
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
- private class Controls : Box
- {
--    [GtkChild] private Box grids_box;
-+    [GtkChild] private unowned Box grids_box;
-     private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
- 
-     private Gdk.Pixbuf arrow_pixbuf;
-@@ -100,15 +100,15 @@ private class Controls : Box
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
- private class ControlsGrid : Button
- {
--    [GtkChild] private Label name_label;
--    [GtkChild] private Image arrow_up;
--    [GtkChild] private Image arrow_down;
--    [GtkChild] private Image arrow_left;
--    [GtkChild] private Image arrow_right;
--    [GtkChild] private Label move_up_label;
--    [GtkChild] private Label move_down_label;
--    [GtkChild] private Label move_left_label;
--    [GtkChild] private Label move_right_label;
-+    [GtkChild] private unowned Label name_label;
-+    [GtkChild] private unowned Image arrow_up;
-+    [GtkChild] private unowned Image arrow_down;
-+    [GtkChild] private unowned Image arrow_left;
-+    [GtkChild] private unowned Image arrow_right;
-+    [GtkChild] private unowned Label move_up_label;
-+    [GtkChild] private unowned Label move_down_label;
-+    [GtkChild] private unowned Label move_left_label;
-+    [GtkChild] private unowned Label move_right_label;
- 
-     internal WormProperties worm_props;
-     internal ulong external_handler;
-diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
-index 6961326..6bfb74a 100644
---- a/src/nibbles-window.vala
-+++ b/src/nibbles-window.vala
-@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
-     private int window_height;
- 
-     /* Main widgets */
--    [GtkChild] private Stack main_stack;
--    [GtkChild] private Overlay overlay;
-+    [GtkChild] private unowned Stack main_stack;
-+    [GtkChild] private unowned Overlay overlay;
- 
-     /* HeaderBar */
--    [GtkChild] private HeaderBar headerbar;
--    [GtkChild] private MenuButton hamburger_menu;
--    [GtkChild] private Button new_game_button;
--    [GtkChild] private Button pause_button;
-+    [GtkChild] private unowned HeaderBar headerbar;
-+    [GtkChild] private unowned MenuButton hamburger_menu;
-+    [GtkChild] private unowned Button new_game_button;
-+    [GtkChild] private unowned Button pause_button;
- 
-     /* Pre-game screen widgets */
--    [GtkChild] private Players players;
--    [GtkChild] private Speed speed;
--    [GtkChild] private Controls controls;
-+    [GtkChild] private unowned Players players;
-+    [GtkChild] private unowned Speed speed;
-+    [GtkChild] private unowned Controls controls;
- 
-     /* Statusbar widgets */
--    [GtkChild] private Stack statusbar_stack;
--    [GtkChild] private Label countdown;
--    [GtkChild] private Scoreboard scoreboard;
-+    [GtkChild] private unowned Stack statusbar_stack;
-+    [GtkChild] private unowned Label countdown;
-+    [GtkChild] private unowned Scoreboard scoreboard;
-     private Gdk.Pixbuf scoreboard_life;
- 
-     /* Rendering of the game */
-     private NibblesView? view;
- 
--    [GtkChild] private Box game_box;
-+    [GtkChild] private unowned Box game_box;
-     private Games.GridFrame frame;
- 
-     /* Game being played */
-diff --git a/src/players.vala b/src/players.vala
-index 9198412..4bde18e 100644
---- a/src/players.vala
-+++ b/src/players.vala
-@@ -21,9 +21,9 @@ using Gtk;
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
- private class Players : Box
- {
--    [GtkChild] private ToggleButton worms4;
--    [GtkChild] private ToggleButton worms5;
--    [GtkChild] private ToggleButton worms6;
-+    [GtkChild] private unowned ToggleButton worms4;
-+    [GtkChild] private unowned ToggleButton worms5;
-+    [GtkChild] private unowned ToggleButton worms6;
- 
-     private SimpleAction nibbles_number_action;
-     private SimpleAction players_number_action;
-diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
-index 216a1e2..2d3a7bf 100644
---- a/src/preferences-dialog.vala
-+++ b/src/preferences-dialog.vala
-@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
-     private GLib.Settings settings;
-     private Gee.ArrayList<GLib.Settings> worm_settings;
- 
--    [GtkChild] private Stack            stack;
--    [GtkChild] private Stack            headerbar_stack;
--    [GtkChild] private ComboBoxText     worm_combobox;
--    [GtkChild] private Gtk.ListStore    list_store_1;
--    [GtkChild] private Gtk.ListStore    list_store_2;
--    [GtkChild] private Gtk.ListStore    list_store_3;
--    [GtkChild] private Gtk.ListStore    list_store_4;
--    [GtkChild] private TreeView         tree_view_1;
--    [GtkChild] private TreeView         tree_view_2;
--    [GtkChild] private TreeView         tree_view_3;
--    [GtkChild] private TreeView         tree_view_4;
--    [GtkChild] private ComboBoxText     combo_box_1;
--    [GtkChild] private ComboBoxText     combo_box_2;
--    [GtkChild] private ComboBoxText     combo_box_3;
--    [GtkChild] private ComboBoxText     combo_box_4;
-+    [GtkChild] private unowned Stack            stack;
-+    [GtkChild] private unowned Stack            headerbar_stack;
-+    [GtkChild] private unowned ComboBoxText     worm_combobox;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_1;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_2;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_3;
-+    [GtkChild] private unowned Gtk.ListStore    list_store_4;
-+    [GtkChild] private unowned TreeView         tree_view_1;
-+    [GtkChild] private unowned TreeView         tree_view_2;
-+    [GtkChild] private unowned TreeView         tree_view_3;
-+    [GtkChild] private unowned TreeView         tree_view_4;
-+    [GtkChild] private unowned ComboBoxText     combo_box_1;
-+    [GtkChild] private unowned ComboBoxText     combo_box_2;
-+    [GtkChild] private unowned ComboBoxText     combo_box_3;
-+    [GtkChild] private unowned ComboBoxText     combo_box_4;
- 
-     private Gee.ArrayList<Gtk.ListStore>    list_stores;
-     private Gee.ArrayList<TreeView>         tree_views;
-diff --git a/src/scoreboard.vala b/src/scoreboard.vala
-index a41aee1..aebc1cc 100644
---- a/src/scoreboard.vala
-+++ b/src/scoreboard.vala
-@@ -59,9 +59,9 @@ private class Scoreboard : Box
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
- private class PlayerScoreBox : Box
- {
--    [GtkChild] private Label name_label;
--    [GtkChild] private Label score_label;
--    [GtkChild] private Grid lives_grid;
-+    [GtkChild] private unowned Label name_label;
-+    [GtkChild] private unowned Label score_label;
-+    [GtkChild] private unowned Grid lives_grid;
- 
-     private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
- 
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch
deleted file mode 100644
index c7a86316925e..000000000000
--- a/srcpkgs/gnome-nibbles/patches/vala2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 16 Jan 2021 13:56:10 +0100
-Subject: [PATCH] Don't alter or try to write [GtkChild] fields
-
-See https://gitlab.gnome.org/GNOME/vala/issues/1121
----
- src/controls.vala | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/controls.vala b/src/controls.vala
-index 4f07358..584c9ff 100644
---- a/src/controls.vala
-+++ b/src/controls.vala
-@@ -140,25 +140,25 @@ private class ControlsGrid : Button
-         arrow_left.set_from_pixbuf  (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE));
-         arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE));
- 
--           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    ref move_up_label));
--         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  ref move_down_label));
--         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  ref move_left_label));
--        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label));
--
--        configure_label (worm_props.up,    ref move_up_label);
--        configure_label (worm_props.down,  ref move_down_label);
--        configure_label (worm_props.left,  ref move_left_label);
--        configure_label (worm_props.right, ref move_right_label);
-+           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    move_up_label));
-+         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  move_down_label));
-+         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  move_left_label));
-+        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label));
-+
-+        configure_label (worm_props.up,    move_up_label);
-+        configure_label (worm_props.down,  move_down_label);
-+        configure_label (worm_props.left,  move_left_label);
-+        configure_label (worm_props.right, move_right_label);
-     }
- 
-     internal void mark_duplicated_keys (GenericSet<uint> duplicate_keys)
-     {
--        set_duplicate_class (worm_props.up    in duplicate_keys, ref move_up_label);
--        set_duplicate_class (worm_props.down  in duplicate_keys, ref move_down_label);
--        set_duplicate_class (worm_props.left  in duplicate_keys, ref move_left_label);
--        set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label);
-+        set_duplicate_class (worm_props.up    in duplicate_keys, move_up_label);
-+        set_duplicate_class (worm_props.down  in duplicate_keys, move_down_label);
-+        set_duplicate_class (worm_props.left  in duplicate_keys, move_left_label);
-+        set_duplicate_class (worm_props.right in duplicate_keys, move_right_label);
-     }
--    private static void set_duplicate_class (bool new_value, ref Label label)
-+    private static void set_duplicate_class (bool new_value, Label label)
-     {
-         if (new_value)
-             label.get_style_context ().add_class ("duplicate");
-@@ -175,7 +175,7 @@ private class ControlsGrid : Button
-         worm_props.disconnect (color_handler);
-     }
- 
--    private static void configure_label (uint key_value, ref Label label)
-+    private static void configure_label (uint key_value, Label label)
-     {
-         string? key_name = Gdk.keyval_name (key_value);
-         if (key_name == "Up")
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 32aa8aea4202..41210fcb7626 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-nibbles'
 pkgname=gnome-nibbles
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config vala"
+hostmakedepends="gettext glib-devel itstool pkg-config vala desktop-file-utils
+ gtk-update-icon-cache"
 makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
  libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
@@ -12,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
 changelog="https://gitlab.gnome.org/GNOME/gnome-nibbles/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=457a64b1c88e2d8d0143c452ffd01f0300d7d3005802954ef5abf9c896b353d9
+checksum=975fde1d83c7b15b392eac7a359161290fc8aeb7605c11e71cee0c3c326b5e61

From 80210511c3de396cb872d9a2159fbdedb4a3f655 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 29 Jun 2023 00:09:05 +0300
Subject: [PATCH 1508/1854] gnome-video-effects: update to 0.6.0

---
 srcpkgs/gnome-video-effects/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-video-effects/template b/srcpkgs/gnome-video-effects/template
index 7e8e62863461..7f1ee8da909a 100644
--- a/srcpkgs/gnome-video-effects/template
+++ b/srcpkgs/gnome-video-effects/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-video-effects'
 pkgname=gnome-video-effects
-version=0.5.0
-revision=2
+version=0.6.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext"
 makedepends="gstreamer1-devel"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeVideoEffects"
 changelog="https://gitlab.gnome.org/GNOME/gnome-video-effects/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dc68e9b38fdfc1e8e0414e2d7ee83ace78efdee76f30506cc9dcd07394ad0c8
+checksum=d7aeaeb46b3f5a832fb2e0d90b42bf8c6160202ca52ac9add17afce192e3c8a8

From 47d963b9177826110258cada8bb39721b6bafd81 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 29 Jun 2023 01:28:46 +0300
Subject: [PATCH 1509/1854] hitori: update to 44.0

---
 srcpkgs/hitori/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 15241423311d..427fe7a7c44e 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,6 +1,6 @@
 # Template file for 'hitori'
 pkgname=hitori
-version=3.38.4
+version=44.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 changelog="https://gitlab.gnome.org/GNOME/hitori/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8993cc91fb923788e389e03ec2aa7876d15c12bad9204cf65b2ffa0ed3922f7d
+checksum=42270bd4f9525d180d3151bd7245335dc5cf248a984e02f68ff930da799e583b

From a0c0993f7828f38ffa987393f2887652207b3f14 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 28 Jun 2023 18:11:32 -0500
Subject: [PATCH 1510/1854] Signal-Desktop: update to 6.23.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 992612267835..4be72538e92f 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=6.22.0
+version=6.23.0
 revision=1
 # Signal officially only supports x86_64 
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=b895314710284bb7b5caac67eb514d8b83e933ace2c0801bc690a9c621cbed94
+checksum=dc004b5a31c4896aa0478618ed9226cc931f819f44a26966956f9fe586967060
 nostrip_files="signal-desktop"
 
 post_extract() {

From 56199cba17a08dbb1c53552f8c95298f0c7d0c44 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 28 Jun 2023 20:05:02 +0200
Subject: [PATCH 1511/1854] snoopy: fix dead distfiles

---
 srcpkgs/snoopy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/snoopy/template b/srcpkgs/snoopy/template
index 3d1b338fb245..da590a249355 100644
--- a/srcpkgs/snoopy/template
+++ b/srcpkgs/snoopy/template
@@ -7,9 +7,9 @@ hostmakedepends="socat"
 conf_files="/etc/snoopy.ini"
 short_desc="Log every executed command to syslog"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/a2o/snoopy"
-distfiles="http://source.a2o.si/download/snoopy/snoopy-${version}.tar.gz"
+distfiles="https://github.com/a2o/snoopy/releases/download/snoopy-${version}/snoopy-${version}.tar.gz"
 checksum=6442e1145a5cad725f6aae0887030ee3db34bafc40bbe3bb84da836cbb5f1569
 
 pre_configure() {

From 67705f9fbae613d9cb7a42dd778573380cdd9c6e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 29 Jun 2023 03:15:12 -0400
Subject: [PATCH 1512/1854] gptfdisk: fix libuuid linking

---
 srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch | 14 ++++++++++++++
 srcpkgs/gptfdisk/template                          |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch

diff --git a/srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch b/srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch
new file mode 100644
index 000000000000..eca9bc7d1518
--- /dev/null
+++ b/srcpkgs/gptfdisk/patches/fix-libuuid-linking.patch
@@ -0,0 +1,14 @@
+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1853985.html
+https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/
+
+--- a/guid.cc
++++ b/guid.cc
+@@ -141,7 +141,7 @@
+ void GUIDData::Randomize(void) {
+    int i, uuidGenerated = 0;
+ 
+-#ifdef _UUID_UUID_H
++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+    uuid_generate(uuidData);
+    ReverseBytes(&uuidData[0], 4);
+    ReverseBytes(&uuidData[4], 2);
diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index 443cf57957ca..9bbc67a4d0ed 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'gptfdisk'
 pkgname=gptfdisk
 version=1.0.9
-revision=2
+revision=3
 build_style=gnu-makefile
 make_check_target=test
 makedepends="ncurses-devel popt-devel libuuid-devel"

From 2fd7edf28115c0d9fec16ab1571e4ccc4d756e4a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 25 Jun 2023 19:45:06 -0500
Subject: [PATCH 1513/1854] New package: kbounce-23.04.0

---
 srcpkgs/kbounce/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kbounce/template

diff --git a/srcpkgs/kbounce/template b/srcpkgs/kbounce/template
new file mode 100644
index 000000000000..de23b9357074
--- /dev/null
+++ b/srcpkgs/kbounce/template
@@ -0,0 +1,16 @@
+# Template file for 'kbounce'
+pkgname=kbounce
+version=23.04.2
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons
+ kconfig kdoctools"
+makedepends="qt5-svg-devel kcoreaddons-devel kconfig-devel kxmlgui-devel
+ kcrash-devel kwidgetsaddons-devel kdbusaddons-devel ki18n-devel
+ kcompletion-devel kio-devel kdoctools-devel libkdegames-devel"
+short_desc="Build walls to confine a number of bouncing balls"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://apps.kde.org/kbounce/"
+distfiles="${KDE_SITE}/release-service/${version}/src/kbounce-${version}.tar.xz"
+checksum=88d9f9753e982b4ed00459ca57e6857649660ff612931ee55a02c549196f153d

From 0e3fb864207a07ea9380f2399d39a8cda730759d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 29 Jun 2023 14:31:32 +0200
Subject: [PATCH 1514/1854] elixir: update to 1.15.0.

---
 ...5eca5af294a8afbed5bc73c178da18f0055c.patch | 29 ++++++++++++++
 ...4e6830d0f44e26179582a16fef6f642df754.patch | 38 +++++++++++++++++++
 srcpkgs/elixir/template                       | 23 +++++++++--
 3 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
 create mode 100644 srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch

diff --git a/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch b/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
new file mode 100644
index 000000000000..06f5976e2c69
--- /dev/null
+++ b/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
@@ -0,0 +1,29 @@
+From 73b65eca5af294a8afbed5bc73c178da18f0055c Mon Sep 17 00:00:00 2001
+From: cjschneider2 <cjschneider2@users.noreply.github.com>
+Date: Fri, 23 Jun 2023 16:04:29 +0200
+Subject: [PATCH] Use printf instead of echo to output user flags (#12704)
+
+Fixes #12677.
+
+Using printf here prevents an error when outputting the filtered flag
+`-e` as doing with with `echo "-e"` doesn't output anything
+(deleting the option we wanted to filter).
+
+More info: https://unix.stackexchange.com/a/65819
+---
+ bin/elixir | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/elixir b/bin/elixir
+index 3c0323f0f1..cb0a84650b 100755
+--- a/bin/elixir
++++ b/bin/elixir
+@@ -233,7 +233,7 @@ set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SC
+ if [ -n "$RUN_ERL_PIPE" ]; then
+   ESCAPED=""
+   for PART in "$@"; do
+-    ESCAPED="$ESCAPED $(echo "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
++    ESCAPED="$ESCAPED $(printf '%s' "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
+   done
+   mkdir -p "$RUN_ERL_PIPE"
+   mkdir -p "$RUN_ERL_LOG"
diff --git a/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch b/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
new file mode 100644
index 000000000000..4512ad60e37b
--- /dev/null
+++ b/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
@@ -0,0 +1,38 @@
+From 9b254e6830d0f44e26179582a16fef6f642df754 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
+Date: Tue, 20 Jun 2023 12:31:53 +0200
+Subject: [PATCH] Do not expect OTP to be compiled with docs, closes #12677
+
+---
+ lib/mix/test/mix/tasks/compile_test.exs | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
+index cdc40977c7..c4e672ffd2 100644
+--- a/lib/mix/test/mix/tasks/compile_test.exs
++++ b/lib/mix/test/mix/tasks/compile_test.exs
+@@ -329,16 +329,22 @@ defmodule Mix.Tasks.CompileTest do
+     Application.delete_env(:sample, :hello, persistent: true)
+   end
+ 
+-  test "code path prunning" do
++  test "code path pruning" do
+     Mix.ensure_application!(:parsetools)
++    otp_docs? = match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:zlib))
+ 
+     in_fixture("no_mixfile", fn ->
+       assert Mix.Task.run("compile", []) == {:ok, []}
+       assert :code.where_is_file(~c"parsetools.app") == :non_existing
+ 
+       # Make sure erts is also kept but not loaded
+-      assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
+       assert Application.spec(:erts, :vsn) == nil
++
++      if otp_docs? do
++        assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
++      else
++        IO.warn("Erlang/OTP was not compiled with docs, skipping assertion")
++      end
+     end)
+   end
+ 
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 568e28e4f7ca..0e475ae139f1 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,11 +1,15 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.14.5
+version=1.15.0
 revision=1
 build_style=gnu-makefile
-make_check_target="test"
+make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+make_check_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+make_install_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+# make_check_target="test"
+make_check_target="test_erlang test_elixir"
 hostmakedepends="erlang"
-depends="erlang>=23"
+depends="erlang>=24"
 checkdepends="git"
 short_desc="Functional, concurrent, general-purpose programming language"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -13,7 +17,18 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd
+checksum=0f4df7574a5f300b5c66f54906222cd46dac0df7233ded165bc8e80fd9ffeb7a
+
+post_patch() {
+	# XXX: find a better solution
+	# Assertion with == failed
+	# code:  assert root_dir == :code.root_dir() |> to_string()
+	# left:  "/usr/lib/erlang"
+	# right: "/usr/lib64/erlang"
+	vsed -e '/assert root_dir == :code\.root_dir()/d' -i lib/mix/test/mix/tasks/release_test.exs
+	# orig file caused by line offset of the issue 12704 diff
+	rm bin/elixir.orig
+}
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From f886ea2e1c2e9af2f27db1fe44086826c7c8fdfa Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 15:49:19 +0530
Subject: [PATCH 1515/1854] checkbashisms: update to 2.23.5.

---
 srcpkgs/checkbashisms/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template
index 108db897a782..4b6bd7b8684b 100644
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.23.4
+version=2.23.5
 revision=1
 depends="perl"
 checkdepends="shunit2 perl"
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/devscripts"
 changelog="https://salsa.debian.org/debian/devscripts/-/raw/master/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=3dc68972734c0aeb310beb35d01b83d85e445270acefd8caeda6a6fef6f6f4f3
+checksum=8f47d45534bf94f28576078c864b22273dbe139928074ec82b6b848f9e44586d
 
 pre_install() {
 	vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl
@@ -21,6 +21,7 @@ do_check() {
 }
 
 do_install() {
+	vcompletion scripts/checkbashisms.bash_completion bash
 	vbin scripts/checkbashisms.pl checkbashisms
 	vman scripts/checkbashisms.1
 }

From 5c6b1c01c344757fa36ef748c5a87408e00b0fc8 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 29 Jun 2023 20:54:41 +0200
Subject: [PATCH 1516/1854] passt: update to 2023.06.27.289301b.

---
 srcpkgs/passt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passt/template b/srcpkgs/passt/template
index aa1679b2467d..a1519af156ba 100644
--- a/srcpkgs/passt/template
+++ b/srcpkgs/passt/template
@@ -1,6 +1,6 @@
 # Template file for 'passt'
 pkgname=passt
-version=2023.06.03.429e1a7
+version=2023.06.27.289301b
 revision=1
 # upstream uses YYYY_MM_DD.COMMIT
 _version=${version/./_}
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2, BSD-3-Clause"
 homepage="https://passt.top"
 distfiles="https://passt.top/passt/snapshot/passt-${_version}.tar.xz"
-checksum=4bd17ce7bd1d6dda033e346a40c5dc60d39cc08a6e3341fef79888299c84c3b6
+checksum=bdda46c2501797031f278c8926941208887f3c53be653e2af45870c48a7ddcb1
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 77062499ad648d121a9714599deb00d4fde5b292 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 28 Jun 2023 01:01:03 +0530
Subject: [PATCH 1517/1854] strace: update to 6.4.

---
 srcpkgs/strace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 7dcdfd098fc6..333f2e8402cf 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,6 +1,6 @@
 # Template file for 'strace'
 pkgname=strace
-version=6.3
+version=6.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731
+checksum=27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238
 
 build_options="static libunwind"
 build_options_default="libunwind"

From 6e9b0b7ec28bcde52820a28e8f32d868a321f928 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 00:34:04 +0530
Subject: [PATCH 1518/1854] carapace: update to 0.25.0.

---
 srcpkgs/carapace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index e99aa377ea45..2d98250b1b99 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,6 +1,6 @@
 # Template file for 'carapace'
 pkgname=carapace
-version=0.24.5
+version=0.25.0
 revision=1
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
@@ -12,7 +12,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://github.com/rsteube/carapace-bin"
 distfiles="https://github.com/rsteube/carapace-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=7f2b9dd360b716c9c1399fb080fbf42fcfdd299336928a4135b5b2a095b186f1
+checksum=727c140851a961d786b5b55bb24852f6f50af8a55725e3d525acf2be10b5afb2
 
 pre_build() {
 	GOARCH= go generate ./cmd/...

From db00a7ec16772c366f6d775cd9e3b6bd27296818 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 21:59:04 +0530
Subject: [PATCH 1519/1854] yaydl: fix update-check

---
 srcpkgs/yaydl/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/yaydl/update

diff --git a/srcpkgs/yaydl/update b/srcpkgs/yaydl/update
new file mode 100644
index 000000000000..541f11194925
--- /dev/null
+++ b/srcpkgs/yaydl/update
@@ -0,0 +1 @@
+pattern="/archive/refs/tags/release-\K[\d\.]+(?=\.tar\.gz)"

From 0995f87b9598a2b126d39df78c292ffffb80add7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 22:09:57 +0530
Subject: [PATCH 1520/1854] qbe: fix update-check

---
 srcpkgs/qbe/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/qbe/update

diff --git a/srcpkgs/qbe/update b/srcpkgs/qbe/update
new file mode 100644
index 000000000000..100207e061cb
--- /dev/null
+++ b/srcpkgs/qbe/update
@@ -0,0 +1 @@
+site="https://c9x.me/compile/releases.html"

From 52833eb33a092a48979ccecc93e898e0d56f13ba Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 29 Jun 2023 05:17:09 +0200
Subject: [PATCH 1521/1854] linuxwave: update to 0.1.4

---
 srcpkgs/linuxwave/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linuxwave/template b/srcpkgs/linuxwave/template
index 60f47d8ac427..0330838b18fe 100644
--- a/srcpkgs/linuxwave/template
+++ b/srcpkgs/linuxwave/template
@@ -1,6 +1,6 @@
 # Template file for 'linuxwave'
 pkgname=linuxwave
-version=0.1.3
+version=0.1.4
 revision=1
 build_style=zig-build
 short_desc="Generate music from the entropy of Linux"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://orhun.dev/linuxwave/"
 changelog="https://raw.githubusercontent.com/orhun/linuxwave/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/linuxwave/releases/download/v${version}/v${version}.tar.gz"
-checksum=d82e0eda6f2bb3080e3af6a86bafa22ed91291eaf2afbb38492326a316f1853e
+checksum=e69e6960e0333883acffc6a1e7c5c77a83901cc96c0742c599e72b0e36baeb05
 
 post_install() {
 	vlicense LICENSE

From 1bd39da548b59b86fec6e0c3377850e2b2c4fe1b Mon Sep 17 00:00:00 2001
From: oliverwiegers <oliver.wiegers@gmail.com>
Date: Thu, 29 Jun 2023 16:13:22 +0200
Subject: [PATCH 1522/1854] nyxt: update to 3.3.0

---
 srcpkgs/nyxt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index fd7353026197..20bfaa15402e 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,6 +1,6 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=3.2.1
+version=3.3.0
 revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=55112dca1a7e0fc8d8c2c2531ecd996c2020ab0e242e240d223aa00498b63d66
+checksum=648809d19f9f971d6025c17a6ad08493af87cb94f96a1edcb994122f9f92436c
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From 3fab817e5be624856868d77295fd220718fd073c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 28 Jun 2023 16:43:30 -0400
Subject: [PATCH 1523/1854] ntfy: update to 2.6.1.

---
 srcpkgs/ntfy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index 54a11d3e5da6..0115b7dc45ae 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,6 +1,6 @@
 # Template file for 'ntfy'
 pkgname=ntfy
-version=2.5.0
+version=2.6.1
 revision=1
 build_style=go
 go_import_path="heckel.io/ntfy"
@@ -13,7 +13,7 @@ license="Apache-2.0,GPL-2.0-only"
 homepage="https://ntfy.sh"
 changelog="https://raw.githubusercontent.com/binwiederhier/ntfy/main/docs/releases.md"
 distfiles="https://github.com/binwiederhier/ntfy/archive/refs/tags/v${version}.tar.gz"
-checksum=16128c38c5ef8397463a44c953f77b14643caf8c044ddc1cc84377b3127ffc9f
+checksum=d9377383b134cb7a80b2a7bbca6eb4f5ec558d186ff63576e1606b0e3ce55058
 system_accounts="_ntfy"
 make_dirs="/var/lib/ntfy 0700 _ntfy _ntfy"
 _ntfy_homedir="/var/lib/ntfy"

From 7b496187f11dec1f27c9a2b98a7768ca474833a7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 29 Jun 2023 10:58:50 +0200
Subject: [PATCH 1524/1854] gegl: update to 0.4.46.

---
 srcpkgs/gegl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index ce14c44fc7f4..6ae901d21ded 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
-version=0.4.44
-revision=3
+version=0.4.46
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dintrospection=true -Dvapigen=enabled
@@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://gegl.org/"
 changelog="https://gitlab.gnome.org/GNOME/gegl/-/raw/master/docs/NEWS.adoc"
 distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=0a4cdb41635e406a0849cd0d3f03caf7d97cab8aa13d28707d532d0089d56126
+checksum=d0b3b2481bc8774c5f3d0a487611910166d18eef823a859fb91e781ab7b1e892
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Db_lto=false"

From 80da3b654ce4606305224841611edcfb4c74b8f4 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 12:17:25 +0900
Subject: [PATCH 1525/1854] gcompat: update to 1.1.0.

---
 srcpkgs/gcompat/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gcompat/template b/srcpkgs/gcompat/template
index 3988a933a5a2..4fe031c5fad6 100644
--- a/srcpkgs/gcompat/template
+++ b/srcpkgs/gcompat/template
@@ -1,17 +1,17 @@
 # Template file for 'gcompat'
 pkgname=gcompat
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="musl-obstack-devel"
 short_desc="Compatibility layer to allow running glibc binaries on musl systems"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
-homepage="https://code.foxkit.us/adelie/gcompat"
-changelog="https://code.foxkit.us/adelie/gcompat/-/raw/current/CHANGELOG.rst"
-distfiles="https://distfiles.AdelieLinux.org/source/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=5bcf8bbe4b417bc66b22a7a3675273aa8834480144338172bbd8e81eaf41a7c4
+homepage="https://git.adelielinux.org/adelie/gcompat"
+changelog="https://git.adelielinux.org/adelie/gcompat/-/raw/current/CHANGELOG.rst"
+distfiles="https://distfiles.adelielinux.org/source/gcompat/gcompat-${version}.tar.xz"
+checksum=4e8c9cbf0615f1ce5d56ce02d84ac9c0a3d38b5bed32e8e02e2105e9658c9d57
 
 build_options="libucontext"
 desc_option_libucontext="Build with ucontext support via libucontext"

From ed2eae08a41a8a2523785d136efbdb70d14c7967 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Tue, 20 Jun 2023 22:51:36 +0100
Subject: [PATCH 1526/1854] New package: havoc-0.5.0

---
 srcpkgs/havoc/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/havoc/template

diff --git a/srcpkgs/havoc/template b/srcpkgs/havoc/template
new file mode 100644
index 000000000000..5df4864bbd71
--- /dev/null
+++ b/srcpkgs/havoc/template
@@ -0,0 +1,17 @@
+# Template file for 'havoc'
+pkgname=havoc
+version=0.5.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="wayland-devel pkg-config"
+makedepends="wayland-devel wayland-protocols libxkbcommon-devel"
+short_desc="Minimal terminal emulator for Wayland on Linux"
+maintainer="ii8 <murray.calavera@protonmail.com>"
+license="Public Domain, MIT"
+homepage="https://github.com/ii8/havoc"
+distfiles="https://github.com/ii8/havoc/archive/refs/tags/${version}.tar.gz"
+checksum=3b0d37b13e3ca21f5e22f1e62a32fe736119cd5c601307c4000bed5fee179f77
+
+post_install() {
+	vlicense LICENSE
+}

From 0a4e83a4571ead6fb8638fcb6fad056fd5727e37 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 15 Jun 2023 11:03:35 +0200
Subject: [PATCH 1527/1854] gradle: update to 8.1.1

---
 srcpkgs/gradle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 4cf4a29408a6..20dbf2d21cac 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=7.6
+version=8.1.1
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+checksum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 1f00bb387fa57372412bb19d5e39ceb2804058e1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 29 Jun 2023 10:26:09 +0200
Subject: [PATCH 1528/1854] linux6.3: update to 6.3.10

---
 srcpkgs/linux6.3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index d2c7b7a3cf48..89affe4a0d9b 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.3'
 pkgname=linux6.3
-version=6.3.8
+version=6.3.10
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- 927ba93d3da556c8e30b2640aa3f19c3c3cda66c655754e0798024020e2981b4"
+ 74d4dfb345540e91de4b41cbe9d81d2e5f90a2777419beac97c80cf6578408b1"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 4dd52766534c2492760ced5e70c65d0da7302c0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 15:50:52 +0200
Subject: [PATCH 1529/1854] bcc: update to 0.28.0.

---
 ...ffc0366981d4e41b08f007b37bd6af931f25.patch | 43 -------------------
 srcpkgs/bcc/template                          |  4 +-
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch

diff --git a/srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch b/srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch
deleted file mode 100644
index 4842e95e3711..000000000000
--- a/srcpkgs/bcc/patches/950cffc0366981d4e41b08f007b37bd6af931f25.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 950cffc0366981d4e41b08f007b37bd6af931f25 Mon Sep 17 00:00:00 2001
-From: Jesus Sanchez-Palencia <jesussanp@google.com>
-Date: Wed, 8 Mar 2023 16:48:36 -0800
-Subject: [PATCH] libbpf: Revert poisoning of strlcpy
-
-This reverts commit 6d0c4b11e743("libbpf: Poison strlcpy()").
-
-It added the pragma poison directive to libbpf_internal.h to protect
-against accidental usage of strlcpy but ended up breaking the build for
-toolchains based on libcs which provide the strlcpy() declaration from
-string.h (e.g. uClibc-ng). The include order which causes the issue is:
-
-    string.h,
-    from Iibbpf_common.h:12,
-    from libbpf.h:20,
-    from libbpf_internal.h:26,
-    from strset.c:9:
-
-Fixes: 6d0c4b11e743 ("libbpf: Poison strlcpy()")
-Signed-off-by: Jesus Sanchez-Palencia <jesussanp@google.com>
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Link: https://lore.kernel.org/bpf/20230309004836.2808610-1-jesussanp@google.com
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
----
- src/libbpf_internal.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libbpf_internal.h b/src/libbpf_internal.h
-index fbaf68335..e4d05662a 100644
---- a/src/cc/libbpf/src/libbpf_internal.h
-+++ b/src/cc/libbpf/src/libbpf_internal.h
-@@ -20,8 +20,8 @@
- /* make sure libbpf doesn't use kernel-only integer typedefs */
- #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
- 
--/* prevent accidental re-addition of reallocarray()/strlcpy() */
--#pragma GCC poison reallocarray strlcpy
-+/* prevent accidental re-addition of reallocarray() */
-+#pragma GCC poison reallocarray
- 
- #include "libbpf.h"
- #include "btf.h"
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 1b690066612f..ecedbd8e4bef 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,6 +1,6 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.27.0
+version=0.28.0
 revision=1
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=157208df3c8c0473b5dbedd57648fb98b5d07e5565984affc4e3e84a3df601bc
+checksum=65adcaf4cee17fa3a94d0bb96d3691ca7e5864244e7bd52df93f7ae6c004f23d
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 58bdaf816d65a0e04a5a5c98338486fc4c4c323c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 15:51:41 +0200
Subject: [PATCH 1530/1854] hwloc: update to 2.9.2.

---
 srcpkgs/hwloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index 7280c4c22653..28019fbf3a49 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.9.1
+version=2.9.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/projects/hwloc/"
 distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=7cc4931a20fef457e0933af3f375be6eafa7703fde21e137bfb9685b1409599e
+checksum=0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 8869eba99c8a8f98ed38ef267869c55f9302912d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 16:03:02 +0200
Subject: [PATCH 1531/1854] sbcl: update to 2.3.6.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 9ce15d3284f5..385709c32c68 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.3.5
+version=2.3.6
 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=89c90720cf9d05dbcd90d690e381a2514c0f1807159e0d7222220c5a8c2d5186
+checksum=b4414ca4d9a7474e8d884d7d63237e2f29ef459dfd5a848424a9c3fa551d19b9
 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+=" c4a9f2b30eeb74db0f069538458b955cfef46eecccc771b17ab250e9c144122d"
+	checksum+=" 004c345518f0bf53e7f38826079d286eb53f5103ec14dcd693f6c1f4831bde25"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From 5681e19b42ab9d823a9506c5cc305fd233ac52a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 16:03:06 +0200
Subject: [PATCH 1532/1854] console-setup: update to 1.222.

---
 srcpkgs/console-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
index f27bb89e8258..56c9b03be078 100644
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'console-setup'
 pkgname=console-setup
-version=1.220
+version=1.222
 revision=1
 hostmakedepends="perl"
 depends="kbd ckbcomp"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/console-setup"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=c33a693025551d0b86435b96dea13d7488b4d3c218ba3e88c024fc807f339125
+checksum=60f759afed744b0242f75c90e25a168a7c360d4f2c4278b9a9badc850f2c5e02
 conf_files="/etc/console-setup/console-setup
  /etc/console-setup/keyboard"
 

From 643d3a2dcef3bdeadf465213070c507b2378e5f0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 29 Mar 2023 14:55:46 -0400
Subject: [PATCH 1533/1854] musl: use nullptr for NULL in >=C++11

---
 ...88a9da5e7b2925dda17a2d6820dddf1fb287.patch | 139 ++++++++++++++++++
 srcpkgs/musl/template                         |   3 +-
 2 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch

diff --git a/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch
new file mode 100644
index 000000000000..a8bfa66d6c47
--- /dev/null
+++ b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch
@@ -0,0 +1,139 @@
+From 98e688a9da5e7b2925dda17a2d6820dddf1fb287 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+Date: Sun, 15 Aug 2021 17:51:57 +0200
+Subject: [PATCH] define NULL as nullptr when used in C++11 or later
+
+This should be safer for casting and more compatible with existing code
+bases that wrongly assume it must be defined as a pointer.
+---
+ include/locale.h | 4 +++-
+ include/stddef.h | 4 +++-
+ include/stdio.h  | 4 +++-
+ include/stdlib.h | 4 +++-
+ include/string.h | 4 +++-
+ include/time.h   | 4 +++-
+ include/unistd.h | 4 +++-
+ include/wchar.h  | 4 +++-
+ 8 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/include/locale.h b/include/locale.h
+index ce384381c..11106fea8 100644
+--- a/include/locale.h
++++ b/include/locale.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/stddef.h b/include/stddef.h
+index bd7538535..f25b86396 100644
+--- a/include/stddef.h
++++ b/include/stddef.h
+@@ -1,7 +1,9 @@
+ #ifndef _STDDEF_H
+ #define _STDDEF_H
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/stdio.h b/include/stdio.h
+index 3604198c3..d1ed01f03 100644
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -25,7 +25,9 @@ extern "C" {
+ 
+ #include <bits/alltypes.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 7af86e3bc..b507ca33b 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/string.h b/include/string.h
+index 795a2abcd..43ad0942e 100644
+--- a/include/string.h
++++ b/include/string.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/time.h b/include/time.h
+index 5494df183..3d9483720 100644
+--- a/include/time.h
++++ b/include/time.h
+@@ -7,7 +7,9 @@ extern "C" {
+ 
+ #include <features.h>
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/unistd.h b/include/unistd.h
+index 130640260..ee2dbe8af 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -15,7 +15,9 @@ extern "C" {
+ #define SEEK_CUR 1
+ #define SEEK_END 2
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+diff --git a/include/wchar.h b/include/wchar.h
+index 88eb55b18..ed5d774df 100644
+--- a/include/wchar.h
++++ b/include/wchar.h
+@@ -38,7 +38,9 @@ extern "C" {
+ #define WCHAR_MIN (-1-0x7fffffff+L'\0')
+ #endif
+ 
+-#ifdef __cplusplus
++#if __cplusplus >= 201103L
++#define NULL nullptr
++#elif defined(__cplusplus)
+ #define NULL 0L
+ #else
+ #define NULL ((void*)0)
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index c77cc2b6c405..9de13710d7d3 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=15
+revision=16
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
@@ -24,6 +24,7 @@ post_build() {
 	$CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
 	$AR r libssp_nonshared.a __stack_chk_fail_local.o
 }
+
 do_install() {
 	# Move everything to /usr.
 	vmkdir usr/lib

From 4a8e256506eff7800933bad58cbbd6606b510214 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:27 -0400
Subject: [PATCH 1534/1854] cross-aarch64-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-aarch64-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 17ba4ec677a6..7fca6b575080 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-aarch64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From aaf0cb0305826753516589d22c9ead695a7419cc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:27 -0400
Subject: [PATCH 1535/1854] cross-aarch64-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-aarch64-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 8038b28d70ad..a633fa900da3 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-aarch64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From a22eeb9ba8f7d8a0540600b90e866a4924f62694 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:27 -0400
Subject: [PATCH 1536/1854] cross-arm-linux-gnueabi: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-arm-linux-gnueabi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 5aa1383aa8f9..dbb8d90c8c24 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-arm-linux-gnueabi
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 1195a833fb65396a19423b5f4bffb6576367dff5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:28 -0400
Subject: [PATCH 1537/1854] cross-arm-linux-gnueabihf: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-arm-linux-gnueabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 13a780794378..1a04ad3713af 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _glibc_patchver="72-g0f90d6204d"
 pkgname=cross-arm-linux-gnueabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From b6d65560666a89021757e03acb97047c16f312ab Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:28 -0400
Subject: [PATCH 1538/1854] cross-arm-linux-musleabi: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-arm-linux-musleabi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index ee59931d6d93..8b25e9f7c365 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-arm-linux-musleabi
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From e73c94c9540a976f3c639a1976c71d91f88a7daa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:28 -0400
Subject: [PATCH 1539/1854] cross-arm-linux-musleabihf: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-arm-linux-musleabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 333db95425dd..d6dca4e920d5 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-arm-linux-musleabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From db096a5ebaa0d849e526dc5c484b576a91dba557 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:29 -0400
Subject: [PATCH 1540/1854] cross-armv7l-linux-gnueabihf: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-armv7l-linux-gnueabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index ffb71af5b454..cb52dd2b291e 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-armv7l-linux-gnueabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From b0be8728d97db92543f010c88246dee23d6487d8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:29 -0400
Subject: [PATCH 1541/1854] cross-armv7l-linux-musleabihf: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-armv7l-linux-musleabihf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 3c4ea2357661..5268465669fa 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,11 +6,11 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-armv7l-linux-musleabihf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 1238fa3b8781b214b93396af3ff65079c72a56a7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:29 -0400
Subject: [PATCH 1542/1854] cross-i686-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-i686-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6dc3fdcba07a..ea5d081e48f6 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,10 +6,10 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-i686-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From d089841c2655cac09104266933f811ddef1decb9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:30 -0400
Subject: [PATCH 1543/1854] cross-i686-pc-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-i686-pc-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index c6f2579c645d..e71a4faa367c 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,10 +6,10 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-i686-pc-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 816f11bd8dd6cf4095e72240f1350b5507a0fdfe Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:30 -0400
Subject: [PATCH 1544/1854] cross-mipsel-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mipsel-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 23247d5bc972..a053fe530153 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mipsel-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 04b960fd6dc8e3d41951684da6702812c32eb9e3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:30 -0400
Subject: [PATCH 1545/1854] cross-mipsel-linux-muslhf: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mipsel-linux-muslhf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 8cc208c7e86d..29d7261e9b48 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mipsel-linux-muslhf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 7a2550eb1ee5728fa1dd2a9560967ba582e3b123 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:31 -0400
Subject: [PATCH 1546/1854] cross-mips-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mips-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index f783961d70d2..8865f6dc092b 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mips-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 00f73f3973d8bfe006e41a7780be622a416dfa7c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:31 -0400
Subject: [PATCH 1547/1854] cross-mips-linux-muslhf: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-mips-linux-muslhf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index fe41bc80d808..94691668dcf2 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mips-linux-muslhf
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From c4b0260dc9244691cb4aefe145e125fb9d6d5638 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:31 -0400
Subject: [PATCH 1548/1854] cross-powerpc64le-linux-gnu: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpc64le-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index f4486e3f229c..577fccc6c5f8 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,12 +6,12 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64le-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From ad64a0f1f95cfa00fcf52adb6d9edbefb3586037 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:32 -0400
Subject: [PATCH 1549/1854] cross-powerpc64le-linux-musl: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpc64le-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index a863233b5b32..57c07e1d780b 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,12 +6,12 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-powerpc64le-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 493408084fe443f89c770ec4c89189575a1675fb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:32 -0400
Subject: [PATCH 1550/1854] cross-powerpc64-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpc64-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 95e6ce653c3d..aaab613d01e9 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,12 +6,12 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 064b91002a32978201e8243e5ed613a7473622e3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:33 -0400
Subject: [PATCH 1551/1854] cross-powerpc64-linux-musl: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpc64-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index b081a136ef29..359557d3afb9 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,12 +6,12 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-powerpc64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 47f55c4e73a37a6e83fb976618815946306dfa7d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:33 -0400
Subject: [PATCH 1552/1854] cross-powerpcle-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpcle-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 32337f1c37cc..340a50e2af41 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,11 +5,11 @@ _glibc_version=2.36
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 358bb3a49689ac2738b5623d78cd78002a8710fc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:33 -0400
Subject: [PATCH 1553/1854] cross-powerpcle-linux-musl: makedepends on
 isl-devel pkg-config

---
 srcpkgs/cross-powerpcle-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 2f483e1f1ee5..4749c8965cdb 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From a0241016b46eca44f68c19ba3332232eb324108d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:34 -0400
Subject: [PATCH 1554/1854] cross-powerpc-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpc-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index c759eda4505a..327f3f911eb5 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,11 +6,11 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 948637e49f529083f71bf363f87cf9bfde223db3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:34 -0400
Subject: [PATCH 1555/1854] cross-powerpc-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-powerpc-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index e06970d76b9e..85ea78c257f9 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,12 +5,12 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"
-hostmakedepends="texinfo tar gcc-objc flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 791e37c1d6d4f280ad3ede6b1e8876820499b764 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:34 -0400
Subject: [PATCH 1556/1854] cross-x86_64-linux-gnu: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-x86_64-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 0f6daea7229c..a079bb7ddbc6 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,10 +6,10 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-x86_64-linux-gnu
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 000134b1051870397bc763f8ca673ccc9b024124 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 16 Mar 2023 14:57:35 -0400
Subject: [PATCH 1557/1854] cross-x86_64-linux-musl: makedepends on isl-devel
 pkg-config

---
 srcpkgs/cross-x86_64-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 4984cd77f149..dfce8b30d0ba 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,10 +6,10 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-x86_64-linux-musl
 version=0.35
-revision=3
+revision=4
 build_style=void-cross
-hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
-makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
+hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
+makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
  zlib-devel libzstd-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"

From 407aa75f4775b1f6152f5d0ace2395c585a107f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 30 Jun 2023 22:22:56 +0700
Subject: [PATCH 1558/1854] linux6.1: update to 6.1.36.

---
 srcpkgs/linux6.1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 36c411cfd693..9068e8fd5b0f 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
 # Template file for 'linux6.1'
 pkgname=linux6.1
-version=6.1.34
+version=6.1.36
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a"
+ e5af3f72906e169cff7f09965a643e82d310e49d709ad2b373e07d2c06ce8688"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From f363649b13558619bb837755b4953c7454a44b5b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 01:29:09 +0530
Subject: [PATCH 1559/1854] pngquant: update to 3.0.1.

---
 srcpkgs/pngquant/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 3e93e4cdf81b..2c98a7abe75c 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,20 +1,13 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.18.0
+version=3.0.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-openmp"
+build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="lcms2-devel libgomp-devel libimagequant-devel libpng-devel"
+makedepends="lcms2-devel libpng-devel"
 short_desc="Lossy PNG compressor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
-distfiles="https://github.com/kornelski/pngquant/archive/${version}.tar.gz"
-checksum=424ff432e51dfc3cf5ff8001ad1b64198850686c5e3c26ecd477e4b69ef4fade
-make_check_target=test
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*) configure_args+=" --enable-sse";;
-	*) configure_args+=" --disable-sse";;
-esac
+distfiles="https://static.crates.io/crates/pngquant/pngquant-${version}.crate"
+checksum=f5ff78ab2fc7b2c58eefe4e37dc68c4757f95380874d478ec3a52e9fdf363ae3

From ee419dbe7f568a851f1cef4ddec2cb0c37f138e4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Jun 2023 20:48:01 +0200
Subject: [PATCH 1560/1854] linux5.4: update to 5.4.249.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 8bd845cec228..10456b6b5b9d 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.248
+version=5.4.249
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
- 0d919e129bdd21bdd25f6f358b8da04a48b598de7baba067ce3e3489b5b4fadf"
+ 58f1a4f9bfb8b3df4227139074e57668938937dfe388df7e414891f1e2629abd"
 python_version=3
 skip_extraction="patch-${version}.xz"
 

From a9403606120d25cb4cbcf86a926b00a09775e2b3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Jun 2023 20:50:31 +0200
Subject: [PATCH 1561/1854] linux4.19: update to 4.19.288.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 52000a3f1f46..a035c030bdbe 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.287
+version=4.19.288
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 6b36e15b50116dc414473a3fec4e012139e622ef99d5b7128935e28f787245eb"
+ f1cad7af74870882e86ed573769b6c15fb8f29faefaef3950561841f21efcf8a"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From d47e200cd3d86fca8ba1a593643cbdf21b11a9b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 12:16:32 +0300
Subject: [PATCH 1562/1854] eclipse: update to 4.28.

---
 srcpkgs/eclipse/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 8aca89770689..4108117dabc6 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.27
+version=4.28
 revision=1
 #code name of version
-_release=2023-03
+_release=2023-06
 archs="x86_64"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
  hicolor-icon-theme desktop-file-utils"
@@ -17,8 +17,8 @@ make_dirs="/usr/lib/eclipse/dropins 0770 root users"
 _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=ccd07314798d6b152eb73321ff9a4e8252622a1e4d02f495c2f3d8c80e9156be
+distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
+checksum=142e33831fbbe52f53255a746b35a038dff0366a04cb4d3be2d8fe0ce76f34e8
 python_version=2
 
 do_install() {

From 14be0c91dbdf8815a14329eb39118985fe62582a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jun 2023 22:38:04 +0300
Subject: [PATCH 1563/1854] opera: update to 100.0.4815.30.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 309afaa56fa5..9ed3ab1ced11 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=99.0.4788.65
+version=100.0.4815.30
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=62bf232a8b648b59616a2a870a2afc0f4be77f74f8e898d2dfe1295058e1b2db
+checksum=31e4c9b6a2ea4712157295afe7714a87cd092761b457a00b2067fd4de7182a6c
 repository="nonfree"
 nostrip=yes
 

From 322c9221b42aa2140afae41652d309cbfeb933a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 30 Jun 2023 23:37:47 +0700
Subject: [PATCH 1564/1854] nss: update to 3.91.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 6fda2a8425eb..ff2fa52f4059 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.35
 
 pkgname=nss
-version=3.89.1
+version=3.91
 revision=1
 hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156
+checksum=84bd46376df17118c55f6d73d30fd93a0af21296c66e7690471547e5898fc4b3
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 3381f12e62dae418a3770ef383f18a1ed4be0180 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 30 Jun 2023 21:24:50 -0400
Subject: [PATCH 1565/1854] jdupes: update to 1.25.3

---
 srcpkgs/jdupes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 28914083a92a..9c77eb429b69 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.25.2
+version=1.25.3
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=c137d07a70bcf70e15e92365df6b69bd210bb7856b6f10a860529aa7afc324a7
+checksum=89814310bb1884db6023436c523d03e405e1dda722a01caa336167e7938ac95e
 
 post_install() {
 	vlicense LICENSE.txt

From dd82e7d589e86a20347f2482dedcc1ec490f4685 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 1 Jul 2023 12:07:06 +0200
Subject: [PATCH 1566/1854] gradle: update to 8.2.

Closes: #44757 [via git-merge-pr]
---
 srcpkgs/gradle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 20dbf2d21cac..6d8f114040ec 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,15 +1,15 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=8.1.1
+version=8.2
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
-maintainer="Adrian Siekierka <kontakt@asie.pl>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+checksum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 834973b1f5fa3de38820b64bacedce815ed5b959 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Jul 2023 14:03:29 +0200
Subject: [PATCH 1567/1854] srt: update to 1.5.2.

---
 srcpkgs/srt/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srt/template b/srcpkgs/srt/template
index d4cacce2ec64..76a4d1055c7c 100644
--- a/srcpkgs/srt/template
+++ b/srcpkgs/srt/template
@@ -1,6 +1,6 @@
 # Template file for 'srt'
 pkgname=srt
-version=1.5.1
+version=1.5.2
 revision=1
 build_style=cmake
 configure_args="
@@ -12,8 +12,9 @@ short_desc="Secure, Reliable, Transport"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/Haivision/srt"
+changelog="https://github.com/Haivision/srt/releases"
 distfiles="https://github.com/Haivision/srt/archive/refs/tags/v${version}.tar.gz"
-checksum=af891e7a7ffab61aa76b296982038b3159da690f69ade7c119f445d924b3cf53
+checksum=463970a3f575446b3f55abb6f323d5476c963c77b3c975cd902e9c87cdd9a92c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From b9148d0db57068e4153469a358ed6f2c5df73e57 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Jul 2023 14:04:36 +0200
Subject: [PATCH 1568/1854] srcpkgs: orphan some packages

---
 srcpkgs/megazeux/template | 2 +-
 srcpkgs/visitors/template | 2 +-
 srcpkgs/xye/template      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/megazeux/template b/srcpkgs/megazeux/template
index 63cba8f658e9..77cce87718a1 100644
--- a/srcpkgs/megazeux/template
+++ b/srcpkgs/megazeux/template
@@ -8,7 +8,7 @@ configure_args="--platform unix --enable-release --bindir /usr/lib/megazeux
  --gamesdir /usr/bin --disable-updater"
 makedepends="SDL2-devel libvorbis-devel libpng-devel"
 short_desc="Game creation system"
-maintainer="Adrian Siekierka <kontakt@asie.pl>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later"
 homepage="http://www.digitalmzx.net/"
 distfiles="http://vault.digitalmzx.net/download.php?latest=src&ver=${version}>${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/visitors/template b/srcpkgs/visitors/template
index e5eea5407605..24a7f8df075d 100644
--- a/srcpkgs/visitors/template
+++ b/srcpkgs/visitors/template
@@ -4,7 +4,7 @@ version=0.7
 revision=3
 build_style=gnu-makefile
 short_desc="Lightweight web log analyzer"
-maintainer="Adrian Siekierka <asiekierka@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.hping.org/visitors/"
 distfiles="http://www.hping.org/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/xye/template b/srcpkgs/xye/template
index d36a89c9ad29..74c1cc9173d7 100644
--- a/srcpkgs/xye/template
+++ b/srcpkgs/xye/template
@@ -5,7 +5,7 @@ revision=4
 build_style=gnu-configure
 makedepends="SDL_image-devel SDL_ttf-devel"
 short_desc="Puzzle game inspired by Kye"
-maintainer="Adrian Siekierka <asiekierka@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, custom:resource"
 homepage="http://xye.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"

From cbd05e93617ff98a0216629a261d89dcb677c9d4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Jun 2023 18:36:04 +0200
Subject: [PATCH 1569/1854] cppcheck: update to 2.11.1.

---
 srcpkgs/cppcheck/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 98f1af93b724..883be07710cb 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.11
+version=2.11.1
 revision=1
 build_style=cmake
 configure_args="
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 changelog="https://sourceforge.net/p/cppcheck/news/"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=ef7d77c16e6903834cc016986a60157918a90958e981863746a7f3147bfb94c6
+checksum=fef6ef868d562d49136f158e1d0f7a38237e7e1c0a91d9189bdd465f1fe54316
 
 export CXXFLAGS="-DNDEBUG"
 
@@ -31,7 +31,6 @@ post_extract() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -e '/run-dmake/d' -i test/CMakeLists.txt -i cli/CMakeLists.txt
 	fi
-	vsed -e 's/"2.11"/"2.11.0"/' -i cmake/versions.cmake
 }
 
 post_install() {

From d875f89dab3a097b9853305a8aa7e053fa0a0387 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 11:18:13 +0530
Subject: [PATCH 1570/1854] toot: update to 0.37.0.

---
 srcpkgs/toot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index a8947848ccc2..b329e52a93ab 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,6 +1,6 @@
 # Template file for 'toot'
 pkgname=toot
-version=0.36.0
+version=0.37.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://toot.bezdomni.net"
 changelog="https://raw.githubusercontent.com/ihabunek/toot/master/CHANGELOG.md"
 distfiles="https://github.com/ihabunek/toot/archive/refs/tags/${version}.tar.gz"
-checksum=0aa554154d3a784e5e2345a8a2df9a90b877de6d888419194968807c942c7d73
+checksum=0a77bb5f4c4f0a0aa22d1cd292312096f6dc5164922184135a483fc41ae014e4

From 553c4865cc8ef334e0984af3bcc153e0111b3a3a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Jun 2023 15:45:18 +0530
Subject: [PATCH 1571/1854] rust-sccache: update to 0.5.4.

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index f16c5ebf6041..aaae926466ab 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.5.3
+version=0.5.4
 revision=1
 build_style=cargo
 # 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 changelog="https://github.com/mozilla/sccache/releases"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
+checksum=b1211a5c7a6dcbb1ef3fab4f3b0f194f05d9ee3a65f7001a908fda5ed61732ad
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 531ee2a67d31469bbc1255c2eacca140b24901a7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Fri, 30 Jun 2023 17:36:27 +0200
Subject: [PATCH 1572/1854] openttd: update to 13.3.

---
 srcpkgs/openttd/patches/regression_tests.patch | 4 ++--
 srcpkgs/openttd/template                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
index 2afc07eb4204..7f9394545329 100644
--- a/srcpkgs/openttd/patches/regression_tests.patch
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -1,7 +1,7 @@
 Fix regression tests on musl libc
 index 19fece83f5..641e1e6de2 100644
---- a/openttd-13.1/cmake/scripts/Regression.cmake
-+++ b/openttd-13.1/cmake/scripts/Regression.cmake
+--- a/openttd-13.3/cmake/scripts/Regression.cmake
++++ b/openttd-13.3/cmake/scripts/Regression.cmake
 @@ -53,6 +53,7 @@ endif()
  string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
  string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index 3649699062df..edce911a3093 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,6 +1,6 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=13.1
+version=13.3
 revision=1
 _gfxver=7.1
 _sfxver=1.0.3
@@ -29,7 +29,7 @@ distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
  https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
  https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
-checksum="5edf22d37035238285ef672a97d59e64280bebab23e584780834ccd6be0a58bb
+checksum="aafa16d2fb67165134c73a888f79f7a5ed7da17a04cf6e9ecf672c9cb89e7192
  928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
  e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
  5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"

From 7fc9c6f479e3a73450275177caa83ec676e4f010 Mon Sep 17 00:00:00 2001
From: Andrei <queyenth@gmail.com>
Date: Fri, 30 Jun 2023 21:40:27 +0600
Subject: [PATCH 1573/1854] protonmail-bridge: update to 3.3.0

---
 srcpkgs/protonmail-bridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index d25b19ead183..5d1315f6063c 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,6 +1,6 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=3.0.21
+version=3.3.0
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://proton.me/mail/bridge"
 distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=cd2d5a605f4a6fcffcb2e536caf7503958419bdeb8ec4e96aa2f9a481699e48a
+checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
 
 restricted=yes
 noverifyrdeps=yes

From 100ad3fd3462730f5c8f2e9c5df69b60d6bdafba Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 10:43:03 +0200
Subject: [PATCH 1574/1854] kanshi: update to 1.4.0.

---
 srcpkgs/kanshi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template
index e1dac36fc238..8f0c810e1386 100644
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@@ -1,6 +1,6 @@
 # Template file for 'kanshi'
 pkgname=kanshi
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://wayland.emersion.fr/kanshi/"
 changelog="https://git.sr.ht/~emersion/kanshi/refs"
 distfiles="https://git.sr.ht/~emersion/kanshi/archive/v${version}.tar.gz"
-checksum=733b2bdc8e57d0040f6f0ad91097548ced0188e8ae23b64fae96638a2be74375
+checksum=e9be76a969f526bd51217c0465f4f00bdb8ce176c1e58f08c7b2ed1b341ce653
 
 post_install() {
 	vlicense LICENSE

From 2e619a2ed60d5592e18b980c87a62f46bbce0d56 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Jun 2023 14:20:29 +0200
Subject: [PATCH 1575/1854] chroma: update to 2.8.0.

---
 srcpkgs/chroma/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 69b1adcd5a98..bc19f850d59e 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=2.7.0
-revision=2
+version=2.8.0
+revision=1
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=9d5d1f5ff7f91aff97b9eb7921e3540c863b5f01197b99a1362e777f7b43e215
+checksum=d6ddb56fd3cf0d7ae2c592f834aced1be4494f21338a79636743c25305a65a00
 
 do_check() {
 	go test -v

From f1a7a11ebb6ed685086cf999b94421fb5bae73de Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jun 2023 22:40:12 +0300
Subject: [PATCH 1576/1854] skype: update to 8.99.0.202.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 9928e91e7c9e..2ad810b427eb 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.98.0.402
+version=8.99.0.202
 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=a7ca6b4a81ce8a28f0d6106dbd928c9b7e6c6dff987b413d8f73e1757dc0de1c
+checksum=27e12b85f272f8406da3e3bf6f79e7e42035115322906bc529d679c1a077d437
 repository="nonfree"
 nostrip="yes"
 

From 3255b3b250625ae5c9819c69fd1885c4e3ac1ba6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Jun 2023 11:31:35 +0300
Subject: [PATCH 1577/1854] ristretto: update to 0.13.1.

Also:
- replace intltool with gettext (upstream, thanks classabbyamp)
- remove --with-locales-dir (and configure_args)
---
 srcpkgs/ristretto/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index 7aaf6162ce5f..f28924663a8a 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -1,10 +1,9 @@
 # Template file for 'ristretto'
 pkgname=ristretto
-version=0.13.0
+version=0.13.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
-hostmakedepends="intltool pkg-config glib-devel"
+hostmakedepends="gettext pkg-config glib-devel"
 makedepends="exo-devel file-devel libexif-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Picture-viewer for the Xfce desktop environment"
@@ -13,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/ristretto/start"
 changelog="https://gitlab.xfce.org/apps/ristretto/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=596676b41daada390c8d83e5bb83be6832a260f4bf0dbcc651ac0b68c0f4e301
+checksum=d71affbf15245067124725b153c908a53208c4ca1ba2d4df1ec5a1308d53791e

From b8586659e34e034c81fadea0ed54808023ea9a10 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 29 Jun 2023 05:11:50 -0500
Subject: [PATCH 1578/1854] focuswriter: update to 1.8.5.

---
 srcpkgs/focuswriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index ac98ed65cd9a..196cc3cdd61a 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -1,6 +1,6 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
-version=1.8.4
+version=1.8.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt6-tools"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gottcode.org/focuswriter/"
 distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
-checksum=fe28b35951de0f5c2f3c5b849dae2267f162ee1bf2b500dc77cdbd45a20cd95b
+checksum=456e1780a0e79023305571c0c63e26dae927c9f8862c746bab53dbb831be7d0b

From 7736ee5745d63d6febf8811b8b6da1823c6b18f0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 1 Jul 2023 08:35:13 -0500
Subject: [PATCH 1579/1854] aide: update to 0.18.5.

---
 srcpkgs/aide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index 32e90793100e..a4e2e5417539 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.18.4
+version=0.18.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=4f7e2c7f49f3ca25fdafad6170390a4d8c8334af17bbd48ad34dbd6dde4ee757
+checksum=58d63e6d16f5af296da427313861222426aec7610f4dbc76a1bc76310e1f1db5
 
 export MHASH_CFLAGS="=I${XBPS_CROSS_BASE}/usr/include"
 export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"

From 38600c70922fe312857aac2fc753e3f23a6c282a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 1 Jul 2023 08:43:49 -0500
Subject: [PATCH 1580/1854] focuswriter: fix cross

---
 srcpkgs/focuswriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index 196cc3cdd61a..8c693da0ede6 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -1,9 +1,9 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
 version=1.8.5
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="pkg-config qt6-tools"
+hostmakedepends="pkg-config qt6-tools qt6-base"
 makedepends="hunspell-devel pulseaudio-devel qt6-multimedia-devel"
 short_desc="Simple, distraction-free word processor with a hide-away interface"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From cf5901f133b533f1f12e4c324904c617a4ef542a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 09:41:06 -0400
Subject: [PATCH 1581/1854] imhex: update to 1.30.1.

---
 srcpkgs/imhex/patches/sort-file-chooser.patch | 27 -------------------
 srcpkgs/imhex/template                        |  6 ++---
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/imhex/patches/sort-file-chooser.patch

diff --git a/srcpkgs/imhex/patches/sort-file-chooser.patch b/srcpkgs/imhex/patches/sort-file-chooser.patch
deleted file mode 100644
index 90bf07de6700..000000000000
--- a/srcpkgs/imhex/patches/sort-file-chooser.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f57d4f2f7adb44b97f9696c94d3178e4ccebcd99 Mon Sep 17 00:00:00 2001
-From: WerWolv <werwolv98@gmail.com>
-Date: Sun, 21 May 2023 18:41:43 +0200
-Subject: [PATCH] impr: Manually sort file chooser popup list
-
----
- .../builtin/include/content/popups/popup_file_chooser.hpp  | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/builtin/include/content/popups/popup_file_chooser.hpp b/plugins/builtin/include/content/popups/popup_file_chooser.hpp
-index ce464aeee76d..e52c040c27ea 100644
---- a/plugins/builtin/include/content/popups/popup_file_chooser.hpp
-+++ b/plugins/builtin/include/content/popups/popup_file_chooser.hpp
-@@ -13,7 +13,12 @@ namespace hex::plugin::builtin {
-                 : hex::Popup<PopupFileChooser>("hex.builtin.common.choose_file"),
-                   m_indices({ }), m_files(files),
-                   m_openCallback(callback),
--                  m_validExtensions(validExtensions), m_multiple(multiple) { }
-+                  m_validExtensions(validExtensions), m_multiple(multiple) {
-+
-+            std::sort(this->m_files.begin(), this->m_files.end(), [](const std::fs::path &a, const std::fs::path &b) {
-+                return a.filename() < b.filename();
-+            });
-+        }
- 
-         void drawContent() override {
-             bool doubleClicked = false;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 6c8761e81fc8..3f7f4750389e 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,6 +1,6 @@
 # Template file for 'imhex'
 pkgname=imhex
-version=1.29.0
+version=1.30.1
 revision=1
 build_wrksrc="ImHex"
 build_style=cmake
@@ -20,8 +20,8 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="25a8b250412e5b870871978e58cd5f5c08bd42587122ab7799c59eec31843c46
- a237a4fcf565af6b4ad94ec71f50b284bef3af93a13da744092da7e83d7767c0"
+checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
+ 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
 patch_args="-Np1 -d $build_wrksrc"
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then

From 99d4914c75e52350e36b90766b13a470b09690a0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 09:41:14 -0400
Subject: [PATCH 1582/1854] pyright: update to 1.1.316.

---
 srcpkgs/pyright/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index f8bb5adf6691..fb6f95c5cef2 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,6 +1,6 @@
 # Template file for 'pyright'
 pkgname=pyright
-version=1.1.315
+version=1.1.316
 revision=1
 build_wrksrc="packages/pyright"
 hostmakedepends="nodejs python3"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://microsoft.github.io/pyright"
 changelog="https://github.com/microsoft/pyright/releases"
 distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
-checksum=6c3d404815527b8143b9eab0e3978b3126a95d9e8502177ebb4f1b23a437896e
+checksum=9601cc32ece6dc6db312c4b947f4c85908a4de75890ffa6519421728d0ee4119
 
 do_configure() {
 	cd "$wrksrc"

From 5582ef3698c18381239eab36ab1665a7aa1fc69e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 09:41:20 -0400
Subject: [PATCH 1583/1854] typst: update to 0.6.0.

---
 srcpkgs/typst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/typst/template b/srcpkgs/typst/template
index 7d517adbf6cd..48ce0da20442 100644
--- a/srcpkgs/typst/template
+++ b/srcpkgs/typst/template
@@ -1,7 +1,7 @@
 # Template file for 'typst'
 pkgname=typst
 reverts="23.03.28_1"
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cargo
 make_install_args="--path cli"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://typst.app"
 changelog="https://typst.app/docs/changelog/"
 distfiles="https://github.com/typst/typst/archive/refs/tags/v${version}.tar.gz"
-checksum=8532b4423fdb125c85a0dd15c8f8718d3135c394b0f8abe26b96a52d14c109c8
+checksum=0f5c16c2143bbdc8889d823506e29a4706f8606ce29769916d71b17a05dda568
 
 export TYPST_VERSION="$version"
 export GEN_ARTIFACTS="./generated"

From bcd4d1ed8c0b9900079f7e69634a26ed846f93b6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jun 2023 22:59:14 +0300
Subject: [PATCH 1584/1854] rssguard: update to 4.4.0.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 2f85cfb29f84..fe08f9c237c2 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.3.4
+version=4.4.0
 revision=1
 build_style=cmake
 configure_args="-DUSE_WEBENGINE=false"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=139db542e82be8c958f6a4c5e5fd0beb1c3c06a7d6b84706d0deb08131de350a
+checksum=38726783d72c3e68c72ace73b46b610f5ea51dcc1085526a932913eb441870da
 
 post_install() {
 	# Install rssguard icon manually

From cf7f43e23521fa85bad8156aeeb1fb9dfa62b072 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jul 2023 11:48:55 -0400
Subject: [PATCH 1585/1854] noto-fonts-ttf: update to 23.7.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 554f1c2ceac1..cda4ce869356 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.6.1
+version=23.7.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=4a52070a67ce1f9c74eb74645bfa769d5df43bf1268123e733a5ac56cb36c476
+checksum=f2fd4738436bde60583fffdbd99744e85c821903a47847b72532c221a29227b4
 font_dirs="/usr/share/fonts/noto"
 
 do_install() {

From 00574cf83a3d5235a40ea4097762462b9c57ae7d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Jul 2023 18:00:05 +0200
Subject: [PATCH 1586/1854] opensmtpd: update to 7.3.0p1.

---
 srcpkgs/opensmtpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 2878481668df..6d20f0159d6b 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,6 +1,6 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=7.3.0p0
+version=7.3.0p1
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
@@ -22,7 +22,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=2dd7a5a8ca127be7eb491540405684acb3dd04d93ad23d7709accd2b0450cae6
+checksum=1b46cd41a1c2738757cc3a0e4aea71f3c6db56def727f7261bcd362583345a07
 provides="smtp-forwarder-0_1 smtp-server-0_1"
 replaces="smtp-forwarder>=0 smtp-server>=0"
 system_accounts="_smtpd _smtpq"

From d598c854935407588f22a82352c617c9f5a8896a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Jul 2023 18:03:59 +0200
Subject: [PATCH 1587/1854] weechat: update to 4.0.1.

---
 srcpkgs/weechat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index ffcbf8b9e5be..972c5ef1c446 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,6 +1,6 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=5bd75ee15f3392a0ad174ee7c54518daece3878477670c07f10d6ebf988240f9
+checksum=1b9533123af427922b3d7fabede958dc85392d50881d97d0b7986d8f514556e9
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From a55f626d851339c3e684d96600082a962c544e54 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Jul 2023 17:53:42 +0200
Subject: [PATCH 1588/1854] elixir: update to 1.15.1.

---
 ...5eca5af294a8afbed5bc73c178da18f0055c.patch | 29 --------------
 ...4e6830d0f44e26179582a16fef6f642df754.patch | 38 -------------------
 srcpkgs/elixir/template                       |  6 +--
 3 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
 delete mode 100644 srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch

diff --git a/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch b/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
deleted file mode 100644
index 06f5976e2c69..000000000000
--- a/srcpkgs/elixir/patches/73b65eca5af294a8afbed5bc73c178da18f0055c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 73b65eca5af294a8afbed5bc73c178da18f0055c Mon Sep 17 00:00:00 2001
-From: cjschneider2 <cjschneider2@users.noreply.github.com>
-Date: Fri, 23 Jun 2023 16:04:29 +0200
-Subject: [PATCH] Use printf instead of echo to output user flags (#12704)
-
-Fixes #12677.
-
-Using printf here prevents an error when outputting the filtered flag
-`-e` as doing with with `echo "-e"` doesn't output anything
-(deleting the option we wanted to filter).
-
-More info: https://unix.stackexchange.com/a/65819
----
- bin/elixir | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/elixir b/bin/elixir
-index 3c0323f0f1..cb0a84650b 100755
---- a/bin/elixir
-+++ b/bin/elixir
-@@ -233,7 +233,7 @@ set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SC
- if [ -n "$RUN_ERL_PIPE" ]; then
-   ESCAPED=""
-   for PART in "$@"; do
--    ESCAPED="$ESCAPED $(echo "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
-+    ESCAPED="$ESCAPED $(printf '%s' "$PART" | sed 's@[^a-zA-Z0-9_/-]@\\&@g')"
-   done
-   mkdir -p "$RUN_ERL_PIPE"
-   mkdir -p "$RUN_ERL_LOG"
diff --git a/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch b/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
deleted file mode 100644
index 4512ad60e37b..000000000000
--- a/srcpkgs/elixir/patches/9b254e6830d0f44e26179582a16fef6f642df754.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9b254e6830d0f44e26179582a16fef6f642df754 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
-Date: Tue, 20 Jun 2023 12:31:53 +0200
-Subject: [PATCH] Do not expect OTP to be compiled with docs, closes #12677
-
----
- lib/mix/test/mix/tasks/compile_test.exs | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
-index cdc40977c7..c4e672ffd2 100644
---- a/lib/mix/test/mix/tasks/compile_test.exs
-+++ b/lib/mix/test/mix/tasks/compile_test.exs
-@@ -329,16 +329,22 @@ defmodule Mix.Tasks.CompileTest do
-     Application.delete_env(:sample, :hello, persistent: true)
-   end
- 
--  test "code path prunning" do
-+  test "code path pruning" do
-     Mix.ensure_application!(:parsetools)
-+    otp_docs? = match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:zlib))
- 
-     in_fixture("no_mixfile", fn ->
-       assert Mix.Task.run("compile", []) == {:ok, []}
-       assert :code.where_is_file(~c"parsetools.app") == :non_existing
- 
-       # Make sure erts is also kept but not loaded
--      assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
-       assert Application.spec(:erts, :vsn) == nil
-+
-+      if otp_docs? do
-+        assert {:docs_v1, _, _, _, _, _, _} = Code.fetch_docs(:zlib)
-+      else
-+        IO.warn("Erlang/OTP was not compiled with docs, skipping assertion")
-+      end
-     end)
-   end
- 
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 0e475ae139f1..2b1bb9af0130 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.15.0
+version=1.15.1
 revision=1
 build_style=gnu-makefile
 make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
@@ -17,7 +17,7 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=0f4df7574a5f300b5c66f54906222cd46dac0df7233ded165bc8e80fd9ffeb7a
+checksum=cf89434f4cf7477b929c56e16ae22bf08e64101a144911d2834a2f3c9b3ae40f
 
 post_patch() {
 	# XXX: find a better solution
@@ -26,8 +26,6 @@ post_patch() {
 	# left:  "/usr/lib/erlang"
 	# right: "/usr/lib64/erlang"
 	vsed -e '/assert root_dir == :code\.root_dir()/d' -i lib/mix/test/mix/tasks/release_test.exs
-	# orig file caused by line offset of the issue 12704 diff
-	rm bin/elixir.orig
 }
 
 do_check() {

From 4a69562fafdb2e90093ad314dcfd128fda36d9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 1 Jul 2023 17:12:11 -0300
Subject: [PATCH 1589/1854] igraph: update to 0.10.5.

---
 srcpkgs/igraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
index 30772d74a2fa..44e52818d4ec 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,6 +1,6 @@
 # Template file for 'igraph'
 pkgname=igraph
-version=0.10.4
+version=0.10.5
 revision=1
 build_style=cmake
 configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://igraph.org/c/"
 changelog="https://github.com/igraph/igraph/releases"
 distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
-checksum=aa5700b58c5f1e1de1f4637ab14df15c6b20e25e51d0f5a260921818e8f02afc
+checksum=1c2725122fda9b72065095794bc7748939d90d942d312cb63c6160cd98d50f1e
 
 build_options="openblas"
 

From 6c7f958a91e46524c122c27c68242fbe8e2c1a51 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 12:05:59 +0530
Subject: [PATCH 1590/1854] hurl: update to 4.0.0.

---
 srcpkgs/hurl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hurl/template b/srcpkgs/hurl/template
index 5881b444a7af..6de478686c53 100644
--- a/srcpkgs/hurl/template
+++ b/srcpkgs/hurl/template
@@ -1,9 +1,10 @@
 # Template file for 'hurl'
 pkgname=hurl
-version=3.0.1
+version=4.0.0
 revision=1
 build_style=cargo
-make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl"
+make_check_args="-- --skip=runner::hurl_file::run --skip=http::tests::libcurl
+ --skip=simple sample"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel libcurl-devel libxml2-devel"
 short_desc="CLI to run HTTP requests defined in a simple plain text format"
@@ -12,7 +13,7 @@ license="Apache-2.0"
 homepage="https://hurl.dev"
 changelog="https://raw.githubusercontent.com/Orange-OpenSource/hurl/master/CHANGELOG.md"
 distfiles="https://github.com/Orange-OpenSource/hurl/archive/refs/tags/${version}.tar.gz"
-checksum=551a730ed23150bc0a120781abe8c36b2989abc03c97c3e79191eea87cca5632
+checksum=43b5943b8135a0b2c0bb16897291e641f38e7e81aab17a18ee3d6eb5e1cd0d48
 
 if [[ "$XBPS_WORDSIZE" -eq 32 ]]; then
 	make_check=no # https://github.com/Orange-OpenSource/hurl/issues/1220

From 8743d3ceb9a91979ab40659f6298e38c19710219 Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Sat, 1 Jul 2023 14:46:57 -0300
Subject: [PATCH 1591/1854] czkawka: update to 6.0.0.

---
 srcpkgs/czkawka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/czkawka/template b/srcpkgs/czkawka/template
index 4bb96fd8bc0d..08b9392fa1ea 100644
--- a/srcpkgs/czkawka/template
+++ b/srcpkgs/czkawka/template
@@ -1,6 +1,6 @@
 # Template file for 'czkawka'
 pkgname=czkawka
-version=5.1.0
+version=6.0.0
 revision=1
 build_style=cargo
 build_helper=rust
@@ -14,7 +14,7 @@ maintainer="sirkhancision <jsantiago12tone@gmail.com>"
 license="MIT"
 homepage="https://github.com/qarmin/czkawka"
 distfiles="https://github.com/qarmin/czkawka/archive/refs/tags/${version}.tar.gz"
-checksum=346c256ef215fa029a78c8150fcac1815e0c7f98319a167e18c5239e04849068
+checksum=32dc1d8a55bc3ce478246830a1f81679affa85735e69aa049fd83e30271e368f
 
 do_check() {
 	dbus-run-session xvfb-run -s '-nolisten local' cargo test --bin czkawka_gui --release

From 64c0e31c6c538384b724a6de1fdc092a0d41732f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 00:37:31 +0530
Subject: [PATCH 1592/1854] osv-scanner: update to 1.3.5.

---
 srcpkgs/osv-scanner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index ff02f965d680..2c98317fbe07 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,6 +1,6 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
-version=1.3.4
+version=1.3.5
 revision=1
 build_style=go
 go_import_path="github.com/google/osv-scanner"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://google.github.io/osv-scanner/"
 changelog="https://raw.githubusercontent.com/google/osv-scanner/main/CHANGELOG.md"
 distfiles="https://github.com/google/osv-scanner/archive/refs/tags/v${version}.tar.gz"
-checksum=19229149eca937a4da60ca29416fe1ea6997655fd10e273b833082ef5977a3de
+checksum=fe4566f1159b33827ad64f86219c8a2f6497cf92fe8d8c9388a7148880396a38
 
 do_check() {
 	go test ./...

From 4c3e3b2b837b53e6061ab073f2d138977d0b298d Mon Sep 17 00:00:00 2001
From: Heinrich Kruger <heindsight@kruger.dev>
Date: Sat, 1 Jul 2023 14:53:42 +0100
Subject: [PATCH 1593/1854] zoom: update to 5.15.2.4260.

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 4271caca95a0..177afbd77f5c 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.15.0.4063
+version=5.15.2.4260
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=5cd162d5a86144e4f87967f5a132c7f0b8cb6d9585fdc02d1ae0ea8a20bbe9db
+checksum=9074a59845a9c7f92d7914a9c77cb00b60c6c3754a40a95dc557f051f24b512a
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From f0d70a1ac02bd9bcb8cebcedcfa586d01284bc95 Mon Sep 17 00:00:00 2001
From: Heinrich Kruger <heindsight@kruger.dev>
Date: Fri, 30 Jun 2023 18:50:28 +0100
Subject: [PATCH 1594/1854] 1password: update to 8.10.8

---
 srcpkgs/1password/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/1password/template b/srcpkgs/1password/template
index e4a929e497ae..92c7fde50229 100644
--- a/srcpkgs/1password/template
+++ b/srcpkgs/1password/template
@@ -1,6 +1,6 @@
 # Template file for '1password'
 pkgname=1password
-version=8.10.7
+version=8.10.8
 revision=1
 archs="x86_64 aarch64"
 hostmakedepends="gnupg"
@@ -12,14 +12,14 @@ homepage="https://www.1password.com"
 case "${XBPS_TARGET_MACHINE}" in
 	aarch64)
 		_arch="arm64"
-		checksum="4e6a1ffa66b54893104525754f97e52de5df7ba5b56b6536998ce2f8caf1bc93
- 31dd56227da961b346c5e00aebfe44b065cecb06314c144c3572033777d5c6d0"
+		checksum="57fa891ede3da4f126d60f76844402b1c989dd99121d3636a00ebd77a0f19265
+ e354e5621259b164d9136fa9947a0e617b4e993ff3c0a57b4279900f5b4dcf1e"
 		;;
 
 	x86_64)
 		_arch="x64"
-		checksum="e4a300cecb683e636015e8e9db547c3dc76b994b645f7ab11d85f7ad5e49ab21
- 572508224d18cceb7efe66ed2db3c52f2cfd7f572c7e107e9d7b8439340d17ac"
+		checksum="13b957cb1a012f6ce2308222b2c909261679ca62b2bafe335c4aa2814b54e352
+ 99e5d9dc9b348d96d8349d68f2a45d11461e2fd2e5c948ad9f4a2c5fcf6af259"
 		;;
 esac
 

From 8de6859f66f823a494f62e19e00bb6b3d65911e3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 15:38:09 +0200
Subject: [PATCH 1595/1854] zls: fix update check

---
 srcpkgs/zls/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/zls/update

diff --git a/srcpkgs/zls/update b/srcpkgs/zls/update
new file mode 100644
index 000000000000..85f55914204f
--- /dev/null
+++ b/srcpkgs/zls/update
@@ -0,0 +1,2 @@
+site=https://github.com/zigtools/zls/releases
+pattern="zls \K[\d.]+"

From 30572ff340b6d0dfe65469740b2b19f0dcc5e177 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 09:36:17 +0200
Subject: [PATCH 1596/1854] got: update to 0.90.

---
 srcpkgs/got/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 873094582d8a..1f2521923f3e 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
 # Template file for 'got'
 pkgname=got
-version=0.89
+version=0.90
 revision=1
 build_style=gnu-configure
 hostmakedepends="byacc pkg-config"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://gameoftrees.org"
 changelog="https://gameoftrees.org/releases/CHANGES"
 distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="27404932c07713400124c15e318417385411b7a1fe7ee534e48f2b9e4f096d8c"
+checksum=da353f43a5b91b563f1d9be4b2bdb50fddfffc70b0a4b777fa5dd114629bf783
 
 post_install() {
 	sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE

From 830802f1ae898e21c0fb435bd69e1419bd77ca24 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 09:30:19 +0200
Subject: [PATCH 1597/1854] containerd: update to 1.7.2, orphan

---
 srcpkgs/containerd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index 932e245800bb..0c74e43bb6ca 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
-version=1.6.10
-revision=2
+version=1.7.2
+revision=1
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd
@@ -16,11 +16,11 @@ hostmakedepends="pkg-config go-md2man"
 makedepends="libbtrfs-devel libseccomp-devel"
 depends="runc"
 short_desc="Open and reliable container runtime"
-maintainer="Paul Knopf <pauldotknopf@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/containerd/containerd"
 distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz"
-checksum=57be0d7b448abc83f2d1e0045864ffec83e6afa0c7e54548b50d67152686745e
+checksum=68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43
 make_dirs="/var/lib/containerd 0755 root root"
 
 post_build() {

From 1dbeb42ca68f40a83b8170a65b4441a72324f550 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 1 Jul 2023 16:36:27 +0200
Subject: [PATCH 1598/1854] bluez: update to 5.68.

---
 srcpkgs/bluez/patches/max-input.patch | 15 ---------------
 srcpkgs/bluez/template                |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/bluez/patches/max-input.patch

diff --git a/srcpkgs/bluez/patches/max-input.patch b/srcpkgs/bluez/patches/max-input.patch
deleted file mode 100644
index f11c1684d82f..000000000000
--- a/srcpkgs/bluez/patches/max-input.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Required for musl, taken from alpine: https://git.alpinelinux.org/aports/tree/main/bluez/max-input.patch
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 0a0308c..a2b8c23 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -65,7 +65,7 @@ void *util_memdup(const void *src, size_t size)
- void util_debug_va(util_debug_func_t function, void *user_data,
- 				const char *format, va_list va)
- {
--	char str[MAX_INPUT];
-+	char str[_POSIX_MAX_INPUT];
- 
- 	if (!function || !format)
- 		return;
-
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index d66ca51557f4..f1a1ca5b72fa 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.66
+version=5.68
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574
+checksum=fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From 8b81f8d033e71f90e3a66448252e3dd4c98699f6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 13:29:26 +0530
Subject: [PATCH 1599/1854] python3-yamllint: update to 1.32.0.

---
 srcpkgs/python3-yamllint/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index e8e1db1290a8..6bb91ed36037 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-yamllint'
 pkgname=python3-yamllint
-version=1.30.0
+version=1.32.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pathspec python3-setuptools python3-yaml"
-checkdepends="python3-pytest python3-pathspec python3-yaml"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-pathspec python3-yaml"
+checkdepends="${depends} python3-pytest-xdist"
 short_desc="Python 3 linter for YAML files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/yamllint"
 changelog="https://github.com/adrienverge/yamllint/raw/master/CHANGELOG.rst"
 distfiles="https://github.com/adrienverge/yamllint/archive/refs/tags/v${version}.tar.gz"
-checksum=8a4a6b2d15f9c6d97f012408eb811e62dd00554fbb4db4a2017dc2c8d1ee1da5
+checksum=08ee588189ce7909401894b2f93375366271132a3ae3afc2de2665b27baf2d5f
 conflicts="python-yamllint>=0"
 
 # These test cases require locale support, which musl libc lacks, so these tests are expected to fail

From 7c05fc6cc13f82f06f77a760c18238a772a00d8e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:18:37 +0100
Subject: [PATCH 1600/1854] calibre: poppler-utils -> poppler

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0bed9e49972e..04bd9fe283fc 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -15,7 +15,7 @@ makedepends="libinput-devel libmagick-devel libmtp-devel libstemmer-devel
  freetype-devel uchardet-devel openssl-devel icu-devel libusb-devel
  sqlite-devel tslib-devel hunspell-devel hyphen-devel libstemmer-devel
  python3-pyqt6-devel python3-pyqt6-webengine-devel"
-depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
+depends="desktop-file-utils optipng poppler python3-BeautifulSoup4
  qt6-imageformats python3-Pygments python3-pycryptodome
  python3-Markdown python3-Pillow python3-zeroconf python3-Pygments python3-apsw
  python3-css-parser python3-cssselect python3-dateutil python3-jeepney

From 96ebf7b954e35b39b08a6b751ed2d7955425c2f6 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:18:59 +0100
Subject: [PATCH 1601/1854] cups-filters: poppler-utils -> poppler

---
 srcpkgs/cups-filters/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 4e475d018054..e7a796d5fbcf 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -6,11 +6,10 @@ build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS
  --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
-hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler-utils
- liblouis"
+hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler liblouis"
 makedepends="avahi-glib-libs-devel cups-devel fontconfig-devel liblouis-devel
  ghostscript-devel lcms2-devel libqpdf-devel poppler-cpp-devel libexif-devel"
-depends="bc ghostscript libcups-filters-${version}_${revision} poppler-utils"
+depends="bc ghostscript libcups-filters-${version}_${revision} poppler"
 checkdepends="dejavu-fonts-ttf"
 conf_files="/etc/cups/cups-browsed.conf"
 short_desc="OpenPrinting CUPS Filters"

From 9dd0ebb3fc1c592d19347a5c3254e34e14f12d8d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:19:18 +0100
Subject: [PATCH 1602/1854] pdfsandwhich: poppler-utils -> poppler

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index 82f2f934fdc1..325222502a57 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"
-depends="tesseract-ocr ImageMagick ghostscript poppler-utils unpaper"
+depends="tesseract-ocr ImageMagick ghostscript poppler unpaper"
 short_desc="CLI tool which is useful to add OCR to scanned books or journals"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="GPL-2.0-only"

From b63415e6daff85e0b00757ad516107f3659e71af Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 30 Jun 2023 23:19:56 +0100
Subject: [PATCH 1603/1854] xpdf: poppler-utils -> poppler

---
 srcpkgs/xpdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index 854150d56eb5..6309c5c8f778 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -25,7 +25,7 @@ post_install() {
 	# copy sample xpdfrc
 	vmkdir etc
 	vinstall doc/sample-xpdfrc 644 etc xpdfrc
-	# already in poppler-utils
+	# already in poppler
 	rm $DESTDIR/usr/bin/pdf*
 	rm $DESTDIR/usr/share/man/man1/pdf*
 }

From a059ca85fa671665faa9f3c67ba331944e1ca700 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 2 Jul 2023 15:55:56 +0300
Subject: [PATCH 1604/1854] srcpkgs: orphaning

Closes: #44789 [via git-merge-pr]
---
 srcpkgs/nemo-audio-tab/template            | 2 +-
 srcpkgs/nemo-compare/template              | 2 +-
 srcpkgs/nemo-emblems/template              | 2 +-
 srcpkgs/nemo-extensions/template           | 2 +-
 srcpkgs/nemo-image-converter/template      | 2 +-
 srcpkgs/nemo-preview/template              | 2 +-
 srcpkgs/nemo-python/template               | 2 +-
 srcpkgs/nemo-terminal/template             | 2 +-
 srcpkgs/python3-distro/template            | 2 +-
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
index a7788a0acafa..7f595e46880c 100644
--- a/srcpkgs/nemo-audio-tab/template
+++ b/srcpkgs/nemo-audio-tab/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python python3-mutagen"
 short_desc="Nemo audio tab extention"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index 9e8cb9e4b46e..eca7719edc33 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python meld"
 short_desc="Nemo compare extention"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
index 153f10e52906..681498ca8b08 100644
--- a/srcpkgs/nemo-emblems/template
+++ b/srcpkgs/nemo-emblems/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python"
 short_desc="Nemo extension for changing emblems in files/dirs"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index ec953536f50c..ac7a2cb16a2d 100644
--- a/srcpkgs/nemo-extensions/template
+++ b/srcpkgs/nemo-extensions/template
@@ -13,7 +13,7 @@ depends="
  nemo-emblems>=${version}
  nemo-terminal>=${version}"
 short_desc="Extentions for nemo file manager"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause" #no vlicense
 homepage="https://github.com/linuxmint/nemo-extensions"
 
diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
index 9bc7f196636d..f0458c09ca27 100644
--- a/srcpkgs/nemo-image-converter/template
+++ b/srcpkgs/nemo-image-converter/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config gettext"
 makedepends="nemo-devel libglib-devel"
 depends="ImageMagick"
 short_desc="Nemo image converter extension"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index beb14c4662a4..2cbac5160b2f 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config gettext gobject-introspection glib-devel"
 makedepends="nemo-devel  libmusicbrainz5-devel cjs-devel clutter-devel
  clutter-gtk-devel clutter-gst3-devel libxreader-devel gtksourceview4-devel webkit2gtk-devel"
 short_desc="Nemo preview extension"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index 5218bc746ab4..630302ee848a 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -7,7 +7,7 @@ build_style=meson
 hostmakedepends="pkg-config"
 makedepends="nemo-devel python3-devel python3-gobject-devel"
 short_desc="Nemo python binding"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
index b3f7679db2a0..5029a82836a6 100644
--- a/srcpkgs/nemo-terminal/template
+++ b/srcpkgs/nemo-terminal/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
 depends="nemo-python vte3 glib gtk+3 xapps"
 short_desc="Nemo terminal extention"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index e8366a9193de..93d66fba5da2 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-wheel"
 depends="python3"
 checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 changelog="https://raw.githubusercontent.com/python-distro/distro/master/CHANGELOG.md"
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index f04aa3c6b4b5..202735222e95 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-poetry-core"
 depends="python3-pytest python3-Werkzeug"
 checkdepends="${depends} python3-MarkupSafe python3-requests"
 short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.github.com/csernazs/pytest-httpserver"
 changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"

From 04da1b47f9837130dd2b204544951c72a6424d8b Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 2 Jul 2023 20:05:41 +0900
Subject: [PATCH 1605/1854] watchdog: fix build on musl

---
 srcpkgs/watchdog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/watchdog/template b/srcpkgs/watchdog/template
index 743b8d4f1291..3d410fc469e6 100644
--- a/srcpkgs/watchdog/template
+++ b/srcpkgs/watchdog/template
@@ -7,14 +7,10 @@ short_desc="Software watchdog daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/watchdog/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/watchdog/watchdog-${version}.tar.gz"
 checksum=b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d
 conf_files="/etc/watchdog.conf"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	broken="nfsmount.h:9:10: fatal error: rpc/rpc.h: No such file or directory"
-fi
-
 post_install() {
 	vsv watchdog
 }

From f47c89ac96e24d3cf1bbe7961ad7d5f1b1c7a523 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 2 Jul 2023 09:54:04 +0200
Subject: [PATCH 1606/1854] system-monitoring-center: update to 2.17.0

---
 srcpkgs/system-monitoring-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/system-monitoring-center/template b/srcpkgs/system-monitoring-center/template
index 0fac7cee3d7c..376ed6ae7794 100644
--- a/srcpkgs/system-monitoring-center/template
+++ b/srcpkgs/system-monitoring-center/template
@@ -1,6 +1,6 @@
 # Template file for 'system-monitoring-center'
 pkgname=system-monitoring-center
-version=2.14.0
+version=2.17.0
 revision=1
 build_style=meson
 hostmakedepends="kdelibs4support-devel gettext"
@@ -10,4 +10,4 @@ maintainer="zenobit <zen@osowoso.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/hakandundar34coding/system-monitoring-center"
 distfiles="https://github.com/hakandundar34coding/system-monitoring-center/archive/refs/tags/v${version}.tar.gz"
-checksum=0ae387300d5a30c1323cb6f0f037cfe0d304270560018bb41933046eb20b2763
+checksum=433e0e06ba2e49c81c19eaa47641a354a5bc4a866db6cbb59544a84943edc831

From ba21439b57276825d28ef8301e3cda330138a71b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 09:18:00 +0200
Subject: [PATCH 1607/1854] ansifilter: update to 2.20.

---
 srcpkgs/ansifilter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansifilter/template b/srcpkgs/ansifilter/template
index 30519cb8ef6c..758c50e65743 100644
--- a/srcpkgs/ansifilter/template
+++ b/srcpkgs/ansifilter/template
@@ -1,6 +1,6 @@
 # Template file for 'ansifilter'
 pkgname=ansifilter
-version=2.18
+version=2.20
 revision=1
 build_style=gnu-makefile
 short_desc="Remove or convert ANSI codes to another format"
@@ -8,4 +8,4 @@ maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://gitlab.com/saalen/ansifilter"
 distfiles="https://gitlab.com/saalen/ansifilter/-/archive/${version}/ansifilter-${version}.tar.gz"
-checksum=e91cc14bd5a464cfd39e77a254ea6e12314a2b7d4554766d6b7043a8cb5faa04
+checksum=96aad3c95113e921ab912b63152471e5b532a54ecfe90d8c86b2c9127c3aa39b

From bf7164ee68b8b38fcf1579cacca8b58f5f7309b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 1 Jul 2023 02:03:06 +0200
Subject: [PATCH 1608/1854] arti: update to 1.1.6.

---
 srcpkgs/arti/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index d6be792e376c..d7b72dc4915c 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
 # Template file for 'arti'
 pkgname=arti
-version=1.1.5
+version=1.1.6
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0, MIT"
 homepage="https://gitlab.torproject.org/tpo/core/arti"
 changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
 distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=1ac43aa8ae742d516724bd1f7b412a5a979b5007b88f9eed2d8ab06e92bb28f4
+checksum=a438507af31078eec90018709529b9c6ebfefefb55827019c83a8e9ec2b5b56c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	case "$XBPS_TARGET_MACHINE" in

From ab66ca9029ed4590166191b52960bf5935962514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 1 Jul 2023 02:27:35 +0200
Subject: [PATCH 1609/1854] netavark: update to 1.7.0.

---
 srcpkgs/netavark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netavark/template b/srcpkgs/netavark/template
index 4bc741f29a5f..c4dd300f9366 100644
--- a/srcpkgs/netavark/template
+++ b/srcpkgs/netavark/template
@@ -1,6 +1,6 @@
 # Template file for 'netavark'
 pkgname=netavark
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=cargo
 hostmakedepends="mandown protobuf"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/netavark"
 changelog="https://raw.githubusercontent.com/containers/netavark/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/netavark/archive/refs/tags/v${version}.tar.gz"
-checksum=3bec9e9b0f3f8f857370900010fb2125ead462d43998ad8f43e4387a5b06f9d6
+checksum=b0ed7d80fd96ef2af88e7a001d91024919125e5842d9772de94648044630e116
 # needs unshare which cannot be used in CI
 make_check=ci-skip
 

From 560f79a6ae7238a55bce35c01afcad945186b3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 1 Jul 2023 02:27:41 +0200
Subject: [PATCH 1610/1854] aardvark-dns: update to 1.7.0.

---
 srcpkgs/aardvark-dns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aardvark-dns/template b/srcpkgs/aardvark-dns/template
index c4a47746f1f3..ab5e1737f06f 100644
--- a/srcpkgs/aardvark-dns/template
+++ b/srcpkgs/aardvark-dns/template
@@ -1,6 +1,6 @@
 # Template file for 'aardvark-dns'
 pkgname=aardvark-dns
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=cargo
 short_desc="Authoritative dns server for A/AAAA container records"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/aardvark-dns"
 changelog="https://raw.githubusercontent.com/containers/aardvark-dns/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/aardvark-dns/archive/refs/tags/v${version}.tar.gz"
-checksum=f3a2ff2d7baf07d8bf2785b6f1c9618db8aa188bd738b7f5cf1b0a31848232f5
+checksum=6ee7dfa8bab8040b917959a2f57f25496ad036a2d933c6225114e2c1e68bab0b
 
 post_install() {
 	vmkdir usr/libexec/podman

From 1cf85bd116e3d0d5866e5ed54b513a63d19bc65b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Apr 2023 19:13:48 -0300
Subject: [PATCH 1611/1854] arpack-ng: update to 3.9.0.

---
 srcpkgs/arpack-ng/patches/b3fe4ad7.patch | 518 +++++++++++++++++++++++
 srcpkgs/arpack-ng/template               |   7 +-
 srcpkgs/arpack-ng/update                 |   4 -
 3 files changed, 521 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/arpack-ng/patches/b3fe4ad7.patch
 delete mode 100644 srcpkgs/arpack-ng/update

diff --git a/srcpkgs/arpack-ng/patches/b3fe4ad7.patch b/srcpkgs/arpack-ng/patches/b3fe4ad7.patch
new file mode 100644
index 000000000000..b3ba91397ec4
--- /dev/null
+++ b/srcpkgs/arpack-ng/patches/b3fe4ad7.patch
@@ -0,0 +1,518 @@
+From b3fe4ad7fa875d192071972ee8523cbc149e8221 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= <szhorvat@gmail.com>
+Date: Sun, 9 Apr 2023 16:36:35 +0200
+Subject: [PATCH] fix: ensure that LAPACK RNG state is propagated
+
+ - fixes #401, #410, #411
+ - restores 'inits' variable removed in ce2e69a849da1d10dad5d6d3ec4db6120b3ecf50, ensuring that the RNG state is propagated
+ - reverts e0d67054f573da351f12a226f7c7cc65a690ef3d to ensure that seed is different on each parallel thread
+ - updates seed initialization of parallel pdgetv0/psgetv0 so that they match that of pzgetv0/pcgetv0
+---
+ PARPACK/SRC/MPI/pcgetv0.f | 48 +++++++++++++++++++++++----------------
+ PARPACK/SRC/MPI/pdgetv0.f | 40 ++++++++++++++++++++++++++------
+ PARPACK/SRC/MPI/psgetv0.f | 43 ++++++++++++++++++++++++++---------
+ PARPACK/SRC/MPI/pzgetv0.f | 48 +++++++++++++++++++++++----------------
+ SRC/cgetv0.f              | 21 ++++++++++++-----
+ SRC/dgetv0.f              | 21 ++++++++++++-----
+ SRC/sgetv0.f              | 21 ++++++++++++-----
+ SRC/zgetv0.f              | 21 ++++++++++++-----
+ 8 files changed, 183 insertions(+), 80 deletions(-)
+
+diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f
+index 59e3d1658..24fe8a0f1 100644
+--- a/PARPACK/SRC/MPI/pcgetv0.f
++++ b/PARPACK/SRC/MPI/pcgetv0.f
+@@ -176,13 +176,13 @@ subroutine pcgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Real
+      &           rnorm0
+       Complex
+      &           cnorm, cnorm2
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Complex
+      &           cnorm_buf, buf2(1)
+@@ -203,6 +203,12 @@ subroutine pcgetv0
+      &           ccdotc
+       external   ccdotc, pscnorm2, slapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -213,26 +219,30 @@ subroutine pcgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
++      if (inits) then
+ c
+-c     %-----------------------------------%
+-c     | Generate a seed on each processor |
+-c     | using process id (myid).          |
+-c     | Note: the seed must be between 1  |
+-c     | and 4095.  iseed(4) must be odd.  |
+-c     %-----------------------------------%
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
+ c
+-      call MPI_COMM_RANK(comm, myid, ierr)
+-      igen = 1000 + 2*myid + 1
+-      if (igen .gt. 4095) then
+-         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+-      end if
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
+ c
+-      iseed(1) = igen/1000
+-      igen     = mod(igen,1000)
+-      iseed(2) = igen/100
+-      igen     = mod(igen,100)
+-      iseed(3) = igen/10
+-      iseed(4) = 7
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f
+index 0f348b820..5a1956997 100644
+--- a/PARPACK/SRC/MPI/pdgetv0.f
++++ b/PARPACK/SRC/MPI/pdgetv0.f
+@@ -177,11 +177,11 @@ subroutine pdgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
+-      integer    idist, iseed(4), iter, msglvl, jj
++      logical    first, inits, orth
++      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Double precision
+      &           rnorm0, buf2(1)
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Double precision
+      &           rnorm_buf
+@@ -206,6 +206,12 @@ subroutine pdgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -216,10 +222,30 @@ subroutine pdgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++c
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
++c
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
++c
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f
+index d79a513b2..078e4fa8c 100644
+--- a/PARPACK/SRC/MPI/psgetv0.f
++++ b/PARPACK/SRC/MPI/psgetv0.f
+@@ -177,11 +177,11 @@ subroutine psgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
+-      integer    idist, iseed(4), iter, msglvl, jj
++      logical    first, inits, orth
++      integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Real
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Real
+      &           rnorm_buf
+@@ -206,20 +206,41 @@ subroutine psgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+ c
+ c
+-c     %-----------------------------------%
+-c     | Initialize the seed of the LAPACK |
+-c     | random number generator           |
+-c     %-----------------------------------%
++      if (inits) then
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
++c
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
++c
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f
+index 731fb319f..94fb705f3 100644
+--- a/PARPACK/SRC/MPI/pzgetv0.f
++++ b/PARPACK/SRC/MPI/pzgetv0.f
+@@ -176,13 +176,13 @@ subroutine pzgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj, myid, igen
+       Double precision
+      &           rnorm0
+       Complex*16
+      &           cnorm, cnorm2
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+       Complex*16
+      &           cnorm_buf, buf2(1)
+@@ -203,6 +203,12 @@ subroutine pzgetv0
+      &           zzdotc
+       external   zzdotc , pdznorm2 , dlapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -213,26 +219,30 @@ subroutine pzgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
++      if (inits) then
+ c
+-c     %-----------------------------------%
+-c     | Generate a seed on each processor |
+-c     | using process id (myid).          |
+-c     | Note: the seed must be between 1  |
+-c     | and 4095.  iseed(4) must be odd.  |
+-c     %-----------------------------------%
++c        %-----------------------------------%
++c        | Generate a seed on each processor |
++c        | using process id (myid).          |
++c        | Note: the seed must be between 1  |
++c        | and 4095.  iseed(4) must be odd.  |
++c        %-----------------------------------%
+ c
+-      call MPI_COMM_RANK(comm, myid, ierr)
+-      igen = 1000 + 2*myid + 1
+-      if (igen .gt. 4095) then
+-         write(0,*) 'Error in p_getv0: seed exceeds 4095!'
+-      end if
++         call MPI_COMM_RANK(comm, myid, ierr)
++         igen = 1000 + 2*myid + 1
++         if (igen .gt. 4095) then
++            write(0,*) 'Error in p_getv0: seed exceeds 4095!'
++         end if
++c
++         iseed(1) = igen/1000
++         igen     = mod(igen,1000)
++         iseed(2) = igen/100
++         igen     = mod(igen,100)
++         iseed(3) = igen/10
++         iseed(4) = mod(igen,10)
+ c
+-      iseed(1) = igen/1000
+-      igen     = mod(igen,1000)
+-      iseed(2) = igen/100
+-      igen     = mod(igen,100)
+-      iseed(3) = igen/10
+-      iseed(4) = 7
++         inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f
+index b49e66708..c231eadcb 100644
+--- a/SRC/cgetv0.f
++++ b/SRC/cgetv0.f
+@@ -156,13 +156,13 @@ subroutine cgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Real
+      &           rnorm0
+       Complex
+      &           cnorm
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -180,6 +180,12 @@ subroutine cgetv0
+      &           ccdotc
+       external   ccdotc, scnrm2, slapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -190,10 +196,13 @@ subroutine cgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f
+index 8be4fa26d..1d6dc01bd 100644
+--- a/SRC/dgetv0.f
++++ b/SRC/dgetv0.f
+@@ -157,11 +157,11 @@ subroutine dgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Double precision
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -183,6 +183,12 @@ subroutine dgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -193,10 +199,13 @@ subroutine dgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f
+index 26130a014..d861b2d6d 100644
+--- a/SRC/sgetv0.f
++++ b/SRC/sgetv0.f
+@@ -157,11 +157,11 @@ subroutine sgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Real
+      &           rnorm0
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -183,6 +183,12 @@ subroutine sgetv0
+ c
+       intrinsic    abs, sqrt
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -193,10 +199,13 @@ subroutine sgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
+diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f
+index cc13c3cfb..1fbd50851 100644
+--- a/SRC/zgetv0.f
++++ b/SRC/zgetv0.f
+@@ -156,13 +156,13 @@ subroutine zgetv0
+ c     | Local Scalars & Arrays |
+ c     %------------------------%
+ c
+-      logical    first, orth
++      logical    first, inits, orth
+       integer    idist, iseed(4), iter, msglvl, jj
+       Double precision
+      &           rnorm0
+       Complex*16
+      &           cnorm
+-      save       first, iseed, iter, msglvl, orth, rnorm0
++      save       first, iseed, inits, iter, msglvl, orth, rnorm0
+ c
+ c     %----------------------%
+ c     | External Subroutines |
+@@ -180,6 +180,12 @@ subroutine zgetv0
+      &           zzdotc
+       external   zzdotc, dznrm2, dlapy2
+ c
++c     %-----------------%
++c     | Data Statements |
++c     %-----------------%
++c
++      data       inits /.true./
++c
+ c     %-----------------------%
+ c     | Executable Statements |
+ c     %-----------------------%
+@@ -190,10 +196,13 @@ subroutine zgetv0
+ c     | random number generator           |
+ c     %-----------------------------------%
+ c
+-      iseed(1) = 1
+-      iseed(2) = 3
+-      iseed(3) = 5
+-      iseed(4) = 7
++      if (inits) then
++          iseed(1) = 1
++          iseed(2) = 3
++          iseed(3) = 5
++          iseed(4) = 7
++          inits = .false.
++      end if
+ c
+       if (ido .eq.  0) then
+ c
diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template
index 8a1098a62c39..82940ff2bdf9 100644
--- a/srcpkgs/arpack-ng/template
+++ b/srcpkgs/arpack-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'arpack-ng'
 pkgname=arpack-ng
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool gcc-fortran pkg-config"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/opencollab/arpack-ng"
 changelog="https://raw.githubusercontent.com/opencollab/arpack-ng/master/CHANGES"
 distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"
-checksum=ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d
+checksum=24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0
 
 # As of 2021-01-03 arpack-ng is only used by octave which includes openblas as
 # its BLAS implementation. So if openblas is available for XBPS_TARGET_MACHINE,
@@ -39,9 +39,8 @@ arpack-ng-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/include/arpack
+		vmove usr/include/arpack-ng
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/arpack-ng/update b/srcpkgs/arpack-ng/update
deleted file mode 100644
index b92bf49ef733..000000000000
--- a/srcpkgs/arpack-ng/update
+++ /dev/null
@@ -1,4 +0,0 @@
-# Regression causes failures in igraph. See:
-# https://github.com/igraph/igraph/issues/2311
-# https://github.com/opencollab/arpack-ng/issues/401
-ignore="3.9.0"

From b453fdb9fc19eaf5966f037f092be5fa43984eff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 2 Jul 2023 16:49:58 +0200
Subject: [PATCH 1612/1854] bluez: remove two year old INSTALL.msg

---
 srcpkgs/bluez/INSTALL.msg | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 srcpkgs/bluez/INSTALL.msg

diff --git a/srcpkgs/bluez/INSTALL.msg b/srcpkgs/bluez/INSTALL.msg
deleted file mode 100644
index 349f14710bec..000000000000
--- a/srcpkgs/bluez/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING: if bluez 5.59 had audio issues for you, removing the
-/var/lib/bluetooth directory might be necessary to completely restore
-functionality.
-
-For more information, see https://github.com/bluez/bluez/issues/157

From 006c4cccace6031b063cafebe38bc14c8d305886 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 18:51:19 +0200
Subject: [PATCH 1613/1854] ansifilter: add changelog

---
 srcpkgs/ansifilter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ansifilter/template b/srcpkgs/ansifilter/template
index 758c50e65743..a24d47217f23 100644
--- a/srcpkgs/ansifilter/template
+++ b/srcpkgs/ansifilter/template
@@ -1,11 +1,12 @@
 # Template file for 'ansifilter'
 pkgname=ansifilter
 version=2.20
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="Remove or convert ANSI codes to another format"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://gitlab.com/saalen/ansifilter"
+changelog="https://gitlab.com/saalen/ansifilter/-/raw/master/ChangeLog.adoc"
 distfiles="https://gitlab.com/saalen/ansifilter/-/archive/${version}/ansifilter-${version}.tar.gz"
 checksum=96aad3c95113e921ab912b63152471e5b532a54ecfe90d8c86b2c9127c3aa39b

From 539694c133071a9fc443f5a5816efcdc083f5e23 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 19:14:55 +0200
Subject: [PATCH 1614/1854] poedit: update to 3.3.2.

---
 srcpkgs/poedit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 4385b532d247..c346c96b12c6 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,6 +1,6 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=3.3
+version=3.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -12,8 +12,9 @@ short_desc="Cross-platform gettext catalogs (.po files) editor"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
+changelog="https://raw.githubusercontent.com/vslavik/poedit/master/NEWS"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=47b608e192a36e10b117da3edc4c684795f4ec10a94846fc5d66395ee1cc2d27
+checksum=e64139dd4beac1b8ea468d351b2b4bdae8ecbc6f4ca5d1ee1c73832036fff097
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
 

From c18c8210c09b52a5d4c699ef22e60b681cd98c63 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Sun, 2 Jul 2023 09:16:33 +0200
Subject: [PATCH 1615/1854] pyradio: update to 0.9.2.12.

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 8b9ad44e1f18..3a6e9fdc8882 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.9.2.11
+version=0.9.2.12
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=fe715119a7341e4f940e3edd854ef2e41285773a9086c6bff611be821e452bcd
+checksum=e34f32e9f0299a7776e9f709f1f116932ca41dc36251e7312b4899b4892a7975
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 1d52dadd66921c39948a5733b301a4169a340951 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:33:29 +0200
Subject: [PATCH 1616/1854] font-mutt-misc: update to 1.0.4.

---
 srcpkgs/font-mutt-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template
index ab1735f89a10..7c277409a9a0 100644
--- a/srcpkgs/font-mutt-misc/template
+++ b/srcpkgs/font-mutt-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-mutt-misc'
 pkgname=font-mutt-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=fcecbfc475dfe5826d137f8edc623ba27d58d32f069165c248a013b3c566bb59
+checksum=9a9bc19088c6c9456c567e8f54d7a8e5e96b0d085066d9dcfe3ac8d898dd7c03
 font_dirs="/usr/share/fonts/X11/misc"
 
 post_install() {

From 2acc7583dc5b508418b138192215b4e228f83f6f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:33:11 +0200
Subject: [PATCH 1617/1854] font-jis-misc: update to 1.0.4.

---
 srcpkgs/font-jis-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-jis-misc/template b/srcpkgs/font-jis-misc/template
index f3c1c652e4d0..2183f538ddb6 100644
--- a/srcpkgs/font-jis-misc/template
+++ b/srcpkgs/font-jis-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-jis-misc'
 pkgname=font-jis-misc
-version=1.0.3
-revision=5
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=57c2db8824865117287d57d47f2c8cf4b2842d036c7475534b5054be69690c73
+checksum=7ab270255b27061003058ccbfc775d0813d17dca7aa8e07bdccb728f1b713984
 font_dirs="/usr/share/fonts/X11/misc"
 
 

From 034d91d8cb022b911bcdd403ddda8c14dd3fc4e1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:32:49 +0200
Subject: [PATCH 1618/1854] font-isas-misc: update to 1.0.4.

---
 srcpkgs/font-isas-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template
index cdd4b235f7fc..20b37ec73e94 100644
--- a/srcpkgs/font-isas-misc/template
+++ b/srcpkgs/font-isas-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-isas-misc'
 pkgname=font-isas-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=493965263070a5ee2a301dfdb2e87c1ca3c00c7882bfb3dd99368565ba558ff5
+checksum=711a648206f0d7f4a8c3fa61b4b4703e789f37603937b488a6edd7c71182f7d5
 font_dirs="/usr/share/fonts/X11/misc"
 
 post_install() {

From c0f4412d53f1d09a9dc93e38e00f331b69f663ef Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:32:26 +0200
Subject: [PATCH 1619/1854] font-bitstream-type1: update to 1.0.4.

---
 srcpkgs/font-bitstream-type1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template
index 82a18792bbf8..1f5539c71358 100644
--- a/srcpkgs/font-bitstream-type1/template
+++ b/srcpkgs/font-bitstream-type1/template
@@ -1,7 +1,7 @@
 # Template file for 'font-bitstream-type1'
 pkgname=font-bitstream-type1
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=3399b7586c18be509cdaeceeebf754b861faa1d8799dda1aae01aeb2a7a30f01
+checksum=3827eef5d8482e956c9cbe412aab03c067f844bff50470add52bdac298f0e4c7
 font_dirs="/usr/share/fonts/X11/Type1"
 
 post_install() {

From 6f0d42abbeaf0dfc861f433af523f9f920657074 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 18:31:45 +0200
Subject: [PATCH 1620/1854] font-misc-misc: update to 1.1.3.

---
 srcpkgs/font-misc-misc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template
index 7f9b85edc86f..998f1a212213 100644
--- a/srcpkgs/font-misc-misc/template
+++ b/srcpkgs/font-misc-misc/template
@@ -1,7 +1,7 @@
 # Template file for 'font-misc-misc'
 pkgname=font-misc-misc
-version=1.1.2
-revision=7
+version=1.1.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf font-util"
 makedepends="font-util"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
-checksum=46142c876e176036c61c0c24c0a689079704d5ca5b510d48c025861ee2dbf829
+checksum=bece4a9482b3cb6f7fad2164fd3b394d22dfe1ad2f96f60030a703bcff30f5a5
 font_dirs="/usr/share/fonts/X11/misc"
 
 post_install() {

From 4c4fecd86dfc7aa6d284cd06a435df869c5224cc Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 2 Jul 2023 18:35:38 +0900
Subject: [PATCH 1621/1854] lifelines: fix build on musl

---
 srcpkgs/lifelines/patches/fix-musl.patch | 15 +++++++++++++++
 srcpkgs/lifelines/template               |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lifelines/patches/fix-musl.patch

diff --git a/srcpkgs/lifelines/patches/fix-musl.patch b/srcpkgs/lifelines/patches/fix-musl.patch
new file mode 100644
index 000000000000..e17f69e2da0a
--- /dev/null
+++ b/srcpkgs/lifelines/patches/fix-musl.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gedlib/locales.c b/src/gedlib/locales.c
+index fb3badca27..c6a73b3fc7 100644
+--- a/src/gedlib/locales.c
++++ b/src/gedlib/locales.c
+@@ -414,8 +414,10 @@ notify_gettext_language_changed (void)
+ #if  WIN32_INTL_SHIM
+ 	gt_notify_language_change();
+ #else
++#ifdef __GLIBC__
+ 	extern int _nl_msg_cat_cntr;
+ 	++_nl_msg_cat_cntr;
++#endif
+ #endif
+ #endif
+ }
diff --git a/srcpkgs/lifelines/template b/srcpkgs/lifelines/template
index b8f42c2e3431..1a2353a0f4d0 100644
--- a/srcpkgs/lifelines/template
+++ b/srcpkgs/lifelines/template
@@ -5,13 +5,13 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
 makedepends="ncurses-devel"
-archs="~*-musl" # For no reason except it keeps failing
 short_desc="Genealogy Software System"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lifelines/lifelines"
 distfiles="https://github.com/lifelines/lifelines/releases/download/${version}/lifelines-${version}.tar.gz"
 checksum=083007f81e406fce15931e5a29a7ba0380ef0b3b9c61d5eb5228ad378c7f332d
+make_check=no # times out
 
 post_install() {
 	vlicense LICENSE

From 57d05d3196ac56adea000be8e4803b0fe0668551 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 2 Jul 2023 20:07:22 +0200
Subject: [PATCH 1622/1854] iana-etc: update to 20230629.

---
 srcpkgs/iana-etc/files/protocols | 2 +-
 srcpkgs/iana-etc/files/services  | 7 +++++++
 srcpkgs/iana-etc/template        | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iana-etc/files/protocols b/srcpkgs/iana-etc/files/protocols
index ed52330ca2ae..1adb889b46df 100644
--- a/srcpkgs/iana-etc/files/protocols
+++ b/srcpkgs/iana-etc/files/protocols
@@ -77,7 +77,6 @@ iso-ip        80 ISO-IP
 vmtp          81 VMTP
 secure-vmtp   82 SECURE-VMTP
 vines         83 VINES
-ttp           84 TTP
 iptm          84 IPTM
 nsfnet-igp    85 NSFNET-IGP
 dgp           86 DGP
@@ -133,4 +132,5 @@ wesp         141 WESP
 rohc         142 ROHC
 ethernet     143 Ethernet
 aggfrag      144 AGGFRAG
+nsh          145 NSH
 reserved     255 Reserved
diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 85155a5a5735..1272f9185cb1 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -1364,6 +1364,8 @@ apex-mesh         912/tcp
 apex-mesh         912/udp
 apex-edge         913/tcp
 apex-edge         913/udp
+rift-lies         914/udp
+rift-ties         915/udp
 rndc              953/tcp
 ftps-data         989/tcp
 ftps-data         989/udp
@@ -3846,6 +3848,8 @@ simple-tx-rx     2257/tcp
 simple-tx-rx     2257/udp
 rcts             2258/tcp
 rcts             2258/udp
+bid-serv         2259/tcp
+bid-serv         2259/udp
 apc-2260         2260/tcp
 apc-2260         2260/udp
 comotionmaster   2261/tcp
@@ -4064,6 +4068,8 @@ service-ctrl     2367/tcp
 service-ctrl     2367/udp
 opentable        2368/tcp
 opentable        2368/udp
+bif-p2p          2369/tcp
+bif-p2p          2369/udp
 l3-hbmon         2370/tcp
 l3-hbmon         2370/udp
 rda              2371/tcp
@@ -10750,6 +10756,7 @@ dsmcc-download  13821/udp
 dsmcc-ccp       13822/tcp
 dsmcc-ccp       13822/udp
 bmdss           13823/tcp
+a-trust-rpc     13832/tcp
 ucontrol        13894/tcp
 ucontrol        13894/udp
 dta-systems     13929/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index ad5430ac07dc..ad2d10630f09 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,7 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
 reverts="202001016_1"
-version=20230104
+version=20230629
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From a7cd087b094346a87f1e9e801c5c8cbbb1785330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 2 Jul 2023 10:20:38 +0100
Subject: [PATCH 1623/1854] SDL2: update to 2.28.1.

---
 srcpkgs/SDL2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index d8fb73d1dd1a..690b04523129 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.26.5
+version=2.28.1
 revision=1
 build_style=cmake
 configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF
@@ -15,7 +15,7 @@ license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz"
-checksum=ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7
+checksum=4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

From ca27581398c591e24750cb36012dd61e930928a8 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sun, 2 Jul 2023 17:33:25 +0200
Subject: [PATCH 1624/1854] stockfish: update to 16

---
 .../patches/makefile-nnue-download.patch      | 40 -------------------
 srcpkgs/stockfish/patches/makefile.patch      | 10 +++--
 srcpkgs/stockfish/template                    |  8 ++--
 3 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/stockfish/patches/makefile-nnue-download.patch

diff --git a/srcpkgs/stockfish/patches/makefile-nnue-download.patch b/srcpkgs/stockfish/patches/makefile-nnue-download.patch
deleted file mode 100644
index 55a38c51ec11..000000000000
--- a/srcpkgs/stockfish/patches/makefile-nnue-download.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 61ea1534ff7026009a3435575c7beee91534db83 Mon Sep 17 00:00:00 2001
-From: Joost VandeVondele <Joost.VandeVondele@gmail.com>
-Date: Mon, 19 Dec 2022 17:54:36 +0100
-Subject: [PATCH] No error if net available but wget/curl missing
-
-do not error out on missing wget/curl if these tools are not needed later on,
-i.e. if the net is available already.
-
-closes https://github.com/official-stockfish/Stockfish/pull/4291
-closes https://github.com/official-stockfish/Stockfish/pull/4253
-
-No functional change
----
- src/Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index da81ceb4a0..bcf0abdf5e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -853,7 +853,7 @@ net:
- 	$(eval nnuedownloadurl2 := https://github.com/official-stockfish/networks/raw/master/$(nnuenet))
- 	$(eval curl_or_wget := $(shell if hash curl 2>/dev/null; then echo "curl -skL"; elif hash wget 2>/dev/null; then echo "wget -qO-"; fi))
- 	@if [ "x$(curl_or_wget)" = "x" ]; then \
--	    echo "Automatic download failed: neither curl nor wget is installed. Install one of these tools or download the net manually"; exit 1; \
-+	    echo "Neither curl nor wget is installed. Install one of these tools unless the net has been downloaded manually"; \
-         fi
- 	$(eval shasum_command := $(shell if hash shasum 2>/dev/null; then echo "shasum -a 256 "; elif hash sha256sum 2>/dev/null; then echo "sha256sum "; fi))
- 	@if [ "x$(shasum_command)" = "x" ]; then \
-@@ -864,7 +864,9 @@ net:
- 	      echo "$(nnuenet) available."; \
- 	   else \
- 	      if [ "x$(curl_or_wget)" != "x" ]; then \
--	         echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\
-+                 echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\
-+              else \
-+                 echo "No net found and download not possible"; exit 1;\
- 	      fi; \
- 	   fi; \
- 	   if [ "x$(shasum_command)" != "x" ]; then \
diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch
index 87aa039c722f..62b436ed5fd3 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,10 +1,11 @@
---- a/src/Makefile	2022-12-04 14:17:15.000000000 +0100
-+++ b/src/Makefile	2022-12-05 16:52:13.648959706 +0100
-@@ -366,27 +366,5 @@ endif
+--- a/src/Makefile	2023-07-02 17:28:33.297238434 +0200
++++ b/src/Makefile	2023-07-02 17:28:50.820207636 +0200
+@@ -377,29 +377,7 @@
+ 
  ifeq ($(COMP),gcc)
  	comp=gcc
 -	CXX=g++
- 	CXXFLAGS += -pedantic -Wextra -Wshadow
+ 	CXXFLAGS += -pedantic -Wextra -Wshadow -Wmissing-declarations
 -
 -	ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64))
 -		ifeq ($(OS),Android)
@@ -28,3 +29,4 @@
 -	endif
  endif
  
+ ifeq ($(target_windows),yes)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index c04e296027f5..363603f83d5a 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=15.1
+version=16
 revision=1
-_net_file=nn-ad9b42354671.nnue
+_net_file=nn-5af11540bbfe.nnue
 build_wrksrc=src
 build_style=gnu-makefile
 make_build_target=build
@@ -14,8 +14,8 @@ license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="d4272657905319328294355973faee40a8c28e3eecb0e7b266ed34ff33383b76
- ad9b423546714137916bd38978af6fd68d7b8951bef25ff76bf43da72d6cb786"
+checksum="a1600ebdaf4e324ba3e10cec2e0c9a810dc64c6f0db5cc955b2fd5e1eefa1cc6
+ 5af11540bbfefcb54e38c5dd000cab4b469dfa7599a1d55be5d2722c20a8929b"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From 4705113273ce05990dca8a9e8fe7826e391efa2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:36:38 +0100
Subject: [PATCH 1625/1854] imath: update to 3.1.9.

---
 common/shlibs          | 2 +-
 srcpkgs/imath/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ef71bae3f9a7..4e6a5a663fa0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4259,7 +4259,7 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
-libImath-3_1.so.30 imath-3.1.7_1
+libImath-3_1.so.29 imath-3.1.9_1
 libIex-3_1.so.30 libopenexr-3.1.5_1
 libIlmThread-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
index ee47207a3e51..e43f1a707562 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
 # Template file for 'imath'
 pkgname=imath
-version=3.1.7
-revision=2
+version=3.1.9
+revision=1
 build_style=cmake
 configure_args="-DPYTHON=ON"
 hostmakedepends="python3-numpy"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://imath.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
 distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/imath-${version}.tar.gz"
-checksum=bff1fa140f4af0e7f02c6cb78d41b9a7d5508e6bcdfda3a583e35460eb6d4b47
+checksum=f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

From c897d2c9b83b39fe9f5e078c14adc0dd621bfee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:57 +0100
Subject: [PATCH 1626/1854] alembic: revbump for imath 3.1.9.

---
 srcpkgs/alembic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index d075ec686ddc..53ff7d48719f 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,7 +1,7 @@
 # Template file for 'alembic'
 pkgname=alembic
 version=1.8.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="zlib-devel imath-devel"

From 8a21f8302cd2fd7cf2c9cbd5047e7fad571b7794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:58 +0100
Subject: [PATCH 1627/1854] blender: revbump for imath 3.1.9.

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index ec724bb0a6dc..7a710ac0df49 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.5.1
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 75f5f945db37c768af9e4f1c989ade5267a1c4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:59 +0100
Subject: [PATCH 1628/1854] darktable: revbump for imath 3.1.9.

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2da30286a3a6..bf6137d46870 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.2.1
-revision=5
+revision=6
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From f61e58cd5b001a696e240db7f44d7ba6cb2bfdc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:59 +0100
Subject: [PATCH 1629/1854] Field3D: revbump for imath 3.1.9.

---
 srcpkgs/Field3D/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 6e4a351327ae..9c6c0e0872ee 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=7
+revision=8
 build_style=cmake
 makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"

From 7bae0842bc2721bdc7944ea55479f940152d737b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:37:59 +0100
Subject: [PATCH 1630/1854] gmic: revbump for imath 3.1.9.

---
 srcpkgs/gmic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 24a9c7218fdf..0bb4034d5cc8 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=3
+revision=4
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 3247798aea47ee4affff18b67e8132491a79191c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:00 +0100
Subject: [PATCH 1631/1854] hugin: revbump for imath 3.1.9.

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 19cee114c73a..52b56a2c4102 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 603a16c0b7adaa550cfe825cc1f76f77f45b84f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:00 +0100
Subject: [PATCH 1632/1854] kimageformats: revbump for imath 3.1.9.

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 364ad440219e..8b4d971133fa 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.107.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From ca1b8fff8a4ec313e155e8e8f1167c37b737721a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:01 +0100
Subject: [PATCH 1633/1854] libgdal: revbump for imath 3.1.9.

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 1aef0fd69a4e..53425db44746 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=7
+revision=8
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From d21aca89b2bdf92a9759a08969f0d49733f13fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:01 +0100
Subject: [PATCH 1634/1854] opencolorio: revbump for imath 3.1.9.

---
 srcpkgs/opencolorio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 4679a10653d2..defdf8a7acad 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,7 +1,7 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
 version=2.1.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DCMAKE_CONFIGURATION_TYPES=None
  -DOCIO_INSTALL_EXT_PACKAGES=NONE

From 2515a9edbc84567bb644ffc07f00731d6d421ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:02 +0100
Subject: [PATCH 1635/1854] openimageio: revbump for imath 3.1.9.

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index c2d36b4b3539..0e9e22e9685d 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From df2319be5544b6d6ae121ff71abce84ab718c3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:03 +0100
Subject: [PATCH 1636/1854] synfig: revbump for imath 3.1.9.

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 5f5f5bb3f4b2..30109541ec4f 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From b04bb26e6bf86fcb9520c6568327c25839ca73d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:03 +0100
Subject: [PATCH 1637/1854] synfigstudio: revbump for imath 3.1.9.

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 91349169ed2b..af1c5a296ef0 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From ca0439cc06bfa1d2d43dece78f8b20738a49595d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 6 Jun 2023 17:38:03 +0100
Subject: [PATCH 1638/1854] vigra: revbump for imath 3.1.9.

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 950afc974309..0ed638bcd990 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=10
+revision=11
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From 10df9ee7b3dd68685bae4062b498008c9c4caead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 28 Jun 2023 15:43:45 +0100
Subject: [PATCH 1639/1854] calligra: revbump for imath 3.1.9.

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 38d7984727af..29a1f0a7716a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=14
+revision=15
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From bddd7bf95d057f595183a4e92afba4b880d8a0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 28 Jun 2023 15:44:02 +0100
Subject: [PATCH 1640/1854] krita: revbump for imath 3.1.9.

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b39dffdd1135..8280590f39ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=7
+revision=8
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 55aba3081dcb3e50faab4933265751bc364bbf7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 28 Jun 2023 15:44:36 +0100
Subject: [PATCH 1641/1854] openexr: update to 3.1.9.

---
 srcpkgs/openexr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b15bfb736f72..a44453df30ec 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,6 +1,6 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.7
+version=3.1.9
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -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=78dbca39115a1c526e6728588753955ee75fa7f5bb1a6e238bed5b6d66f91fd7
+checksum=103e902d3902800ab07b5f3a298be7afd2755312737b2cdbfa01326ff99dac07
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

From d97e6fb01e420d77531671208dc18928ef600dca Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Thu, 29 Jun 2023 20:42:35 +0900
Subject: [PATCH 1642/1854] systemtap: update to 4.9.

---
 srcpkgs/systemtap/patches/fix-musl.patch | 127 +++++++++++++++++++++++
 srcpkgs/systemtap/template               |  16 ++-
 2 files changed, 139 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/systemtap/patches/fix-musl.patch

diff --git a/srcpkgs/systemtap/patches/fix-musl.patch b/srcpkgs/systemtap/patches/fix-musl.patch
new file mode 100644
index 000000000000..9d1039100c3b
--- /dev/null
+++ b/srcpkgs/systemtap/patches/fix-musl.patch
@@ -0,0 +1,127 @@
+diff --git a/buildrun.cxx b/buildrun.cxx
+index 0048d07..904ce47 100644
+--- a/buildrun.cxx
++++ b/buildrun.cxx
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/resource.h>
++#include "gnu_basename.h"
+ }
+ 
+ // A bit of obfuscation for Gentoo's sake.
+@@ -943,7 +944,7 @@ make_kernel_run_command (systemtap_session& s, const string& remotedir,
+           if (remotedir.empty())
+             opt_u.append(s.uprobes_path);
+           else
+-            opt_u.append(remotedir + "/" + basename(s.uprobes_path.c_str()));
++            opt_u.append(remotedir + "/" + gnu_basename(s.uprobes_path.c_str()));
+         }
+       cmd.push_back(opt_u);
+     }
+diff --git a/client-http.cxx b/client-http.cxx
+index fca7362..d6096b9 100644
+--- a/client-http.cxx
++++ b/client-http.cxx
+@@ -38,6 +38,7 @@ extern "C" {
+ #include <elfutils/libdw.h>
+ #include <fcntl.h>
+ #include <nss3/nss.h>
++#include <paths.h>
+ 
+ #ifdef HAVE_RPMCRYPTO_H
+ #include <rpm/rpmcrypto.h>
+@@ -1016,7 +1017,7 @@ http_client_backend::include_file_or_directory (const string &subdir,
+ 
+   // Canonicalize the given path and remove the leading /.
+   string rpath;
+-  char *cpath = canonicalize_file_name (path.c_str ());
++  char *cpath = realpath (path.c_str (), NULL);
+   if (! cpath)
+     {
+       // It can not be canonicalized. Use the name relative to
+diff --git a/client-nss.cxx b/client-nss.cxx
+index 55266fe..a775ed1 100644
+--- a/client-nss.cxx
++++ b/client-nss.cxx
+@@ -576,7 +576,7 @@ nss_client_backend::include_file_or_directory (const string &subdir,
+ 
+   // Canonicalize the given path and remove the leading /.
+   string rpath;
+-  char *cpath = canonicalize_file_name (path.c_str ());
++  char *cpath = realpath (path.c_str (), NULL);
+   if (! cpath)
+     {
+       // It can not be canonicalized. Use the name relative to
+diff --git a/gnu_basename.h b/gnu_basename.h
+new file mode 100644
+index 0000000..dce5f19
+--- /dev/null
++++ b/gnu_basename.h
+@@ -0,0 +1,12 @@
++#ifndef GNU_BASENAME_H
++#define GNU_BASENAME_H
++
++#include <string.h>
++
++#if defined(__GLIBC__)
++#define gnu_basename(src) basename(src)
++#else
++#define gnu_basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
++#endif
++
++#endif
+diff --git a/remote.cxx b/remote.cxx
+index bffeaa9..bd6c7c4 100644
+--- a/remote.cxx
++++ b/remote.cxx
+@@ -16,6 +16,7 @@ extern "C" {
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include "gnu_basename.h"
+ }
+ 
+ #include <cstdio>
+@@ -472,7 +473,7 @@ class stapsh : public remote {
+ 
+         if (!s->uprobes_path.empty())
+           {
+-            string remoteuprobes = basename(s->uprobes_path.c_str());
++            string remoteuprobes = gnu_basename(s->uprobes_path.c_str());
+             if ((rc = send_file(s->uprobes_path, remoteuprobes)))
+               return rc;
+ 
+diff --git a/session.cxx b/session.cxx
+index a22baab..77eedf9 100644
+--- a/session.cxx
++++ b/session.cxx
+@@ -42,6 +42,7 @@ extern "C" {
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <wordexp.h>
++#include <paths.h>
+ }
+ 
+ #if HAVE_NSS
+@@ -1537,7 +1538,7 @@ systemtap_session::parse_cmdline (int argc, char * const argv [])
+ 	  } else {
+ 	      char *spath;
+ 	      assert(optarg);
+-	      spath = canonicalize_file_name (optarg);
++	      spath = realpath (optarg, NULL);
+ 	      if (spath == NULL) {
+ 		  cerr << _F("ERROR: %s is an invalid directory for --sysroot", optarg) << endl;
+ 		  return 1;
+diff --git a/util.h b/util.h
+index c708aa6..ef4a6fe 100644
+--- a/util.h
++++ b/util.h
+@@ -27,6 +27,7 @@ extern "C" {
+ #include <spawn.h>
+ #include <assert.h>
+ #include <poll.h>
++#include <unistd.h>
+ }
+ 
+ // Sanity check C++11 support.  We're only requiring GCC 4.4's level of
diff --git a/srcpkgs/systemtap/template b/srcpkgs/systemtap/template
index 8441d545c435..0c4bc2ebcaa3 100644
--- a/srcpkgs/systemtap/template
+++ b/srcpkgs/systemtap/template
@@ -1,8 +1,7 @@
 # Template file for 'systemtap'
 pkgname=systemtap
-version=4.5
+version=4.9
 revision=1
-archs="i686 x86_64 armv6l armv7l aarch64 ppc64le"
 build_style=gnu-configure
 hostmakedepends="python3"
 makedepends="elfutils-devel"
@@ -12,10 +11,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/systemtap/"
 distfiles="https://sourceware.org/pub/systemtap/releases/systemtap-${version}.tar.gz"
-checksum=75078ed37e0dd2a769c9d1f9394170b2d9f4d7daa425f43ca80c13bad6cfc925
+checksum=d01033baea9d0af52a65e70167816931f4b856427a53ff2ab30e4b45f6ad3a98
 python_version=3
 CFLAGS=-Wno-error
-CXXFLAGS=-Wno-error
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-obstack-devel"
+	CFLAGS+=" -DFNM_EXTMATCH=0"
+	CFLAGS+=" -DFTW_ACTIONRETVAL=16 -DFTW_CONTINUE=0 -DFTW_SKIP_SUBTREE=2"
+	CFLAGS+=" -D__off_t=off_t -D__uint32_t=uint32_t -D__uint64_t=uint64_t"
+	CXXFLAGS=-fpermissive
+fi
+
+CXXFLAGS+=" $CFLAGS"
 
 systemtap-devel_package() {
 	depends="systemtap-${version}_${revision}"

From 386a27b020810d6f956b606181e4bafa7f592b72 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 10:42:28 +0200
Subject: [PATCH 1643/1854] docker-compose: update to 2.19.1.

---
 srcpkgs/docker-compose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 280cca8333d0..50bb23bdb186 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=2.19.0
-revision=2
+version=2.19.1
+revision=1
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 changelog="https://github.com/docker/compose/releases"
 distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=0be3fd713ef84985f63d76de4c58451401aed1dfbeb235127dd77a57d1890996
+checksum=869d4ffd3f6b6835dcbb5cd627e98a9d2f1d30a9ae2c8e712275db9aa3e6e97d
 
 post_install() {
 	vmkdir usr/libexec/docker/cli-plugins

From 75857ff5503d58a2d66df490002c2f9d59cefe76 Mon Sep 17 00:00:00 2001
From: lzcoder <lzcoder@proton.me>
Date: Thu, 29 Jun 2023 14:30:41 -0300
Subject: [PATCH 1644/1854] grub-btrfs: update to 4.13.

---
 srcpkgs/grub-btrfs/patches/no-root-please.patch | 16 +++++++---------
 srcpkgs/grub-btrfs/template                     |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/grub-btrfs/patches/no-root-please.patch b/srcpkgs/grub-btrfs/patches/no-root-please.patch
index 4e0a32803fd1..85349efeb891 100644
--- a/srcpkgs/grub-btrfs/patches/no-root-please.patch
+++ b/srcpkgs/grub-btrfs/patches/no-root-please.patch
@@ -1,15 +1,13 @@
-Index: grub-btrfs-4.9/Makefile
-===================================================================
---- grub-btrfs-4.9.orig/Makefile
-+++ grub-btrfs-4.9/Makefile
-@@ -9,10 +9,6 @@ LIB_DIR = $(DESTDIR)$(PREFIX)/lib
- .PHONY: install uninstall help
+--- a/Makefile
++++ b/Makefile
+@@ -22,10 +22,6 @@
+ .PHONY: install uninstall clean help
  
  install:
 -	@if test "$(shell id -u)" != 0; then \
 -		echo "You are not root, run this target as root please."; \
 -		exit 1; \
 -	fi
- 	@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
- 	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
- 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
+ 	@echo "					     	   Installing "
+ 	@echo
+ 	@echo "       ::::::::  :::::::::  :::    ::: :::::::::               ::::::::: ::::::::::: :::::::::  :::::::::: ::::::::      "
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 9579e0a51e0e..c74ab5d04845 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.10.1
+version=4.13
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -8,8 +8,8 @@ short_desc="Include btrfs snapshots at Grub menu"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
-distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=3ef53f16a7bc0fdd5a5ac2216a41bf1b2f4fd2283717c5c240415d5d24d3734b
+distfiles="https://github.com/Antynea/grub-btrfs/archive/${version}.tar.gz"
+checksum=c493d0d5a6548c01993641ce586c98d461cabe40df4dff79d974d0c59068ff1d
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

From 04c755ac870cc1421369d6c7dcd92fcdc392c2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=2E=20C=2E=20Moreira?=
 <andrelcmoreira@disroot.org>
Date: Sun, 2 Jul 2023 23:29:54 -0300
Subject: [PATCH 1645/1854] newsboat: update to 2.32

---
 srcpkgs/newsboat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 45d0b355d5ed..463709feec91 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.31
+version=2.32
 revision=1
 build_style=configure
 build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=4baf7de25cf569924eebb63a5ddc467cd58dd3f0e7190b327b49d0c1e454c1da
+checksum=5b63514572a21e93f4dd3dd6c58f44fdbd9c9e6c6f978329a4766aabb13be6e6
 python_version=3
 
 # tests fail when run by superuser

From f3ed5bce00586d2577009ab6a6b3335c191343b4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Jul 2023 13:09:42 +0200
Subject: [PATCH 1646/1854] elixir: update to 1.15.2.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 2b1bb9af0130..9a829fef2e05 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.15.1
+version=1.15.2
 revision=1
 build_style=gnu-makefile
 make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
@@ -17,7 +17,7 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=cf89434f4cf7477b929c56e16ae22bf08e64101a144911d2834a2f3c9b3ae40f
+checksum=3cfadca57c3092ccbd3ec3f17e5eab529bbd2946f50e4941a903c55c39e3c5f5
 
 post_patch() {
 	# XXX: find a better solution

From 3a9272e7c24b3855405b23eb6d80551ea0c151eb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Jun 2023 13:01:17 +0530
Subject: [PATCH 1647/1854] lets: update to 0.0.52.

Closes: #44802 [via git-merge-pr]
---
 srcpkgs/lets/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index b4aa4171993c..0be733e685f3 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,16 +1,16 @@
 # Template file for 'lets'
 pkgname=lets
-version=0.0.50
-revision=2
+version=0.0.52
+revision=1
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"
 short_desc="CLI task runner for developers - a better alternative to make"
-maintainer="juan <juan@horlux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://lets-cli.org/"
 distfiles="https://github.com/lets-cli/lets/archive/refs/tags/v${version}.tar.gz"
-checksum=8c2cd55d7e2432dac0b89941125f2a83ce03a89ff36adcc52dd75896919376d8
+checksum=478a97dab8123b7bd5555502ae53146f05e44bbdc11cee87b69a53c1bf7c796c
 
 post_install() {
 	vlicense LICENSE

From 09f03472443d6e149eb7337b9403fbd6082500e2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Jul 2023 13:10:48 +0200
Subject: [PATCH 1648/1854] srcpkgs: orphan never updated packages

---
 srcpkgs/firehol/template        | 2 +-
 srcpkgs/podman-compose/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firehol/template b/srcpkgs/firehol/template
index 228584e4780b..52fe7ac2e783 100644
--- a/srcpkgs/firehol/template
+++ b/srcpkgs/firehol/template
@@ -7,7 +7,7 @@ configure_args="--disable-doc --disable-man"
 hostmakedepends="automake iproute2 kmod procps-ng iprange iputils traceroute curl ipset tar"
 depends="iproute2 kmod procps-ng iprange iputils traceroute curl ipset"
 short_desc="Firewall for humans"
-maintainer="juan <juan@horlux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/firehol/firehol/"
 distfiles="https://github.com/firehol/firehol/archive/v${version}.tar.gz"
diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 205691f08dcb..1902d68f1b33 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="podman python3-yaml python3-dotenv"
 short_desc="Script to run docker-compose.yml using podman"
-maintainer="juan <juan@horlux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"

From bd010f78d4087c2f88f29b0d134f1c6910f2b9ac Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 11:34:48 +0200
Subject: [PATCH 1649/1854] pnpm: update to 8.6.5, fix update-check

Closes: #44809 [via git-merge-pr]
---
 srcpkgs/pnpm/template | 6 +++---
 srcpkgs/pnpm/update   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pnpm/update

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 09d40e5b7124..516c1921b399 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,16 +1,16 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=8.6.2
+version=8.6.5
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
 depends="nodejs"
 short_desc="Fast, disk space efficient package manager"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pnpm.io/"
 distfiles="https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"
-checksum=c6da9e00697e334b6193c034a5d1508e4c8605b12f249736b13f31139f4f0d73
+checksum=91dd45b4762c73f58f354999867854fcbe7376235474d131080fe391f2eb5227
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/pnpm/update b/srcpkgs/pnpm/update
new file mode 100644
index 000000000000..839b3fac2ecc
--- /dev/null
+++ b/srcpkgs/pnpm/update
@@ -0,0 +1,2 @@
+site=https://github.com/pnpm/pnpm/tags
+pattern='/tags/v\K[\d.]+(?=.tar.gz)'

From 73f555056b9328652c2275305f73e90912146717 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Jul 2023 13:18:36 +0200
Subject: [PATCH 1650/1854] srcpkgs: orphan packages

---
 srcpkgs/blanket/template           | 2 +-
 srcpkgs/ddgtk/template             | 2 +-
 srcpkgs/ekushey-fonts-ttf/template | 2 +-
 srcpkgs/ibus-m17n/template         | 2 +-
 srcpkgs/textadept/template         | 2 +-
 srcpkgs/xdgmenumaker/template      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 9db5a1d5a3c9..79f18e4fe21d 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
 depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libadwaita"
 short_desc="Improve focus and productivity by listening to different sounds"
-maintainer="Reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
 distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
diff --git a/srcpkgs/ddgtk/template b/srcpkgs/ddgtk/template
index 5d45aeb4a8b9..31e8517c65dd 100644
--- a/srcpkgs/ddgtk/template
+++ b/srcpkgs/ddgtk/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config glib glib-devel gettext appstream-glib"
 depends="python3 python3-gobject gtk+3"
 short_desc="GUI frontend for dd to create bootable ISO images for Linux"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gort818/ddgtk"
 distfiles="https://github.com/gort818/ddgtk/archive/${version}.tar.gz"
diff --git a/srcpkgs/ekushey-fonts-ttf/template b/srcpkgs/ekushey-fonts-ttf/template
index 4862d810d8c6..afa5ce3b0bf2 100644
--- a/srcpkgs/ekushey-fonts-ttf/template
+++ b/srcpkgs/ekushey-fonts-ttf/template
@@ -5,7 +5,7 @@ revision=2
 build_style=fetch
 depends="font-util"
 short_desc="Bengali fonts from Ekushey project"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, OFL-1.0, GPL-3.0-or-later"
 homepage="http://ekushey.org/"
 distfiles="${SOURCEFORGE_SITE}/ekushey/SolaimanLipi_20-04-07.ttf
diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template
index 663096d55c06..9f3b2c28c332 100644
--- a/srcpkgs/ibus-m17n/template
+++ b/srcpkgs/ibus-m17n/template
@@ -9,7 +9,7 @@ hostmakedepends="gettext gettext-devel ibus m17n-db m17n-lib
 makedepends="gettext-devel ibus-devel m17n-lib-devel"
 depends="ibus m17n-db"
 short_desc="M17N engine for IBus"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ibus/ibus-m17n"
 distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz"
diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template
index 2625a775a7e2..e97f96f2a8c6 100644
--- a/srcpkgs/textadept/template
+++ b/srcpkgs/textadept/template
@@ -6,7 +6,7 @@ build_wrksrc="src"
 hostmakedepends="tar unzip pkg-config"
 makedepends="gtk+3-devel ncurses-devel"
 short_desc="Fast, minimalist, and extensible text editor for programmers"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://orbitalquark.github.io/textadept/"
 # Note: The dependency urls and filenames must be checked and updated manually
diff --git a/srcpkgs/xdgmenumaker/template b/srcpkgs/xdgmenumaker/template
index 2235ed1a02f8..02fd30f60c95 100644
--- a/srcpkgs/xdgmenumaker/template
+++ b/srcpkgs/xdgmenumaker/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="txt2tags"
 depends="python3-xdg python3-gobject gobject-introspection python3-Pillow gtk+3"
 short_desc="Automatic menu generator for WMs, such as, fluxbox, icewm, jwm, pekwm"
-maintainer="reback00 <reback00@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gapan/xdgmenumaker"
 distfiles="https://github.com/gapan/xdgmenumaker/archive/${version}.tar.gz"

From 4bddb7aefcb67a1e18cfa85164514b7c24506218 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 3 Jul 2023 12:42:14 +0100
Subject: [PATCH 1651/1854] alacritty: update to 0.12.2.

---
 srcpkgs/alacritty/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 6508a3059557..88ff3bcea75c 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 make_install_args="--path alacritty"
@@ -13,13 +13,13 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="https://github.com/alacritty/alacritty/archive/refs/tags/v${version}.tar.gz"
-checksum=14bce0bfc538872c97e0e38b9233a9d1fa992dcf83a22b6035da5fe58a55bc6c
+checksum=285b44d2d2e83118ab7fe61d575811bb85d5e21147808171bd0e583e9e794748
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	ppc*) broken="ftbfs: thread 'main' panicked at 'slice index starts at 4289555962 but ends at 114', /builddir/rustc-1.46.0-src/src/libstd/io/mod.rs:396:27";;
+	ppc*) broken="ftbfs: thread 'main' panicked at 'slice index starts at 4289555962 but ends at 114', /builddir/rustc-1.46.0-src/src/libstd/io/mod.rs:396:27" ;;
 	# disable doctests on i686
-	i686) make_check_args="--tests";;
+	i686*) make_check_args="--tests" ;;
 esac
 
 post_install() {

From f7da85e918a42e4e0f53f2e217d5050a084a83c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 14:14:28 +0200
Subject: [PATCH 1652/1854] jq: upstream moved.

---
 srcpkgs/jq/template | 6 +++---
 srcpkgs/jq/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/jq/update

diff --git a/srcpkgs/jq/template b/srcpkgs/jq/template
index 5cf139e340db..26928ff9b442 100644
--- a/srcpkgs/jq/template
+++ b/srcpkgs/jq/template
@@ -1,7 +1,7 @@
 # Template file for 'jq'
 pkgname=jq
 version=1.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="oniguruma-devel"
@@ -9,8 +9,8 @@ checkdepends="valgrind"
 short_desc="Command-line JSON processor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="http://stedolan.github.io/jq/"
-distfiles="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"
+homepage="https://jqlang.github.io/jq/"
+distfiles="https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz"
 checksum=5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72
 CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 
diff --git a/srcpkgs/jq/update b/srcpkgs/jq/update
deleted file mode 100644
index 5952b47d8f74..000000000000
--- a/srcpkgs/jq/update
+++ /dev/null
@@ -1 +0,0 @@
-site="http://stedolan.github.io/jq/download/"

From afe64c4dcafcb84767dbd8ba5753a438caa56ada Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 2 Jul 2023 09:17:28 +0200
Subject: [PATCH 1653/1854] godot: update to 4.0.3.

---
 srcpkgs/godot/INSTALL.msg               |  6 ++
 srcpkgs/godot/patches/10-fix-musl.patch |  2 +-
 srcpkgs/godot/patches/ppc.patch         | 87 -------------------------
 srcpkgs/godot/template                  | 61 ++++++++++-------
 4 files changed, 43 insertions(+), 113 deletions(-)
 create mode 100644 srcpkgs/godot/INSTALL.msg
 delete mode 100644 srcpkgs/godot/patches/ppc.patch

diff --git a/srcpkgs/godot/INSTALL.msg b/srcpkgs/godot/INSTALL.msg
new file mode 100644
index 000000000000..c05923f489a3
--- /dev/null
+++ b/srcpkgs/godot/INSTALL.msg
@@ -0,0 +1,6 @@
+If your graphics card does not support Vulkan, you need to use
+the OpenGL 3 renderer:
+
+$ godot --rendering-driver opengl3
+
+More details: https://github.com/godotengine/godot/issues/58927
diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index ed32914e0708..42e6111c6afe 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- a/joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ b/platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ b/platform/linuxbsd/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
diff --git a/srcpkgs/godot/patches/ppc.patch b/srcpkgs/godot/patches/ppc.patch
deleted file mode 100644
index a6e4d3638fd4..000000000000
--- a/srcpkgs/godot/patches/ppc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9ae32c08a4cab0a77eed682c9fb188ce7fc6f85a Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 1 Nov 2021 21:05:31 +0100
-Subject: [PATCH] add ppc detection
-
----
- core/os/os.cpp                    | 14 ++++++++++++++
- modules/lightmapper_cpu/config.py |  3 +++
- modules/raycast/config.py         |  3 +++
- platform/x11/detect.py            |  8 ++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/core/os/os.cpp b/core/os/os.cpp
-index 35896d8..948c79a 100644
---- a/core/os/os.cpp
-+++ b/core/os/os.cpp
-@@ -699,6 +699,20 @@ bool OS::has_feature(const String &p_feature) {
- 	if (p_feature == "arm") {
- 		return true;
- 	}
-+#elif defined(__powerpc__)
-+#if defined(__powerpc64__)
-+#if defined(__LITTLE_ENDIAN__)
-+	if (p_feature == "ppc64le") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc64") {
-+		return true;
-+	}
-+#endif
-+	if (p_feature == "ppc") {
-+		return true;
-+	}
- #endif
- 
- 	if (_check_internal_feature_support(p_feature))
-diff --git a/modules/lightmapper_cpu/config.py b/modules/lightmapper_cpu/config.py
-index a3a33b3..842f9ae 100644
---- a/modules/lightmapper_cpu/config.py
-+++ b/modules/lightmapper_cpu/config.py
-@@ -15,6 +15,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/modules/raycast/config.py b/modules/raycast/config.py
-index 6ea8e0a..bc2d40c 100644
---- a/modules/raycast/config.py
-+++ b/modules/raycast/config.py
-@@ -14,6 +14,9 @@ def can_build(env, platform):
-     if env["bits"] == "32":
-         return False
- 
-+    if env["arch"].startswith("ppc"):
-+        return False
-+
-     return True
- 
- 
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index b6472e2..c1858a7 100644
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -119,6 +119,14 @@ def configure(env):
-     if env["bits"] == "default":
-         env["bits"] = "64" if is64 else "32"
- 
-+    if env["arch"] == "":
-+        if platform.machine() == "ppc64le":
-+            env["arch"] = "ppc64le"
-+        elif platform.machine() == "ppc64":
-+            env["arch"] = "ppc64"
-+        elif platform.machine() == "ppc":
-+            env["arch"] = "ppc"
-+
-     ## Compiler configuration
- 
-     if "CXX" in env and "clang" in os.path.basename(env["CXX"]):
--- 
-2.33.0
-
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index aa4fb90e11fc..956fe154b59d 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,41 +1,49 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.5.1
+version=4.0.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
-# Godot contains private copies of libraries
-# that already have been packaged elsewhere.
-# Use builtin bullet for now as it's too old in repos (needs 2.89)
-# Toggle to not use builtin once bullet has been updated
-make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
- builtin_bullet=false builtin_libpng=false builtin_libvpx=false
- builtin_libwebp=false builtin_libogg=false builtin_libtheora=false
- builtin_opus=false builtin_libvorbis=false builtin_enet=false
- builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
- builtin_miniupnpc=false builtin_pcre2=false"
+# Build currently fails with embree-4.X
+make_build_args="platform=linuxbsd target=editor progress=no production=yes
+ builtin_embree=true builtin_enet=false builtin_freetype=false
+ builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
+ builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
+ builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
+ builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
-makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
- bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
- opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
- miniupnpc-devel pcre2-devel pulseaudio-devel"
+makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
+ libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
+ libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
+ libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
+ speech-dispatcher-devel"
+depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=164523c1c8aef0b69b135645794f5bece3f63788556a56aa293c118cde457023
+checksum=8d629aa4910bd0b13354a3b96c253fb62df130ff8acb510c81e23cd100bfdc9f
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
-post_extract() {
-	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-		-i platform/x11/crash_handler_x11.cpp
-}
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel"
+	depends+=" libexecinfo"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) arch="x86_32" ;;
+	x86_64*) arch="x86_64" ;;
+	aarch64*) arch="arm64" ;;
+	armv7*) arch="arm32" ;;
+	ppc64*) arch="ppc64" ;;
+esac
+
+make_build_args+=" arch=$arch"
 
 pre_build() {
 	export CXXFLAGS=" $CXXFLAGS "
@@ -46,9 +54,12 @@ do_install() {
 	vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
 	vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
 
+
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
-		ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
-		*) vbin bin/godot.x11.opt.tools.32 godot;;
+		x86_64*) vbin bin/godot.linuxbsd.editor.x86_64 godot;;
+		i686*) vbin bin/godot.linuxbsd.editor.x86_32 godot;;
+		aarch64*) vbin bin/godot.linuxbsd.editor.arm64 godot;;
+		armv7*) vbin bin/godot.linuxbsd.editor.arm32 godot;;
+		ppc64*) vbin bin/godot.linuxbsd.editor.ppc64 godot;;
 	esac
 }

From 43344066b08b7a6c5403e416f5cfccec400c6d26 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 11:49:10 +0200
Subject: [PATCH 1654/1854] rust-analyzer: fix update-check

---
 srcpkgs/rust-analyzer/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/rust-analyzer/update

diff --git a/srcpkgs/rust-analyzer/update b/srcpkgs/rust-analyzer/update
new file mode 100644
index 000000000000..48dce688f314
--- /dev/null
+++ b/srcpkgs/rust-analyzer/update
@@ -0,0 +1,2 @@
+site=https://github.com/rust-lang/rust-analyzer/tags
+pattern="/tag/\K\d{4}-\d{2}-\d{2}"

From da1aa5cba28de8b943b93962b8e9a69830efbaa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 1 Jul 2023 18:06:23 -0300
Subject: [PATCH 1655/1854] SuiteSparse: update to 7.1.0.

---
 srcpkgs/SuiteSparse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 6cc6b0a232d5..3490f6f3fa7f 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.0.1
+version=7.1.0
 revision=1
 hostmakedepends="cmake gcc-fortran"
 makedepends="libgomp-devel mpfr-devel
@@ -11,7 +11,7 @@ license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
 changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=dc2f8d5c2657c120b30cce942f634ec08fc3a4b0b10e19d3eef7790b2bec8d1e
+checksum=4cd3d161f9aa4f98ec5fa725ee5dc27bca960a3714a707a7d12b3d0abb504679
 
 build_options="openblas"
 

From 0988f0f92472e3ae012fddad9bf712f2ab90295f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 2 Jul 2023 18:00:08 -0300
Subject: [PATCH 1656/1854] octave: fix build with SuiteSparse-7.1.0

---
 .../octave/patches/fix-suitesparse-7.1.patch  | 166 ++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 srcpkgs/octave/patches/fix-suitesparse-7.1.patch

diff --git a/srcpkgs/octave/patches/fix-suitesparse-7.1.patch b/srcpkgs/octave/patches/fix-suitesparse-7.1.patch
new file mode 100644
index 000000000000..a9235cb386fb
--- /dev/null
+++ b/srcpkgs/octave/patches/fix-suitesparse-7.1.patch
@@ -0,0 +1,166 @@
+--- a/liboctave/numeric/sparse-qr.cc	2023-04-13 13:43:35.000000000 -0300
++++ b/liboctave/numeric/sparse-qr.cc	2023-07-02 17:56:48.485762203 -0300
+@@ -804,17 +804,17 @@
+   Matrix ret (nrows, nc);
+   cholmod_dense *q;
+ 
+-  // I is nrows x nrows identity matrix
+-  cholmod_dense *I
++  // Id is nrows x nrows identity matrix
++  cholmod_dense *Id
+     = cholmod_l_allocate_dense (nrows, nrows, nrows, CHOLMOD_REAL, &m_cc);
+ 
+   for (octave_idx_type i = 0; i < nrows * nrows; i++)
+-    (reinterpret_cast<double *> (I->x))[i] = 0.0;
++    (reinterpret_cast<double *> (Id->x))[i] = 0.0;
+ 
+   for (octave_idx_type i = 0; i < nrows; i++)
+-    (reinterpret_cast<double *> (I->x))[i * nrows + i] = 1.0;
++    (reinterpret_cast<double *> (Id->x))[i * nrows + i] = 1.0;
+ 
+-  q = SuiteSparseQR_qmult<double> (SPQR_QX, m_H, m_Htau, m_HPinv, I, &m_cc);
++  q = SuiteSparseQR_qmult<double> (SPQR_QX, m_H, m_Htau, m_HPinv, Id, &m_cc);
+   spqr_error_handler (&m_cc);
+ 
+   double *q_x = reinterpret_cast<double *> (q->x);
+@@ -824,7 +824,7 @@
+       ret_vec[j * nrows + i] = q_x[j * nrows + i];
+ 
+   cholmod_l_free_dense (&q, &m_cc);
+-  cholmod_l_free_dense (&I, &m_cc);
++  cholmod_l_free_dense (&Id, &m_cc);
+ 
+   return ret;
+ 
+@@ -1738,18 +1738,18 @@
+   ComplexMatrix ret (nrows, nc);
+   cholmod_dense *q;
+ 
+-  // I is nrows x nrows identity matrix
+-  cholmod_dense *I
++  // Id is nrows x nrows identity matrix
++  cholmod_dense *Id
+     = reinterpret_cast<cholmod_dense *>
+       (cholmod_l_allocate_dense (nrows, nrows, nrows, CHOLMOD_COMPLEX, &m_cc));
+ 
+   for (octave_idx_type i = 0; i < nrows * nrows; i++)
+-    (reinterpret_cast<Complex *> (I->x))[i] = 0.0;
++    (reinterpret_cast<Complex *> (Id->x))[i] = 0.0;
+ 
+   for (octave_idx_type i = 0; i < nrows; i++)
+-    (reinterpret_cast<Complex *> (I->x))[i * nrows + i] = 1.0;
++    (reinterpret_cast<Complex *> (Id->x))[i * nrows + i] = 1.0;
+ 
+-  q = SuiteSparseQR_qmult<Complex> (SPQR_QX, m_H, m_Htau, m_HPinv, I,
++  q = SuiteSparseQR_qmult<Complex> (SPQR_QX, m_H, m_Htau, m_HPinv, Id,
+                                     &m_cc);
+   spqr_error_handler (&m_cc);
+ 
+@@ -1761,7 +1761,7 @@
+       ret_vec[j * nrows + i] = q_x[j * nrows + i];
+ 
+   cholmod_l_free_dense (&q, &m_cc);
+-  cholmod_l_free_dense (&I, &m_cc);
++  cholmod_l_free_dense (&Id, &m_cc);
+ 
+   return ret;
+ 
+@@ -1786,7 +1786,7 @@
+       OCTAVE_LOCAL_BUFFER (cs_complex_t, bvec, nr);
+ 
+       for (octave_idx_type i = 0; i < nr; i++)
+-        bvec[i] = cs_complex_t (0.0, 0.0);
++        bvec[i] = (cs_complex_t) 0.0;
+ 
+       OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2);
+ 
+@@ -1794,7 +1794,7 @@
+         {
+           octave_quit ();
+ 
+-          bvec[j] = cs_complex_t (1.0, 0.0);
++          bvec[j] = (cs_complex_t) 1.0;
+ 
+           volatile octave_idx_type nm = (nr < nc ? nr : nc);
+ 
+@@ -1813,7 +1813,7 @@
+           for (octave_idx_type i = 0; i < nr; i++)
+             vec[i+idx] = buf[i];
+ 
+-          bvec[j] = cs_complex_t (0.0, 0.0);
++          bvec[j] = (cs_complex_t) 0.0;
+         }
+     }
+ 
+@@ -2073,7 +2073,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv,
+                                reinterpret_cast<cs_complex_t *>(Xx),
+@@ -2143,7 +2143,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *> (Xx),
+                               buf, nr);
+@@ -2206,7 +2206,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv,
+                                reinterpret_cast<cs_complex_t *> (Xx),
+@@ -2304,7 +2304,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q,
+                               reinterpret_cast<cs_complex_t *> (Xx),
+@@ -2392,7 +2392,7 @@
+       octave_quit ();
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + bidx, buf, nr);
+ 
+@@ -2460,7 +2460,7 @@
+       octave_quit ();
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q, bvec + bidx, buf, nr);
+       CXSPARSE_ZNAME (_utsolve) (N->U, buf);
+@@ -2522,7 +2522,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < S->m2; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_ipvec) (S->pinv,
+                                reinterpret_cast<cs_complex_t *> (Xx),
+@@ -2620,7 +2620,7 @@
+         Xx[j] = b.xelem (j, i);
+ 
+       for (octave_idx_type j = nr; j < nbuf; j++)
+-        buf[j] = cs_complex_t (0.0, 0.0);
++        buf[j] = (cs_complex_t) 0.0;
+ 
+       CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx),
+                               buf, nr);

From 2b9e4cc31a8e7fbe8cc3065047dc53997e17f9a2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:37 +0200
Subject: [PATCH 1657/1854] erlang: update to 26.0.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 6b94c9dbd9f5..c34f2bb01bd1 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=25.3.2
+version=26.0.2
 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=504fc2045198c192de7edbb04e880cbb1ee79b1d9880270b8af8ed2348d2e242
+checksum=4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 33ede824eaa4a59f2d732cd363aca31d45885b52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1658/1854] elixir: rebuild for erlang-26.0.2.

---
 srcpkgs/elixir/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 9a829fef2e05..d8f31283ed9c 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,7 +1,7 @@
 # Template file for 'elixir'
 pkgname=elixir
 version=1.15.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
 make_check_args="LIBDIR=lib${XBPS_TARGET_WORDSIZE}"

From 8d383cc4f187980825d6a4d8ef8438e75c48c1cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1659/1854] rebar3: rebuild for erlang-26.0.2.

---
 srcpkgs/rebar3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index cce9ffb4db68..37c562e55cb5 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,7 +1,7 @@
 # Template file for 'rebar3'
 pkgname=rebar3
 version=3.19.0
-revision=2
+revision=3
 hostmakedepends=erlang
 depends="erlang>=22"
 short_desc="Erlang build tool to compile, test, and release applications"

From 92f6b755c12b86d19a127a67fe76e97d127530a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1660/1854] ejabberd: rebuild for erlang-26.0.2.

---
 srcpkgs/ejabberd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index c77545190f4f..5d5995e0be21 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,7 +1,7 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=22.05
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"

From 942aa616dd755d790e4654ab2544e250f5a78464 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 20:54:58 +0200
Subject: [PATCH 1661/1854] lfe: update to 2.1.1.

---
 srcpkgs/lfe/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lfe/template b/srcpkgs/lfe/template
index 04967e48fc96..5a91da33bc2e 100644
--- a/srcpkgs/lfe/template
+++ b/srcpkgs/lfe/template
@@ -1,7 +1,7 @@
 # Template file for 'lfe'
 pkgname=lfe
-version=2.0.1
-revision=2
+version=2.1.1
+revision=1
 build_style=gnu-makefile
 hostmakedepends="erlang"
 depends="erlang"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://lfe.io/"
 distfiles="https://github.com/lfe/lfe/archive/v${version}.tar.gz"
-checksum=d64a5c0b626411afe67f146b56094337801c596d9b0cdfeabaf61223c479985f
+checksum=e5abacd57dc2f357dda46d8336a40046be806f5c6776f95612676c4b45f6d56b
 
 do_install() {
 	for b in lfe lfec lfescript; do

From 97034a50af93dca53f5ffa862017b010e8d93e2c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jun 2023 23:14:05 +0200
Subject: [PATCH 1662/1854] ejabberd: remove conflict with elixir.

---
 srcpkgs/ejabberd/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 5d5995e0be21..218c2857ab85 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,7 +1,7 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=22.05
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
@@ -29,3 +29,7 @@ fi
 pre_configure() {
 	autoreconf -fi
 }
+
+post_install() {
+	rm -f ${DESTDIR}/usr/bin/{elixir,iex,mix}
+}

From dbd03e01e12672d57f791286539039ada57d552e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 26 Jun 2023 20:01:53 +0200
Subject: [PATCH 1663/1854] Manual.md: move section on automatically detected
 depends

---
 Manual.md | 91 +++++++++++++++++++++++++++----------------------------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/Manual.md b/Manual.md
index 1670863cbe54..da2572e911a0 100644
--- a/Manual.md
+++ b/Manual.md
@@ -27,7 +27,6 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Build helper scripts](#build_helper)
 	* [Functions](#functions)
 	* [Build options](#build_options)
-		* [Runtime dependencies](#deps_runtime)
 	* [INSTALL and REMOVE files](#install_remove_files)
 	* [INSTALL.msg and REMOVE.msg files](#install_remove_files_msg)
 	* [Creating system accounts/groups at runtime](#runtime_account_creation)
@@ -787,11 +786,55 @@ should be listed in `checkdepends` and will be installed as if they were part of
   a D-Bus session for applications that need it
 - `git`: some test suites run the `git` command
 
+<a id="deps_runtime"></a>
 Lastly, a package may require certain dependencies at runtime, without which it
 is unusable. These dependencies, when they aren't detected automatically by
 XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
 modules and other programs that use `dlopen(3)` instead of dynamically linking.
 
+Dependencies for ELF objects are detected automatically by `xbps-src`, hence runtime
+dependencies must not be specified in templates via `$depends` with the following exceptions:
+
+- ELF objects using dlopen(3).
+- non ELF objects, i.e perl/python/ruby/etc modules.
+- Overriding the minimal version specified in the `shlibs` file.
+
+The runtime dependencies for ELF objects are detected by checking which SONAMEs
+they require and then the SONAMEs are mapped to a binary package name with a minimal
+required version. The `shlibs` file in the `void-packages/common` directory
+sets up the `<SONAME> <pkgname>>=<version>` mappings.
+
+For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
+software requiring this library will link to `libfoo`; the resulting binary
+package will have a run-time dependency to `foo>=1.0_1` package as specified in
+`common/shlibs`:
+
+```
+# common/shlibs
+...
+libfoo.so.1 foo-1.0_1
+...
+```
+
+- The first field specifies the SONAME.
+- The second field specified the package name and minimal version required.
+- A third optional field (usually set to `ignore`) can be used to skip checks in soname bumps.
+
+Dependencies declared via `${depends}` are not installed to the master directory, rather are
+only checked if they exist as binary packages, and are built automatically by `xbps-src` if
+the specified version is not in the local repository.
+
+As a special case, `virtual` dependencies may be specified as runtime dependencies in the
+`${depends}` template variable. Several different packages can provide common functionality by
+declaring a virtual name and version in the `${provides}` template variable (e.g.,
+`provides="vpkg-0.1_1"`). Packages that rely on the common functionality without concern for the
+specific provider can declare a dependency on the virtual package name with the prefix `virtual?`
+(e.g., `depends="virtual?vpkg-0.1_1"`). When a package is built by `xbps-src`, providers for any
+virtual packages will be confirmed to exist and will be built if necessary. A map from virtual
+packages to their default providers is defined in `etc/defaults.virtual`. Individual mappings can be
+overridden by local preferences in `etc/virtual`. Comments in `etc/defaults.virtual` provide more
+information on this map.
+
 Finally, as a general rule, if a package is built the exact same way whether or
 not a particular package is present in `makedepends` or `hostmakedepends`, that
 package shouldn't be added as a build time dependency.
@@ -1214,52 +1257,6 @@ Example: `XBPS_PKG_OPTIONS_xorg_server=opt`.
 The list of supported package build options and its description is defined in the
 `common/options.description` file.
 
-<a id="deps_runtime"></a>
-#### Runtime dependencies
-
-Dependencies for ELF objects are detected automatically by `xbps-src`, hence runtime
-dependencies must not be specified in templates via `$depends` with the following exceptions:
-
-- ELF objects using dlopen(3).
-- non ELF objects, i.e perl/python/ruby/etc modules.
-- Overriding the minimal version specified in the `shlibs` file.
-
-The runtime dependencies for ELF objects are detected by checking which SONAMEs
-they require and then the SONAMEs are mapped to a binary package name with a minimal
-required version. The `shlibs` file in the `void-packages/common` directory
-sets up the `<SONAME> <pkgname>>=<version>` mappings.
-
-For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
-software requiring this library will link to `libfoo`; the resulting binary
-package will have a run-time dependency to `foo>=1.0_1` package as specified in
-`common/shlibs`:
-
-```
-# common/shlibs
-...
-libfoo.so.1 foo-1.0_1
-...
-```
-
-- The first field specifies the SONAME.
-- The second field specified the package name and minimal version required.
-- A third optional field (usually set to `ignore`) can be used to skip checks in soname bumps.
-
-Dependencies declared via `${depends}` are not installed to the master directory, rather are
-only checked if they exist as binary packages, and are built automatically by `xbps-src` if
-the specified version is not in the local repository.
-
-As a special case, `virtual` dependencies may be specified as runtime dependencies in the
-`${depends}` template variable. Several different packages can provide common functionality by
-declaring a virtual name and version in the `${provides}` template variable (e.g.,
-`provides="vpkg-0.1_1"`). Packages that rely on the common functionality without concern for the
-specific provider can declare a dependency on the virtual package name with the prefix `virtual?`
-(e.g., `depends="virtual?vpkg-0.1_1"`). When a package is built by `xbps-src`, providers for any
-virtual packages will be confirmed to exist and will be built if necessary. A map from virtual
-packages to their default providers is defined in `etc/defaults.virtual`. Individual mappings can be
-overridden by local preferences in `etc/virtual`. Comments in `etc/defaults.virtual` provide more
-information on this map.
-
 <a id="install_remove_files"></a>
 ### INSTALL and REMOVE files
 

From ab5a4fe9ec0d6614e720db6355077c86385919d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 26 Jun 2023 20:13:46 +0200
Subject: [PATCH 1664/1854] Manual.md: reword section on automatically detected
 depends

Co-authored-by: Mohammed Anas <triallax@tutanota.com>
---
 Manual.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Manual.md b/Manual.md
index da2572e911a0..bb1f4edfcc34 100644
--- a/Manual.md
+++ b/Manual.md
@@ -789,24 +789,25 @@ should be listed in `checkdepends` and will be installed as if they were part of
 <a id="deps_runtime"></a>
 Lastly, a package may require certain dependencies at runtime, without which it
 is unusable. These dependencies, when they aren't detected automatically by
-XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
-modules and other programs that use `dlopen(3)` instead of dynamically linking.
+XBPS, should be listed in `depends`.
 
-Dependencies for ELF objects are detected automatically by `xbps-src`, hence runtime
-dependencies must not be specified in templates via `$depends` with the following exceptions:
+Libraries linked by ELF objects are detected automatically by `xbps-src`, hence they
+must not be specified in templates via `depends`. This variable should list:
 
+- executables called as separate processes.
 - ELF objects using dlopen(3).
-- non ELF objects, i.e perl/python/ruby/etc modules.
-- Overriding the minimal version specified in the `shlibs` file.
+- non-object code, e.g. C headers, perl/python/ruby/etc modules.
+- data files.
+- overriding the minimal version specified in the `common/shlibs` file.
 
 The runtime dependencies for ELF objects are detected by checking which SONAMEs
 they require and then the SONAMEs are mapped to a binary package name with a minimal
-required version. The `shlibs` file in the `void-packages/common` directory
+required version. The `common/shlibs` file
 sets up the `<SONAME> <pkgname>>=<version>` mappings.
 
 For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
-software requiring this library will link to `libfoo`; the resulting binary
-package will have a run-time dependency to `foo>=1.0_1` package as specified in
+software requiring this library will link to `libfoo.so.1`; the resulting binary
+package will have a run-time dependency on `foo>=1.0_1` package as specified in
 `common/shlibs`:
 
 ```
@@ -820,13 +821,13 @@ libfoo.so.1 foo-1.0_1
 - The second field specified the package name and minimal version required.
 - A third optional field (usually set to `ignore`) can be used to skip checks in soname bumps.
 
-Dependencies declared via `${depends}` are not installed to the master directory, rather are
+Dependencies declared via `depends` are not installed to the master directory, rather they are
 only checked if they exist as binary packages, and are built automatically by `xbps-src` if
 the specified version is not in the local repository.
 
 As a special case, `virtual` dependencies may be specified as runtime dependencies in the
-`${depends}` template variable. Several different packages can provide common functionality by
-declaring a virtual name and version in the `${provides}` template variable (e.g.,
+`depends` template variable. Several different packages can provide common functionality by
+declaring a virtual name and version in the `provides` template variable (e.g.
 `provides="vpkg-0.1_1"`). Packages that rely on the common functionality without concern for the
 specific provider can declare a dependency on the virtual package name with the prefix `virtual?`
 (e.g., `depends="virtual?vpkg-0.1_1"`). When a package is built by `xbps-src`, providers for any

From f72ddc9e319f4f20034f27a239d698f1f485b7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 26 Jun 2023 20:25:19 +0200
Subject: [PATCH 1665/1854] Manual.md: adjust sections hierarchy

---
 Manual.md | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/Manual.md b/Manual.md
index bb1f4edfcc34..63f10f354582 100644
--- a/Manual.md
+++ b/Manual.md
@@ -5,7 +5,8 @@ packages for XBPS, the `Void Linux` native packaging system.
 
 *Table of Contents*
 
-* [Introduction](#Introduction)
+* The XBPS source packages manual
+	* [Introduction](#Introduction)
 	* [Package build phases](#buildphase)
 	* [Package naming conventions](#namingconventions)
 		* [Libraries](#libs)
@@ -33,13 +34,14 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Writing runit services](#writing_runit_services)
 	* [32bit packages](#32bit_pkgs)
 	* [Subpackages](#pkgs_sub)
-	* [Development packages](#pkgs_development)
-	* [Data packages](#pkgs_data)
-	* [Documentation packages](#pkgs_documentation)
-	* [Python packages](#pkgs_python)
-	* [Go packages](#pkgs_go)
-	* [Haskell packages](#pkgs_haskell)
-	* [Font packages](#pkgs_font)
+	* [Some package classes](#pkgs_classes)
+		* [Development packages](#pkgs_development)
+		* [Data packages](#pkgs_data)
+		* [Documentation packages](#pkgs_documentation)
+		* [Python packages](#pkgs_python)
+		* [Go packages](#pkgs_go)
+		* [Haskell packages](#pkgs_haskell)
+		* [Font packages](#pkgs_font)
 	* [Renaming a package](#pkg_rename)
 	* [Removing a package](#pkg_remove)
 	* [XBPS Triggers](#xbps_triggers)
@@ -72,10 +74,10 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Void specific documentation](#documentation)
 	* [Notes](#notes)
 	* [Contributing via git](#contributing)
-* [Help](#help)
+	* [Help](#help)
 
 <a id="Introduction"></a>
-## Introduction
+### Introduction
 
 The `void-packages` repository contains all the
 recipes to download, compile and build binary packages for Void Linux.
@@ -841,10 +843,10 @@ not a particular package is present in `makedepends` or `hostmakedepends`, that
 package shouldn't be added as a build time dependency.
 
 <a id="repositories"></a>
-#### Repositories
+### Repositories
 
 <a id="repo_by_branch"></a>
-##### Repositories defined by Branch
+#### Repositories defined by Branch
 
 The global repository takes the name of
 the current branch, except if the name of the branch is master. Then the resulting
@@ -852,7 +854,7 @@ repository will be at the global scope. The usage scenario is that the user can
 update multiple packages in a second branch without polluting his local repository.
 
 <a id="pkg_defined_repo"></a>
-##### Package defined Repositories
+#### Package defined Repositories
 
 The second way to define a repository is by setting the `repository` variable in
 a template. This way the maintainer can define repositories for a specific
@@ -1474,8 +1476,11 @@ destdir (`$DESTDIR`) to the `subpackage` destdir (`$PKGDESTDIR`).
 Subpackages are processed always in alphabetical order; To force a custom order,
 the `subpackages` variable can be declared with the wanted order.
 
+<a id="pkgs_classes"></a>
+### Some package classes
+
 <a id="pkgs_development"></a>
-### Development packages
+#### Development packages
 
 A development package, commonly generated as a subpackage, shall only contain
 files required for development, that is, headers, static libraries, shared
@@ -1505,7 +1510,7 @@ following subset of files from the main package:
 * Vala bindings `usr/share/vala`
 
 <a id="pkgs_data"></a>
-### Data packages
+#### Data packages
 
 Another common subpackage type is the `-data` subpackage. This subpackage
 type used to split architecture independent, big(ger) or huge amounts
@@ -1517,7 +1522,7 @@ The main package must then have `depends="${pkgname}-data-${version}_${revision}
 possibly in addition to other, non-automatic depends.
 
 <a id="pkgs_documentation"></a>
-### Documentation packages
+#### Documentation packages
 
 Packages intended for user interaction do not always unconditionally require
 their documentation part. A user who does not want to e.g. develop
@@ -1532,7 +1537,7 @@ amounts of documentation for no reason. Thus the size of the documentation part
 be your guidance to decide whether or not to split off a `-doc` subpackage.
 
 <a id="pkgs_python"></a>
-### Python packages
+#### Python packages
 
 Python packages should be built with the `python{,2,3}-module` build style, if possible.
 This sets some environment variables required to allow cross compilation. Support to allow
@@ -1593,7 +1598,7 @@ Also, a set of useful variables are defined to use in the templates:
 python versions.
 
 <a id="pkgs_go"></a>
-### Go packages
+#### Go packages
 
 Go packages should be built with the `go` build style, if possible.
 The `go` build style takes care of downloading Go dependencies and
@@ -1627,7 +1632,7 @@ The path to the package's source inside `$GOPATH` is available as
 `$GOSRCPATH`.
 
 <a id="pkgs_haskell"></a>
-### Haskell packages
+#### Haskell packages
 
 We build Haskell package using `stack` from
 [Stackage](http://www.stackage.org/), generally the LTS versions.
@@ -1645,7 +1650,7 @@ The following variables influence how Haskell packages are built:
   you can add your `--flag ...` parameters there.
 
 <a id="pkgs_font"></a>
-### Font packages
+#### Font packages
 
 Font packages are very straightforward to write, they are always set with the
 following variables:
@@ -1902,7 +1907,7 @@ If it is running under another architecture it tries to use the host's `install-
 utility.
 
 <a id="triggers_initramfs_regenerate"></a>
-### initramfs-regenerate
+#### initramfs-regenerate
 
 The initramfs-regenerate trigger will trigger the regeneration of all kernel
 initramfs images after package installation or removal. The trigger must be
@@ -2151,7 +2156,7 @@ to pull in new changes:
     $ git pull --rebase upstream master
 
 <a id="help"></a>
-## Help
+### Help
 
 If after reading this `manual` you still need some kind of help, please join
 us at `#xbps` via IRC at `irc.libera.chat`.

From 63177f6280da9425bec65e4654d876261d4bc206 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 11:40:36 +0200
Subject: [PATCH 1666/1854] zig: fix update-check

---
 srcpkgs/zig/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/zig/update

diff --git a/srcpkgs/zig/update b/srcpkgs/zig/update
new file mode 100644
index 000000000000..930380745b6b
--- /dev/null
+++ b/srcpkgs/zig/update
@@ -0,0 +1,2 @@
+site=https://ziglang.org
+pattern="<b>\K[\d.]+(?=</b>)"

From 6cc8f6485f2eb62982d27753d2973f758bb0eab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 6 Sep 2019 20:55:47 +0200
Subject: [PATCH 1667/1854] util-linux: adjust PATH for usrmerge

---
 srcpkgs/util-linux-common/template            |  2 +-
 srcpkgs/util-linux/patches/default-PATH.patch | 37 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/util-linux/patches/default-PATH.patch

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 90b768803f05..d17a31a482f5 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux
 pkgname=util-linux-common
 version=2.38.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/util-linux/patches/default-PATH.patch b/srcpkgs/util-linux/patches/default-PATH.patch
new file mode 100644
index 000000000000..d811470b16a1
--- /dev/null
+++ b/srcpkgs/util-linux/patches/default-PATH.patch
@@ -0,0 +1,37 @@
+From 52f81526dbbea59e5c8f6aee64db1a9c29509d58 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Tue, 30 Mar 2021 22:58:45 +0200
+Subject: [PATCH] default-PATH
+
+
+diff --git a/include/pathnames.h b/include/pathnames.h
+index 3845d4c..984b4d8 100644
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -19,20 +19,12 @@
+ /* DEFPATHs from <paths.h> don't include /usr/local */
+ #undef _PATH_DEFPATH
+ 
+-#ifdef USE_USRDIR_PATHS_ONLY
+-# define _PATH_DEFPATH	        "/usr/local/bin:/usr/bin"
+-#else
+-# define _PATH_DEFPATH	        "/usr/local/bin:/bin:/usr/bin"
+-#endif
++# define _PATH_DEFPATH	        "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"
+ 
+ #undef _PATH_DEFPATH_ROOT
+ 
+-#ifdef USE_USRDIR_PATHS_ONLY
+-# define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+-#else
+-# define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
+-#endif
+-
++# define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"
++	
+ #define	_PATH_HUSHLOGIN		".hushlogin"
+ #define	_PATH_HUSHLOGINS	"/etc/hushlogins"
+ 
+-- 
+2.31.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 29477fc6ea89..99819d02068b 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.38.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From 02fc12ba8dac69f407f5fe83a70593efc1979348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 30 Mar 2021 22:03:49 +0200
Subject: [PATCH 1668/1854] openssh: adjust PATH for usrmerge

---
 srcpkgs/openssh/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index c74b56e08ac3..5beea5260428 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,13 +1,14 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.3p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
  --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth
  --disable-strip --with-privsep-path=/var/chroot/ssh
- --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
+ --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
  --with-pid-dir=/run --with-pam
  --with-libedit --with-Werror
  $(vopt_if ldns --with-ldns=$XBPS_CROSS_BASE/usr)

From 72912b34870b01296da46bbe4603d49d7b07193c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 8 Oct 2019 19:42:38 +0200
Subject: [PATCH 1669/1854] lxdm: adjust PATH for usrmerge

---
 srcpkgs/lxdm/patches/default-PATH.patch | 22 ++++++++++++++++++++++
 srcpkgs/lxdm/template                   |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/lxdm/patches/default-PATH.patch

diff --git a/srcpkgs/lxdm/patches/default-PATH.patch b/srcpkgs/lxdm/patches/default-PATH.patch
new file mode 100644
index 000000000000..160fcbb73453
--- /dev/null
+++ b/srcpkgs/lxdm/patches/default-PATH.patch
@@ -0,0 +1,22 @@
+From e46c33735f81ca5607247fd0690ebbe9f1565708 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Tue, 8 Oct 2019 19:32:15 +0200
+Subject: [PATCH] tweak default PATH
+
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index a37f051..8a0e6c6 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -1399,7 +1399,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ 	if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */
+ 		env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */
+ 	else /* don't use the global env, they are bad for user */
+-		env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */
++		env=g_environ_setenv(env, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin", TRUE); /* set proper default */
+ 	g_free(path);
+ 	/* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */
+ 	if( lang && lang[0] )
+-- 
+2.23.0
+
diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template
index 55ae9b5356eb..d9e532be58ac 100644
--- a/srcpkgs/lxdm/template
+++ b/srcpkgs/lxdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lxdm'
 pkgname=lxdm
 version=0.5.3
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-consolekit --with-pam --enable-gtk3"
 hostmakedepends="automake gettext-devel libtool pkg-config intltool"
@@ -16,13 +16,13 @@ conf_files="
 	/etc/lxdm/Xsession
 	/etc/lxdm/lxdm.conf
 	/etc/pam.d/lxdm"
-system_groups="lxdm"
 short_desc="GUI login manager for LXDE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://lxde.org"
 distfiles="${SOURCEFORGE_SITE}/lxdm/lxdm-${version}.tar.xz"
 checksum=4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f
+system_groups="lxdm"
 
 pre_configure() {
 	autoreconf -fi

From b9f07f2ebaf80df666a70baddff0dbab5c848006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 27 Jun 2023 00:11:02 +0200
Subject: [PATCH 1670/1854] sddm: adjust PATH for usrmerge

---
 .../sddm/patches/0.19.0--default-path.patch   | 22 +++++++++++++++++++
 srcpkgs/sddm/template                         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sddm/patches/0.19.0--default-path.patch

diff --git a/srcpkgs/sddm/patches/0.19.0--default-path.patch b/srcpkgs/sddm/patches/0.19.0--default-path.patch
new file mode 100644
index 000000000000..bc3f8bd348cd
--- /dev/null
+++ b/srcpkgs/sddm/patches/0.19.0--default-path.patch
@@ -0,0 +1,22 @@
+From 57d716be7cb0588538d89bb72113bec82adf9e52 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Mon, 26 Jun 2023 23:15:05 +0200
+Subject: default-path
+
+
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index cf44a62..4c01c4a 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -82,7 +82,7 @@ namespace SDDM {
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
++            Entry(DefaultPath,         QString,     _S("/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
+-- 
+2.41.0
+
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 2a87381c8e8a..63fa93f160cf 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
 version=0.19.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs

From d397e2390027f751065da3e32b0556bb7861e81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 14:40:51 +0200
Subject: [PATCH 1671/1854] gdm: adjust PATH for usrmerge

---
 srcpkgs/gdm/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 5cdcf618cb83..f8990839198a 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=44.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -10,6 +10,7 @@ configure_args="
  -Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
  -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true
  -Dselinux=disabled -Dlibaudit=disabled -Dgdm-xsession=true
+ -Ddefault-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
  -Dsystemdsystemunitdir=/usr/lib/systemd/system
  -Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="dconf gettext itstool pkg-config"

From 7009c8e8333efe344c7871043c467192be113732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 17:28:41 +0200
Subject: [PATCH 1672/1854] slim: adjust PATH for usrmerge

---
 .../1.3.6--adjust-PATH-for-usrmerge.patch     | 34 +++++++++++++++++++
 srcpkgs/slim/template                         |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch

diff --git a/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch b/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch
new file mode 100644
index 000000000000..76bf4fa6c6e9
--- /dev/null
+++ b/srcpkgs/slim/patches/1.3.6--adjust-PATH-for-usrmerge.patch
@@ -0,0 +1,34 @@
+From 0a96bb015d9dc30ff98cfc21256851cb2005cea1 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Sat, 1 Jul 2023 17:28:17 +0200
+Subject: adjust-PATH-for-usrmerge
+
+
+diff --git a/cfg.cpp b/cfg.cpp
+index 02379f2..56a584b 100644
+--- a/cfg.cpp
++++ b/cfg.cpp
+@@ -29,7 +29,7 @@ Cfg::Cfg()
+ 	: currentSession(-1)
+ {
+ 	/* Configuration options */
+-	options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));
++	options.insert(option("default_path","/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"));
+ 	options.insert(option("default_xserver","/usr/bin/X"));
+ 	options.insert(option("xserver_arguments",""));
+ 	options.insert(option("numlock",""));
+diff --git a/slim.conf b/slim.conf
+index a8e2e1c..1c14ade 100644
+--- a/slim.conf
++++ b/slim.conf
+@@ -1,6 +1,6 @@
+ # Path, X server and arguments (if needed)
+ # Note: -xauth $authfile is automatically appended
+-default_path        /bin:/usr/bin:/usr/local/bin
++default_path        /usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
+ default_xserver     /usr/bin/X
+ #xserver_arguments   -dpi 75
+ 
+-- 
+2.41.0
+
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b7382cac3085..1ca2ff320bfc 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -1,7 +1,7 @@
 # Template file for 'slim'
 pkgname=slim
 version=1.3.6
-revision=13
+revision=14
 build_style=cmake
 configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
 conf_files="/etc/slim.conf /etc/pam.d/slim"

From 22382a019f7e056491ad0dc7b3a92d69f6a97036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 17:31:24 +0200
Subject: [PATCH 1673/1854] lightdm: adjust PATH for usrmerge

---
 .../1.32.0--adjust-PATH-for-usrmerge.patch    | 22 +++++++++++++++++++
 srcpkgs/lightdm/template                      |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch

diff --git a/srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch b/srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch
new file mode 100644
index 000000000000..0e079369ec04
--- /dev/null
+++ b/srcpkgs/lightdm/patches/1.32.0--adjust-PATH-for-usrmerge.patch
@@ -0,0 +1,22 @@
+From 389d9e09217ee598674ff7d6df69563be51cbfe6 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Sat, 1 Jul 2023 17:30:54 +0200
+Subject: adjust-PATH-for-usrmerge
+
+
+diff --git a/src/session-child.c b/src/session-child.c
+index 112daab..af28c48 100644
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -394,7 +394,7 @@ session_child_run (int argc, char **argv)
+         else
+         {
+             /* Set POSIX variables */
+-            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
++            pam_putenv (pam_handle, "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin");
+             pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));
+-- 
+2.41.0
+
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index f527616261ba..5a0db355bf73 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.32.0
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter

From be375c0fa1f69da24e214f00d7b6b1dfde642f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 17:53:46 +0200
Subject: [PATCH 1674/1854] xdm: adjust PATH for usrmerge

---
 srcpkgs/xdm/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 2fdc56ad7f23..282b8fe7a540 100644
--- a/srcpkgs/xdm/template
+++ b/srcpkgs/xdm/template
@@ -1,7 +1,7 @@
 # Template file for 'xdm'
 pkgname=xdm
 version=1.1.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-random-device=/dev/urandom
  --with-utmp-file=/var/run/utmp
@@ -24,6 +24,10 @@ homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
 checksum=3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f
 
+pre_configure() {
+	export DEF_USER_PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin
+}
+
 post_install() {
 	vsv xdm
 	vinstall ${FILESDIR}/xdm.pam 644 etc/pam.d xdm

From 181bba33aea6d385843c7241687dfc53cd115bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 1 Jul 2023 22:39:03 +0200
Subject: [PATCH 1675/1854] linux-driver-management: move sddm setup to
 examples

do not overwrite sddm file
---
 srcpkgs/linux-driver-management/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index 0a8859cb73b4..33396a0b9be3 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-driver-management'
 pkgname=linux-driver-management
 version=1.0.3
-revision=2
+revision=3
 # Tests require unpackaged umockdev
 # https://github.com/martinpitt/umockdev
 build_style=meson
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
 fi
 
+post_install() {
+	mkdir -p ${DESTDIR}/usr/share/examples/sddm/scripts
+	mv ${DESTDIR}/usr/share/sddm/scripts/Xsetup ${DESTDIR}/usr/share/examples/sddm/scripts/Xsetup
+}
+
 linux-driver-management-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"

From dde1a0b272a441dc5cc455849f1e29eedb959ea6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:36:25 +0200
Subject: [PATCH 1676/1854] xorg-util-macros: update to 1.20.0.

---
 srcpkgs/xorg-util-macros/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template
index 2ee195972a73..364947d4e4e4 100644
--- a/srcpkgs/xorg-util-macros/template
+++ b/srcpkgs/xorg-util-macros/template
@@ -1,15 +1,15 @@
 # Template file for 'xorg-util-macros'
 pkgname=xorg-util-macros
-version=1.19.3
+version=1.20.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 short_desc="X.org autotool macros"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/util/macros/"
-distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2"
-checksum=0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971
+distfiles="${XORG_SITE}/util/util-macros-${version}.tar.xz"
+checksum=0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db
 
 post_install() {
 	vlicense COPYING

From 34386c37148665372922cd7939213ab3eb9765e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:36:29 +0200
Subject: [PATCH 1677/1854] xorg-cf-files: update to 1.0.8.

---
 srcpkgs/xorg-cf-files/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index 4bec7c2ac82e..65bd013abca4 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-cf-files'
 pkgname=xorg-cf-files
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake xorg-util-macros font-util"
@@ -8,8 +8,8 @@ short_desc="X.Org imake program and related utilities"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="X11"
 homepage="https://www.x.org/wiki/"
-distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
-checksum=74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308
+distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.xz"
+checksum=7408955defcfab0f44d1bedd4ec0c20db61914917ad17bfc1f1c9bf56acc17b9
 
 pre_configure() {
 	autoreconf -fi

From 0292452b78697ea3a346b38c43c5835a307fcdd4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:37:40 +0200
Subject: [PATCH 1678/1854] xkbevd: update to 1.1.5.

---
 srcpkgs/xkbevd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xkbevd/template b/srcpkgs/xkbevd/template
index 6ed2959ad663..da491661f069 100644
--- a/srcpkgs/xkbevd/template
+++ b/srcpkgs/xkbevd/template
@@ -1,7 +1,7 @@
 # Template file for 'xkbevd'
 pkgname=xkbevd
-version=1.1.4
-revision=2
+version=1.1.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
@@ -9,8 +9,8 @@ short_desc="XKBD Event Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b
 
 post_install() {
 	vlicense COPYING

From a31c4703ff6ac8d9bde3c35b5c1227f7023f2ff5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:38:03 +0200
Subject: [PATCH 1679/1854] xkbutils: update to 1.0.5.

---
 srcpkgs/xkbutils/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xkbutils/template b/srcpkgs/xkbutils/template
index 18789b0ad14e..3b8d51321160 100644
--- a/srcpkgs/xkbutils/template
+++ b/srcpkgs/xkbutils/template
@@ -1,7 +1,7 @@
 # Template build file for 'xkbutils'.
 pkgname=xkbutils
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXaw-devel xorgproto"
@@ -9,8 +9,8 @@ short_desc="XKBD Utilities"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4
 
 post_install() {
 	vlicense COPYING

From 6c7437745aa738ee279cb1dd34d2b59484ab0d96 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:39:01 +0200
Subject: [PATCH 1680/1854] xlsatoms: update to 1.1.4.

---
 srcpkgs/xlsatoms/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template
index 42570e6b125b..e1cd09eddf38 100644
--- a/srcpkgs/xlsatoms/template
+++ b/srcpkgs/xlsatoms/template
@@ -1,7 +1,7 @@
 # Template file for 'xlsatoms'
 pkgname=xlsatoms
-version=1.1.3
-revision=2
+version=1.1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxcb-devel"
@@ -9,8 +9,8 @@ short_desc="List interned atoms defined on the X server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7
 
 post_install() {
 	vlicense COPYING

From a90c7c062c70bc54e5d8577d3ecb10179f3b87f5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:40:08 +0200
Subject: [PATCH 1681/1854] xvinfo: update to 1.1.5.

---
 srcpkgs/xvinfo/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template
index 21be07874f8e..847a275b9427 100644
--- a/srcpkgs/xvinfo/template
+++ b/srcpkgs/xvinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'xvinfo'
 pkgname=xvinfo
-version=1.1.4
-revision=2
+version=1.1.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXv-devel"
@@ -9,8 +9,8 @@ short_desc="Query X-Video capabilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404
 
 post_install() {
 	vlicense COPYING

From e9998417c1ffc8844c444f0f2e34c457cb978d06 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:40:53 +0200
Subject: [PATCH 1682/1854] xwininfo: update to 1.1.6.

---
 srcpkgs/xwininfo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xwininfo/template b/srcpkgs/xwininfo/template
index 6ba84063fe8a..432ae29443b9 100644
--- a/srcpkgs/xwininfo/template
+++ b/srcpkgs/xwininfo/template
@@ -1,6 +1,6 @@
 # Template file for 'xwininfo'
 pkgname=xwininfo
-version=1.1.5
+version=1.1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Query information about X windows"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f
 
 post_install() {
 	vlicense COPYING

From a9eca820cc4393dd77d13e98d17871407d44decd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:41:50 +0200
Subject: [PATCH 1683/1854] setxkbmap: update to 1.3.4.

---
 srcpkgs/setxkbmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 02a6f5de2452..820288afe657 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -1,6 +1,6 @@
 # Template file for 'setxkbmap'
 pkgname=setxkbmap
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/app/setxkbmap"
 distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.xz"
-checksum=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b
+checksum=be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade
 
 post_install() {
 	vlicense COPYING

From a51f0a54d530b777c53794c5b177882cfd7ae553 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 Jul 2023 21:42:35 +0200
Subject: [PATCH 1684/1854] sessreg: update to 1.1.3.

---
 srcpkgs/sessreg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sessreg/template b/srcpkgs/sessreg/template
index a95e0b950789..a7ef25c66914 100644
--- a/srcpkgs/sessreg/template
+++ b/srcpkgs/sessreg/template
@@ -1,6 +1,6 @@
 # Template build file for 'sessreg'.
 pkgname=sessreg
-version=1.1.2
+version=1.1.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Manage utmp/wtmp entries for xdm"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From 8c4508bf706e00b88a08c6daa7f674c6a5dd9e06 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 12:22:59 -0500
Subject: [PATCH 1685/1854] sddm: update to 0.20.0.

Closes #44593.
---
 srcpkgs/sddm/patches/qt-5.15.2.patch | 23 -----------------------
 srcpkgs/sddm/template                | 11 ++++++-----
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/sddm/patches/qt-5.15.2.patch

diff --git a/srcpkgs/sddm/patches/qt-5.15.2.patch b/srcpkgs/sddm/patches/qt-5.15.2.patch
deleted file mode 100644
index 51094817c6da..000000000000
--- a/srcpkgs/sddm/patches/qt-5.15.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid@kde.org" <aacid@kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b37..d5f29a94a 100644
---- a/src/daemon/XorgDisplayServer.cpp
-+++ b/src/daemon/XorgDisplayServer.cpp
-@@ -65,7 +65,7 @@ namespace SDDM {
-         // create a random hexadecimal number
-         const char *digits = "0123456789abcdef";
-         for (int i = 0; i < 32; ++i)
--            m_cookie[i] = digits[dis(gen)];
-+            m_cookie[i] = QLatin1Char(digits[dis(gen)]);
-     }
- 
-     XorgDisplayServer::~XorgDisplayServer() {
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 63fa93f160cf..b91cef64249e 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
-version=0.19.0
-revision=4
+version=0.20.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
@@ -12,9 +12,10 @@ depends="dbus"
 short_desc="QML based X11 display manager"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-3.0"
-homepage="http://github.com/sddm/sddm"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
+homepage="https://github.com/sddm/sddm"
+changelog="https://raw.githubusercontent.com/sddm/sddm/develop/ChangeLog"
+distfiles="https://github.com/sddm/sddm/archive/v${version}.tar.gz"
+checksum=467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

From 16935b4f53db1462291ed21c5415096c8d878a9d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 22:12:08 -0500
Subject: [PATCH 1686/1854] ntdsextract2: update to 0.12.2.

---
 srcpkgs/ntdsextract2/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index ce95b7a42748..34842894e043 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,17 +1,11 @@
 # Template file for 'ntdsextract2'
 pkgname=ntdsextract2
-version=0.9.1
-revision=2
+version=0.12.2
+revision=1
 build_style=cargo
 short_desc="Display contents of Active Directory database files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/janstarke/ntdsextract2"
 distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=75b3731dac5e3d2f6d3149f60f4336d3bd2732a1843bfff6e1fcb8d1cc46fc45
-
-post_patch() {
-	# https://github.com/janstarke/ntdsextract2/pull/8
-	cargo generate-lockfile
-	cargo update --package libesedb@0.1.4 --precise 0.1.3
-}
+checksum=d6515d5c703d6d2dd0d921439d72f0e47a0f58b41d9efc24aa2eeda92068b3fb

From 67ac13233af1580a786621e27f99c94266f0be56 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 22:51:24 -0500
Subject: [PATCH 1687/1854] QXlsx: backport cmake patch

---
 srcpkgs/QXlsx/patches/fix-inc.patch | 24 ++++++++++++++++++++++++
 srcpkgs/QXlsx/template              |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/QXlsx/patches/fix-inc.patch

diff --git a/srcpkgs/QXlsx/patches/fix-inc.patch b/srcpkgs/QXlsx/patches/fix-inc.patch
new file mode 100644
index 000000000000..5b26d47c2c70
--- /dev/null
+++ b/srcpkgs/QXlsx/patches/fix-inc.patch
@@ -0,0 +1,24 @@
+From 8c3e6633e3c901bc5a5cd477383421b0980dcd26 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Mon, 17 Apr 2023 23:43:59 +0100
+Subject: [PATCH] Fix #278
+
+There's no real reason to install the same headers twice, but at least
+now clients of the library can build again
+---
+ QXlsx/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index 4fa7f7f..074922a 100644
+--- a/QXlsx/CMakeLists.txt
++++ b/QXlsx/CMakeLists.txt
+@@ -179,7 +179,7 @@ PRIVATE
+     ${QXLSX_HEADERPATH}
+ PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/header>
+-    $<INSTALL_INTERFACE:include/QXlsx>
++    $<INSTALL_INTERFACE:include/QXlsxQt${QT_VERSION_MAJOR}>
+ )
+ 
+ set_target_properties(QXlsx PROPERTIES
diff --git a/srcpkgs/QXlsx/template b/srcpkgs/QXlsx/template
index 8177672d010c..31cc3ba9e5f8 100644
--- a/srcpkgs/QXlsx/template
+++ b/srcpkgs/QXlsx/template
@@ -1,7 +1,7 @@
 # Template file for 'QXlsx'
 pkgname=QXlsx
 version=1.4.6
-revision=1
+revision=2
 build_style=cmake
 build_wrksrc="QXlsx"
 hostmakedepends="qt5-qmake qt5-host-tools"

From 07788581e692a8a113876fff3862ad9855d2846f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 23:00:23 -0500
Subject: [PATCH 1688/1854] stellarium: update to 23.2.

---
 srcpkgs/stellarium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index e468c1f3bc06..74ee07205f6e 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=23.1
+version=23.2
 revision=1
 build_style=cmake
 configure_args="-DENABLE_SHOWMYSKY=Off -DUSE_PLUGIN_TELESCOPECONTROL=NO"
@@ -14,5 +14,5 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://stellarium.org/"
 distfiles="https://github.com/Stellarium/stellarium/archive/refs/tags/v${version}.tar.gz"
-checksum=ce896ddf6f0b35d6bbf6cee122d8f0b5c7bca93fffa17c10f16c56a689a1850f
+checksum=58cf1dc6b7f18626177f80d9912dff6ac24044ad4184d778fe513788c3d97b96
 replaces="stellarium-data>=0"

From 7aaf015787440fe549265f796239f377f8ea3ce1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 23:52:10 -0500
Subject: [PATCH 1689/1854] python3-ytmusicapi: update to 1.1.1.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 6cd02fa6be08..bb8abe329516 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${PYPI_SITE}/y/ytmusicapi/ytmusicapi-${version}.tar.gz"
-checksum=3286de79e94a914e4a14814fffe372d24b734e784acd7f9fa734ee383adf8c6d
+checksum=50258db9bd0512b766177906488265a4870a74f65d3f3279cbccb1f593c1525c
 
 post_install() {
 	vlicense LICENSE

From 6f5ac56438e92f7521d4fa054a8956ba1462edd1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Jul 2023 23:52:14 -0500
Subject: [PATCH 1690/1854] python3-pydyf: update to 0.7.0.

---
 srcpkgs/python3-pydyf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pydyf/template b/srcpkgs/python3-pydyf/template
index b705f1e4c311..ae5e0092490e 100644
--- a/srcpkgs/python3-pydyf/template
+++ b/srcpkgs/python3-pydyf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pydyf'
 pkgname=python3-pydyf
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core python3-flit_core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://courtbouillon.org/pydyf"
 distfiles="https://github.com/CourtBouillon/pydyf/archive/refs/tags/v${version}.tar.gz"
-checksum=28b521b82e5b76633680b97172a13265e3dedab807372d01802015b83ea99d9d
+checksum=b7055ab659108f13036637a398de6ed20a9e23e11ed33fbd9cc586c91fcfd16b
 
 post_install() {
 	vlicense LICENSE

From ff72c932bb526a6059905da3fd0757f9647aae9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Jul 2023 22:08:02 -0300
Subject: [PATCH 1691/1854] primecount: update to 7.9.

---
 srcpkgs/primecount/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template
index 4f698b1e2169..624f7b9cd674 100644
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@@ -1,6 +1,6 @@
 # Template file for 'primecount'
 pkgname=primecount
-version=7.8
+version=7.9
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primecount/"
 changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=7588b241cd268f4cc6c836135088a143ca65c181278ee0ba3b3309ac055d5ae8
+checksum=872975ba2cbb43f5cc1ff5f5fda9ec4ec3f2be1eb3e3e906abe5d0b29a997f5b
 
 build_options="native_build"
 

From 29711d82c05f588219301e9acc98a477627dd500 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 3 Jul 2023 21:54:18 -0400
Subject: [PATCH 1692/1854] grype: update to 0.63.1

---
 srcpkgs/grype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 11972217100b..df162a5317ee 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,6 +1,6 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.63.0
+version=0.63.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=a55aa18498a2b67f7bdcfb0fac0746a351ceb8a2e9da0842ab1a68a07f0ffa65
+checksum=c0cae06f51a00a9ada57dd3ddd8de052893e42620d8cee49c8874630d5d89817
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

From 68dd477e6c55c37115d710597c8c9f7d3a7861e0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 3 Jul 2023 21:30:42 -0400
Subject: [PATCH 1693/1854] syft: update to 0.84.1

---
 srcpkgs/syft/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index a38b2524bd87..11bd81181bee 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,16 +1,17 @@
 # Template file for 'syft'
 pkgname=syft
-version=0.84.0
+version=0.84.1
 revision=1
 build_style=go
 build_helper=qemu
-go_import_path="github.com/anchore/syft/cmd/syft"
+go_import_path="github.com/anchore/syft"
+go_package="github.com/anchore/syft/cmd/syft"
 short_desc="SBOM generator CLI for container images, filesystems and more"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/syft"
 distfiles="https://github.com/anchore/syft/archive/refs/tags/v${version}.tar.gz"
-checksum=fc16bd2e207d864a56c7122b0ad48b393214383f606e63d3f71bc4761d809326
+checksum=f8089209966436e7ef829b50092a410a152df8b98e60fe93214556f473d306b0
 
 post_install() {
 	syft="${DESTDIR}/usr/bin/syft"

From 3d4bdb0aa980b1d69257252c4d9eb47d0ec8ad4a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 18:48:29 +0200
Subject: [PATCH 1694/1854] wayland-protocols: update to 1.32.

---
 srcpkgs/wayland-protocols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template
index 2b29a4206cba..d24fd1f43af4 100644
--- a/srcpkgs/wayland-protocols/template
+++ b/srcpkgs/wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'wayland-protocols'
 pkgname=wayland-protocols
-version=1.31
+version=1.32
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://wayland.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${version}/wayland-protocols-${version}.tar.gz"
-checksum=04d3f66eca99d638ec8dbfdfdf79334290e22028f7d0b04c7034d9ef18a3248a
+checksum=444b5d823ad0163dfe505c97ea1a0689ca7e2978a87cf59b03f06573b87db260
 
 post_install() {
 	vlicense COPYING

From 91d0f70e840372076b2e905bfc68541a39d006bc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 3 Jul 2023 18:29:26 +0200
Subject: [PATCH 1695/1854] squirrel: fix -devel subpackage

---
 srcpkgs/squirrel/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/squirrel/template b/srcpkgs/squirrel/template
index abd2c7a0d607..32fdef7af991 100644
--- a/srcpkgs/squirrel/template
+++ b/srcpkgs/squirrel/template
@@ -1,7 +1,7 @@
 # Template file for 'squirrel'
 pkgname=squirrel
 version=3.2
-revision=1
+revision=2
 build_style=cmake
 short_desc="Squirrel Programming Language"
 maintainer="Wilson Birney <wpb@360scada.com>"
@@ -25,9 +25,9 @@ squirrel-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmkdir usr
-		vcopy include usr
-		vmove usr/lib/*.so
-		vmove usr/lib/*.a
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }

From 25843f1ecf87aeb2136812de653a939fa68cd115 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 3 Jul 2023 18:34:15 +0200
Subject: [PATCH 1696/1854] hwids: update to 0.372.

---
 srcpkgs/hwids/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index 7b1bfc0dc06d..f274acd8cdf1 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -1,14 +1,14 @@
 # Template file for 'hwids'
 pkgname=hwids
 reverts="20201207_1 20210613_1 20200813.1_1 20200813.1_2 20200306_1 20200204_1 20191025_1 20190818_1 20190316_1 20180917_1 20180518_1 20180315_1 20171003_1 20170715_1 20170328_1 20161103_1 20160801_1 20160421_1 20160306_1 20150717_1 20150421_1 20150129_1 20150118_1"
-version=0.368
+version=0.372
 revision=1
 short_desc="Hardware Identification Databases"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/vcrhonek/hwdata"
 distfiles="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${version}.tar.gz"
-checksum=d3db5f4d08a0ba2e4d776fba507662399816e75a14af78bd25dd3c8f2fb8e951
+checksum=aff121c1c7a7dec58414c5e21151a180d3a23628e21c12e3bef58e063a0dc228
 
 do_install() {
 	vmkdir usr/share/hwdata

From 5602a5738e824018d4891960166e01a8273cbdb0 Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Fri, 24 Mar 2023 19:42:35 -0400
Subject: [PATCH 1697/1854] newsraft: update to 0.19.

Closes #44817.
---
 srcpkgs/newsraft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/newsraft/template b/srcpkgs/newsraft/template
index 68cd33eea0f8..74e39db007e9 100644
--- a/srcpkgs/newsraft/template
+++ b/srcpkgs/newsraft/template
@@ -1,6 +1,6 @@
 # Template file for 'newsraft'
 pkgname=newsraft
-version=0.17
+version=0.19
 revision=1
 build_style=gnu-makefile
 make_install_args="EXAMPLES_DIR=${DESTDIR}/usr/share/examples/newsraft"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://codeberg.org/grisha/newsraft"
 changelog="https://codeberg.org/grisha/newsraft/releases"
 distfiles="https://codeberg.org/grisha/newsraft/archive/newsraft-${version}.tar.gz"
-checksum=12a09b4d4ade374d1ccf4256a9d7eb511f4a59e175e4d832842dfd2b95d8742c
+checksum=6f7b578609f543f65b63dc0ba2fd904cc7b71d4f33f84ef052fe704c5156b605
 
 post_install() {
 	vlicense doc/license.txt

From acf223f1b2609eedca97d08c3fe6c3990738f600 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 28 Jun 2023 14:24:43 +0000
Subject: [PATCH 1698/1854] MoarVM: update to 2023.06.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index d5a1b302328c..d48bb17819e7 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2023.05
+version=2023.06
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -14,6 +14,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=c8e75883c1e1936d71ac081b21e8c2a344c80c6db5b4f8e1e6bb9481dd8b7547
+checksum=143f92510eaa3452c712e4aae9f44d84cd078f16517b40252bab7dd5e224ecdb
 nocross=yes
 shlib_provides="libmoar.so"

From 9138e1cc14ca76f7fa034f6a2a5a2f9bfdf0a499 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 28 Jun 2023 14:25:39 +0000
Subject: [PATCH 1699/1854] nqp: update to 2023.06.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 5c05ed55c9a5..648dae62f7a0 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2023.05
+version=2023.06
 revision=1
 build_style=configure
 make_check_target=test
@@ -14,5 +14,5 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
 distfiles="https://rakudo.org/dl/nqp/nqp-${version}.tar.gz"
-checksum=1402db7e3ca6f2f3dfc1e98aa32e0e2a937e49b2a777a74c62268a98abb3bbd2
+checksum=ddcb92f29180699ebaf0a7faa46ad4ac902f9c8826d7476d9c6f71176cadd7d3
 nocross=yes

From a6ef62e7fa2710a3fd842375f3584570df9cbfcf Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 28 Jun 2023 14:26:51 +0000
Subject: [PATCH 1700/1854] rakudo: update to 2023.06.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 5ccd01e973fd..8e87abaa2535 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2023.05
+version=2023.06
 revision=1
 build_style=configure
 make_check_target=test
@@ -31,7 +31,7 @@ license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
 distfiles="https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"
-checksum=cfae1cf1321c8130e4746eb5f5c926f65adc9774e92c1b3a89c2c48f0b22236a
+checksum=da50fed9fa99cced37f8e450c6a023150804d627bf698a5c0d88cbe84f405e72
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 256dad944d4acc791a655627e60fc130e8cf606d Mon Sep 17 00:00:00 2001
From: Bryce Vandegrift <bryce@brycevandegrift.xyz>
Date: Tue, 16 May 2023 18:22:00 -0400
Subject: [PATCH 1701/1854] New package: juliaup-1.8.16

---
 srcpkgs/juliaup/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/juliaup/template

diff --git a/srcpkgs/juliaup/template b/srcpkgs/juliaup/template
new file mode 100644
index 000000000000..3f718e4692d8
--- /dev/null
+++ b/srcpkgs/juliaup/template
@@ -0,0 +1,21 @@
+# Template file for 'juliaup'
+pkgname=juliaup
+version=1.8.16
+revision=1
+archs="x86_64* i686 aarch64"
+build_style=cargo
+short_desc="Julia installer and version multiplexer"
+maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
+license="MIT"
+homepage="https://github.com/JuliaLang/juliaup"
+distfiles="https://github.com/JuliaLang/juliaup/archive/refs/tags/v${version}.tar.gz"
+checksum=99b0d62b589c8a330fffaa2252b8e4251124bfd59077f0789a6a456d3b1ae81a
+
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+	# command_add test fails, doesn't seem to be able to launch the downloaded julia in the test
+	make_check=no
+fi
+
+post_install() {
+	vlicense LICENSE
+}

From faf8d9b269a3b5d1542345ea13d114d662788341 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 4 Jul 2023 06:09:09 -0400
Subject: [PATCH 1702/1854] chezmoi: update to 2.34.3.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 4e8b46f9b709..074ef8b8c602 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.34.2
+version=2.34.3
 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=fc47d6e4cbe1b8f4762c204be28e30d9e9f3bcfa8c51ac276cbd1864804b2dc8
+checksum=708ad93e8e0504ca598f6571652fc15ac609c735ce55af6a23a9b8931553c2e5
 
 pre_build() {
 	local _date

From 30011a9194110de936833805c114a1b93bb29d29 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 13:57:56 +0200
Subject: [PATCH 1703/1854] cmark: update to 0.30.3.

---
 srcpkgs/cmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmark/template b/srcpkgs/cmark/template
index cd822051b3ab..08f8e4d8930f 100644
--- a/srcpkgs/cmark/template
+++ b/srcpkgs/cmark/template
@@ -1,6 +1,6 @@
 # Template file for 'cmark'
 pkgname=cmark
-version=0.30.2
+version=0.30.3
 revision=1
 build_style=cmake
 short_desc="CommonMark parsing and rendering library and program in C"
@@ -8,7 +8,7 @@ maintainer="pancake <pancake@nopcode.org>"
 license="MIT"
 homepage="https://github.com/commonmark/cmark"
 distfiles="https://github.com/commonmark/cmark/archive/${version}.tar.gz"
-checksum=6c7d2bcaea1433d977d8fed0b55b71c9d045a7cdf616e3cd2dce9007da753db3
+checksum=85e9fb515531cc2c9ae176d693f9871774830cf1f323a6758fb187a5148d7b16
 
 pre_configure() {
 	# Fix the SONAME version to use just the major number

From df5bae6e68548ea573a6a1dcad255672528213b5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 13:58:36 +0200
Subject: [PATCH 1704/1854] gucci: update to 1.6.10.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d2de364bbd2e..887d8a1ad5af 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.6.6
+version=1.6.10
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz"
-checksum=5e418d5801bee415fe055535dd2943aceb4a19646a2b101be0ba429b84de3fd6
+checksum=1cdf723cf95708234034608a9628aed642cfb2f0ad58f58756694e34d18e557b
 
 post_install() {
 	vlicense LICENSE

From 6a9b6a93446c22f0dd7ac920caa583d493169f68 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:06:52 +0200
Subject: [PATCH 1705/1854] imlib2: update to 1.11.1.

---
 srcpkgs/imlib2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 19cb61e08f4c..e985230fbb8a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,7 +1,7 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.11.0
-revision=3
+version=1.11.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
-checksum=6121196a05a82cc49d104d066ef1bd1e68b4b6394064d244985d0d6aa5fd8170
+checksum=f712b6bb9dcad46d8b8f4ad52610dcbbaebb4cc80b5fd12f93124d3a380fa6bf
 
 post_install() {
 	vlicense COPYING

From f1d47a840db8c4e939cb3f66f0a34208556ccf42 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:08:09 +0200
Subject: [PATCH 1706/1854] libpng: update to 1.6.40.

---
 srcpkgs/libpng/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index 626caa73effe..8c33a8252c90 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -1,16 +1,16 @@
 # Template file for 'libpng'
 pkgname=libpng
-version=1.6.39
+version=1.6.40
 revision=1
 build_style=gnu-configure
 makedepends="zlib-devel"
 short_desc="Library for manipulating PNG images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Libpng"
 homepage="http://www.libpng.org/pub/png/libpng.html"
 changelog="https://github.com/pnggroup/libpng/blob/master/CHANGES"
 distfiles="${SOURCEFORGE_SITE}/libpng/libpng-${version}.tar.xz"
-checksum=1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
+checksum=535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*) configure_args="--enable-arm-neon=no";;

From a8a3f062a4a4a1e1878e6557c23e1a23c6ae2b5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:10:40 +0200
Subject: [PATCH 1707/1854] imake: update to 1.0.9.

---
 srcpkgs/imake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imake/template b/srcpkgs/imake/template
index 90d09a3bab0b..a3eddf950e17 100644
--- a/srcpkgs/imake/template
+++ b/srcpkgs/imake/template
@@ -1,6 +1,6 @@
 # Template file for 'imake'
 pkgname=imake
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config perl makedepend xorg-cf-files"
@@ -10,5 +10,5 @@ short_desc="X.Org imake program and related utilities"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="GPL-2.0-or-later"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/util/imake-${version}.tar.bz2"
-checksum=b8d2e416b3f29cd6482bcffaaf19286d32917a164d07102a0e531ccd41a2a702
+distfiles="${XORG_SITE}/util/imake-${version}.tar.xz"
+checksum=72de9d278f74d95d320ec7b0d745296f582264799eab908260dbea0ce8e08f83

From 3be438f89508b945f25fbd0f5ed22214bb77571b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:11:51 +0200
Subject: [PATCH 1708/1854] libXaw3d: update to 1.6.4.

---
 srcpkgs/libXaw3d/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libXaw3d/template b/srcpkgs/libXaw3d/template
index f0241c7cc871..dcdd7dec142f 100644
--- a/srcpkgs/libXaw3d/template
+++ b/srcpkgs/libXaw3d/template
@@ -1,7 +1,7 @@
 # Template file for 'libXaw3d'
 pkgname=libXaw3d
-version=1.6.3
-revision=2
+version=1.6.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-internationalization --enable-multiplane-bitmaps
  --enable-gray-stipples --enable-arrow-scrollbars --with-pic --with-gnu-ld"
@@ -11,8 +11,8 @@ short_desc="X Athena Widget 3d library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT/X11"
 homepage="https://cgit.freedesktop.org/xorg/lib/libXaw3d"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=2600df524bc68eb0f25a5a9b28f056f9ad0bfa9336db870c6b4a623992750411
 
 post_install() {
 	vlicense COPYING

From 1a27b2a9dc30244f4580d7033b9fd3ecfabe2410 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:12:28 +0200
Subject: [PATCH 1709/1854] libSM: update to 1.2.4.

---
 srcpkgs/libSM/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index 8ed244b8a462..554423552a92 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -1,6 +1,6 @@
 # Template file for 'libSM'
 pkgname=libSM
-version=1.2.3
+version=1.2.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X Session Management Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84
 
 post_install() {
 	vlicense COPYING

From c2e5d6fd0551a79e89006e57d0474293317c0d27 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:13:11 +0200
Subject: [PATCH 1710/1854] libXfixes: update to 6.0.1.

---
 srcpkgs/libXfixes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index 173c075e99f5..5aa1618c5504 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -1,6 +1,6 @@
 # Template file for 'libXfixes'
 pkgname=libXfixes
-version=6.0.0
+version=6.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Xfixes library and extension of X RandR from modular X.org"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58
 
 post_install() {
 	vlicense COPYING

From a0f38d718446c2a3fb1fcd53f75c30df2353ad36 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:15:07 +0200
Subject: [PATCH 1711/1854] libXft: update to 2.3.8.

---
 srcpkgs/libXft/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 98b206dd35a2..3564df73cae2 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.7
+version=2.3.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxft"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.gz"
-checksum=75b4378644f5df3a15f684f8f0b5ff1324d37aacd5a381f3b830a2fbe985f660
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49
 
 post_install() {
 	vlicense COPYING

From a3aa9b186cec9c2b4fda312077a8d2a2980ccf6d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:16:27 +0200
Subject: [PATCH 1712/1854] libXi: update to 1.8.1.

---
 srcpkgs/libXi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index d1781a394bd3..c199d9c825a1 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -1,6 +1,6 @@
 # Template file for 'libXi'
 pkgname=libXi
-version=1.8
+version=1.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="X Input extension library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxi"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7
 
 post_install() {
 	vlicense COPYING

From ea8c30adb2fcac452df6cc8392c4b427bc72fb0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:17:20 +0200
Subject: [PATCH 1713/1854] libXpm: update to 3.5.16.

---
 srcpkgs/libXpm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXpm/template b/srcpkgs/libXpm/template
index f038544d9be3..bfd6ff3ca25c 100644
--- a/srcpkgs/libXpm/template
+++ b/srcpkgs/libXpm/template
@@ -1,6 +1,6 @@
 # Template file for 'libXpm'
 pkgname=libXpm
-version=3.5.14
+version=3.5.16
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
@@ -9,8 +9,8 @@ short_desc="X PixMap Library from modular Xorg X11"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.xz"
-checksum=f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=e6bc5da7a69dbd9bcc67e87c93d4904fe2f5177a0711c56e71fa2f6eff649f51
 
 post_install() {
 	vlicense COPYING

From 363774b1a49d8dbd3c68aff57e8f4f44bd3ee9a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:18:23 +0200
Subject: [PATCH 1714/1854] libXp: update to 1.0.4.

---
 srcpkgs/libXp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libXp/template b/srcpkgs/libXp/template
index 1f67f212c0b0..153aef21367d 100644
--- a/srcpkgs/libXp/template
+++ b/srcpkgs/libXp/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXp'.
 pkgname=libXp
-version=1.0.3
-revision=2
+version=1.0.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="xorgproto libXext-devel"
 short_desc="X Print Service Extension Library"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
 maintainer="Orphaned <orphan@voidlinux.org>"
-checksum=7f360c9905849c3587d48efc0f0ecbc852c19f61a52b18530d6b005cb9148c57
+checksum=1f19e3b8e82a34a8fd9889a7d9af0abe8588cb03fb57c37c569634cf3b9df1a4
 
 post_install() {
 	vlicense COPYING

From 73b6d70d7d5a9f539222aa3ea86f4807ec560e6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:19:17 +0200
Subject: [PATCH 1715/1854] libXres: update to 1.2.2.

---
 srcpkgs/libXres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template
index af75d0ad21d5..213e1cae7861 100644
--- a/srcpkgs/libXres/template
+++ b/srcpkgs/libXres/template
@@ -1,6 +1,6 @@
 # Template file for 'libXres'
 pkgname=libXres
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="X Resource Information Extension Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxres"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f
 
 post_install() {
 	vlicense COPYING

From db133e97bc6720febdcaff4fd9ef7093ccacc33f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:20:36 +0200
Subject: [PATCH 1716/1854] libXt: update to 1.3.0.

---
 srcpkgs/libXt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index 25891d8f9b8f..c06ad0dc2ae0 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -1,6 +1,6 @@
 # Template file for 'libXt'
 pkgname=libXt
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="X Toolkit Intrinsics library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91
 
 post_install() {
 	vlicense COPYING

From 7ff0e500bbe9153786f4c846a31bcd9b826d6369 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:21:15 +0200
Subject: [PATCH 1717/1854] libXxf86dga: update to 1.1.6.

---
 srcpkgs/libXxf86dga/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template
index fe22492d3a29..761b49e52af7 100644
--- a/srcpkgs/libXxf86dga/template
+++ b/srcpkgs/libXxf86dga/template
@@ -1,6 +1,6 @@
 # Template file for 'libXxf86dga'
 pkgname=libXxf86dga
-version=1.1.5
+version=1.1.6
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
@@ -10,8 +10,8 @@ short_desc="Library for the XFree86-DGA X extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=be44427579808fe3a217d59f51cae756a26913eb6e4c8738ccab65ff56d7980f
 
 post_install() {
 	vlicense COPYING

From 85b92a473e940492b3ef878675b75c2006cc56eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:22:00 +0200
Subject: [PATCH 1718/1854] smproxy: update to 1.0.7.

---
 srcpkgs/smproxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/smproxy/template b/srcpkgs/smproxy/template
index 15eb253f900f..0408ac12d425 100644
--- a/srcpkgs/smproxy/template
+++ b/srcpkgs/smproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'smproxy'
 pkgname=smproxy
-version=1.0.6
-revision=2
+version=1.0.7
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libSM-devel libXt-devel libXmu-devel"
@@ -9,8 +9,8 @@ short_desc="X11R6 session management application"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/smproxy-${version}.tar.bz2"
-checksum=6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266
+distfiles="${XORG_SITE}/app/smproxy-${version}.tar.xz"
+checksum=4aa99237cc9dab7d87ce9bc7cca4116674a853b5f08dfe3f9db1bb2b2cf9f305
 
 post_install() {
 	vlicense COPYING

From 4898a5bf406891cc3de45309ce90da4c06e77f3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:23:00 +0200
Subject: [PATCH 1719/1854] xcowsay: update to 1.6.

---
 srcpkgs/xcowsay/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xcowsay/template b/srcpkgs/xcowsay/template
index 7e62d1307e27..7028c5982ad7 100644
--- a/srcpkgs/xcowsay/template
+++ b/srcpkgs/xcowsay/template
@@ -1,6 +1,6 @@
 # Template file for 'xcowsay'
 pkgname=xcowsay
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.doof.me.uk/xcowsay/"
 distfiles="http://www.nickg.me.uk/files/${pkgname}-${version}.tar.gz"
-checksum=3ea45a453135e4d4eb79bd587c29acd4ee08c5fd3ed4099b114f852f0c50ca5f
+checksum=46ace864ff28d2d21f4b7058f0295e18d0041a120c1078a951fa43c4e0f5c8c5

From 15eb8a8bce05fbfa4c7dc0822c8fd780ebd4ed8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Jul 2023 14:23:50 +0200
Subject: [PATCH 1720/1854] xf86-video-dummy: update to 0.4.1.

---
 srcpkgs/xf86-video-dummy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xf86-video-dummy/template b/srcpkgs/xf86-video-dummy/template
index c123cd2d6189..1e11163faad6 100644
--- a/srcpkgs/xf86-video-dummy/template
+++ b/srcpkgs/xf86-video-dummy/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-video-dummy'
 pkgname=xf86-video-dummy
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="Xorg dummy video driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.gz"
-checksum=bbecddd599d6fbf0e2a40aa4a5baabaa2ea9690521ffc8e9a3c26e1172498197
+distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.xz"
+checksum=351920a7fd0f759a3ac972a5999b3ffed46f07fb52a99f319bfb5b6a59d3dfaf
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"

From db0d25c8e47e9e8ee0f559f4ad98e01963adba5e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 1 Mar 2023 17:57:24 +0000
Subject: [PATCH 1721/1854] unixodbc: update to 2.3.11.

---
 srcpkgs/unixodbc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index d1ee07c0b54d..11784add7063 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -1,6 +1,6 @@
 # Template file for 'unixodbc'
 pkgname=unixodbc
-version=2.3.9
+version=2.3.11
 revision=1
 build_style=gnu-configure
 makedepends="libltdl-devel readline-devel"
@@ -8,9 +8,9 @@ conf_files="/etc/odbcinst.ini /etc/odbc.ini"
 short_desc="Basic ODBC tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
-homepage="http://www.unixodbc.org"
-distfiles="http://www.unixodbc.org/unixODBC-${version}.tar.gz"
-checksum=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
+homepage="https://www.unixodbc.org"
+distfiles="https://www.unixodbc.org/unixODBC-${version}.tar.gz"
+checksum=d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c
 
 libodbc_package() {
 	short_desc="ODBC library for Unix"

From 847cb3a29396ea3fe5c285abb2bbc59958e9122c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 12:33:40 +0100
Subject: [PATCH 1722/1854] firebird3: rename isql to avoid conflict with
 unixodbc.

---
 srcpkgs/firebird3/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index 8f2285dc7729..575415d2128f 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -1,7 +1,7 @@
 # Template file for 'firebird3'
 pkgname=firebird3
 version=3.0.6.33328
-revision=1
+revision=2
 _build=0
 _uver=${version//./_}
 build_style=gnu-configure
@@ -30,7 +30,7 @@ makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-dev
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom"
+license="custom:IDPL-1.0, Interbase-1.0"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
 checksum=34c1d2a29bbaf288e682cd1b5f8083f2baf73f351062245ace0bee35a3f7d35f
@@ -87,7 +87,7 @@ pre_configure() {
 	# do not change ownership to root:root and
 	# do not change permissions to read-only
 	find -iname "*.sh.in" -exec sed -i "{}" \
-		-e 's;"`whoami`";"root";' \
+		-e 's;"\x60whoami\x60";"root";' \
 		-e 's;chown root:root;#&;' \
 		-e 's;chown -R;#&;' \
 		-e 's;chmod 0444;chmod 0644;' \
@@ -113,6 +113,9 @@ do_install() {
 
 	cp -pR gen/buildroot/* ${DESTDIR}/
 
+	# Conflicts with isql from unixodbc.
+	mv ${DESTDIR}/usr/bin/isql{,-fb}
+
 	# TODO: create superserver?
 	# system account?
 	# runit service?

From 320c3578f36531a486743230916461fceb8cbf83 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 4 Jul 2023 15:31:33 +0200
Subject: [PATCH 1723/1854] syncthing: update to 1.23.6.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1c704f3d6eed..9a5f43c41489 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.23.5
+version=1.23.6
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=d87f02b3e970c0f08c59166851b40ee5c647efcb2d70b5f0410416987cd42294
+checksum=8b4d127c6893375165bbbc31865735b7cccc99e1bb019f6dab7a6020ba6b621b
 
 pre_build() {
 	GOARCH= go generate \

From d892d7ec4824b23fc3b566ba1893b257c401a400 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 12:29:07 +0530
Subject: [PATCH 1724/1854] pex: update to 2.1.138.

---
 srcpkgs/pex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index 9db0c0483905..d3ebccc07248 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,6 +1,6 @@
 # Template file for 'pex'
 pkgname=pex
-version=2.1.137
+version=2.1.138
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core python3-Sphinx"
@@ -9,9 +9,9 @@ short_desc="Library & tool for generating .pex (Python EXecutable) files"
 maintainer="icp <pangolin@vivaldi.net>"
 license="Apache-2.0"
 homepage="https://github.com/pantsbuild/pex"
-changelog="https://raw.githubusercontent.com/pantsbuild/pex/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/pantsbuild/pex/main/CHANGES.md"
 distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=cb0ce6cf64757dd5ba4f34c4607ab485f7909e6c24cd479ca28ce52205f0edeb
+checksum=75a514cd37a23fb587d15d91664be0e94f7acc1d132ff0f72c215e2125c28be2
 
 post_build() {
 	PYTHONPATH="$PWD" make -C docs man

From 84ffe279a8bd2e101258de0a75ff346686eed585 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Tue, 4 Jul 2023 15:06:52 +0000
Subject: [PATCH 1725/1854] gzdoom: update to version 4.10.0.

---
 srcpkgs/gzdoom/patches/fix-i686.patch    | 32 ------------------------
 srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------
 srcpkgs/gzdoom/template                  | 30 +++++++---------------
 3 files changed, 9 insertions(+), 77 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.patch

diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
deleted file mode 100644
index 14914b3a5a51..000000000000
--- a/srcpkgs/gzdoom/patches/fix-i686.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 26c617e..e162638 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1361,11 +1361,11 @@ endif()
- if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 	# Need to enable intrinsics for these files.
- 	if( SSE_MATTERS )
--		set_property( SOURCE
-+		set_source_files_properties(
- 			common/rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
--			utility/palette.cpp
--			utility/x86.cpp
-+			common/utility/palette.cpp
-+			common/utility/x86.cpp
- 			APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
- 	endif()
- endif()
-diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
-index f2a2987..b8de208 100644
---- a/src/common/utility/palette.cpp
-+++ b/src/common/utility/palette.cpp
-@@ -33,6 +33,8 @@
- */
- 
- #include <algorithm>
-+#include <cfloat>
-+#include <cmath>
- #include "palutil.h"
- #include "palentry.h"
- #include "sc_man.h"
diff --git a/srcpkgs/gzdoom/patches/sdl-version.patch b/srcpkgs/gzdoom/patches/sdl-version.patch
deleted file mode 100644
index 2ec2680ab4b7..000000000000
--- a/srcpkgs/gzdoom/patches/sdl-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2c69afa1187f55c2634c67c3ece47d89fd1b4f67 Mon Sep 17 00:00:00 2001
-From: Christoph Oelckers <coelckers@users.noreply.github.com>
-Date: Tue, 31 May 2022 11:00:10 +0200
-Subject: [PATCH] - fixed SDL version check
-
----
- src/common/platform/posix/sdl/sdlglvideo.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp
-index a5f7e6b527e..335dc620657 100644
---- a/src/common/platform/posix/sdl/sdlglvideo.cpp
-+++ b/src/common/platform/posix/sdl/sdlglvideo.cpp
-@@ -394,9 +394,7 @@ SDLVideo::SDLVideo ()
- 	}
- 
- 	// Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6.
--	SDL_version sdlver;
--	SDL_GetVersion(&sdlver);
--	if (!(sdlver.patch >= 6))
-+	if (!SDL_VERSION_ATLEAST(2, 0, 6))
- 	{
- 		I_FatalError("Only SDL 2.0.6 or later is supported.");
- 	}
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 99ee5e2144c2..781616f36a93 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,34 +1,31 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.1
-revision=2
-_tagdate=2021-10-20
+version=4.10.0
+revision=1
+archs="~i686* ~arm*"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel"
+makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel libvpx-devel"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.zdoom.org"
 # WARNING: watch out for new submodules
-distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
- https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
-checksum="454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102
- af1501c05815a7945a335704f6f05ac263c5877549fa3f476478077b56ea14f2"
+distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz
+ https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
+checksum="8702522c05048dfd4a765c6ac82a270d8bd0942e813d5bc6f4b69795a5d23a20
+ 1baf9f577839daff89073768eeccf561dd330eabec65217ba67eba799a4dfcab"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
 CXXFLAGS=-std=gnu++11
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	CFLAGS="-D_7ZIP_AFFINITY_DISABLE"
 	makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
-esac
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
@@ -39,15 +36,6 @@ post_extract() {
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 }
 
-post_patch() {
-	vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
-	vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
-	vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp
-	vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
-		-i src/common/platform/posix/i_system.h
-	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
-}
-
 post_install() {
 	vmkdir usr/share/licenses
 	mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}

From ac66f9bd12acbac876094b1480d8a561902b9e9b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:24:04 +0200
Subject: [PATCH 1726/1854] xtrans: update to 1.5.0

---
 srcpkgs/xtrans/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xtrans/template b/srcpkgs/xtrans/template
index 444f6801723f..27491fa3c3ca 100644
--- a/srcpkgs/xtrans/template
+++ b/srcpkgs/xtrans/template
@@ -1,15 +1,15 @@
 # Template file for 'xtrans'
 pkgname=xtrans
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 short_desc="Network API translation layer to insulate X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/lib/xtrans-${version}.tar.bz2"
-checksum=377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773
+distfiles="${XORG_SITE}/lib/xtrans-${version}.tar.gz"
+checksum=a806f8a92f879dcd0146f3f1153fdffe845f2fc0df9b1a26c19312b7b0a29c86
 
 post_install() {
 	vlicense COPYING

From e68a152943209674e6317e04889fcd3a3b6ecd17 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:22:34 +0200
Subject: [PATCH 1727/1854] xcursorgen: update to 1.0.8

---
 srcpkgs/xcursorgen/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xcursorgen/template b/srcpkgs/xcursorgen/template
index f6d5165d43c0..54a1fda4a732 100644
--- a/srcpkgs/xcursorgen/template
+++ b/srcpkgs/xcursorgen/template
@@ -1,6 +1,6 @@
 # Template file for 'xcursorgen'
 pkgname=xcursorgen
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X cursor generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.gz"
+checksum=b8bb2756918343b8bc15a4ce875e9efb6c4e7777adba088280e53dd09753b6ac
 
 post_install() {
 	vlicense COPYING

From 5db20989121eb093a0b39bf911a3d327f7fe1c2a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:30:25 +0200
Subject: [PATCH 1728/1854] xwud: update to 1.0.6

Closes: #44838 [via git-merge-pr]
---
 srcpkgs/xwud/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xwud/template b/srcpkgs/xwud/template
index d49fb3d5e3a4..356673aecfae 100644
--- a/srcpkgs/xwud/template
+++ b/srcpkgs/xwud/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwud'.
+# Template file for 'xwud'
 pkgname=xwud
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="Image displayer for X"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9
+license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/xwud-${version}.tar.gz"
+checksum=262171b0c434966ddbbe8a54afb9615567ad74d4cc2e823e14e51e099ec3ab0d
 
 post_install() {
 	vlicense COPYING

From dec0ff5acdce56392310591ddc28cb1eeda9d82e Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:31:36 +0200
Subject: [PATCH 1729/1854] xrefresh: update to 1.0.7

Closes: #44839 [via git-merge-pr]
---
 srcpkgs/xrefresh/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template
index 2a0c179313e0..0a54077b9f0e 100644
--- a/srcpkgs/xrefresh/template
+++ b/srcpkgs/xrefresh/template
@@ -1,16 +1,16 @@
-# Template build file for 'xrefresh'.
+# Template file for 'xrefresh'
 pkgname=xrefresh
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="X refresher"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=287dfb9bb7e8d780d07e672e3252150850869cb550958ed5f8401f0835cd6353
+license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/xrefresh-${version}.tar.gz"
+checksum=f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337
 
 post_install() {
 	vlicense COPYING

From a2469658ee5cf603a29908ed354b0378b9466547 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 00:30:34 +0200
Subject: [PATCH 1730/1854] xrefresh: update metadata

---
 srcpkgs/xrefresh/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template
index 0a54077b9f0e..dc585750006a 100644
--- a/srcpkgs/xrefresh/template
+++ b/srcpkgs/xrefresh/template
@@ -1,14 +1,14 @@
 # Template file for 'xrefresh'
 pkgname=xrefresh
 version=1.0.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
-short_desc="X refresher"
+short_desc="Refresh all or part of an X screen"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xorg.freedesktop.org"
+homepage="https://gitlab.freedesktop.org/xorg/app/xrefresh"
 distfiles="${XORG_SITE}/app/xrefresh-${version}.tar.gz"
 checksum=f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337
 

From 813090abec084c2c936c38095b4efff912765e26 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 4 Jul 2023 20:43:20 +0100
Subject: [PATCH 1731/1854] freetype: update to 2.13.1.

---
 srcpkgs/freetype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 7a47c539928f..2e5aeaadc9fa 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,6 +1,6 @@
 # Template file for 'freetype'
 pkgname=freetype
-version=2.13.0
+version=2.13.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
@@ -13,7 +13,7 @@ homepage="https://www.freetype.org/"
 # Should be using NONGNU_SITE instead, but that often redirects to outdated
 # mirrors, causing fetching the distfile to fail.
 distfiles="https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${version}.tar.xz"
-checksum=5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c
+checksum=ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf
 
 post_patch() {
 	vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in

From a71965754c69d1048c466853ced0e4e3522c43a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 4 Jul 2023 23:19:59 +0200
Subject: [PATCH 1732/1854] ncpamixer: update to 1.3.3.5.

---
 srcpkgs/ncpamixer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncpamixer/template b/srcpkgs/ncpamixer/template
index 2adac2d5f703..514b60c43e4b 100644
--- a/srcpkgs/ncpamixer/template
+++ b/srcpkgs/ncpamixer/template
@@ -1,6 +1,6 @@
 # Template file for 'ncpamixer'
 pkgname=ncpamixer
-version=1.3.3.4
+version=1.3.3.5
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/fulhax/ncpamixer"
 distfiles="https://github.com/fulhax/ncpamixer/archive/${version}.tar.gz"
-checksum=78be1b229c0325d58d34efd50cec3d2b0a1cb04fd2b34e4914e6ad29c7c17658
+checksum=2f9cd3801acea6f1f5e93222b80940b5966790c51236b6ee3456e46d4b0269af
 
 post_install() {
 	vlicense ../LICENSE

From ed8df3fd36e1124d868371b62d79c90d2ce4865d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 4 Jul 2023 18:33:29 +0200
Subject: [PATCH 1733/1854] pciutils: update to 3.10.0.

---
 srcpkgs/pciutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index e7f993727aad..b5c8eb6bea05 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -1,6 +1,6 @@
 # Template file for 'pciutils'
 pkgname=pciutils
-version=3.9.0
+version=3.10.0
 revision=1
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libkmod-devel"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://mj.ucw.cz/sw/pciutils/"
 changelog="https://raw.githubusercontent.com/pciutils/pciutils/master/ChangeLog"
 distfiles="https://mj.ucw.cz/download/linux/pci/pciutils-${version}.tar.gz"
-checksum=8953a785b2e3af414434b8fdcbfb75c90758819631001e60dd3afb89b22b2331
+checksum=7deabe38ae5fa88a96a8c4947975cf31c591506db546e9665a10dddbf350ead0
 
 do_build() {
 	make OPT="${CFLAGS}" SHARED=no AR=${AR} \

From af53a276924d54f8bb5703b8a42b3f6958fc9ec4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 3 Jul 2023 22:22:08 -0400
Subject: [PATCH 1734/1854] NetworkManager: update to 1.42.8

---
 srcpkgs/NetworkManager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 6311d82924c1..61dba80e131a 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.42.6
+version=1.42.8
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-42/NEWS"
 distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
-checksum=8c388ac3775ac6bceb605fae21be2c3e261cafe6067994a89f0dfa4610ed0279
+checksum=0337e7583d2ec5ade2ba2e8c625d2f09eeccda1d22836ee29aa72925d399c353
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes

From 6af0bc7433aa55322174521edbd8fa6488d49262 Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH 1735/1854] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index 7a1d31df3d..262448c2da 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -22,7 +22,7 @@ jobs:
-     runs-on: ubuntu-20.04
-     strategy:
-       matrix:
--        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
-+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:19:24 +0100
-Subject: [PATCH 2/4] follow bpo-37324:
- :ref:`collections-abstract-base-classes` moved to the :mod:`collections.abc`
- module
-
-(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
----
- fail2ban/server/action.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
-index 3bc48fe046..f0f1e6f59a 100644
---- a/fail2ban/server/action.py
-+++ b/fail2ban/server/action.py
-@@ -30,7 +30,10 @@
- import threading
- import time
- from abc import ABCMeta
--from collections import MutableMapping
-+try:
-+	from collections.abc import MutableMapping
-+except ImportError:
-+	from collections import MutableMapping
- 
- from .failregex import mapTag2Opt
- from .ipdns import DNSUtils
-
-From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:25:45 +0100
-Subject: [PATCH 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py
-index b7b95b445a..897d907c1a 100644
---- a/fail2ban/server/actions.py
-+++ b/fail2ban/server/actions.py
-@@ -28,7 +28,10 @@
- import os
- import sys
- import time
--from collections import Mapping
-+try:
-+	from collections.abc import Mapping
-+except ImportError:
-+	from collections import Mapping
- try:
- 	from collections import OrderedDict
- except ImportError:
-
-From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 17:35:59 +0100
-Subject: [PATCH 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py
-index 972a8c4bd2..27e12ddf65 100644
---- a/fail2ban/server/jails.py
-+++ b/fail2ban/server/jails.py
-@@ -22,7 +22,10 @@
- __license__ = "GPL"
- 
- from threading import Lock
--from collections import Mapping
-+try:
-+	from collections.abc import Mapping
-+except ImportError:
-+	from collections import Mapping
- 
- from ..exceptions import DuplicateJailException, UnknownJailException
- from .jail import Jail
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

From 3d2bae9e782b565f2ded74f33ef5a7d8fd1f0b3d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 4 Jul 2023 20:41:16 -0400
Subject: [PATCH 1736/1854] podofo: fix homepage, distfile, update check

closes #44846
---
 srcpkgs/podofo/template | 6 +++---
 srcpkgs/podofo/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/podofo/update

diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index 6194d645ddcc..8fdf86188cf7 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -8,9 +8,9 @@ makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://podofo.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/podofo/podofo/${version}/podofo-${version}.tar.gz"
-checksum=7cf2e716daaef89647c54ffcd08940492fd40c385ef040ce7529396bfadc1eb8
+homepage="https://github.com/podofo/podofo"
+distfiles="https://github.com/podofo/podofo/archive/refs/tags/${version}.tar.gz"
+checksum=42d7eaa3c8ffabf001121447830343c4362e562d0f12192b033a393f334a64a6
 disable_parallel_build=yes
 
 libpodofo_package() {
diff --git a/srcpkgs/podofo/update b/srcpkgs/podofo/update
deleted file mode 100644
index 35f969938eda..000000000000
--- a/srcpkgs/podofo/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://sourceforge.net/projects/podofo/files/"

From 7d899cd4d2a4332bcf258ea0bda73df342a9bee1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Jul 2023 18:39:03 +0200
Subject: [PATCH 1737/1854] rustypaste: update to 0.11.1

---
 srcpkgs/rustypaste/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustypaste/template b/srcpkgs/rustypaste/template
index f04fb2e37d6a..b1d056dfd53a 100644
--- a/srcpkgs/rustypaste/template
+++ b/srcpkgs/rustypaste/template
@@ -1,6 +1,6 @@
 # Template file for 'rustypaste'
 pkgname=rustypaste
-version=0.10.0
+version=0.11.1
 revision=1
 build_style=cargo
 make_check_args="-- --test-threads 1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste/archive/refs/tags/v${version}.tar.gz"
-checksum=54e4235716ccece450b51ffbd7a42a21b730650d3b481901e95d91477819806b
+checksum=5e6be43231b9dc1765390414c2d370717444be52f1ce4f23cf454c50bdfbb44d
 conf_files="/etc/rustypaste/config.toml"
 
 system_accounts="_rustypaste"

From b5fdcca5d3f374a9c8688da2759e3e1d04550300 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Jul 2023 18:39:23 +0200
Subject: [PATCH 1738/1854] rustypaste-cli: update to 0.5.0

---
 srcpkgs/rustypaste-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustypaste-cli/template b/srcpkgs/rustypaste-cli/template
index 663a222a059f..a521dd887b08 100644
--- a/srcpkgs/rustypaste-cli/template
+++ b/srcpkgs/rustypaste-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'rustypaste-cli'
 pkgname=rustypaste-cli
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=cargo
 short_desc="CLI tool for rustypaste"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/orhun/rustypaste-cli"
 changelog="https://raw.githubusercontent.com/orhun/rustypaste-cli/master/CHANGELOG.md"
 distfiles="https://github.com/orhun/rustypaste-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=c534d047202dcae17255a816882ac6358f82735270843f0b7ae525cc15fc2e91
+checksum=6af63a98fdd852e4a930568d74b75442c48cea741410ef87efc7694910d94be2
 
 post_install() {
 	vlicense LICENSE

From 3e200e90e426e9a41100d26d523ea8d7702e334b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 1 Jul 2023 12:47:38 +0530
Subject: [PATCH 1739/1854] python3-markdown-it: update to 3.0.0.

---
 srcpkgs/python3-markdown-it/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template
index 75075530af2a..58a2fe5e2211 100644
--- a/srcpkgs/python3-markdown-it/template
+++ b/srcpkgs/python3-markdown-it/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-markdown-it'
 pkgname=python3-markdown-it
-version=2.2.0
+version=3.0.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/executablebooks/markdown-it-py"
 changelog="https://raw.githubusercontent.com/executablebooks/markdown-it-py/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/m/markdown-it-py/markdown-it-py-${version}.tar.gz"
-checksum=7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1
+checksum=e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb
 # Tests not shipped in PYPI tarball
 make_check=no
 

From 8411643ae1a6e63269ec5aa7aaf0a8461b8073fd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 00:33:37 +0530
Subject: [PATCH 1740/1854] python3-pyfuse3: update to 3.2.3.

---
 srcpkgs/python3-pyfuse3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyfuse3/template b/srcpkgs/python3-pyfuse3/template
index 1463ecb76f81..7df3627a4067 100644
--- a/srcpkgs/python3-pyfuse3/template
+++ b/srcpkgs/python3-pyfuse3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyfuse3'
 pkgname=python3-pyfuse3
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -13,4 +13,4 @@ license="LGPL-2.0-or-later"
 homepage="https://pypi.org/project/pyfuse3/"
 changelog="https://raw.githubusercontent.com/libfuse/pyfuse3/master/Changes.rst"
 distfiles="${PYPI_SITE}/p/pyfuse3/pyfuse3-${version}.tar.gz"
-checksum=aa4080913e6148bff1365d4aaacdc96767b87a1e178031fd9caeb5f0b9fc8cec
+checksum=0771e921fd2a1c36bd4ed6b74db0616f4d40c8ac68994a80f3cc8a249fa807d8

From af6ce1298eacce51ff8fab996d8fdb7377b67756 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 31 May 2023 12:28:26 +0530
Subject: [PATCH 1741/1854] python3-semver: update to 3.0.1.

---
 srcpkgs/python3-semver/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-semver/template b/srcpkgs/python3-semver/template
index 171f8e521315..225c634148d2 100644
--- a/srcpkgs/python3-semver/template
+++ b/srcpkgs/python3-semver/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-semver'
 pkgname=python3-semver
-version=2.13.0
-revision=2
+version=3.0.1
+revision=1
 build_style=python3-pep517
-make_check_target="test_semver.py"
-hostmakedepends="python3-wheel"
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3"
 checkdepends="python3-pytest-cov"
 short_desc="Python package to work with Semantic Versioning"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://github.com/python-semver/python-semver"
+homepage="https://python-semver.readthedocs.io/en/latest/"
+changelog="https://raw.githubusercontent.com/python-semver/python-semver/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/s/semver/semver-${version}.tar.gz"
-checksum=fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f
+checksum=9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
 
 post_install() {
 	vlicense LICENSE.txt

From f00b24d3fbd25bd2d23c3ffb7c64e59c69543fd1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 00:28:24 +0530
Subject: [PATCH 1742/1854] python3-milc: update to 1.6.8.

Adopt.
---
 srcpkgs/python3-milc/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-milc/template b/srcpkgs/python3-milc/template
index 94772363c818..04bbc495b33a 100644
--- a/srcpkgs/python3-milc/template
+++ b/srcpkgs/python3-milc/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-milc'
 pkgname=python3-milc
-version=1.6.5
-revision=2
+version=1.6.8
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-argcomplete python3-colorama python3-halo
  python3-spinners"
 checkdepends="${depends} python3-pytest python3-semver"
 short_desc="Batteries-Included Python 3 CLI Framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://milc.clueboard.co"
+changelog="https://raw.githubusercontent.com/clueboard/milc/master/CHANGELOG.rst"
 distfiles="https://github.com/clueboard/milc/archive/refs/tags/${version}.tar.gz"
-checksum=c2ec7ca643f7bc59ed22b510cdd2ff9fb28c1778a9b98021c4386bcb6854ea08
+checksum=578f51ca87be5d135ff6e8ada8268402819424b723efb7ac954bd99ebaeec0ab
 
 post_install() {
 	vlicense LICENSE

From be4dd5df22959c4cd5f79e616fdf2ca320eea5df Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 4 Jul 2023 13:14:54 -0400
Subject: [PATCH 1743/1854] libjodycode: update to 3.1

---
 srcpkgs/libjodycode/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
index 92f5ed05e736..fa91b332c5f4 100644
--- a/srcpkgs/libjodycode/template
+++ b/srcpkgs/libjodycode/template
@@ -1,6 +1,6 @@
 # Template file for 'libjodycode'
 pkgname=libjodycode
-version=3.0.1
+version=3.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/libjodycode"
 changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
-checksum=e02aa4b96577fb5b6ca26018759cdaf71e3768dac321c07a84f2fb93ca4871bf
+checksum=c72974eb1d38873e06ea84b3d78990f87192f0113da5bd13fcac6bbc6a6e2184
 
 post_install() {
 	vlicense LICENSE.txt
@@ -21,6 +21,7 @@ libjodycode-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 	}
 }

From c66dc6b3021f8290bb41868140b229d3612ce1e9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 4 Jul 2023 13:15:09 -0400
Subject: [PATCH 1744/1854] jdupes: update to 1.26.1

---
 srcpkgs/jdupes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 9c77eb429b69..657ce382ec07 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.25.3
+version=1.26.1
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES.txt"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=89814310bb1884db6023436c523d03e405e1dda722a01caa336167e7938ac95e
+checksum=09153824320c65ad529f8f97cd3b7e792c50e9f9018192ea1a76f2e33a196225
 
 post_install() {
 	vlicense LICENSE.txt

From 93f480b580a66913d1f1117685ea7687ee133b1a Mon Sep 17 00:00:00 2001
From: lukas-jo <lukas.jordan@pm.me>
Date: Tue, 4 Jul 2023 11:16:50 +0200
Subject: [PATCH 1745/1854] ncspot: update to 0.13.3.

---
 srcpkgs/ncspot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ncspot/template b/srcpkgs/ncspot/template
index 19a47daeca3c..070b720b8c3d 100644
--- a/srcpkgs/ncspot/template
+++ b/srcpkgs/ncspot/template
@@ -1,6 +1,6 @@
 # Template file for 'ncspot'
 pkgname=ncspot
-version=0.13.2
+version=0.13.3
 revision=1
 build_style=cargo
 build_helper="qemu"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/hrkfdn/ncspot"
 changelog="https://github.com/hrkfdn/ncspot/releases"
 distfiles="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${version}.tar.gz"
-checksum=c329fc3fe229c47c2b3490555b4c8df550a3e2bbe3d0ade4e07f59434fa14e77
+checksum=316995d5bbef59c7a8699c8e7c3b3bc7699a38395a7d3500771abe4ca51b4d50
 
 post_build() {
 	cargo auditable build --release --target ${RUST_TARGET} --package xtask

From 78ff5ada1f6ac700ab68faae79ded84cadf3163c Mon Sep 17 00:00:00 2001
From: Massimo Manzato <massimo.manzato@gmail.com>
Date: Tue, 4 Jul 2023 12:08:25 +0200
Subject: [PATCH 1746/1854] a4: update to 0.2.2.

---
 srcpkgs/a4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/a4/template b/srcpkgs/a4/template
index 42c3ee99ade7..0b068ab111df 100644
--- a/srcpkgs/a4/template
+++ b/srcpkgs/a4/template
@@ -1,6 +1,6 @@
 # Template file for 'a4'
 pkgname=a4
-version=0.2.1
+version=0.2.2
 revision=1
 build_style=gnu-makefile
 makedepends="libvterm-devel libtickit-devel"
@@ -9,7 +9,7 @@ maintainer="Massimo Manzato <massimo.manzato@gmail.com>"
 license="MIT"
 homepage="https://a4term.com/"
 distfiles="https://github.com/rpmohn/a4/archive/v${version}.tar.gz"
-checksum=52e16e58ac52b9157933a3fd1063bc79e8dfa2f72ea2b4f03e77327bbec2c59e
+checksum=6cf79cfae36d171d0de9b2e79c55c2fbd10d30be25863842d23c95e8df628050
 
 post_install() {
 	vlicense LICENSE

From de5394d9e9bb44c5346ae50ad6bb329b1b2bbacb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 21:50:49 +0530
Subject: [PATCH 1747/1854] rust-analyzer: update to 2023.07.03.

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 6ae7cd38d4fb..83984deaaed2 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2023.06.26
+version=2023.07.03
 revision=1
 _ver=${version//./-}
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/refs/tags/${_ver}.tar.gz"
-checksum=2a22d552e98820dacf34aa84816dff1d83e9c56c997470e917c9d77f150069b4
+checksum=8212fd4f4337166f046cab44463185226e6782554c956cddbe2786c8e1dd510e
 # tests require Rust source code
 make_check=no
 

From f3fcca00c19131b657c5c8951bf2bd5176dda291 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 3 Jul 2023 10:56:52 +0530
Subject: [PATCH 1748/1854] gallery-dl: update to 1.25.7.

---
 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 2c893c251a71..7a277412c05a 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.6
+version=1.25.7
 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=d162f97c62e9d54ef3efdf00cd6c76ee422929bf19871b948caa6b3e0a1cc356
+checksum=46b37242e101e81f6ae908d972349c103b2b589453cf2f98547f19bf10cdf6dd
 
 pre_build() {
 	make man completion

From 3d50f6086c8b79e85570e7564a8711f7b9dd456b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 28 Jun 2023 13:38:22 +0100
Subject: [PATCH 1749/1854] apparmor: update to 3.1.6.

---
 srcpkgs/apparmor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index b81fab0d0f02..1a4293f5ba72 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,6 +1,6 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.4
+version=3.1.6
 revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
-checksum=6bee0c3941836dae2c635fe82f09b666123fcac16563aa0fedf4a63c22b91f40
+checksum=d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

From d810e444305f2421627e1c0b3ba77c1d65a5afab Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 30 Jun 2023 09:50:09 +0200
Subject: [PATCH 1750/1854] mdBook: update to 0.4.31.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index cfcdbc4cb545..05894f869ce3 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.30
+version=0.4.31
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/refs/tags/v${version}.tar.gz"
-checksum=9df217a6a4c22d4b0fef0d13e04b1a9ae896a0c1084af36b93d032c9fa2c4148
+checksum=0eab74f3861db63fce1a6624cc84a834441f35558128fb0b2e12f8806311283d
 
 post_install() {
 	vlicense LICENSE

From a82688956c595f33191e86cda67591c400c2b8bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 23:15:14 -0400
Subject: [PATCH 1751/1854] python: fix checksum

---
 srcpkgs/python/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 21566f3e9733..52b2b4532e62 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,7 +4,8 @@
 #
 pkgname=python
 version=2.7.18.7
-revision=2
+revision=3
+_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -14,8 +15,8 @@ short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
 
 alternatives="
  python:idle:/usr/bin/idle2.7

From cb4546cc71d21c8d4877bea92f1fc2f24f50f8a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 27 Jun 2023 23:15:17 -0400
Subject: [PATCH 1752/1854] python-tkinter: fix checksum

---
 srcpkgs/python-tkinter/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 858a70a97c9a..35c2c102b73c 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -8,7 +8,8 @@ _desc="Interpreted, interactive, object-oriented programming language"
 
 pkgname=python-tkinter
 version=2.7.18.7
-revision=1
+revision=2
+_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
@@ -17,8 +18,8 @@ short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=84d1f812da249da666685b9eac82df0b201e898b8b3f164f81f348072c12b933
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
 
 pre_configure() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.

From a1515ead84d9b54df33de5a52931fe8f12f98c61 Mon Sep 17 00:00:00 2001
From: Numair Dubas <Numair2644@protonmail.com>
Date: Tue, 4 Jul 2023 22:21:23 -0400
Subject: [PATCH 1753/1854] flavours: update to 0.7.1.

closes #44850
---
 srcpkgs/flavours/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/flavours/template b/srcpkgs/flavours/template
index 7e5dfd626932..afb58c057d56 100644
--- a/srcpkgs/flavours/template
+++ b/srcpkgs/flavours/template
@@ -1,6 +1,6 @@
 # Template file for 'flavours'
 pkgname=flavours
-version=0.6.1
+version=0.7.1
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -8,8 +8,9 @@ short_desc="Simple and easy cli to build and use base16 schemes"
 maintainer="Numair Dubas <Numair2644@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Misterio77/flavours"
-distfiles=${homepage}/archive/refs/tags/v${version}.tar.gz
-checksum=48c7659031d399ff125a07b71419935946e0da8d3ef1817a9f89dda32c2dcac1
+changelog="https://raw.githubusercontent.com/Misterio77/flavours/master/CHANGELOG.md"
+distfiles=https://github.com/Misterio77/flavours/archive/refs/tags/v${version}.tar.gz
+checksum=207002728cc270d92f4cd437384925e767c611d30520ec8a29816dfe600d7f61
 
 post_build() {
 	FLAVOURS="target/${RUST_TARGET}/release/flavours"

From ce5fa5e39772f2e5789af091137d79d0a9e8e5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 29 Mar 2023 15:02:49 +0100
Subject: [PATCH 1754/1854] New package: darkman-1.5.4

---
 srcpkgs/darkman/template | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/darkman/template

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
new file mode 100644
index 000000000000..123091a952a1
--- /dev/null
+++ b/srcpkgs/darkman/template
@@ -0,0 +1,31 @@
+# Template file for 'darkman'
+pkgname=darkman
+version=1.5.4
+revision=1
+build_style=go
+go_import_path="gitlab.com/WhyNotHugo/darkman"
+go_package="${go_import_path}/cmd/darkman"
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
+depends="dbus"
+short_desc="Daemon for dark-mode and light-mode transitions on Linux desktop"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="ISC"
+homepage="https://darkman.whynothugo.nl/"
+changelog="https://gitlab.com/WhyNotHugo/darkman/-/raw/main/CHANGELOG.md"
+distfiles="https://gitlab.com/WhyNotHugo/darkman/-/archive/v${version}/darkman-v${version}.tar"
+checksum=c19b33a62a90120df53ccfa823eb69da24429bb63101d57e9604e36eb3de9e38
+
+post_install() {
+	vmkdir usr/share/dbus-1/services
+	vinstall contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service 644 usr/share/dbus-1/services
+	vinstall contrib/dbus/nl.whynothugo.darkman.service 644 usr/share/dbus-1/services
+
+	vmkdir usr/share/xdg-desktop-portal/portals
+	vinstall contrib/portal/darkman.portal 644 usr/share/xdg-desktop-portal/portals
+
+	scdoc < darkman.1.scd > darkman.1
+	vman darkman.1
+
+	vlicense LICENCE
+}

From 46ac04ab7cd9d358f4e16ba010f581fef1491f50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 15:23:09 +0200
Subject: [PATCH 1755/1854] msmtp: update to 1.8.24.

---
 srcpkgs/msmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 0310b6bf284e..15c0a030e2f8 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.23
+version=1.8.24
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8
+checksum=bd6644b1aaab17d61b86647993e3efad860b23c54283b00ddc579c1f5110aa59
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl msmtpd"

From d056e4067c4aa713fc9d002f6669f1d4c6efb92d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 15:24:49 +0200
Subject: [PATCH 1756/1854] cloud-hypervisor: update to 33.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index f4bb6b21c064..2171efcbd7de 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=32.0
+version=33.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=b9754a5ecd26697e5416a642345b2f35f4fdc983a83d540d740978309f2eb419
+checksum=d3c03e26621ea70a73ab03395e284312e30113cfbb13df50f16e503a413a3a82
 
 post_install() {
 	vbin scripts/ch-trace-visualiser.py ch-trace-visualiser

From 914dd8aa3c56e75374497e1ee12828055e5278ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 16:34:13 +0200
Subject: [PATCH 1757/1854] crawl: update to 0.30.1.

---
 srcpkgs/crawl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index 8e061ee68eea..2b19b200f838 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.30.0
+version=0.30.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=a4ba0d5a6fcf9bb1ad57b6a116f5d577b7ee9dac33d90448525a1061207a6abf
+checksum=f7f793271eab06822b9cb3936da54a1cbe759b471347088a4d76052ac8947597
 nocross=yes
 
 post_extract() {

From 51ade6980b2b798143ce2f627fab4b98aff60bb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 16:34:15 +0200
Subject: [PATCH 1758/1854] crawl-tiles: update to 0.30.1.

---
 srcpkgs/crawl-tiles/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index af4ff9fddd8d..a2f229cea7bc 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.30.0
+version=0.30.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin DATADIR=/usr/share/crawl-tiles
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=a4ba0d5a6fcf9bb1ad57b6a116f5d577b7ee9dac33d90448525a1061207a6abf
+checksum=f7f793271eab06822b9cb3936da54a1cbe759b471347088a4d76052ac8947597
 nocross=yes
 
 post_extract() {

From 1d8902c73390c34f2f58898d0f258ff2552da4ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Jul 2023 22:02:58 +0200
Subject: [PATCH 1759/1854] lnav: update to 0.11.2.

---
 srcpkgs/lnav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 02cc3c853413..18bb1dd3a6e6 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,6 +1,6 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.11.1
+version=0.11.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/lnav/archive/v${version}.tar.gz"
-checksum=7d73ceeeae0fdc61cffce0f8a7a3435aa91b401b67d233ffaa018faab00d7d3f
+checksum=03b72fd02faccdbf98fcdeba62306794b677b8bcf49d6023117808f88ed627dc
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 23024dd18ee21675f7f1f0f116309205d400bb12 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:17:42 +0200
Subject: [PATCH 1760/1854] icu: update to 73.2.

---
 common/shlibs        | 12 ++++++------
 srcpkgs/icu/template |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4e6a5a663fa0..b8ab3ec37bff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -525,12 +525,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.72 icu-libs-72.1_2
-libicui18n.so.72 icu-libs-72.1_2
-libicudata.so.72 icu-libs-72.1_2
-libicutu.so.72 icu-libs-72.1_2
-libicuuc.so.72 icu-libs-72.1_2
-libicutest.so.72 icu-libs-72.1_2
+libicuio.so.73 icu-libs-73.2_1
+libicui18n.so.73 icu-libs-73.2_1
+libicudata.so.73 icu-libs-73.2_1
+libicutu.so.73 icu-libs-73.2_1
+libicuuc.so.73 icu-libs-73.2_1
+libicutest.so.73 icu-libs-73.2_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant-2.so.2 enchant2-2.2.3_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 50abf1f34b94..355865ce25df 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,8 +2,8 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=72.1
-revision=2
+version=73.2
+revision=1
 build_wrksrc=source
 build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
@@ -15,7 +15,7 @@ maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
+checksum=818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
 
 CFLAGS="-fPIC  -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-fPIC  -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"

From f2ee70ce1838ab424d7c1a407ccd3e53fc8164cb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:17:53 +0200
Subject: [PATCH 1761/1854] firefox: update to 115.0.

---
 srcpkgs/firefox/patches/lto-thin.patch      | 19 -------------------
 srcpkgs/firefox/patches/rust-lto-thin.patch | 12 ++++++++++++
 srcpkgs/firefox/template                    |  4 ++--
 3 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/firefox/patches/rust-lto-thin.patch

diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/patches/rust-lto-thin.patch b/srcpkgs/firefox/patches/rust-lto-thin.patch
new file mode 100644
index 000000000000..788fceab39f5
--- /dev/null
+++ b/srcpkgs/firefox/patches/rust-lto-thin.patch
@@ -0,0 +1,12 @@
+set rust crate lto to thin to not use fatlto for gkrust which fails sometimes
+--- a/config/makefiles/rust.mk
++++ b/config/makefiles/rust.mk
+@@ -92,7 +92,7 @@
+ # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
+ ifndef MOZ_CODE_COVERAGE
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)
++cargo_rustc_flags += -Clto=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3bf78b037413..083b409f27b3 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=114.0
+version=115.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -12,7 +12,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 # distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"
-checksum=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6
+checksum=7cdb23fe5ccb54334c8fe14c1e5dd89d5788f8e7b79a2bd9cc4eabdc7e54e898
 
 lib32disabled=yes
 

From 51337516c10b5ec76ba2986a64ee51347ac4ec74 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:54 +0200
Subject: [PATCH 1762/1854] 0ad: rebuild for icu-73.2_1

---
 srcpkgs/0ad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f085facb1fdd..6d596c331988 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.26
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel

From 5983447ab4e3d233e5ebfbb6e7a4aa78a1e8c0a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:54 +0200
Subject: [PATCH 1763/1854] Aegisub: rebuild for icu-73.2_1

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 7a2bf765d3af..671c74ca645a 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.3.2
-revision=8
+revision=9
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 cmake_builddir="BUILD"

From 641f25639e68e3ae652be6194e690a88600518f0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1764/1854] OpenRCT2: rebuild for icu-73.2_1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 87f68c27927a..ceb69d829a39 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -3,7 +3,7 @@
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
 version=0.4.5
-revision=1
+revision=2
 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
 _objects_version=1.3.11
 _titles_version=0.4.0

From 6b5cc5001130ff3ed77d91cd61ada7510893e63b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1765/1854] R: rebuild for icu-73.2_1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 9740a27a6636..334d68ddaa65 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From 4a407f80a13204989835936411771d4de639e99c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1766/1854] R-cran-stringi: rebuild for icu-73.2_1

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index a2708c8cd120..358e924b2e6c 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.7.12
-revision=1
+revision=2
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From 1e6f1f6fca73ef2e10d90bbbfa578a1ac11d9d0d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1767/1854] an: rebuild for icu-73.2_1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 7eea017502fa..c3e4315ff853 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=11
+revision=12
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From ce6daa81c28e41231472457e881bc0c524d42c90 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1768/1854] boost: rebuild for icu-73.2_1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 743ed9850772..1f6abd4fcab1 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.82.0
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config openmpi"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From e87ebdf95ab907c780668669a1883e5291b69ce4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1769/1854] brltty: rebuild for icu-73.2_1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 44b39d26439e..6858fbd10b04 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.4
-revision=8
+revision=9
 build_style=gnu-configure
 build_helper=python3
 configure_args="--enable-gpm --with-screen-driver=lx,sc

From ca96a27c4ba74295ae9ce230981cc8e66891e592 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:55 +0200
Subject: [PATCH 1770/1854] calibre: rebuild for icu-73.2_1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 04bd9fe283fc..bddbd0d896a3 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=6.17.0
-revision=1
+revision=2
 build_wrksrc=calibre
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"

From 50cd3be88a40d47f228f0c6b8d8a68d288022299 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1771/1854] clamav: rebuild for icu-73.2_1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 65237deb1413..1bcd94cd7761 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.8
-revision=2
+revision=3
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From c62e1fe21ab6ef323eccc9288be41ffedd4ee4e1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1772/1854] darktable: rebuild for icu-73.2_1

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index bf6137d46870..6f6d24ac27a7 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.2.1
-revision=6
+revision=7
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 900a21c6e1cb58c91b046e24c64c962a71fe59ca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1773/1854] dino: rebuild for icu-73.2_1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 7a32986b692e..f359226a73b8 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.4.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON -DUSE_SOUP3=ON"
 hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"

From e4e87aed1e1899977fa764a72a46896158dffd36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1774/1854] dwdiff: rebuild for icu-73.2_1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 8d980fe9ec16..e7b2eaecdc88 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From be60f94e43b80cc339007af47b6eec7fc37a8030 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1775/1854] enchant2: rebuild for icu-73.2_1

---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index c3d41d86fda6..4e7a9c0b5ee1 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
 # might be a bug in their build system that only this directory and/or file aren't

From 1a92500aef65d8cbece2af8c14e2bffde8ddca4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:56 +0200
Subject: [PATCH 1776/1854] evolution-data-server: rebuild for icu-73.2_1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 652f8911aef0..dc161e0aa313 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.48.0
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc

From a69d9a734df2dec5761d238f6fb9ed1b8ca49286 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1777/1854] firefox-esr: rebuild for icu-73.2_1

---
 srcpkgs/firefox-esr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 49c86d8e59de..fcad6ea4194a 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -5,7 +5,7 @@
 #
 pkgname=firefox-esr
 version=102.9.0
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release"
 maintainer="Orphaned <orphan@voidlinux.org>"

From debf8d664230ec9d1c3cae491828a3ff77af0cf7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1778/1854] freeciv: rebuild for icu-73.2_1

---
 srcpkgs/freeciv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 14a116e4f2b3..827b30f5e11c 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,7 +1,7 @@
 # Template file for 'freeciv'
 pkgname=freeciv
 version=3.0.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
 hostmakedepends="pkg-config"

From 703be340c74461c7fe3fab0760afa60f84c640fd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1779/1854] fsearch: rebuild for icu-73.2_1

---
 srcpkgs/fsearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fsearch/template b/srcpkgs/fsearch/template
index 5b01ca37f4f9..e579dfcaaad2 100644
--- a/srcpkgs/fsearch/template
+++ b/srcpkgs/fsearch/template
@@ -1,7 +1,7 @@
 # Template file for 'fsearch'
 pkgname=fsearch
 version=0.2.2
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="gtk+3-devel pcre2-devel"

From 8e788308d057a92011a48dadeac29eaf21a71e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1780/1854] geary: rebuild for icu-73.2_1

---
 srcpkgs/geary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a1804b4b65e5..7479ab2bdb5c 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=43.0
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From a588933ba32831de7af6dbc23e78cf17c7fe7a4f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1781/1854] gnome-builder: rebuild for icu-73.2_1

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 24baa8995ae1..11cff69fe7fb 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=44.1
-revision=3
+revision=4
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"

From b4c63dc0c78948ce7247f86469e54337a090d831 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1782/1854] gnome-text-editor: rebuild for icu-73.2_1

---
 srcpkgs/gnome-text-editor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 82c89561a6f5..0c68ebd73d88 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-text-editor'
 pkgname=gnome-text-editor
 version=44.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel
  gtk-update-icon-cache desktop-file-utils"

From a431b8ca90d3bfbf92984edfc92640996c979c87 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:57 +0200
Subject: [PATCH 1783/1854] gnucash: rebuild for icu-73.2_1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index c648d0bff35d..7dec42730332 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.13
-revision=3
+revision=4
 build_style=cmake
 make_check_target=check
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"

From 3ac454c8f81d34d23b17566eaca088e7b6be9ba1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1784/1854] gnustep-base: rebuild for icu-73.2_1

---
 srcpkgs/gnustep-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index be29b6c7a132..64e1f812fb93 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.29.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From 19f29a3db2d857b0497400b7eddf9cac2f4fb010 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1785/1854] gnustep-gui: rebuild for icu-73.2_1

---
 srcpkgs/gnustep-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 5ba94179d482..7beb2854a8a1 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.30.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From 5259c6225df79d115de20983fd4d4463253ab941 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1786/1854] gspell: rebuild for icu-73.2_1

---
 srcpkgs/gspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 06cc8718242f..b76318ffffd9 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
 # Template file for 'gspell'
 pkgname=gspell
 version=1.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)

From 4f55fa1d97342cee7201dfb7635f9d5609721c82 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1787/1854] harfbuzz: rebuild for icu-73.2_1

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 29901df47ad2..cc939aebce0d 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=7.3.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled

From f90b558884849e73bec441f9588767c75b48751e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1788/1854] icu4lua: rebuild for icu-73.2_1

---
 srcpkgs/icu4lua/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index a63d0362e179..05117c642db0 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=13
+revision=14
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From 766cb2b5168ad36c6a55175277dcba93990043dd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1789/1854] imv: rebuild for icu-73.2_1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index f59108e98e1d..7e34b622d9e1 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.4.0
-revision=4
+revision=5
 build_style=meson
 # don't define NDEBUG since assert(3) is used to detect error conditions
 # (e.g.: https://git.sr.ht/~exec64/imv/tree/v4.4.0/item/src/x11_window.c#L109

From 3aa9a90a421c5518556bc41ded2df8aba80316b9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:58 +0200
Subject: [PATCH 1790/1854] kdb: rebuild for icu-73.2_1

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index ee02c7ae3040..57bff3872488 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=9
+revision=10
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons python3"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From b3e299338fe31757ae9fa08f26abaf4d96bffecf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1791/1854] kdeplasma-addons5: rebuild for icu-73.2_1

---
 srcpkgs/kdeplasma-addons5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 877694cb3f46..b3ce923df439 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
 version=5.27.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools pkg-config

From aa207711748dbe2e5044ed81f6d6de0bed3a76d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1792/1854] kiwix-lib: rebuild for icu-73.2_1

---
 srcpkgs/kiwix-lib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index f05fe442241e..6534f59384a5 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=5
+revision=6
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel

From fc34517d8d8991d09188996f5d73c91042489205 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1793/1854] konsole: rebuild for icu-73.2_1

---
 srcpkgs/konsole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index e210bd4803de..fe2ffc25713c 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,7 +1,7 @@
 # Template file for 'konsole'
 pkgname=konsole
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From fcc0854c2c883940affffea81df2f554dce4d7f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1794/1854] libcdr: rebuild for icu-73.2_1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index c0057aada95f..979206c432ac 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 636bee8171f133cfeb4f85cc34ae6e715f57bf9a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1795/1854] libe-book: rebuild for icu-73.2_1

---
 srcpkgs/libe-book/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index f9a17bdc72a7..c2f7ebeed3e4 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From 8fbb514052301128c2237f18080a557c679be911 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:18:59 +0200
Subject: [PATCH 1796/1854] libical: rebuild for icu-73.2_1

---
 srcpkgs/libical/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 937c9613c4d3..f368c11c3db8 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
 version=3.0.16
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false

From 8089b9d6676f647768be6d4af970414fae13aa7d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1797/1854] liblcf: rebuild for icu-73.2_1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 35f3a24c8036..19c6db01578e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From ee17d64f92b3a42e5c9b0bf9ee91e29795cfa54f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1798/1854] libmspub: rebuild for icu-73.2_1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5b4ff7331eb4..b99747040d60 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=10
+revision=11
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From c5f3f3d0e469b761e8eff5c4ef5ed4d75d17acfe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1799/1854] libphonenumber: rebuild for icu-73.2_1

---
 srcpkgs/libphonenumber/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 0af9ced1bcff..f554714b3c7a 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
 version=8.12.39
-revision=11
+revision=12
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu

From 5a68d746435a089dc34d64905e6c68250ea9b7e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1800/1854] libpsl: rebuild for icu-73.2_1

---
 srcpkgs/libpsl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 2e1527338dfc..bfdbb13a5404 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From 4f887af3df5348645c7e381e538494497fb368c3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1801/1854] libqalculate: rebuild for icu-73.2_1

---
 srcpkgs/libqalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template
index beec5e4a96d5..23d9d0c18ab2 100644
--- a/srcpkgs/libqalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -2,7 +2,7 @@
 # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
 pkgname=libqalculate
 version=4.5.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
 makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel

From 23e06038644efd897a929c8c805815c44b98c0d6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1802/1854] libqxp: rebuild for icu-73.2_1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 78e24b95ed3a..0925df7036dd 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From 377c43f874f8b42c5ec93630534cad718afdad24 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:00 +0200
Subject: [PATCH 1803/1854] libreoffice: rebuild for icu-73.2_1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
 nocross="Several dependencies are nocross=yes"

From fb94b0fe963e7b6f0f0e2613dd42a1fe405248ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1804/1854] libvisio: rebuild for icu-73.2_1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 77dbf5cf02e4..dd376f85afac 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From b99e5a017e2d0564139c72d6379042b081d4045c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1805/1854] libxml2: rebuild for icu-73.2_1

---
 srcpkgs/libxml2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 5041c99e5819..bdfc411d75c9 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2'
 pkgname=libxml2
 version=2.11.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu
  --with-legacy --with-ftp --with-xptr-locs --enable-static"

From 969d4a3cc461bca2357490670379d69719b1a21f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1806/1854] libzim: rebuild for icu-73.2_1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 242334046c1d..cb6d1be1620a 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.2
-revision=4
+revision=5
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From a41886b64a4c455bbdbbabdfc295d8749a5bd467 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1807/1854] maim: rebuild for icu-73.2_1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index 70e05e06c539..894369ec42f8 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 46f5c7b89f12d4180948671555fed2b088e43dbf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1808/1854] modsecurity: rebuild for icu-73.2_1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 00774d754cf3..d0ad1b197bc2 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
 hostmakedepends="pkg-config"

From caefd08139e7b8a63f49a03c039c6cad05c984ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:01 +0200
Subject: [PATCH 1809/1854] mozjs102: rebuild for icu-73.2_1

---
 srcpkgs/mozjs102/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 8c9f93a5b37a..4bbc084b5a44 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs102'
 pkgname=mozjs102
 version=102.8.0
-revision=2
+revision=3
 build_wrksrc=js/src
 build_style=gnu-configure
 build_helper=rust

From ea26adabda3c37380123d3f06cee6224d5b7b808 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1810/1854] mozjs78: rebuild for icu-73.2_1

---
 srcpkgs/mozjs78/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 91142647baeb..10d9af44619f 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=7
+revision=8
 build_wrksrc=js/src
 build_style=gnu-configure
 build_helper=rust

From a9b6f3facfbf901ca15b07d55f8951c094df6065 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1811/1854] mpd: rebuild for icu-73.2_1

---
 srcpkgs/mpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 9dbd4c935acc..9f058b62df2f 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.23.13
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled

From c0080b3d5d7c48c6e0deb43285ed3e49b6df02fa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1812/1854] ncmpcpp: rebuild for icu-73.2_1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index a66f5f7e9e0c..31a5c007a990 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From 671605e115d72f0e47815789d8b0006fba5b88e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1813/1854] nodejs: rebuild for icu-73.2_1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 14f17fd3167f..aa03b7f48c27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=18.16.0
-revision=1
+revision=2
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
  $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)

From 5ac8fe6fbeaa322d2c72941d085e6cea761d91be Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1814/1854] nuspell: rebuild for icu-73.2_1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 92da1cae8371..57e5acd58688 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=5.1.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From 3bcc7645742fbd9b16858f048717d4e66ac415b4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1815/1854] openttd: rebuild for icu-73.2_1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index edce911a3093..4bfb9a56c076 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=13.3
-revision=1
+revision=2
 _gfxver=7.1
 _sfxver=1.0.3
 _msxver=0.4.2

From 0e2f4a85a3017a309003443ac471ddb77b2e8bce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:02 +0200
Subject: [PATCH 1816/1854] peaclock: rebuild for icu-73.2_1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 76b7fd1aebf4..4618c2ae5582 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=5
+revision=6
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From b5eda6d8657018707b4f40c53b86ff7f0eceba9e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1817/1854] perl-XML-LibXML: rebuild for icu-73.2_1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index f8ff1fd13a4d..63917e570a98 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=11
+revision=12
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends} libxml2-devel perl-XML-SAX perl-XML-NamespaceSupport"

From 05c010aa3437534f0540fe545f21d9410d96a20c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1818/1854] php8.0: rebuild for icu-73.2_1

---
 srcpkgs/php8.0/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index be2dec51141e..520bc839f11c 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0'
 pkgname=php8.0
 version=8.0.28
-revision=2
+revision=3
 _php_version=8.0
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From 82a935b96f118dcd024661d41e766370c56f2226 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1819/1854] php8.1: rebuild for icu-73.2_1

---
 srcpkgs/php8.1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 90be03c44a5d..d41eb4784b48 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.19
-revision=1
+revision=2
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From 8b5aa46d3227239b186356e4aee2e7dd0e375e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1820/1854] php8.2: rebuild for icu-73.2_1

---
 srcpkgs/php8.2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index c73b5f8c010c..05275b9bfb1c 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
 version=8.2.6
-revision=1
+revision=2
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From b6659dfe7028230aed1eaf8d98593b871e645a03 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1821/1854] plasma-workspace: rebuild for icu-73.2_1

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 772c0dd6e846..9033ad55ac17 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.27.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner

From 55e09a63bd967845898651dcc5c2259f5cae64bb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1822/1854] poedit: rebuild for icu-73.2_1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index c346c96b12c6..f27cb3e5dbef 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=3.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From 9bc51f12b9ab5d3b81a08dede7ad02b063c1b74e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:03 +0200
Subject: [PATCH 1823/1854] postfix: rebuild for icu-73.2_1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 1a5fb172288c..fb603162173f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.8.1
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
  postgresql-libs-devel sqlite-devel"

From b66b2b26434ceb67359434b418752dfe83e2ee33 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1824/1854] prosody: rebuild for icu-73.2_1

---
 srcpkgs/prosody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index c93905bea5cd..db5f614b4973 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.12.1
-revision=2
+revision=3
 build_style=configure
 configure_args="
  --ostype=linux

From 84ad9960eb99e7e908c41dda57116d1707354c69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1825/1854] python3-PyICU: rebuild for icu-73.2_1

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index b6292f67504b..ded6827200ae 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.10.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel icu-devel"

From 1df1cf429c895778cddb1696237e3fc1f1b4caa1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1826/1854] qt5: rebuild for icu-73.2_1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index a79d25e69da8..d3821efbe378 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
 version=5.15.7+20221119
 # commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=5
+revision=6
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From 7dfc1a0cd02e7ce6187e1434ddc3a7bb298db744 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1827/1854] qt5-webengine: rebuild for icu-73.2_1

---
 srcpkgs/qt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 85267c7cf8a3..edeb07f1ab7a 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.11
-revision=3
+revision=4
 _version="${version}-lts"
 _chromium_commit=be349eaf62e77955791d7bf29f893f1e8a37daf4
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"

From b4c8eded89c4b89fca48c7d63991253eee3c6517 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1828/1854] qt5-webkit: rebuild for icu-73.2_1

---
 srcpkgs/qt5-webkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 249902bb9d62..b66658071d43 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=15
+revision=16
 _snap=1586819898
 _v=${version%.*}
 build_style=cmake

From bd93ed59358706a41d34e2ee0cc80d9b7f2d6d5b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:04 +0200
Subject: [PATCH 1829/1854] qt6-base: rebuild for icu-73.2_1

---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c6d790e64226..c2e526cf9c22 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6

From f4cce145dea82f1be7e572c6ce7b0565b102c294 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1830/1854] qt6-qt5compat: rebuild for icu-73.2_1

---
 srcpkgs/qt6-qt5compat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 3b3d2b5dfacf..3facfbfca375 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_FEATURE_textcodec=ON -DQT_FEATURE_codecs=ON
  -DQT_FEATURE_iconv=ON -DQT_FEATURE_big_codecs=ON"

From 89eadf0cfb99cf9ad48773f0a62498105b9d8a49 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1831/1854] qt6-webengine: rebuild for icu-73.2_1

---
 srcpkgs/qt6-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 4e22cb6e8863..f948dc919a15 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-webengine'
 pkgname=qt6-webengine
 version=6.5.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DQT_FEATURE_webengine_system_ffmpeg=ON

From 513d95ab12c82a4d78e207ddafc181635128196b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1832/1854] rspamd: rebuild for icu-73.2_1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 44d3eb142951..38679104924d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=9
+revision=10
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 6011cd3770a6f8a1e83725b355acdc63e22f2f62 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1833/1854] scribus: rebuild for icu-73.2_1

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 7794c71b0e6c..5fd3f79d1931 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From d77fb1625c7280e522214fb5a9cf350f1aa1cb15 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1834/1854] sile: rebuild for icu-73.2_1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 93279cb59f38..097fccd2b39e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From a1e319dd442d4f4884919c9c2744591e77f749b0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1835/1854] slop: rebuild for icu-73.2_1

---
 srcpkgs/slop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index ff9a02db3826..929c0486cfb0 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.6
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From c63b5dfb3784fecaf4e136adbebe009b3ab3b775 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:05 +0200
Subject: [PATCH 1836/1854] strawberry: rebuild for icu-73.2_1

---
 srcpkgs/strawberry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 83cbd3bd73a5..b42efa1b89b2 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=1.0.17
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel

From d0a0fb0820937375c5b4c6b6cf458a2011494980 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1837/1854] sword: rebuild for icu-73.2_1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 7eef5b8be663..61c9de83e110 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From 68eec7375d9b693893b3c17d590135abe66fe5bf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1838/1854] tectonic: rebuild for icu-73.2_1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index ef293da34228..088c9569b5fe 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.14.1
-revision=1
+revision=2
 build_style=cargo
 configure_args="--features=external-harfbuzz"
 hostmakedepends="pkg-config"

From 92c8131372573958562557b99ced055f12e4309f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1839/1854] tepl: rebuild for icu-73.2_1

---
 srcpkgs/tepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 7e8c5ba0ffd5..c989d7ed7289 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.4.0
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"

From c9f6541fe20316c4d3a85e57b0a1741ba0092a13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1840/1854] tesseract-ocr: rebuild for icu-73.2_1

---
 srcpkgs/tesseract-ocr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 9a1de9581262..ac55c2892dbd 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=8
+revision=9
 _tessdataver=4.0.0
 create_wrksrc=yes
 build_style=gnu-configure

From e53a5f2486c489b3bbbef47ae9e076b5b6fddaa7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1841/1854] texlive: rebuild for icu-73.2_1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 3ed852196cc5..cd7ab47a061a 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20210325
-revision=5
+revision=6
 build_wrksrc="build"
 build_style=gnu-configure
 configure_script="../configure"

From acd59e4da7f64bf94043d240fbc46df70edc00d0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:06 +0200
Subject: [PATCH 1842/1854] thunderbird: rebuild for icu-73.2_1

---
 srcpkgs/thunderbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index ec3fa3d4c35f..397e3b246aef 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
 #
 pkgname=thunderbird
 version=102.6.1
-revision=3
+revision=4
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From b6856a6564976c2442ae7c9d78155cf9f896a96d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1843/1854] tracker: rebuild for icu-73.2_1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 4e431f680a6b..0ac5d828e786 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=3.5.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled

From 4d2e26938e589368a2af50a3c4f67c7d44ede15d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1844/1854] tracker-miners: rebuild for icu-73.2_1

---
 srcpkgs/tracker-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 8c005d697fa4..a6e5aa577702 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=3.5.0
-revision=3
+revision=4
 build_style=meson
 build_helper=qemu
 # missing libgrss for miner_rss

From 6513dd12be2a0b60a1d78b31f3c79feafb77b029 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1845/1854] unar: rebuild for icu-73.2_1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 460c65022c68..c7068465ed7a 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=12
+revision=13
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From 4c689981bf5d4531ca083068b027952b3c7085ad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1846/1854] vte3: rebuild for icu-73.2_1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index b15539a721a9..db2e5a8b8dd8 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.72.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false

From a4876173936275875849d4046385c6f5c05f468d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1847/1854] webkit2gtk: rebuild for icu-73.2_1

---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 3894f64a2ffe..15e98aaca3b0 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
 version=2.40.0
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF

From d64cd078ae5e28a5f9475d0f575a0d4e929a9154 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1848/1854] widelands: rebuild for icu-73.2_1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 8a2706efbf63..3f86742df6b0 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -4,7 +4,7 @@ pkgname=widelands
 reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
  19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
 version=1.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_BASEDIR=/usr/share/widelands

From 1d05497f14e0e27d5cb49bf3278766ef31097036 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:07 +0200
Subject: [PATCH 1849/1854] xerces-c: rebuild for icu-73.2_1

---
 srcpkgs/xerces-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 47c57b22d354..1ac8de6b568b 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From bcf0a159c508ac8bc4a716d003c6c8a145da032e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:08 +0200
Subject: [PATCH 1850/1854] yaz: rebuild for icu-73.2_1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 1716a6e6c9bf..25c8c301a582 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From 28b9b694137ebf9e426aeda851952776a7a81bc2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 02:19:08 +0200
Subject: [PATCH 1851/1854] znc: rebuild for icu-73.2_1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index c279d4a655b9..69d03cae4661 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=14
+revision=15
 build_style=gnu-configure
 configure_args="
  --enable-python

From 581014e8b1f51d9c13aa3269995cbbac0832c40d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jul 2023 23:41:06 +0200
Subject: [PATCH 1852/1854] firefox-i18n: update to 115.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7c94212c279a..845dafecdfb4 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=114.0
+version=115.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="c0f9a6c3d766c08f3676602696d8798b679ec1388cd5392a1b8668ffee145ffa
- 26e309adb10d6ee133a5e1d47d969b04da06a9aaafb915080ab6d039bd7c9995
- 5275570c342f09f90a735bb264810c7f4ae1fbc8e18d9a4944a95569682daf62
- 4f6b16a79b454c72f8fdc0e4800e7a085c392a3204cf2173fb85853568820fe9
- 34423da9b8cf41b280a3c6dc998da72004bc2ea0245dcb59af6cbe26a6683b68
- e37ca54dbd3506ca177e812305c5ba870584131a16958b8c46c7f2159172982d
- 0db3c23472f6b45d158b9de5220040821e89be207767910121040e9cba949f92
- 38e9cccd6791e769fd9016c2e0a3d5aafb6a2090c1c60326f03907aac0991325
- f3bec565c0c4c1bd7b659e4c4922d2d33ed5ebc1dd81e9d7b5a23c510da325a0
- 045ff5e6a99bacdeb1421061fb01a1fc71a76e12c9205cdd1fc58391cd89a613
- 7aa85724f5b31d31c3108700bf0d2efca74105c5e0df72c6a79b1913f5058152
- 6a1fd174df2343abe8a74f219c32cbf457f3914c0dd3c96949d947dedafec8b1
- 559b6c47830caaae13ea507cec2268e4469ee1b90504cdfa1252e5d6295d9a7c
- ff96e801074a1343ea9a122d3078250a961eb7da29ecac542a0c84186a17f010
- d0f973e086135861ce2e5e26e1e56bf9b21503d06fb732c8b918f426d55348f6
- aee67eb0b05c7c06b23aca4af3e473ddc75c9570a3d866675bb30c0fa409f2c0
- 20e9c7514e8e4a135c36cfd32177fbb000072e2fe3b7a38ea3e08ec2064d9633
- 6adfd2d6f9667472b0665f0370c2eb582355ca370ea046028741b91c16aa76b2
- c2a9d90d8a46a3f0070c031c48dcc09fcb33b8d571881578ae541984f0f98ff5
- 797686f4f8ad9279e8b080ba39cf52f049235ff4ce6e61ca0fe65f9d479a2d45
- 9ea3dc01ba7d9389d4514626f5cb1597063f7e68401ea13522a74ac777cde4cb
- 3e02c13156f87af7a25e826f8f72487004c3b64675be73e53eaa55f45a4b0147
- a2561641f64b428f34ec4d5215b97a6ae945df31b347c282e4f33a1fe82c5bc1
- 93a4955b0952613b931c2574fa9c6ed251a08df32f46304b3ead002bbe701ec9
- f1bab7c5b208ebb5ac87a5006a236fe09727be260bdd3b0f7b520a0ed91366d8
- c7ff4fee557227e6dbf87a1bd12205217710e41028066b0da3ed46adc3df2944
- 7f6f51cc45674f07f905107d2b6ea1770c39ccf1b8a5782e6bab964fcccc39a2
- a28453e1d0727297918fb3a83bd68090598c5ddd0386e5cbd21b5ead68cd8d2e
- 5b88a842efc8b8adccf314734e56ef5570e8823614f03b1023e7f3ba6ae904bf
- 0f607d174af36790046d1ce2219dd341e557af524f22d8afa504538e047d9081
- 85a57d3d4746f6e43c3f24ca9d7c2d873ba48166772c0a127485381b4017d9d2
- ed68f1678df1cedc204c2ebc6363f5ccc82562f684f45455169ffce3a94860ab
- da0e4e3abc51b101e84450ef84f77b3709ef21d7db3f401f4449fab69966ff62
- b474686d3b54e00ef1c3606dc432c64a4f3b1f56321cc1b28cd0737e7e313ab8
- c2c27f1b46fdf4288fd04ff8554443542ce6821cdb7c13e3ddc7bf51c4b62c0a
- 342230adbb31f5e07b5a89ded0bd860fe76a1cb638953383de5c690fead75050
- 48d5d27014991eebd2f3cd86ddce13807753fba0c67af32f4665db3685b45ee0
- e9a5d2be6f3e69570abefcf58390ffecf911efcbb096601f6ea326797d9950e3
- 0185575560595cd58b8526ba5450c395b0c513e360b523e57be37c3d0af05744
- e5abcec84157c0085f99b2f4d0cce258d3dd496a8edb7fa208937da8fa7436a3
- 4d3f1274da892de438c0d0e1003dd06509a7c21b60e7df3f91cbec463021a9db
- 61356d776b6341a0802ad6974bfd133db0b93b5430eb55d21167049a8626b603
- 8968f1a77e30680209df33cc6282797ef0e24164ca65141e232d8bc3fbff8123
- cc4769a1372fe19d1d64afb2660d71eb012f518a731fe2a3b1fc4d38cab285f0
- b3cfcc9e008fd1800d6688d5180e9fbcbb0336e16e444f81715ffca4d1ddc96f
- 96592a74d16993e03fd202be691f2e3bc9ac6e2d9fa50a6de0670f46e71b203b
- 1644d3bfd7e4c2b537a7a52b25b7f9cd808ddbaf86e026be91536c62252cd792
- 63e53aee3ca63d086778c3b66d2e0530c23e901dc4e2a437e8bdba7bcb6ee720
- 49e78397cd9d8ec6ce22f6503f89132009ecf028719f5b5ddd1164922184ffa5
- 12ec633c84011216239334c2f08eaa7ec4e4fa4f9c4d9277d6275a84f6df467f
- 825410ee4860f3466803725a7a604530b5641779f819f48e3fd47b5831a47659
- cab3fdae9481f6b8d4f81b91377771022de050a5da63d970b0b35c9a4c8c82f1
- aa56bd371cf1096c65e2c76073d25d69ecc8018be8487e14cac370bd9f5d45b1
- 0a18c294ef2a89150acc6521898bed8276806ca607bbb87c6e01c30cc3f6f697
- fc5e0b80bb4dda023a18d46f3f686981a13bfb364d6d29e4e46cf1f58381daf2
- 6f15404bca77866c663e8ba1c727ff40007700ca0d36f0e5559e417e654d3b64
- f0b77a56215baf8546b06a69e7211319af04e3baeb5c06a0fe0519787d949d8c
- 0a8c4f3c3f541cf4be8ac72c5d8e9cc85852568ece273f4173c71eb637d406e7
- 23a448de4027b9b2b7d3ad46d3a53411289a2d9b8fdfcbf2b9d9094d0269ff34
- 3890f6fcc967db23914ee090edd31ca03622e359d7ca7fe5ebb92a203d63f17e
- f14464fee583c0afe7022db7e6d5dd607782a5f04c9e0caef7dfab6ab135f609
- 82baa25118153388a0ab7b9c2ec4d89ad52c1acd380141e0bb301bb698371563
- 39da2bd341d58d4686b2609772d2e40c04183a4046ef4de5bf02821cd550d864
- ca2e41b6c29c062f40cbf8b5ebb9badfde0457350169b6ae201f607f3dc25813
- 752168e60f96d2b01275afc1ffcf7b8ad9f3383a05d6f99c76d7f8b2052189e9
- 37cac85f7af9cb2edc726cb8336dead32ed2f10ab6e72547c799e0dae455148a
- da58c2ba13252a42551629e66771e8254fdc4e80fff7e7fab40baeec8adc201c
- 050b33dba495f812910ee3a53affd7eae61ce2456b148a33e1883e06c6beb73e
- 16d619c02edb3179a30f7af5aea14d0c01266d46f0663b76fbcf71de29b27af8
- 1eadb108e6271cd74ef0a3328dd277cb92765ff0b8d72d922a979d0ed9710944
- ac5352956096a0eb869759cbbc0e04acc95a3be677b5ef56f2b237ae74567632
- cc2035801a929b67b97d5185480757eb51fd8063e360a7bd0d2cecea6edda2e4
- 62d73008f29ffc7078d1e2bddb36f360044f28a3bab820832b6ea82b07582048
- 129981bf7628f49fba9522636211405b66fb14159f76c557b93d6d810c672cc2
- ba6a082b4c41594d1fa671269357f7f814c169f0c62e343164ea86957cb0c748
- 33de6d30b7a9337b299d083bf5ede792f785c17e4bf3a9c85dcecd7abb0ea4ef
- b8d14e07fdbd034d4241de6a77c6bfed38b54726ec770ea25442a947fd9a821f
- 86436adc98e9f449ca2dcdf076042987400d62f8acf9458abf7cd98c327751e8
- ba69da64c6ab3d416759818e420259023a4d64434b27cb604d6491737e7e4a33
- ff239bdcb54a03dad3210b9457231e56a38e306220ec981c1f29307d73620fa4
- 3ebb85c2974c9d69f4e9c816f338da304a58469034997f83f0cd9056c4acb6d3
- 5315ff187fe3fddfc39000a7164ff3b42938059978eb322ba222a43d2a1145d1
- 0f768dd1b87e34b347e32d5f06691b68d7747654faf2586a673154d777a2765f
- 802537e360788ec58d697c17cd0333e8fcfc92ce3161d19cedc2a4841825d0ca
- 6722b217cd12f3a6502f14865fbf02bae8dceeb98f7a593840a88d57829cbbed
- a0d85d09f3bda6a1416240a252ec4cfc916cf37b98c72185a6b97e3b7b50251d
- 0a48ee5ae79e98d8b07adfef4eaacf93b19011ec3a667bfca3fc0098e348ab8c
- 4b559d090fe138fabc031b27b1cf5a0d67c0a036f646fa4430fe8c4c9f6b0e37
- 3c9b56539542ace8a6481400800367a07e980ebaad213caba3e5fe2da15bef9b
- 0b27ce7aa8ff4b09d5f42c1525d89505d2b159c7d9051b3e1dcb60ed67a0be5c
- b9fcbc9063278b77c652ed738913c1d9506306796af41c42fbe5ff2bae721fe1
- 625c2e19caa24046e624383501a395bdbbbf39594e742cc40e31d85cdc3eadce
- 5b397388706d49d413b745ca17f0776f8db6c81b3b6001d0490b3f1163d50ff3
- 03bb0e45f2038e8dd5d57ad131c163ddcd135cbf1b42371670bef4fa2fdf8da3
- 8b11f723ba5a973cf3639fa03e860e29f7427c8d8e68d278d5770ec83a6fb903
- 6ded563d8f5ae096ed6f3c58dd19277333dae81fda96832a50a5040ef79ca35b"
+checksum="
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ "

From 52087c11b4c014c9e77f17735c95558b79077d1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 6 Jul 2023 00:58:05 +0200
Subject: [PATCH 1853/1854] boost: temporarily marked as broken to build some
 other stuff first

---
 srcpkgs/boost/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 1f6abd4fcab1..dcfbb2567ea1 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -23,6 +23,8 @@ if [ "${version%beta*}" != "$version" ]; then
 	distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version%.rc*}/source/boost_${_version//./_}.tar.bz2"
 fi
 
+broken="build some other stuff first"
+
 replaces="libboost_program_options1.80>=0 libboost_math_c99f1.80>=0
  libboost_stacktrace_basic1.80>=0 libboost_stacktrace_noop1.80>=0
  libboost_iostreams1.80>=0 libboost_math_tr1l1.80>=0 libboost_filesystem1.80>=0

From 858bcd8e138f92d5974d429b4aa7b83f0645c7c3 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:14:05 +0000
Subject: [PATCH 1854/1854] Update srcpkgs/vifm/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/vifm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index fa820ceeba7b..02a0e798b98a 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -7,7 +7,7 @@ configure_args="--without-gtk"
 hostmakedepends="mdocml"
 makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
+short_desc="File manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (4 preceding siblings ...)
  2023-07-05 23:14 ` hholst80
@ 2023-07-05 23:28 ` hholst80
  2023-07-05 23:30 ` hholst80
                   ` (27 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 23:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

There is an updated pull request by hholst80 against master on the void-packages repository

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 4113 bytes --]

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH 1/2] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

From 378b56a9d79dbb3530e3a7081be7484facc71894 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:14:05 +0000
Subject: [PATCH 2/2] Update srcpkgs/vifm/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/vifm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index fa820ceeba7b..02a0e798b98a 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -7,7 +7,7 @@ configure_args="--without-gtk"
 hostmakedepends="mdocml"
 makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
+short_desc="File manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (5 preceding siblings ...)
  2023-07-05 23:28 ` hholst80
@ 2023-07-05 23:30 ` hholst80
  2023-07-05 23:45 ` [PR REVIEW] " classabbyamp
                   ` (26 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-05 23:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1622681609

Comment:
Sorry for the git cluster-fsck. I was trying to get the latest linting rules to ensure I had the required template format. I'll stop messing about it for today. ;-)

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (6 preceding siblings ...)
  2023-07-05 23:30 ` hholst80
@ 2023-07-05 23:45 ` classabbyamp
  2023-07-06 12:29 ` [PR PATCH] [Updated] " hholst80
                   ` (25 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2023-07-05 23:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1253760141

Comment:
perl should go in hostmakedepends because it needs to run during build.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] Update vifm to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (7 preceding siblings ...)
  2023-07-05 23:45 ` [PR REVIEW] " classabbyamp
@ 2023-07-06 12:29 ` hholst80
  2023-07-06 22:07 ` vifm: update " hholst80
                   ` (24 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-06 12:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

There is an updated pull request by hholst80 against master on the void-packages repository

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 4245 bytes --]

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH 1/2] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

From 83c5faf1151d854b39c91ef4b3186144d43255ba Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:14:05 +0000
Subject: [PATCH 2/2] Update srcpkgs/vifm/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/vifm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index fa820ceeba7b..ac6a9729a599 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -4,10 +4,10 @@ version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
-hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel perl"
+hostmakedepends="mdocml perl"
+makedepends="ncurses-devel file-devel"
 depends="desktop-file-utils"
-short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
+short_desc="File manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (8 preceding siblings ...)
  2023-07-06 12:29 ` [PR PATCH] [Updated] " hholst80
@ 2023-07-06 22:07 ` hholst80
  2023-07-08 16:05 ` [PR PATCH] [Updated] " hholst80
                   ` (23 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-06 22:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1624372348

Comment:
Reached out to the Vifm maintainers for some help.

https://github.com/vifm/vifm/issues/913

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (9 preceding siblings ...)
  2023-07-06 22:07 ` vifm: update " hholst80
@ 2023-07-08 16:05 ` hholst80
  2023-07-08 16:28 ` hholst80
                   ` (22 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-08 16:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

There is an updated pull request by hholst80 against master on the void-packages repository

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

vifm: update to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 9268 bytes --]

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH 1/3] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

From 83c5faf1151d854b39c91ef4b3186144d43255ba Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:14:05 +0000
Subject: [PATCH 2/3] Update srcpkgs/vifm/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/vifm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index fa820ceeba7b..ac6a9729a599 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -4,10 +4,10 @@ version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
-hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel perl"
+hostmakedepends="mdocml perl"
+makedepends="ncurses-devel file-devel"
 depends="desktop-file-utils"
-short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
+short_desc="File manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"

From 4e6e5887124c29fba929202d8bb5c70fe4983fa7 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Sat, 8 Jul 2023 16:04:16 +0000
Subject: [PATCH 3/3] Add vifm-v0.13-musl-tests.patch

Co-authored-by: xaizek <xaizek@posteo.net>
---
 .../vifm/patches/vifm-v0.13-musl-tests.patch  | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch

diff --git a/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
new file mode 100644
index 000000000000..d464cdb51d37
--- /dev/null
+++ b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
@@ -0,0 +1,132 @@
+ src/filelist.c                  |  6 +++++-
+ src/opt_handlers.c              |  6 +++++-
+ src/ui/fileview.c               |  1 +
+ src/ui/ui.h                     |  3 +++
+ tests/misc/sort.c               | 13 ++++++++++---
+ tests/test-support/test-utils.c |  5 +++++
+ 6 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/src/filelist.c b/src/filelist.c
+index 1e63c1120..e5fe0131e 100644
+--- a/src/filelist.c
++++ b/src/filelist.c
+@@ -329,7 +329,11 @@ flist_free_view(view_t *view)
+ 	modview_info_free(view->vi);
+ 	view->vi = NULL;
+ 
+-	regfree(&view->primary_group);
++	if(view->primary_group_set)
++	{
++		regfree(&view->primary_group);
++		view->primary_group_set = 0;
++	}
+ 
+ 	marks_clear_view(view);
+ 
+diff --git a/src/opt_handlers.c b/src/opt_handlers.c
+index f655da5da..69935d669 100644
+--- a/src/opt_handlers.c
++++ b/src/opt_handlers.c
+@@ -3250,9 +3250,13 @@ set_sortgroups(view_t *view, char **opt, char value[])
+ 	{
+ 		if(scope == OPT_LOCAL)
+ 		{
+-			regfree(&view->primary_group);
++			if(view->primary_group_set)
++			{
++				regfree(&view->primary_group);
++			}
+ 			(void)regexp_compile(&view->primary_group, first,
+ 					REG_EXTENDED | REG_ICASE);
++			view->primary_group_set = 1;
+ 		}
+ 		free(first);
+ 	}
+diff --git a/src/ui/fileview.c b/src/ui/fileview.c
+index 7a4b9f189..4539e0530 100644
+--- a/src/ui/fileview.c
++++ b/src/ui/fileview.c
+@@ -215,6 +215,7 @@ fview_init(view_t *view)
+ 	view->sort_groups_g = strdup("");
+ 	(void)regexp_compile(&view->primary_group, view->sort_groups,
+ 			REG_EXTENDED | REG_ICASE);
++	view->primary_group_set = 1;
+ 
+ 	view->preview_prg = strdup("");
+ 	view->preview_prg_g = strdup("");
+diff --git a/src/ui/ui.h b/src/ui/ui.h
+index 91c90eb49..69654d4c6 100644
+--- a/src/ui/ui.h
++++ b/src/ui/ui.h
+@@ -448,6 +448,9 @@ struct view_t
+ 	char *sort_groups, *sort_groups_g;
+ 	/* Primary group of sort_groups (not sort_groups_g) in compiled form. */
+ 	regex_t primary_group;
++	/* Indicates that primary_group was initialized, which is used to avoid
++	 * freeing uninitialized data or freeing it twice. */
++	int primary_group_set;
+ 
+ 	int history_num;    /* Number of used history elements. */
+ 	int history_pos;    /* Current position in history. */
+diff --git a/tests/misc/sort.c b/tests/misc/sort.c
+index bad2120ee..4b9ce6a3b 100644
+--- a/tests/misc/sort.c
++++ b/tests/misc/sort.c
+@@ -424,8 +424,13 @@ TEST(groups_sorting_works)
+ 	lwin.dir_entry[6].origin = lwin.curr_dir;
+ 
+ 	update_string(&lwin.sort_groups, "-(done|todo).*");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "-(done|todo).*",
+ 			REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	/* Ascending sorting. */
+ 
+@@ -458,15 +463,17 @@ TEST(groups_sorting_works)
+ 	assert_string_equal("11-todo-publish", lwin.dir_entry[4].name);
+ 	assert_string_equal("1-done", lwin.dir_entry[5].name);
+ 	assert_string_equal("3-done", lwin.dir_entry[6].name);
+-
+-	regfree(&lwin.primary_group);
+-	update_string(&lwin.sort_groups, NULL);
+ }
+ 
+ TEST(global_groups_sorts_entries_list)
+ {
+ 	update_string(&lwin.sort_groups_g, "([0-9])");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "([a-z])", REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	lwin.sort_g[0] = SK_BY_GROUPS;
+ 	lwin.sort_g[1] = SK_BY_NAME;
+diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c
+index 6938d0538..bb449d441 100644
+--- a/tests/test-support/test-utils.c
++++ b/tests/test-support/test-utils.c
+@@ -32,6 +32,7 @@
+ #include "../../src/utils/macros.h"
+ #include "../../src/utils/matcher.h"
+ #include "../../src/utils/path.h"
++#include "../../src/utils/regexp.h"
+ #include "../../src/utils/str.h"
+ #include "../../src/utils/string_array.h"
+ #include "../../src/utils/utils.h"
+@@ -253,6 +254,10 @@ view_setup(view_t *view)
+ 	memset(&view->sort[1], SK_NONE, sizeof(view->sort) - 1);
+ 	memcpy(view->sort_g, view->sort, sizeof(view->sort_g));
+ 
++	/* The code assumes that this field is initialized. */
++	assert_success(regexp_compile(&view->primary_group, "", REG_ICASE));
++	view->primary_group_set = 1;
++
+ 	view->custom.entry_count = 0;
+ 	view->custom.entries = NULL;
+ 

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (10 preceding siblings ...)
  2023-07-08 16:05 ` [PR PATCH] [Updated] " hholst80
@ 2023-07-08 16:28 ` hholst80
  2023-07-13 14:25 ` [PR PATCH] [Updated] " hholst80
                   ` (21 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-08 16:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1627394603

Comment:
@classabbyamp will you accept the CI/CD build to see if this fixes the crashed musl tests?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (11 preceding siblings ...)
  2023-07-08 16:28 ` hholst80
@ 2023-07-13 14:25 ` hholst80
  2023-07-13 14:28 ` hholst80
                   ` (20 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-13 14:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

There is an updated pull request by hholst80 against master on the void-packages repository

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

vifm: update to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 10128 bytes --]

From cf43ec2f6c12ef580d62b229f5194c27b9228437 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH 1/4] Update vifm to 0.13

---
 .../vifm/patches/disable-failed-tests.patch   | 38 -------------------
 srcpkgs/vifm/template                         | 12 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..fa820ceeba7b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
 hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

From 83c5faf1151d854b39c91ef4b3186144d43255ba Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:14:05 +0000
Subject: [PATCH 2/4] Update srcpkgs/vifm/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/vifm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index fa820ceeba7b..ac6a9729a599 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -4,10 +4,10 @@ version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
-hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel perl"
+hostmakedepends="mdocml perl"
+makedepends="ncurses-devel file-devel"
 depends="desktop-file-utils"
-short_desc="Vifm is a file manager with curses interface and a Vim-like environment"
+short_desc="File manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"

From 4e6e5887124c29fba929202d8bb5c70fe4983fa7 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Sat, 8 Jul 2023 16:04:16 +0000
Subject: [PATCH 3/4] Add vifm-v0.13-musl-tests.patch

Co-authored-by: xaizek <xaizek@posteo.net>
---
 .../vifm/patches/vifm-v0.13-musl-tests.patch  | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch

diff --git a/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
new file mode 100644
index 000000000000..d464cdb51d37
--- /dev/null
+++ b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
@@ -0,0 +1,132 @@
+ src/filelist.c                  |  6 +++++-
+ src/opt_handlers.c              |  6 +++++-
+ src/ui/fileview.c               |  1 +
+ src/ui/ui.h                     |  3 +++
+ tests/misc/sort.c               | 13 ++++++++++---
+ tests/test-support/test-utils.c |  5 +++++
+ 6 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/src/filelist.c b/src/filelist.c
+index 1e63c1120..e5fe0131e 100644
+--- a/src/filelist.c
++++ b/src/filelist.c
+@@ -329,7 +329,11 @@ flist_free_view(view_t *view)
+ 	modview_info_free(view->vi);
+ 	view->vi = NULL;
+ 
+-	regfree(&view->primary_group);
++	if(view->primary_group_set)
++	{
++		regfree(&view->primary_group);
++		view->primary_group_set = 0;
++	}
+ 
+ 	marks_clear_view(view);
+ 
+diff --git a/src/opt_handlers.c b/src/opt_handlers.c
+index f655da5da..69935d669 100644
+--- a/src/opt_handlers.c
++++ b/src/opt_handlers.c
+@@ -3250,9 +3250,13 @@ set_sortgroups(view_t *view, char **opt, char value[])
+ 	{
+ 		if(scope == OPT_LOCAL)
+ 		{
+-			regfree(&view->primary_group);
++			if(view->primary_group_set)
++			{
++				regfree(&view->primary_group);
++			}
+ 			(void)regexp_compile(&view->primary_group, first,
+ 					REG_EXTENDED | REG_ICASE);
++			view->primary_group_set = 1;
+ 		}
+ 		free(first);
+ 	}
+diff --git a/src/ui/fileview.c b/src/ui/fileview.c
+index 7a4b9f189..4539e0530 100644
+--- a/src/ui/fileview.c
++++ b/src/ui/fileview.c
+@@ -215,6 +215,7 @@ fview_init(view_t *view)
+ 	view->sort_groups_g = strdup("");
+ 	(void)regexp_compile(&view->primary_group, view->sort_groups,
+ 			REG_EXTENDED | REG_ICASE);
++	view->primary_group_set = 1;
+ 
+ 	view->preview_prg = strdup("");
+ 	view->preview_prg_g = strdup("");
+diff --git a/src/ui/ui.h b/src/ui/ui.h
+index 91c90eb49..69654d4c6 100644
+--- a/src/ui/ui.h
++++ b/src/ui/ui.h
+@@ -448,6 +448,9 @@ struct view_t
+ 	char *sort_groups, *sort_groups_g;
+ 	/* Primary group of sort_groups (not sort_groups_g) in compiled form. */
+ 	regex_t primary_group;
++	/* Indicates that primary_group was initialized, which is used to avoid
++	 * freeing uninitialized data or freeing it twice. */
++	int primary_group_set;
+ 
+ 	int history_num;    /* Number of used history elements. */
+ 	int history_pos;    /* Current position in history. */
+diff --git a/tests/misc/sort.c b/tests/misc/sort.c
+index bad2120ee..4b9ce6a3b 100644
+--- a/tests/misc/sort.c
++++ b/tests/misc/sort.c
+@@ -424,8 +424,13 @@ TEST(groups_sorting_works)
+ 	lwin.dir_entry[6].origin = lwin.curr_dir;
+ 
+ 	update_string(&lwin.sort_groups, "-(done|todo).*");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "-(done|todo).*",
+ 			REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	/* Ascending sorting. */
+ 
+@@ -458,15 +463,17 @@ TEST(groups_sorting_works)
+ 	assert_string_equal("11-todo-publish", lwin.dir_entry[4].name);
+ 	assert_string_equal("1-done", lwin.dir_entry[5].name);
+ 	assert_string_equal("3-done", lwin.dir_entry[6].name);
+-
+-	regfree(&lwin.primary_group);
+-	update_string(&lwin.sort_groups, NULL);
+ }
+ 
+ TEST(global_groups_sorts_entries_list)
+ {
+ 	update_string(&lwin.sort_groups_g, "([0-9])");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "([a-z])", REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	lwin.sort_g[0] = SK_BY_GROUPS;
+ 	lwin.sort_g[1] = SK_BY_NAME;
+diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c
+index 6938d0538..bb449d441 100644
+--- a/tests/test-support/test-utils.c
++++ b/tests/test-support/test-utils.c
+@@ -32,6 +32,7 @@
+ #include "../../src/utils/macros.h"
+ #include "../../src/utils/matcher.h"
+ #include "../../src/utils/path.h"
++#include "../../src/utils/regexp.h"
+ #include "../../src/utils/str.h"
+ #include "../../src/utils/string_array.h"
+ #include "../../src/utils/utils.h"
+@@ -253,6 +254,10 @@ view_setup(view_t *view)
+ 	memset(&view->sort[1], SK_NONE, sizeof(view->sort) - 1);
+ 	memcpy(view->sort_g, view->sort, sizeof(view->sort_g));
+ 
++	/* The code assumes that this field is initialized. */
++	assert_success(regexp_compile(&view->primary_group, "", REG_ICASE));
++	view->primary_group_set = 1;
++
+ 	view->custom.entry_count = 0;
+ 	view->custom.entries = NULL;
+ 

From 6f18b0ad21266f64d63fccd83418201b43e6f0ab Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Thu, 13 Jul 2023 14:26:12 +0000
Subject: [PATCH 4/4] vifm: add coreutils to hostmakedepends

Workaround for bug in busybox: https://github.com/vifm/vifm/issues/913
---
 srcpkgs/vifm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index ac6a9729a599..fc7ec596bcde 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -4,7 +4,7 @@ version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
-hostmakedepends="mdocml perl"
+hostmakedepends="mdocml perl coreutils"
 makedepends="ncurses-devel file-devel"
 depends="desktop-file-utils"
 short_desc="File manager with curses interface and a Vim-like environment"

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (12 preceding siblings ...)
  2023-07-13 14:25 ` [PR PATCH] [Updated] " hholst80
@ 2023-07-13 14:28 ` hholst80
  2023-07-24 13:16 ` hholst80
                   ` (19 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-13 14:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1634347295

Comment:
@classabbyamp I have included coreutils in the hostmakedeps to fix the mtime and atime issue in the tests.  Hopefully the build environment uses the latest musl and that should fix the build tests on x86_64-musl.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (13 preceding siblings ...)
  2023-07-13 14:28 ` hholst80
@ 2023-07-24 13:16 ` hholst80
  2023-07-24 13:37 ` [PR REVIEW] " classabbyamp
                   ` (18 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 13:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1647891903

Comment:
@classabbyamp Ping. I want us to move forward again.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (14 preceding siblings ...)
  2023-07-24 13:16 ` hholst80
@ 2023-07-24 13:37 ` classabbyamp
  2023-07-24 13:37 ` classabbyamp
                   ` (17 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2023-07-24 13:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272264617

Comment:
don't hardcode version, and use .gz

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (15 preceding siblings ...)
  2023-07-24 13:37 ` [PR REVIEW] " classabbyamp
@ 2023-07-24 13:37 ` classabbyamp
  2023-07-24 13:37 ` classabbyamp
                   ` (16 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2023-07-24 13:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272273171

Comment:
include the full git header so we know where it came from, i.e., `curl https://github.com/vifm/vifm/commit/c97f144231afbeb4215659d5c685fdf1e3fe5612.patch > srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch`

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (16 preceding siblings ...)
  2023-07-24 13:37 ` classabbyamp
@ 2023-07-24 13:37 ` classabbyamp
  2023-07-24 15:07 ` hholst80
                   ` (15 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2023-07-24 13:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272267812

Comment:
this makes no sense, coreutils are installed by default.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (17 preceding siblings ...)
  2023-07-24 13:37 ` classabbyamp
@ 2023-07-24 15:07 ` hholst80
  2023-07-24 15:17 ` hholst80
                   ` (14 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 15:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272397165

Comment:
Well, including it does fix the fileops tests in the package tests.

https://github.com/vifm/vifm/issues/913#issuecomment-1628605050

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (18 preceding siblings ...)
  2023-07-24 15:07 ` hholst80
@ 2023-07-24 15:17 ` hholst80
  2023-07-24 15:26 ` hholst80
                   ` (13 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 15:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

New review comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272410552

Comment:
I don't see a .gz for the v0.13 release. There is a source code tar.gz which might do the trick.  Should I try that or can we stick with .bz2?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (19 preceding siblings ...)
  2023-07-24 15:17 ` hholst80
@ 2023-07-24 15:26 ` hholst80
  2023-07-24 15:26 ` [PR PATCH] [Updated] " hholst80
                   ` (12 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 15:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 377 bytes --]

New review comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272421863

Comment:
The remaining failing test on 64-bit musl most likely breaks due to an old musl version used in the build environment.  I was able to confirm the upstream fix to simply upgrade musl (run a later alpine version) during the build.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Updated] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (20 preceding siblings ...)
  2023-07-24 15:26 ` hholst80
@ 2023-07-24 15:26 ` hholst80
  2023-07-24 15:29 ` [PR REVIEW] " xaizek
                   ` (11 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 15:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

There is an updated pull request by hholst80 against master on the void-packages repository

https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870

vifm: update to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 8625 bytes --]

From 8cd59f1a586066796f03b3234bb0252e37ac5404 Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH] Update vifm to 0.13

Co-authored-by: xaizek <xaizek@posteo.net>
---
 .../vifm/patches/disable-failed-tests.patch   |  38 -----
 .../vifm/patches/vifm-v0.13-musl-tests.patch  | 154 ++++++++++++++++++
 srcpkgs/vifm/template                         |  12 +-
 3 files changed, 160 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch
 create mode 100644 srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch

diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d82..0000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
- 
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
- 
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid1);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid1);
- 
- 	mark_selection_or_current(curr_view);
- 	fops_chown(0, 1, 0, gid2);
- 	assert_success(os_stat("dir/chown-me", &s));
--	assert_true(s.st_gid == gid2);
- 
- 	assert_success(unlink("dir/chown-me"));
- 	assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
new file mode 100644
index 0000000000000..a134e59ebdf62
--- /dev/null
+++ b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
@@ -0,0 +1,154 @@
+From c97f144231afbeb4215659d5c685fdf1e3fe5612 Mon Sep 17 00:00:00 2001
+From: xaizek <xaizek@posteo.net>
+Date: Sat, 8 Jul 2023 15:02:37 +0300
+Subject: [PATCH] Fix running tests with musl libc
+
+Thanks to Henrik Holst (a.k.a. hholst80).
+---
+ ChangeLog                       |  3 +++
+ src/filelist.c                  |  6 +++++-
+ src/opt_handlers.c              |  6 +++++-
+ src/ui/fileview.c               |  1 +
+ src/ui/ui.h                     |  3 +++
+ tests/misc/sort.c               | 13 ++++++++++---
+ tests/test-support/test-utils.c |  5 +++++
+ 7 files changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 21803c9e6..e6fcf5a36 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -78,6 +78,9 @@
+ 
+ 	Fixed performance degradation after preview consumes lots of color pairs.
+ 
++	Fixed running tests with musl libc.  Thanks to Henrik Holst (a.k.a.
++	hholst80).
++
+ 0.13-beta to 0.13 (2023-04-04)
+ 
+ 	Made "withicase" and "withrcase" affect how files are sorted before
+diff --git a/src/filelist.c b/src/filelist.c
+index 28d26c69f..a7121f238 100644
+--- a/src/filelist.c
++++ b/src/filelist.c
+@@ -329,7 +329,11 @@ flist_free_view(view_t *view)
+ 	modview_info_free(view->vi);
+ 	view->vi = NULL;
+ 
+-	regfree(&view->primary_group);
++	if(view->primary_group_set)
++	{
++		regfree(&view->primary_group);
++		view->primary_group_set = 0;
++	}
+ 
+ 	marks_clear_view(view);
+ 
+diff --git a/src/opt_handlers.c b/src/opt_handlers.c
+index 5d1c000b0..9905b2b7f 100644
+--- a/src/opt_handlers.c
++++ b/src/opt_handlers.c
+@@ -3301,9 +3301,13 @@ set_sortgroups(view_t *view, char **opt, char value[])
+ 	{
+ 		if(scope == OPT_LOCAL)
+ 		{
+-			regfree(&view->primary_group);
++			if(view->primary_group_set)
++			{
++				regfree(&view->primary_group);
++			}
+ 			(void)regexp_compile(&view->primary_group, first,
+ 					REG_EXTENDED | REG_ICASE);
++			view->primary_group_set = 1;
+ 		}
+ 		free(first);
+ 	}
+diff --git a/src/ui/fileview.c b/src/ui/fileview.c
+index 11c80fe8b..ef5f422be 100644
+--- a/src/ui/fileview.c
++++ b/src/ui/fileview.c
+@@ -253,6 +253,7 @@ fview_init(view_t *view)
+ 	view->sort_groups_g = strdup("");
+ 	(void)regexp_compile(&view->primary_group, view->sort_groups,
+ 			REG_EXTENDED | REG_ICASE);
++	view->primary_group_set = 1;
+ 
+ 	view->preview_prg = strdup("");
+ 	view->preview_prg_g = strdup("");
+diff --git a/src/ui/ui.h b/src/ui/ui.h
+index c9fee0782..886eb9d38 100644
+--- a/src/ui/ui.h
++++ b/src/ui/ui.h
+@@ -449,6 +449,9 @@ struct view_t
+ 	char *sort_groups, *sort_groups_g;
+ 	/* Primary group of sort_groups (not sort_groups_g) in compiled form. */
+ 	regex_t primary_group;
++	/* Indicates that primary_group was initialized, which is used to avoid
++	 * freeing uninitialized data or freeing it twice. */
++	int primary_group_set;
+ 
+ 	int history_num;    /* Number of used history elements. */
+ 	int history_pos;    /* Current position in history. */
+diff --git a/tests/misc/sort.c b/tests/misc/sort.c
+index 9938414b5..3db71db5b 100644
+--- a/tests/misc/sort.c
++++ b/tests/misc/sort.c
+@@ -409,8 +409,13 @@ TEST(groups_sorting_works)
+ 	lwin.dir_entry[6].origin = lwin.curr_dir;
+ 
+ 	update_string(&lwin.sort_groups, "-(done|todo).*");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "-(done|todo).*",
+ 			REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	/* Ascending sorting. */
+ 
+@@ -437,15 +442,17 @@ TEST(groups_sorting_works)
+ 	assert_string_equal("11-todo-publish", lwin.dir_entry[4].name);
+ 	assert_string_equal("1-done", lwin.dir_entry[5].name);
+ 	assert_string_equal("3-done", lwin.dir_entry[6].name);
+-
+-	regfree(&lwin.primary_group);
+-	update_string(&lwin.sort_groups, NULL);
+ }
+ 
+ TEST(global_groups_sorts_entries_list)
+ {
+ 	update_string(&lwin.sort_groups_g, "([0-9])");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "([a-z])", REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	dir_entry_t entry_list[] = { { .name = "a1" }, { .name = "b0" } };
+ 	entries_t entries = { entry_list, 2 };
+diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c
+index 932bdc9c9..e3d9ba694 100644
+--- a/tests/test-support/test-utils.c
++++ b/tests/test-support/test-utils.c
+@@ -32,6 +32,7 @@
+ #include "../../src/utils/macros.h"
+ #include "../../src/utils/matcher.h"
+ #include "../../src/utils/path.h"
++#include "../../src/utils/regexp.h"
+ #include "../../src/utils/str.h"
+ #include "../../src/utils/string_array.h"
+ #include "../../src/utils/utils.h"
+@@ -254,6 +255,10 @@ view_setup(view_t *view)
+ 	view_set_sort(view->sort, SK_BY_NAME, SK_NONE);
+ 	view_set_sort(view->sort_g, SK_BY_NAME, SK_NONE);
+ 
++	/* The code assumes that this field is initialized. */
++	assert_success(regexp_compile(&view->primary_group, "", REG_ICASE));
++	view->primary_group_set = 1;
++
+ 	view->custom.entry_count = 0;
+ 	view->custom.entries = NULL;
+ 
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943c..28e09046a1b3b 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.12
+version=0.13
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
-hostmakedepends="mdocml"
+hostmakedepends="mdocml perl coreutils"
 makedepends="ncurses-devel file-devel"
 depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="File manager with curses interface and a Vim-like environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
 
 post_install() {
 	vsconf data/vifmrc

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (21 preceding siblings ...)
  2023-07-24 15:26 ` [PR PATCH] [Updated] " hholst80
@ 2023-07-24 15:29 ` xaizek
  2023-07-24 15:30 ` classabbyamp
                   ` (10 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: xaizek @ 2023-07-24 15:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

New review comment by xaizek on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272426090

Comment:
Stick with bz2, it's prepared with `make dist` and unlike automatically generated one can't change its hash and won't have issues with `configure` due to incorrect file timestamps.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (22 preceding siblings ...)
  2023-07-24 15:29 ` [PR REVIEW] " xaizek
@ 2023-07-24 15:30 ` classabbyamp
  2023-07-24 16:13 ` ahesford
                   ` (9 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2023-07-24 15:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272427565

Comment:
then it should be patched for our musl, as the test indicates it would fail in our environment

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (23 preceding siblings ...)
  2023-07-24 15:30 ` classabbyamp
@ 2023-07-24 16:13 ` ahesford
  2023-07-24 17:01 ` xaizek
                   ` (8 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ahesford @ 2023-07-24 16:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272478335

Comment:
Although I can't get the tests to pass (even when removing the conflicting Changelog text) with your patch, I'm pretty sure this change is unnecessary because the only failing test is not a complaint about these compiler warnings.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (24 preceding siblings ...)
  2023-07-24 16:13 ` ahesford
@ 2023-07-24 17:01 ` xaizek
  2023-07-24 17:02 ` xaizek
                   ` (7 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: xaizek @ 2023-07-24 17:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

New review comment by xaizek on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272526180

Comment:
A fix could look like adding this at the top of `src/sort.c`:
```c
#ifdef HAVE_STRVERSCMP_FUNC
#    undef HAVE_STRVERSCMP_FUNC
#endif
```
(`#undef` alone might also work, but just in case.)
This will always use custom implementation of `strverscmp()` (Windows doesn't have it and BSD-systems probably too).  The tests validate custom implementation and that behaviour is consistent across various systems.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (25 preceding siblings ...)
  2023-07-24 17:01 ` xaizek
@ 2023-07-24 17:02 ` xaizek
  2023-07-24 19:43 ` hholst80
                   ` (6 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: xaizek @ 2023-07-24 17:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

New review comment by xaizek on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272526180

Comment:
A fix could look like adding this at the top of `src/sort.c` (before or after includes, doesn't really matter):
```c
#ifdef HAVE_STRVERSCMP_FUNC
#    undef HAVE_STRVERSCMP_FUNC
#endif
```
(`#undef` alone might also work, but just in case.)
This will always use custom implementation of `strverscmp()` (Windows doesn't have it and BSD-systems probably too).  The tests validate custom implementation and that behaviour is consistent across various systems.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR REVIEW] vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (26 preceding siblings ...)
  2023-07-24 17:02 ` xaizek
@ 2023-07-24 19:43 ` hholst80
  2023-07-24 20:24 ` ahesford
                   ` (5 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 19:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

New review comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#discussion_r1272678856

Comment:
> Although I can't get the tests to pass (even when removing the conflicting Changelog text) with your patch, I'm pretty sure this change is unnecessary because the only failing test is not a complaint about these compiler warnings.

Yes I saw that the patch from the git history was non compatible. I'll add back the original with some kind of source link back to GitHub.

The unused warning thing was just my attempt to have a clean build. 

The tests pass on alpine:latest which uses a recent musl release. Did you build on native void linux? Is that using the latest musl?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (27 preceding siblings ...)
  2023-07-24 19:43 ` hholst80
@ 2023-07-24 20:24 ` ahesford
  2023-07-24 20:24 ` [PR PATCH] [Closed]: " ahesford
                   ` (4 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ahesford @ 2023-07-24 20:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1648553468

Comment:
It's probably best to leave these kinds of updates to people actually using the software on Void.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: [PR PATCH] [Closed]: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (28 preceding siblings ...)
  2023-07-24 20:24 ` ahesford
@ 2023-07-24 20:24 ` ahesford
  2023-07-24 21:39 ` hholst80
                   ` (3 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: ahesford @ 2023-07-24 20:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

There's a closed pull request on the void-packages repository

vifm: update to 0.13
https://github.com/void-linux/void-packages/pull/44870

Description:
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (29 preceding siblings ...)
  2023-07-24 20:24 ` [PR PATCH] [Closed]: " ahesford
@ 2023-07-24 21:39 ` hholst80
  2023-07-24 21:42 ` ahesford
                   ` (2 subsequent siblings)
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 21:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1648664982

Comment:
@ahesford what are you talking about? I am using void, I am using vifm? I have opted to maintain this as well. I am not expected to use ALL platforms of void linux on a regular basis am I?

Seriously, shitty behavior to close this after I spent all this time on this?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (30 preceding siblings ...)
  2023-07-24 21:39 ` hholst80
@ 2023-07-24 21:42 ` ahesford
  2023-07-24 22:02 ` xaizek
  2023-07-24 22:02 ` hholst80
  33 siblings, 0 replies; 35+ messages in thread
From: ahesford @ 2023-07-24 21:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1648668375

Comment:
Your patches don't even apply, and you are referring to tests on Alpine rather than Void. Whether you use Void or not, you're clearly not testing your updates on it.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (31 preceding siblings ...)
  2023-07-24 21:42 ` ahesford
@ 2023-07-24 22:02 ` xaizek
  2023-07-24 22:02 ` hholst80
  33 siblings, 0 replies; 35+ messages in thread
From: xaizek @ 2023-07-24 22:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

New comment by xaizek on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1648686525

Comment:
@ahesford The patch applied until another reviewer suggested that it's an exact commit, which is not correct.

@hholst80 Maybe try doing as specified [here](https://github.com/void-linux/void-packages#building-packages-natively-for-the-musl-c-library) to build against musl, so Alpine isn't necessary for testing.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: vifm: update to 0.13
  2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
                   ` (32 preceding siblings ...)
  2023-07-24 22:02 ` xaizek
@ 2023-07-24 22:02 ` hholst80
  33 siblings, 0 replies; 35+ messages in thread
From: hholst80 @ 2023-07-24 22:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New comment by hholst80 on void-packages repository

https://github.com/void-linux/void-packages/pull/44870#issuecomment-1648686734

Comment:
Yes, I am. I just happen to not have 10 different installations of Void. Reopen it and stop being a jerk.

^ permalink raw reply	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2023-07-24 22:02 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-05 22:33 [PR PATCH] Update vifm to 0.13 hholst80
2023-07-05 22:35 ` hholst80
2023-07-05 22:39 ` [PR PATCH] [Updated] " hholst80
2023-07-05 22:42 ` [PR REVIEW] " classabbyamp
2023-07-05 23:06 ` [PR PATCH] [Updated] " hholst80
2023-07-05 23:14 ` hholst80
2023-07-05 23:28 ` hholst80
2023-07-05 23:30 ` hholst80
2023-07-05 23:45 ` [PR REVIEW] " classabbyamp
2023-07-06 12:29 ` [PR PATCH] [Updated] " hholst80
2023-07-06 22:07 ` vifm: update " hholst80
2023-07-08 16:05 ` [PR PATCH] [Updated] " hholst80
2023-07-08 16:28 ` hholst80
2023-07-13 14:25 ` [PR PATCH] [Updated] " hholst80
2023-07-13 14:28 ` hholst80
2023-07-24 13:16 ` hholst80
2023-07-24 13:37 ` [PR REVIEW] " classabbyamp
2023-07-24 13:37 ` classabbyamp
2023-07-24 13:37 ` classabbyamp
2023-07-24 15:07 ` hholst80
2023-07-24 15:17 ` hholst80
2023-07-24 15:26 ` hholst80
2023-07-24 15:26 ` [PR PATCH] [Updated] " hholst80
2023-07-24 15:29 ` [PR REVIEW] " xaizek
2023-07-24 15:30 ` classabbyamp
2023-07-24 16:13 ` ahesford
2023-07-24 17:01 ` xaizek
2023-07-24 17:02 ` xaizek
2023-07-24 19:43 ` hholst80
2023-07-24 20:24 ` ahesford
2023-07-24 20:24 ` [PR PATCH] [Closed]: " ahesford
2023-07-24 21:39 ` hholst80
2023-07-24 21:42 ` ahesford
2023-07-24 22:02 ` xaizek
2023-07-24 22:02 ` hholst80

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).